commit 5cde5403007ac19a08d06586d752996e70dc2d7a Author: Juergen Daubert <jue@jue.li> Date: Fri Feb 17 13:16:56 2017 +0100 poppler-qt4: dropped diff --git a/poppler-qt4/.footprint b/poppler-qt4/.footprint deleted file mode 100644 index b13e003..0000000 --- a/poppler-qt4/.footprint +++ /dev/null @@ -1,18 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/poppler/ -drwxr-xr-x root/root usr/include/poppler/qt4/ --rw-r--r-- root/root usr/include/poppler/qt4/poppler-annotation.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-export.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-form.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-link.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-media.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-optcontent.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-page-transition.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-qt4.h -drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so -> libpoppler-qt4.so.4 -lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so.4 -> libpoppler-qt4.so.4.11.0 --rwxr-xr-x root/root usr/lib/libpoppler-qt4.so.4.11.0 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/poppler-qt4.pc diff --git a/poppler-qt4/.md5sum b/poppler-qt4/.md5sum deleted file mode 100644 index e730525..0000000 --- a/poppler-qt4/.md5sum +++ /dev/null @@ -1,2 +0,0 @@ -dfdd55d5df39685bbb82b0c08fa4ef66 poppler-0.52.0.tar.xz -56403c21d7357d1151d72d3fe26a1bf6 poppler-cmake.patch diff --git a/poppler-qt4/.signature b/poppler-qt4/.signature deleted file mode 100644 index 919addc..0000000 --- a/poppler-qt4/.signature +++ /dev/null @@ -1,6 +0,0 @@ -untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/esSSgG4nuBiqMOhGoVeHiaJyr2v4B8ZlzrzdCYVcXlg2b4W5+tMr/NPwEae3s2X2NI8fblM271pJjbTMGa9ygk= -SHA256 (Pkgfile) = 2cb10c69ad1ee20e55af9dbbc40ea7e528ee75baf9265ad6c547fb3aa80d79fe -SHA256 (.footprint) = 24a302bd42d6cd66ea4463815b86618190c384ee8d69d809391f7af6818cd367 -SHA256 (poppler-0.52.0.tar.xz) = 528b661738839f9a25f6e580fcd2d5db007e0a1948580c6489f0062798ca1992 -SHA256 (poppler-cmake.patch) = dc3074f93cfcbdbf9b7934763cf1de3d8fdfef5665f503c0471f8aa4e2166dc7 diff --git a/poppler-qt4/Pkgfile b/poppler-qt4/Pkgfile deleted file mode 100644 index 6e8a8b2..0000000 --- a/poppler-qt4/Pkgfile +++ /dev/null @@ -1,42 +0,0 @@ -# Description: qt4 wrapper for poppler -# URL: http://poppler.freedesktop.org/ -# Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: qt4 poppler - -name=poppler-qt4 -version=0.52.0 -release=1 -source=(http://poppler.freedesktop.org/poppler-$version.tar.xz - poppler-cmake.patch) - -build() { - cd poppler-$version - - patch -p0 -i $SRC/poppler-cmake.patch - - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_XPDF_HEADERS=OFF \ - -DENABLE_UTILS=OFF \ - -DENABLE_SPLASH=ON \ - -DENABLE_CAIRO=OFF \ - -DENABLE_CPP=OFF \ - -DENABLE_GLIB=OFF \ - -DENABLE_QT4=ON \ - -DENABLE_QT5=OFF \ - -DENABLE_ZLIB=ON \ - -DENABLE_CMS=lcms2 \ - -DENABLE_LIBOPENJPEG=OFF \ - -DENABLE_NSS3=OFF \ - -DBUILD_GTK_TESTS=OFF \ - -DBUILD_QT4_TESTS=OFF \ - -DBUILD_QT5_TESTS=OFF \ - -DBUILD_CPP_TESTS=OFF \ - - make - make DESTDIR=$PKG install - - rm $PKG/usr/lib/libpoppler.so* - rm $PKG/usr/lib/pkgconfig/poppler.pc - rm $PKG/usr/lib/pkgconfig/poppler-splash.pc -} diff --git a/poppler-qt4/poppler-cmake.patch b/poppler-qt4/poppler-cmake.patch deleted file mode 100644 index 1ccfe05..0000000 --- a/poppler-qt4/poppler-cmake.patch +++ /dev/null @@ -1,158 +0,0 @@ ---- CMakeLists.txt.orig 2016-12-17 14:42:45.869315608 +0100 -+++ CMakeLists.txt 2016-12-17 18:17:13.215529642 +0100 -@@ -33,8 +33,14 @@ - option(BUILD_QT5_TESTS "Whether compile the Qt5 test programs." ON) - option(BUILD_CPP_TESTS "Whether compile the CPP test programs." ON) - option(ENABLE_SPLASH "Build the Splash graphics backend." ON) -+option(ENABLE_CAIRO "Build the Cairo graphics backend." ON) - option(ENABLE_UTILS "Compile poppler command line utils." ON) - option(ENABLE_CPP "Compile poppler cpp wrapper." ON) -+option(ENABLE_GLIB "Compile poppler glib wrapper." ON) -+option(ENABLE_QT4 "Compile poppler QT4 wrapper." ON) -+option(ENABLE_QT5 "Compile poppler QT5 wrapper." ON) -+option(ENABLE_NSS3 "Build with NSS3 support." OFF) -+ - set(ENABLE_LIBOPENJPEG "auto" CACHE STRING "Use libopenjpeg for JPX streams. Possible values: auto, openjpeg1, openjpeg2. 'auto' prefers openjpeg1 over openjpeg2 if both are available. Unset to not use openjpeg.") - set(ENABLE_CMS "auto" CACHE STRING "Use color management system. Possible values: auto, lcms1, lcms2. 'auto' prefers lcms2 over lcms1 if both are available. Unset to disable color management system.") - option(ENABLE_LIBCURL "Build libcurl based HTTP support." OFF) -@@ -111,43 +117,46 @@ - set(ENABLE_LIBJPEG ${JPEG_FOUND}) - endif(JPEG_FOUND) - macro_optional_find_package(Qt4) --if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) -- find_package(Qt5Core) -- find_package(Qt5Gui) -- find_package(Qt5Xml) -- find_package(Qt5Widgets) -- find_package(Qt5Test) -- if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND) -- set(QT5_FOUND true) -- else () -- message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found") -+if(ENABLE_QT5) -+ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) -+ find_package(Qt5Core) -+ find_package(Qt5Gui) -+ find_package(Qt5Xml) -+ find_package(Qt5Widgets) -+ find_package(Qt5Test) -+ if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND) -+ set(QT5_FOUND true) -+ else () -+ message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found") -+ set(QT5_FOUND false) -+ endif() -+ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) - set(QT5_FOUND false) -- endif() --else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) -- set(QT5_FOUND false) -- 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) -- --macro_optional_find_package(Cairo ${CAIRO_VERSION}) --if(CAIRO_FOUND) -- set(HAVE_CAIRO ${CAIRO_FOUND}) -- set(CAIRO_FEATURE "#define POPPLER_HAS_CAIRO 1") -- set(CAIRO_REQ "cairo") -- set(POPPLER_GLIB_DISABLE_DEPRECATED "") -- set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "") -- macro_optional_find_package(GLIB) -- if(GLIB_FOUND) -- set(ENABLE_GLIB ON) -- # Check for introspection -- macro_optional_find_package(GObjectIntrospection 0.9.12) -- set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND}) -- set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED") -- set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES") -- macro_optional_find_package(GTK) -- endif(GLIB_FOUND) --else(CAIRO_FOUND) -- set(CAIRO_FEATURE "#undef POPPLER_HAS_CAIRO") --endif(CAIRO_FOUND) -+ 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) -+endif() -+if(ENABLE_CAIRO) -+ macro_optional_find_package(Cairo ${CAIRO_VERSION}) -+ if(CAIRO_FOUND) -+ set(HAVE_CAIRO ${CAIRO_FOUND}) -+ set(CAIRO_FEATURE "#define POPPLER_HAS_CAIRO 1") -+ set(CAIRO_REQ "cairo") -+ set(POPPLER_GLIB_DISABLE_DEPRECATED "") -+ set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "") -+ macro_optional_find_package(GLIB) -+ if(ENABLE_GLIB) -+ set(ENABLE_GLIB ON) -+ # Check for introspection -+ macro_optional_find_package(GObjectIntrospection 0.9.12) -+ set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND}) -+ set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED") -+ set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES") -+ macro_optional_find_package(GTK) -+ endif(ENABLE_GLIB) -+ else(CAIRO_FOUND) -+ set(CAIRO_FEATURE "#undef POPPLER_HAS_CAIRO") -+ endif(CAIRO_FOUND) -+endif(ENABLE_CAIRO) - if(ENABLE_CPP) - macro_optional_find_package(Iconv) - set(ENABLE_CPP ${ICONV_FOUND}) -@@ -241,10 +250,10 @@ - include_directories(${ZLIB_INCLUDE_DIR}) - endif(ENABLE_ZLIB) - --if (NSS3_FOUND) -+if (ENABLE_NSS3 AND NSS3_FOUND) - add_definitions(${NSS3_CFLAGS}) - set(ENABLE_NSS3 ON) --endif(NSS3_FOUND) -+endif(ENABLE_NSS3 AND NSS3_FOUND) - if(JPEG_FOUND) - include_directories(${JPEG_INCLUDE_DIR}) - set(ENABLE_LIBJPEG ON) -@@ -681,12 +690,12 @@ - add_subdirectory(glib) - endif(ENABLE_GLIB) - add_subdirectory(test) --if(QT4_FOUND) -+if(ENABLE_QT4) - add_subdirectory(qt4) --endif(QT4_FOUND) --if(QT5_FOUND) -+endif(ENABLE_QT4) -+if(ENABLE_QT5) - add_subdirectory(qt5) --endif(QT5_FOUND) -+endif(ENABLE_QT5) - if(ENABLE_CPP) - add_subdirectory(cpp) - endif(ENABLE_CPP) -@@ -708,12 +717,12 @@ - if(ENABLE_SPLASH) - poppler_create_install_pkgconfig(poppler-splash.pc lib${LIB_SUFFIX}/pkgconfig) - endif(ENABLE_SPLASH) --if(QT4_FOUND) -+if(ENABLE_QT4) - poppler_create_install_pkgconfig(poppler-qt4.pc lib${LIB_SUFFIX}/pkgconfig) --endif(QT4_FOUND) --if(QT5_FOUND) -+endif(ENABLE_QT4) -+if(ENABLE_QT5) - poppler_create_install_pkgconfig(poppler-qt5.pc lib${LIB_SUFFIX}/pkgconfig) --endif(QT5_FOUND) -+endif(ENABLE_QT5) - if(ENABLE_GLIB) - poppler_create_install_pkgconfig(poppler-glib.pc lib${LIB_SUFFIX}/pkgconfig) - endif(ENABLE_GLIB) -@@ -732,8 +741,8 @@ - message(" with CMYK support") - endif() - show_end_message_yesno("cairo output" CAIRO_FOUND) --show_end_message_yesno("qt4 wrapper" QT4_FOUND) --show_end_message_yesno("qt5 wrapper" QT5_FOUND) -+show_end_message_yesno("qt4 wrapper" ENABLE_QT4) -+show_end_message_yesno("qt5 wrapper" ENABLE_QT5) - show_end_message_yesno("glib wrapper" ENABLE_GLIB) - show_end_message_yesno(" introspection" INTROSPECTION_FOUND) - show_end_message_yesno("cpp wrapper" ENABLE_CPP)