diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-text/poppler/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-text/poppler/files')
6 files changed, 0 insertions, 180 deletions
diff --git a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch b/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch deleted file mode 100644 index f0a8d3c7eb4a..000000000000 --- a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7178d25..934f38f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -119,6 +119,18 @@ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSIO - message("-- CMake >= 2.8.8 is needed to enable Qt5") - endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) - -+# -+# Ugly workaround: Manually patch library paths for Qt4 and Qt5: -+# -+IF( "${CMAKE_CXX_FLAGS}" MATCHES "-m32") -+ GET_CMAKE_PROPERTY(_res VARIABLES) -+ FOREACH(_var ${_res}) -+ IF(_var MATCHES "^QT" AND ${_var} MATCHES "lib64") -+ STRING(REPLACE "lib64" "lib32" ${_var} "${${_var}}") -+ ENDIF() -+ ENDFOREACH() -+ENDIF() -+ - macro_optional_find_package(Cairo ${CAIRO_VERSION}) - if(CAIRO_FOUND) - set(HAVE_CAIRO ${CAIRO_FOUND}) diff --git a/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch b/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch deleted file mode 100644 index faf632128ff7..000000000000 --- a/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix security issue [internal unmaintained JPX decoder] that is caused -by building without system-jpeg libs. Fedora does not care because they -always build with system-jpeg, however in Gentoo we allow the user to -disable both options and poppler's buildsystem is making us believe -there would be no JPX decoder built in that case, when in reality -JPXStream.cc is built (even if it may not be used by the code). - - ---- a/CMakeLists.txt 2017-11-24 23:12:41.953450442 +0100 -+++ b/CMakeLists.txt 2017-11-24 23:16:09.441030669 +0100 -@@ -506,9 +508,11 @@ - add_definitions(-DUSE_OPENJPEG2) - set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG2_LIBRARIES}) - else () -- set(poppler_SRCS ${poppler_SRCS} -- poppler/JPXStream.cc -- ) -+ if(NOT WITH_OPENJPEG AND HAVE_JPX_DECODER) -+ set(poppler_SRCS ${poppler_SRCS} -+ poppler/JPXStream.cc -+ ) -+ endif() - endif() - if(USE_CMS) - if(LCMS_FOUND) diff --git a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch deleted file mode 100644 index 259be15c6631..000000000000 --- a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch +++ /dev/null @@ -1,29 +0,0 @@ -From af70882d85999b1912f9909f506ee7d22cc58ca7 Mon Sep 17 00:00:00 2001 -From: Johannes Huber <johu@gentoo.org> -Date: Fri, 6 Oct 2017 08:52:10 +0200 -Subject: [PATCH] [Qt5] Drop unused dependencies - ---- - CMakeLists.txt | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7485b2ad..04327568 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -147,10 +147,8 @@ if (ENABLE_QT5) - find_package(Qt5Core) - find_package(Qt5Gui) - find_package(Qt5Xml) -- find_package(Qt5Widgets) -- find_package(Qt5Test) -- if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)) -- message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found") -+ if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND)) -+ message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found") - set(ENABLE_QT5 OFF) - endif() - endif() --- -2.14.2 - diff --git a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch deleted file mode 100644 index a75b84b482f5..000000000000 --- a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- poppler-0.61.0/cmake/modules/PopplerMacros.cmake -+++ poppler-0.61.0/cmake/modules/PopplerMacros.cmake -@@ -98,8 +98,6 @@ - set(CMAKE_BUILD_TYPE RelWithDebInfo) - endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - --if(CMAKE_COMPILER_IS_GNUCXX) -- # set the default compile warnings - set(_warn "-Wall -Wextra -Wpedantic") - set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers") - set(_warn "${_warn} -Wcast-align") -@@ -124,39 +122,6 @@ - set(DEFAULT_COMPILE_WARNINGS "${_warn}") - set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - -- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") -- set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}") -- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}") -- -- poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED) -- if(GCC_HAS_AS_NEEDED) -- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed") -- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed") -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") -- endif(GCC_HAS_AS_NEEDED) --endif (CMAKE_COMPILER_IS_GNUCXX) -- --if(CMAKE_C_COMPILER MATCHES "icc") -- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cxxflags}") -- set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}") --endif(CMAKE_C_COMPILER MATCHES "icc") -- -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") -+ -\ Kein Zeilenumbruch am Dateiende. diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch b/app-text/poppler/files/poppler-0.62.0-glibc.patch deleted file mode 100644 index 6808e91601dc..000000000000 --- a/app-text/poppler/files/poppler-0.62.0-glibc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001 -From: Pekka Vuorela <pekka.vuorela@jollamobile.com> -Date: Fri, 15 Dec 2017 16:56:20 +0200 -Subject: Honor configuration for building glibc copy of strtok_r - -config.h didn't get included and HAVE_STRTOK_R was never defined. -Now getting via glibc.h. ---- - goo/glibc_strtok_r.cc | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc -index e779bf5..e323bc2 100644 ---- a/goo/glibc_strtok_r.cc -+++ b/goo/glibc_strtok_r.cc -@@ -50,12 +50,15 @@ - // Copyright (C) 2012 Alexey Pavlov <alexpux@gmail.com> - // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org> - // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> -+// Copyright (C) 2017 Pekka Vuorela <pekka.vuorela@jollamobile.com> - // - // To see a description of the changes please see the Changelog file that - // came with your tarball or type make ChangeLog if you are building from git - // - //======================================================================== - -+#include "glibc.h" -+ - #ifndef HAVE_STRTOK_R - - #include <string.h> --- -cgit v1.1 - diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch deleted file mode 100644 index 789090cc9b22..000000000000 --- a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch +++ /dev/null @@ -1,14 +0,0 @@ -Sadly the CMake side of openjpeg slotting in Gentoo is broken. -To reliably find openjpeg:2 we need to use pkg-config. - ---- poppler-0.62.0/CMakeLists.txt -+++ poppler-0.62.0/CMakeLists.txt -@@ -193,7 +193,7 @@ - endif() - set(WITH_OPENJPEG FALSE) - if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2") -- find_package(LIBOPENJPEG2) -+ pkg_check_modules(LIBOPENJPEG2 libopenjp2) - set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND}) - if(NOT LIBOPENJPEG2_FOUND) - message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.") |