Date: Thursday, November 9, 2017 @ 08:30:32 Author: foutrelis Revision: 309070
archrelease: copy trunk to staging-x86_64 Added: poppler/repos/staging-x86_64/PKGBUILD (from rev 309069, poppler/trunk/PKGBUILD) poppler/repos/staging-x86_64/fix-incorrect-paths-in-pc-files.patch (from rev 309069, poppler/trunk/fix-incorrect-paths-in-pc-files.patch) Deleted: poppler/repos/staging-x86_64/PKGBUILD ---------------------------------------+ PKGBUILD | 195 ++++++++++++++++---------------- fix-incorrect-paths-in-pc-files.patch | 117 +++++++++++++++++++ 2 files changed, 218 insertions(+), 94 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-11-09 08:30:24 UTC (rev 309069) +++ PKGBUILD 2017-11-09 08:30:32 UTC (rev 309070) @@ -1,94 +0,0 @@ -# $Id$ -# Maintainer: AndyRTR <andy...@archlinux.org> -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') -pkgver=0.61.0 -pkgrel=1 -arch=(x86_64) -license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'qt4' 'pkgconfig' 'lcms2' - 'gobject-introspection' 'icu' 'qt5-base' 'git' 'nss' 'gtk-doc' 'curl' 'poppler-data' - 'cmake' 'python2') # python2 just for make-glib-api-docs/gtkdoc.py -options=('!emptydirs') -url="https://poppler.freedesktop.org/" -source=(https://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz - test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=0d2bfd4) -sha256sums=('53cde17a2afa3b73eb8b209d24e4369b52bfac444065dbb0a8cbcc7356582b7f' - 'SKIP') - -prepare() { - mkdir build - sed -i -e "s:python:python2:" ${pkgbase}-${pkgver}/make-glib-api-docs -} - -build() { - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DENABLE_XPDF_HEADERS=ON \ - -DENABLE_GTK_DOC=ON - make -} - -check() { - cd build - LANG=en_US.UTF8 make test -} - -package_poppler() { - pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'lcms2' 'nss' 'curl') - optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters') - conflicts=("poppler-qt3<${pkgver}") - - cd build - make DESTDIR="${pkgdir}" install - - # cleanup for splitted build - rm -vrf "${pkgdir}"/usr/include/poppler/{glib,qt4,qt5} - rm -vf "${pkgdir}"//usr/lib/libpoppler-{glib,qt4,qt5}.* - rm -vf "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc - rm -vrf "${pkgdir}"/usr/{lib,share}/gir* - rm -vrf "${pkgdir}"/usr/share/gtk-doc -} - -package_poppler-glib() { - pkgdesc="Poppler glib bindings" - depends=("poppler=${pkgver}" 'glib2') - - cd build - - make -C glib DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -vf "${pkgdir}"/usr/lib/libpoppler.* - rm -vf "${pkgdir}/usr/bin/poppler-glib-demo" -} - -package_poppler-qt4() { - pkgdesc="Poppler Qt4 bindings" - provides=("poppler-qt=${pkgver}") - replaces=('poppler-qt') - conflicts=('poppler-qt') - depends=("poppler=${pkgver}" 'qt4') - - cd build - make -C qt4 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" -} - -package_poppler-qt5() { - pkgdesc="Poppler Qt5 bindings" - depends=("poppler=${pkgver}" 'qt5-base') - - cd build - make -C qt5 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/" -} - Copied: poppler/repos/staging-x86_64/PKGBUILD (from rev 309069, poppler/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-11-09 08:30:32 UTC (rev 309070) @@ -0,0 +1,101 @@ +# $Id$ +# Maintainer: AndyRTR <andy...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=poppler +pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') +pkgver=0.61.0 +pkgrel=2 +arch=(x86_64) +license=('GPL') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'qt4' 'pkgconfig' 'lcms2' + 'gobject-introspection' 'icu' 'qt5-base' 'git' 'nss' 'gtk-doc' 'curl' 'poppler-data' + 'cmake' 'python2') # python2 just for make-glib-api-docs/gtkdoc.py +options=('!emptydirs') +url="https://poppler.freedesktop.org/" +source=(https://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz + fix-incorrect-paths-in-pc-files.patch + test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=0d2bfd4) +sha256sums=('53cde17a2afa3b73eb8b209d24e4369b52bfac444065dbb0a8cbcc7356582b7f' + 'da402576a7eb6cf07596d76ebadbac9f6aadc69d7234630904a5577fc818c3c1' + 'SKIP') + +prepare() { + mkdir build + cd ${pkgbase}-${pkgver} + + sed -i -e "s:python:python2:" make-glib-api-docs + + # https://bugs.freedesktop.org/show_bug.cgi?id=103578 + patch -Np1 -i ../fix-incorrect-paths-in-pc-files.patch +} + +build() { + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DENABLE_XPDF_HEADERS=ON \ + -DENABLE_GTK_DOC=ON + make +} + +check() { + cd build + LANG=en_US.UTF8 make test +} + +package_poppler() { + pkgdesc="PDF rendering library based on xpdf 3.0" + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'lcms2' 'nss' 'curl') + optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters') + conflicts=("poppler-qt3<${pkgver}") + + cd build + make DESTDIR="${pkgdir}" install + + # cleanup for splitted build + rm -vrf "${pkgdir}"/usr/include/poppler/{glib,qt4,qt5} + rm -vf "${pkgdir}"//usr/lib/libpoppler-{glib,qt4,qt5}.* + rm -vf "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc + rm -vrf "${pkgdir}"/usr/{lib,share}/gir* + rm -vrf "${pkgdir}"/usr/share/gtk-doc +} + +package_poppler-glib() { + pkgdesc="Poppler glib bindings" + depends=("poppler=${pkgver}" 'glib2') + + cd build + + make -C glib DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -vf "${pkgdir}"/usr/lib/libpoppler.* + rm -vf "${pkgdir}/usr/bin/poppler-glib-demo" +} + +package_poppler-qt4() { + pkgdesc="Poppler Qt4 bindings" + provides=("poppler-qt=${pkgver}") + replaces=('poppler-qt') + conflicts=('poppler-qt') + depends=("poppler=${pkgver}" 'qt4') + + cd build + make -C qt4 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" +} + +package_poppler-qt5() { + pkgdesc="Poppler Qt5 bindings" + depends=("poppler=${pkgver}" 'qt5-base') + + cd build + make -C qt5 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/" +} + Copied: poppler/repos/staging-x86_64/fix-incorrect-paths-in-pc-files.patch (from rev 309069, poppler/trunk/fix-incorrect-paths-in-pc-files.patch) =================================================================== --- fix-incorrect-paths-in-pc-files.patch (rev 0) +++ fix-incorrect-paths-in-pc-files.patch 2017-11-09 08:30:32 UTC (rev 309070) @@ -0,0 +1,117 @@ +From e8eb59c93abd7e835cb5a1488a4679b585985715 Mon Sep 17 00:00:00 2001 +From: Adam Sampson <a...@offog.org> +Date: Sun, 5 Nov 2017 11:45:00 +0000 +Subject: [PATCH] Fix incorrect paths in .pc files. + +The change in 67c3878ef10449b241c37d1022e2518029860335 used the +CMAKE_INSTALL_x variables instead of CMAKE_INSTALL_FULL_x; the former +contain things like "include" instead of full paths, so the resulting +.pc files break packages that depend on poppler. Use the latter. + +Also fix a missing @ in the qt5 file. + +Bug #103578 +--- + poppler-cairo.pc.cmake | 4 ++-- + poppler-cpp.pc.cmake | 4 ++-- + poppler-glib.pc.cmake | 4 ++-- + poppler-qt4.pc.cmake | 4 ++-- + poppler-qt5.pc.cmake | 4 ++-- + poppler-splash.pc.cmake | 4 ++-- + poppler.pc.cmake | 4 ++-- + 7 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/poppler-cairo.pc.cmake b/poppler-cairo.pc.cmake +index 4a606440..e68cceab 100644 +--- a/poppler-cairo.pc.cmake ++++ b/poppler-cairo.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-cairo + Description: Cairo backend for Poppler PDF rendering library +diff --git a/poppler-cpp.pc.cmake b/poppler-cpp.pc.cmake +index a26177a5..3eb68b38 100644 +--- a/poppler-cpp.pc.cmake ++++ b/poppler-cpp.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-cpp + Description: cpp backend for Poppler PDF rendering library +diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake +index 6e006d49..ac248192 100644 +--- a/poppler-glib.pc.cmake ++++ b/poppler-glib.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-glib + Description: GLib wrapper for poppler +diff --git a/poppler-qt4.pc.cmake b/poppler-qt4.pc.cmake +index 8523a17a..46a37f6d 100644 +--- a/poppler-qt4.pc.cmake ++++ b/poppler-qt4.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-qt4 + Description: Qt4 bindings for poppler +diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake +index aaa1aa77..94636892 100644 +--- a/poppler-qt5.pc.cmake ++++ b/poppler-qt5.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-qt5 + Description: Qt5 bindings for poppler +diff --git a/poppler-splash.pc.cmake b/poppler-splash.pc.cmake +index 1aa1a835..f9eceebe 100644 +--- a/poppler-splash.pc.cmake ++++ b/poppler-splash.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-splash + Description: Splash backend for Poppler PDF rendering library +diff --git a/poppler.pc.cmake b/poppler.pc.cmake +index 9432c5c6..00b73488 100644 +--- a/poppler.pc.cmake ++++ b/poppler.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler + Description: PDF rendering library +-- +2.15.0 +