diff --git a/app-text/poppler/poppler-0.57.0.recipe b/app-text/poppler/poppler-0.60.1.recipe similarity index 75% rename from app-text/poppler/poppler-0.57.0.recipe rename to app-text/poppler/poppler-0.60.1.recipe index 8b8073ccd..e21057962 100644 --- a/app-text/poppler/poppler-0.57.0.recipe +++ b/app-text/poppler/poppler-0.60.1.recipe @@ -8,34 +8,26 @@ COPYRIGHT="2002-2017 Albert Astals Cid LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://poppler.freedesktop.org/poppler-$portVersion.tar.xz" -CHECKSUM_SHA256="0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8" +CHECKSUM_SHA256="19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir -if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= - commandBinDir=$prefix/bin -fi - PROVIDES=" poppler$secondaryArchSuffix = $portVersion - lib:libpoppler$secondaryArchSuffix = 68.0.0 compat >= 68 + lib:libpoppler$secondaryArchSuffix = 71.0.0 compat >= 71 lib:libpoppler_cpp$secondaryArchSuffix = 0.3.0 compat >= 0 - cmd:pdfdetach$commandSuffix - cmd:pdfimages$commandSuffix - cmd:pdfseparate$commandSuffix - cmd:pdftohtml$commandSuffix - cmd:pdftops$commandSuffix - cmd:pdfunite$commandSuffix - cmd:pdffonts$commandSuffix - cmd:pdfinfo$commandSuffix - cmd:pdftocairo$commandSuffix - cmd:pdftoppm$commandSuffix - cmd:pdftotext$commandSuffix + cmd:pdfdetach + cmd:pdfimages + cmd:pdfseparate + cmd:pdftohtml + cmd:pdftops + cmd:pdfunite + cmd:pdffonts + cmd:pdfinfo + cmd:pdftocairo + cmd:pdftoppm + cmd:pdftotext " REQUIRES=" haiku$secondaryArchSuffix @@ -57,14 +49,16 @@ REQUIRES=" PROVIDES_devel=" poppler${secondaryArchSuffix}_devel = $portVersion - devel:libpoppler$secondaryArchSuffix = 68.0.0 compat >= 68 + devel:libpoppler$secondaryArchSuffix = 71.0.0 compat >= 71 devel:libpoppler${secondaryArchSuffix}_cpp = 0.3.0 compat >= 0 devel:libpoppler${secondaryArchSuffix}_glib = 8.9.0 compat >= 8 - devel:libpoppler${secondaryArchSuffix}_qt5 = 1.10.0 compat >= 1 + devel:libpoppler${secondaryArchSuffix}_qt5 = 1.11.0 compat >= 1 " REQUIRES_devel=" haiku${secondaryArchSuffix}_devel poppler$secondaryArchSuffix == $portVersion base + lib:libpoppler${secondaryArchSuffix}_glib + lib:libpoppler${secondaryArchSuffix}_qt5 devel:libcairo$secondaryArchSuffix devel:libcurl$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix @@ -122,7 +116,7 @@ base." PROVIDES_qt5=" poppler${secondaryArchSuffix}_qt5 = $portVersion - lib:libpoppler${secondaryArchSuffix}_qt5 = 1.10.0 compat >= 1 + lib:libpoppler${secondaryArchSuffix}_qt5 = 1.11.0 compat >= 1 " REQUIRES_qt5=" haiku$secondaryArchSuffix @@ -166,37 +160,22 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake + cmd:cmake cmd:gawk cmd:grep cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:sed + cmd:python2 " BUILD() { - export CXXFLAGS="-D_BSD_SOURCE -std=c++11" - export LDFLAGS="-lnetwork -lbsd" - - libtoolize --force --copy --install - aclocal -I m4 - autoconf - automake --add-missing - runConfigure --omit-dirs "binDir sbinDir docDir" ./configure \ - --bindir=$commandBinDir \ - --sbindir=$commandBinDir \ - --docdir=$docDir \ - --enable-xpdf-headers \ - --enable-build-type=release \ - --enable-libcurl \ - --enable-cmyk - + cmake . $cmakeDirArgs \ + -DCMAKE_CXX_FLAGS="-D_BSD_SOURCE" \ + -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_XPDF_HEADERS=ON make $jobArgs } @@ -204,37 +183,26 @@ INSTALL() { make install - rm -rf $libDir/*.la - - # defining docDir doesn't helps too much - popplerdocdir="$dataDir/gtk-doc/html/poppler" - mkdir -p $docDir - cp -R $popplerdocdir/* $docDir/ - rm -rf $dataDir - prepareInstalledDevelLibs libpoppler \ libpoppler-cpp \ libpoppler-glib \ libpoppler-qt5 - fixPkgconfig - # GLIB + mkdir -p $manDir $(dirname $includeDir) + mv $prefix/share/man/* $manDir/ + mv $prefix/include $includeDir + rm -rf $prefix/share + # GLIB packageEntries "glib" \ $libDir/*glib* - rm -rf $libDir/*glib* - # QT5 - packageEntries "qt5" \ $libDir/*qt5* - rm -rf $libDir/*qt5* - # DEVEL - packageEntries devel \ $developDir }