| author | Evangelos Foutras
<foutrelis@archlinux.org> 2017-11-09 08:30:24 UTC |
| committer | Evangelos Foutras
<foutrelis@archlinux.org> 2017-11-09 08:30:24 UTC |
| parent | 9c0bf2a712f36fa6df5c07f8a3211b2c8768dfb9 |
| PKGBUILD | +9 | -2 |
| fix-incorrect-paths-in-pc-files.patch | +117 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index af9ec20..f6d017f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') pkgver=0.61.0 -pkgrel=1 +pkgrel=2 arch=(x86_64) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'qt4' 'pkgconfig' 'lcms2' @@ -13,13 +13,20 @@ makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'qt4' 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 - sed -i -e "s:python:python2:" ${pkgbase}-${pkgver}/make-glib-api-docs + 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() { diff --git a/fix-incorrect-paths-in-pc-files.patch b/fix-incorrect-paths-in-pc-files.patch new file mode 100644 index 0000000..461ffa6 --- /dev/null +++ b/fix-incorrect-paths-in-pc-files.patch @@ -0,0 +1,117 @@ +From e8eb59c93abd7e835cb5a1488a4679b585985715 Mon Sep 17 00:00:00 2001 +From: Adam Sampson <ats@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 +