January 2017 - crux-commits

ports/core (3.2): zlib: updated to 1.2.9
by crux＠crux.nu 01 Jan '17

01 Jan '17

commit 8937ecdd46160e960fa94ec10b4c08f2c76960a4 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jan 1 20:14:07 2017 +0100 zlib: updated to 1.2.9 diff --git a/zlib/.footprint b/zlib/.footprint index 6c2c16a..ab9c157 100644 --- a/zlib/.footprint +++ b/zlib/.footprint @@ -1,13 +1,13 @@ drwxr-xr-x root/root lib/ -lrwxrwxrwx root/root lib/libz.so.1 -> libz.so.1.2.8 --rwxr-xr-x root/root lib/libz.so.1.2.8 +lrwxrwxrwx root/root lib/libz.so.1 -> libz.so.1.2.9 +-rwxr-xr-x root/root lib/libz.so.1.2.9 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/zconf.h -rw-r--r-- root/root usr/include/zlib.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libz.a -lrwxrwxrwx root/root usr/lib/libz.so -> ../../lib/libz.so.1.2.8 +lrwxrwxrwx root/root usr/lib/libz.so -> ../../lib/libz.so.1.2.9 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/zlib.pc drwxr-xr-x root/root usr/share/ diff --git a/zlib/.md5sum b/zlib/.md5sum index 6a41bed..0faa9b3 100644 --- a/zlib/.md5sum +++ b/zlib/.md5sum @@ -1 +1 @@ -44d667c142d7cda120332623eab69f40 zlib-1.2.8.tar.gz +e453644539a07783aa525e834491134e zlib-1.2.9.tar.gz diff --git a/zlib/Pkgfile b/zlib/Pkgfile index 6315204..fe892d5 100644 --- a/zlib/Pkgfile +++ b/zlib/Pkgfile @@ -3,8 +3,8 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=zlib -version=1.2.8 -release=2 +version=1.2.9 +release=1 source=(http://www.zlib.net/$name-$version.tar.gz) build() {

1 0

ports/opt (3.3): signature updates
by crux＠crux.nu 01 Jan '17

01 Jan '17

commit b54c4af3fff9665522503cae50fc36f34b3cf263 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 1 15:46:10 2017 +0100 signature updates diff --git a/flash-player-plugin/.signature b/flash-player-plugin/.signature index 46f380f..2eed080 100644 --- a/flash-player-plugin/.signature +++ b/flash-player-plugin/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aVFvKUIw09WJ2efc/FUwDioH8J/ylhkUGlYpvpLoZH0CeXrJFLCb0DhOUmI/bIfzdA3KclM6Nf5o///8NanEQw= -SHA256 (Pkgfile) = 47f971aae8e0366c7d9800e22043079398c920e98b3b4909ac9340bf695be027 +RWSE3ohX2g5d/f1nUH44shOufNftPNbHlsv6+y2EWeVoMYfqjBIvSwOALCqsEq3mtsj45QBEfizTmzEL3Ewoe49tVEkBoXkAUQw= +SHA256 (Pkgfile) = 074d93b676172b3d6c5ffcaa8b2b1822f8637dafde4932c3a458fd8c8a62c3ce SHA256 (.footprint) = 9bc6ecbc9ca40c49f8ac0db0024a96e10a49e188ae0402544f6b70ab32e7277f -SHA256 (flash-plugin-11.2.202.644-release.x86_64.rpm) = 4fd4aca26eeb9fa4f83c5925ada95f7bf35712d695e0397655453bc8afbf1663 +SHA256 (flash-player-npapi-24.0.0.186-release.x86_64.rpm) = 0074c7b33b3de0dea1aa2d729ebe890c53b049c648dc7179c4a0677db991b4f4 diff --git a/pure-ftpd/.signature b/pure-ftpd/.signature index 7eb8dfe..79deec0 100644 --- a/pure-ftpd/.signature +++ b/pure-ftpd/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QavWOIqCgAq7t/cPtdwBR5oZXWSVCPSU1VBxwgvmYo0kL+VJHFb0ictdNmxrRIR/Uv+K20rVEsPf6xDG2/0Uw8= -SHA256 (Pkgfile) = ef95bb50b76fd54202a1d2860cfc3bc85b70d9fa8b73e437983019e00db4cafe +RWSE3ohX2g5d/Ro1foV4OSQz7RAuR01uaYwZca4QAj64Ceyu8d0yZEpc9yfElHOEp0sDC03uh6A4GA/Y0NEFiyt8DGEI6mcKhws= +SHA256 (Pkgfile) = 9f0397f4716974283f1f7eb7da4bb5f4f85f7a53a4918b4f530f83af0fde39c0 SHA256 (.footprint) = 3f104cd552f809906695df83fb8f562098f22e3798594fde9042265aafa9d8d5 -SHA256 (pure-ftpd-1.0.43.tar.bz2) = 1289a094c7b5675132cefd1383472d6cab60e757ee75ff3b2687072e8d7df7b2 -SHA256 (pure-ftpd) = 2b5e9da98ea0e3781856276de2e8258d14ffe6290ac1590e66ef9476560dc13b -SHA256 (pure-ftpd.conf) = c921719e2cac56865e0c0dabbcc7edb930d0d1b20caeeeb42c9ec64c68b41e00 +SHA256 (pure-ftpd-1.0.44.tar.bz2) = 30b65765cab64db04ebb983a8ff363a6d45fd1f99e9e5ec2fbdd40eba3c68b7a +SHA256 (pure-ftpd) = 3d6bb818cc8a314c64373072807b1f33afa2e6bd53e7ce82884d85c2ce22627e +SHA256 (pure-ftpd.conf) = b5f236f499ee93101ee1d5ac1569aaf9aa93118773d6b498382ad190f844f710

1 0

ports/opt (3.3): Merge branch '3.2' into 3.3
by crux＠crux.nu 01 Jan '17

01 Jan '17

commit 1f59b3b58c35ca995fe76ae79cf567dc47ecc12a Merge: 72c2cbb 5e37fc1 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 1 15:43:59 2017 +0100 Merge branch '3.2' into 3.3

1 0

ports/opt (3.3): [notify] flash-player-plugin: update to 24.0.0.186
by crux＠crux.nu 01 Jan '17

01 Jan '17

commit 5e37fc16fbd2861b6ead04ec1c3a4fea0cce9fdb Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 1 14:30:46 2017 +0100 [notify] flash-player-plugin: update to 24.0.0.186 several security fixes, see https://helpx.adobe.com/security/products/flash-player/apsb16-39.html diff --git a/flash-player-plugin/.md5sum b/flash-player-plugin/.md5sum index 23cecd2..069e994 100644 --- a/flash-player-plugin/.md5sum +++ b/flash-player-plugin/.md5sum @@ -1 +1 @@ -1ff994ff1ac9628f469a6ccb05adfe60 flash-plugin-11.2.202.644-release.x86_64.rpm +8590518098f7c06a90483e4d84c6d7d7 flash-player-npapi-24.0.0.186-release.x86_64.rpm diff --git a/flash-player-plugin/Pkgfile b/flash-player-plugin/Pkgfile index d9d1fee..5b423e4 100644 --- a/flash-player-plugin/Pkgfile +++ b/flash-player-plugin/Pkgfile @@ -5,9 +5,9 @@ # Depends on: name=flash-player-plugin -version=11.2.202.644 +version=24.0.0.186 release=1 -source=(http://fpdownload.macromedia.com/get/flashplayer/pdc/$version/flash-plugin-$version-release.x86_64.rpm) +source=(https://fpdownload.adobe.com/pub/flashplayer/pdc/$version/flash-player-npapi-$version-release.x86_64.rpm) build() { install -D -m 0755 usr/lib64/flash-plugin/libflashplayer.so \

1 0

ports/opt (3.3): pure-ftpd: update to 1.0.44
by crux＠crux.nu 01 Jan '17

01 Jan '17

commit a34ec65cb96845b3c2f46616c8362005c285c584 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 1 13:10:54 2017 +0100 pure-ftpd: update to 1.0.44 diff --git a/pure-ftpd/.md5sum b/pure-ftpd/.md5sum index a409c4d..60738a7 100644 --- a/pure-ftpd/.md5sum +++ b/pure-ftpd/.md5sum @@ -1,3 +1,3 @@ -3698dc9fced3c059e3acd0497bda6b1a pure-ftpd -685498474a47340e9a3eae1518cf83c8 pure-ftpd-1.0.43.tar.bz2 -91e56b81f8f77c8b9d81d455817b1892 pure-ftpd.conf +b488de0fd27c7ae17fa779fb6c24b8ef pure-ftpd +8da4207c02a72267abfdf0a9fc2bf3a9 pure-ftpd-1.0.44.tar.bz2 +0892402e770259031b3398cde4394bb3 pure-ftpd.conf diff --git a/pure-ftpd/Pkgfile b/pure-ftpd/Pkgfile index 1a0ab9d..bba18b3 100644 --- a/pure-ftpd/Pkgfile +++ b/pure-ftpd/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl name=pure-ftpd -version=1.0.43 +version=1.0.44 release=1 source=(http://download.pureftpd.org/$name/releases/$name-$version.tar.bz2 \ pure-ftpd pure-ftpd.conf) diff --git a/pure-ftpd/pure-ftpd b/pure-ftpd/pure-ftpd index a0b6184..74d1420 100644 --- a/pure-ftpd/pure-ftpd +++ b/pure-ftpd/pure-ftpd @@ -8,9 +8,7 @@ PROG=/usr/sbin/pure-ftpd PID=/var/run/pure-ftpd.pid CRT=/etc/ssl/certs/pure-ftpd.pem -CONF=/etc/pure-ftpd.conf -ARGS=$(sed -e '/^\s*$/d' -e '/^#/d' $CONF) - +OPTS="/etc/pure-ftpd.conf" case $1 in start) @@ -18,7 +16,7 @@ start) /usr/bin/mksslcert $CRT $CRT fi - $SSD --start --pidfile $PID --exec $PROG -- $ARGS + $SSD --start --pidfile $PID --exec $PROG -- $OPTS ;; stop) $SSD --stop --retry 10 --pidfile $PID diff --git a/pure-ftpd/pure-ftpd.conf b/pure-ftpd/pure-ftpd.conf index 392f498..3bcdc3b 100644 --- a/pure-ftpd/pure-ftpd.conf +++ b/pure-ftpd/pure-ftpd.conf @@ -1,18 +1,12 @@ # # /etc/pure-ftpd.conf # -# Put the commandline options for pure-ftpd in this file. -# Use the same syntax as calling pure-ftpd directly from -# the commandline, also include the dashes. -# Blank lines and lines beginning by a pound-sign, which -# are considered comments, are ignored. -# ---daemonize ---chrooteveryone ---anonymousonly ---anonymouscantupload ---altlog clf:/var/log/pure-ftpd.log ---tls=1 +daemonize yes +chrooteveryone yes +anonymousonly no +anonymouscantupload yes +altlog clf:/var/log/pure-ftpd.log +tls 1 # End of file

1 0

ports/opt (3.2): [notify] flash-player-plugin: update to 24.0.0.186
by crux＠crux.nu 01 Jan '17

01 Jan '17

commit 5e37fc16fbd2861b6ead04ec1c3a4fea0cce9fdb Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 1 14:30:46 2017 +0100 [notify] flash-player-plugin: update to 24.0.0.186 several security fixes, see https://helpx.adobe.com/security/products/flash-player/apsb16-39.html diff --git a/flash-player-plugin/.md5sum b/flash-player-plugin/.md5sum index 23cecd2..069e994 100644 --- a/flash-player-plugin/.md5sum +++ b/flash-player-plugin/.md5sum @@ -1 +1 @@ -1ff994ff1ac9628f469a6ccb05adfe60 flash-plugin-11.2.202.644-release.x86_64.rpm +8590518098f7c06a90483e4d84c6d7d7 flash-player-npapi-24.0.0.186-release.x86_64.rpm diff --git a/flash-player-plugin/Pkgfile b/flash-player-plugin/Pkgfile index d9d1fee..5b423e4 100644 --- a/flash-player-plugin/Pkgfile +++ b/flash-player-plugin/Pkgfile @@ -5,9 +5,9 @@ # Depends on: name=flash-player-plugin -version=11.2.202.644 +version=24.0.0.186 release=1 -source=(http://fpdownload.macromedia.com/get/flashplayer/pdc/$version/flash-plugin-$version-release.x86_64.rpm) +source=(https://fpdownload.adobe.com/pub/flashplayer/pdc/$version/flash-player-npapi-$version-release.x86_64.rpm) build() { install -D -m 0755 usr/lib64/flash-plugin/libflashplayer.so \

1 0

ports/opt (3.2): pure-ftpd: update to 1.0.44
by crux＠crux.nu 01 Jan '17

01 Jan '17

commit a34ec65cb96845b3c2f46616c8362005c285c584 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 1 13:10:54 2017 +0100 pure-ftpd: update to 1.0.44 diff --git a/pure-ftpd/.md5sum b/pure-ftpd/.md5sum index a409c4d..60738a7 100644 --- a/pure-ftpd/.md5sum +++ b/pure-ftpd/.md5sum @@ -1,3 +1,3 @@ -3698dc9fced3c059e3acd0497bda6b1a pure-ftpd -685498474a47340e9a3eae1518cf83c8 pure-ftpd-1.0.43.tar.bz2 -91e56b81f8f77c8b9d81d455817b1892 pure-ftpd.conf +b488de0fd27c7ae17fa779fb6c24b8ef pure-ftpd +8da4207c02a72267abfdf0a9fc2bf3a9 pure-ftpd-1.0.44.tar.bz2 +0892402e770259031b3398cde4394bb3 pure-ftpd.conf diff --git a/pure-ftpd/Pkgfile b/pure-ftpd/Pkgfile index 1a0ab9d..bba18b3 100644 --- a/pure-ftpd/Pkgfile +++ b/pure-ftpd/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl name=pure-ftpd -version=1.0.43 +version=1.0.44 release=1 source=(http://download.pureftpd.org/$name/releases/$name-$version.tar.bz2 \ pure-ftpd pure-ftpd.conf) diff --git a/pure-ftpd/pure-ftpd b/pure-ftpd/pure-ftpd index a0b6184..74d1420 100644 --- a/pure-ftpd/pure-ftpd +++ b/pure-ftpd/pure-ftpd @@ -8,9 +8,7 @@ PROG=/usr/sbin/pure-ftpd PID=/var/run/pure-ftpd.pid CRT=/etc/ssl/certs/pure-ftpd.pem -CONF=/etc/pure-ftpd.conf -ARGS=$(sed -e '/^\s*$/d' -e '/^#/d' $CONF) - +OPTS="/etc/pure-ftpd.conf" case $1 in start) @@ -18,7 +16,7 @@ start) /usr/bin/mksslcert $CRT $CRT fi - $SSD --start --pidfile $PID --exec $PROG -- $ARGS + $SSD --start --pidfile $PID --exec $PROG -- $OPTS ;; stop) $SSD --stop --retry 10 --pidfile $PID diff --git a/pure-ftpd/pure-ftpd.conf b/pure-ftpd/pure-ftpd.conf index 392f498..3bcdc3b 100644 --- a/pure-ftpd/pure-ftpd.conf +++ b/pure-ftpd/pure-ftpd.conf @@ -1,18 +1,12 @@ # # /etc/pure-ftpd.conf # -# Put the commandline options for pure-ftpd in this file. -# Use the same syntax as calling pure-ftpd directly from -# the commandline, also include the dashes. -# Blank lines and lines beginning by a pound-sign, which -# are considered comments, are ignored. -# ---daemonize ---chrooteveryone ---anonymousonly ---anonymouscantupload ---altlog clf:/var/log/pure-ftpd.log ---tls=1 +daemonize yes +chrooteveryone yes +anonymousonly no +anonymouscantupload yes +altlog clf:/var/log/pure-ftpd.log +tls 1 # End of file

1 0

ports/opt (3.3): poppler-qt5: initial release
by crux＠crux.nu 01 Jan '17

01 Jan '17

commit 22ca05e58302e754fe9372ddaa14b8e552161af7 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 1 13:41:55 2017 +0100 poppler-qt5: initial release diff --git a/poppler-qt5/.footprint b/poppler-qt5/.footprint new file mode 100644 index 0000000..c83fed1 --- /dev/null +++ b/poppler-qt5/.footprint @@ -0,0 +1,18 @@ +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/qt5/ +-rw-r--r-- root/root usr/include/poppler/qt5/poppler-annotation.h +-rw-r--r-- root/root usr/include/poppler/qt5/poppler-export.h +-rw-r--r-- root/root usr/include/poppler/qt5/poppler-form.h +-rw-r--r-- root/root usr/include/poppler/qt5/poppler-link.h +-rw-r--r-- root/root usr/include/poppler/qt5/poppler-media.h +-rw-r--r-- root/root usr/include/poppler/qt5/poppler-optcontent.h +-rw-r--r-- root/root usr/include/poppler/qt5/poppler-page-transition.h +-rw-r--r-- root/root usr/include/poppler/qt5/poppler-qt5.h +drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libpoppler-qt5.so -> libpoppler-qt5.so.1 +lrwxrwxrwx root/root usr/lib/libpoppler-qt5.so.1 -> libpoppler-qt5.so.1.8.0 +-rwxr-xr-x root/root usr/lib/libpoppler-qt5.so.1.8.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/poppler-qt5.pc diff --git a/poppler-qt5/.md5sum b/poppler-qt5/.md5sum new file mode 100644 index 0000000..e164f44 --- /dev/null +++ b/poppler-qt5/.md5sum @@ -0,0 +1,2 @@ +1a4c0cd873bddd8f266b85ab8d799962 poppler-0.50.0.tar.xz +56403c21d7357d1151d72d3fe26a1bf6 poppler-cmake.patch diff --git a/poppler-qt5/.signature b/poppler-qt5/.signature new file mode 100644 index 0000000..0d6f3c0 --- /dev/null +++ b/poppler-qt5/.signature @@ -0,0 +1,6 @@ +untrusted comment: verify with /etc/ports/opt.pub +RWSE3ohX2g5d/WFiZfkMKIJT93cfE1ZLMbCdIjvczHWo9RS0kOEHGO+qdqocshyBGL4x60XZN8+sFCJ2XpvDGgrAyCQGjMj2YQU= +SHA256 (Pkgfile) = 3d0db054f3366720903587c5e3dfc0a781eb1a04db4077985bdd3045f8c5a3e3 +SHA256 (.footprint) = 62c010be6ce3fbcce941e0dd132e7ff78379e66c43ce909344c3c3346cf59700 +SHA256 (poppler-0.50.0.tar.xz) = c9c93318b789d3933f6e0bad3bc65110280c28eac3f0666284bb9c9a0ab4bc36 +SHA256 (poppler-cmake.patch) = dc3074f93cfcbdbf9b7934763cf1de3d8fdfef5665f503c0471f8aa4e2166dc7 diff --git a/poppler-qt5/Pkgfile b/poppler-qt5/Pkgfile new file mode 100644 index 0000000..7fb30f9 --- /dev/null +++ b/poppler-qt5/Pkgfile @@ -0,0 +1,42 @@ +# Description: qt5 wrapper for poppler +# URL: http://poppler.freedesktop.org/ +# Maintainer: Juergen Daubert, jue at crux dot nu +# Depends on: qt5 poppler + +name=poppler-qt5 +version=0.50.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=OFF \ + -DENABLE_QT5=ON \ + -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-qt5/poppler-cmake.patch b/poppler-qt5/poppler-cmake.patch new file mode 100644 index 0000000..1ccfe05 --- /dev/null +++ b/poppler-qt5/poppler-cmake.patch @@ -0,0 +1,158 @@ +--- 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)

1 0

ports/opt (3.3): qpdfview: update to 4.17beta1, use qt5
by crux＠crux.nu 01 Jan '17

01 Jan '17

commit 72c2cbb949f656193fc13c1a7bdab01924a275ec Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 1 13:45:27 2017 +0100 qpdfview: update to 4.17beta1, use qt5 diff --git a/qpdfview/.md5sum b/qpdfview/.md5sum index 085ac43..d976bda 100644 --- a/qpdfview/.md5sum +++ b/qpdfview/.md5sum @@ -1 +1 @@ -4b317c4536332a7fe437abe50eca1716 qpdfview-0.4.16.tar.gz +c203518a8988203dd94c648490089a8e qpdfview-0.4.17beta1.tar.gz diff --git a/qpdfview/.signature b/qpdfview/.signature index ec6c34a..2508bd1 100644 --- a/qpdfview/.signature +++ b/qpdfview/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dxnWZmbv7QYm2DkGE8ilS9/TAf3iHEc0C9WHjPYX2/D8ESgBHXlrBQr52rvWEH7lSLTS+xeGIrAL627nD+Xlwk= -SHA256 (Pkgfile) = d2bed06dc00557d913ec2c9df483c41a3435a7270c695bb02bcb985ec9da9cb2 +RWSE3ohX2g5d/URhEMIrodUZVBEizqbzyCkxQ3WfeX53Ta1RfdtpZZqnBJt+RJuA80Z4d/2kl/MybTvJ8v1ecTeRubmxftb5NQ4= +SHA256 (Pkgfile) = c521fed656d63ecd68c2dc7e231b4cfb6b141458ca81d0546e64e242c9b2a63d SHA256 (.footprint) = 75aab53ceb8ff2006850a67151c196fac74b04d113ed4d1dea72dd0b714b42c6 -SHA256 (qpdfview-0.4.16.tar.gz) = fad416e8fefc3057fa1b8d12d964c7eccd16dffe0307a0d6e9d55a543294da7f +SHA256 (qpdfview-0.4.17beta1.tar.gz) = 60206c5f76410a35098e3c965552cec08cd85941776ea6f6b207d7ea63ce940f diff --git a/qpdfview/Pkgfile b/qpdfview/Pkgfile index 366274f..7d753e1 100644 --- a/qpdfview/Pkgfile +++ b/qpdfview/Pkgfile @@ -1,17 +1,17 @@ # Description: PDF viewer # URL: https://launchpad.net/qpdfview # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: poppler-qt4 +# Depends on: poppler-qt5 name=qpdfview -version=0.4.16 +version=0.4.17beta1 release=1 source=(https://launchpad.net/qpdfview/trunk/$version/+download/$name-$vers… build () { cd $name-$version - qmake qpdfview.pro \ + qmake-qt5 qpdfview.pro \ MANUAL_INSTALL_PATH=/usr/share/man/man1 \ CONFIG+="without_ps without_djvu"

1 0

ports/opt (3.3): poppler-qt4: use cmake build system
by crux＠crux.nu 01 Jan '17

01 Jan '17

commit 4950e8c19b2cc4539f385a88a8e050dc6c910932 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 1 13:36:49 2017 +0100 poppler-qt4: use cmake build system diff --git a/poppler-qt4/.footprint b/poppler-qt4/.footprint index 53ad4ec..b13e003 100644 --- a/poppler-qt4/.footprint +++ b/poppler-qt4/.footprint @@ -5,16 +5,13 @@ 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-private.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/ --rw-r--r-- root/root usr/lib/libpoppler-qt4.a --rwxr-xr-x root/root usr/lib/libpoppler-qt4.la -lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so -> libpoppler-qt4.so.4.11.0 +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/ diff --git a/poppler-qt4/.md5sum b/poppler-qt4/.md5sum index 1fa22bb..e164f44 100644 --- a/poppler-qt4/.md5sum +++ b/poppler-qt4/.md5sum @@ -1 +1,2 @@ 1a4c0cd873bddd8f266b85ab8d799962 poppler-0.50.0.tar.xz +56403c21d7357d1151d72d3fe26a1bf6 poppler-cmake.patch diff --git a/poppler-qt4/.signature b/poppler-qt4/.signature index 797501b..c434223 100644 --- a/poppler-qt4/.signature +++ b/poppler-qt4/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cbpMhQvX+/4wGoZe6Qh0LK4rt4QfsqXVVh9C7roeY1UaFUhSuwpQfkc9e1+XH8DuCd/NZPFE6jet2lTWzWfAAU= -SHA256 (Pkgfile) = b870e1ab3b83beb077f04b686557aba7dfab4bf4e4fa3b8877fe2b905a3826f5 -SHA256 (.footprint) = f5b68c9d718eba0ea33836b6e0ea145f4e9f81109d2f948e42e671ca1affd5ed +RWSE3ohX2g5d/ZHmzO3gYDaaVH895nfgfawn6kt7E7cuOeEyHQz2bWHpo1pjE5b6yYxhox44bbgCdFcB2WxHXz4wI5aH1YINPws= +SHA256 (Pkgfile) = 7253d343c9e047012b8c8a359ece10b41a456dd2390d54885dc7029a8af3b8e2 +SHA256 (.footprint) = 24a302bd42d6cd66ea4463815b86618190c384ee8d69d809391f7af6818cd367 SHA256 (poppler-0.50.0.tar.xz) = c9c93318b789d3933f6e0bad3bc65110280c28eac3f0666284bb9c9a0ab4bc36 +SHA256 (poppler-cmake.patch) = dc3074f93cfcbdbf9b7934763cf1de3d8fdfef5665f503c0471f8aa4e2166dc7 diff --git a/poppler-qt4/Pkgfile b/poppler-qt4/Pkgfile index e7592a2..8cb06c2 100644 --- a/poppler-qt4/Pkgfile +++ b/poppler-qt4/Pkgfile @@ -1,27 +1,42 @@ -# Description: QT4-based shared library for poppler +# Description: qt4 wrapper for poppler # URL: http://poppler.freedesktop.org/ # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: qt4 poppler +# Depends on: qt4 poppler name=poppler-qt4 version=0.50.0 -release=1 -source=(http://poppler.freedesktop.org/poppler-$version.tar.xz) +release=2 +source=(http://poppler.freedesktop.org/poppler-$version.tar.xz + poppler-cmake.patch) build() { cd poppler-$version - ./configure --prefix=/usr \ - --mandir=/usr/man \ - --enable-{zlib,libjpeg,libpng} \ - --enable-cms=lcms2 \ - --enable-libopenjpeg=none \ - --disable-utils \ - --disable-poppler-{qt5,glib,cpp} + 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/pkgconfig/poppler{,-cairo,-splash}.pc - rm $PKG/usr/lib/libpoppler.* + 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 new file mode 100644 index 0000000..1ccfe05 --- /dev/null +++ b/poppler-qt4/poppler-cmake.patch @@ -0,0 +1,158 @@ +--- 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)

1 0