Skip to content

Commit

Permalink
app-text/poppler: Revbump to fix broken pkgconfig files.
Browse files Browse the repository at this point in the history
Bug: https://bugs.gentoo.org/636708
Package-Manager: Portage-2.3.13, Repoman-2.3.4
  • Loading branch information
Lars Wendler committed Nov 7, 2017
1 parent 701ba26 commit e54cf75
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
24 changes: 24 additions & 0 deletions app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 950d19a00a454098831ca42ffbe0b61d323f0f89 Mon Sep 17 00:00:00 2001
From: Lars Wendler <[email protected]>
Date: Tue, 7 Nov 2017 15:41:30 +0100
Subject: [PATCH] poppler-qt5.pc.cmake: Fixed typo in libdir entry.

Signed-off-by: Lars Wendler <[email protected]>
---
poppler-qt5.pc.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake
index aaa1aa77..7e8c5c8f 100644
--- a/poppler-qt5.pc.cmake
+++ b/poppler-qt5.pc.cmake
@@ -1,5 +1,5 @@
prefix=@CMAKE_INSTALL_PREFIX@
-libdir=CMAKE_INSTALL_LIBDIR@
+libdir=@CMAKE_INSTALL_LIBDIR@
includedir=@CMAKE_INSTALL_INCLUDEDIR@

Name: poppler-qt5
--
2.15.0

Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
"${FILESDIR}/${PN}-0.40-FindQt4.patch"
"${FILESDIR}/${PN}-0.61.0-qt5_pc_in_typo.patch"
)

src_prepare() {
Expand Down Expand Up @@ -96,6 +97,10 @@ src_configure() {
-DBUILD_QT4_TESTS=OFF
-DBUILD_QT5_TESTS=OFF
-DBUILD_CPP_TESTS=OFF
-DCMAKE_INSTALL_DATADIR="/usr/share"
-DCMAKE_INSTALL_INCLUDEDIR="/usr/include"
-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)"
-DCMAKE_INSTALL_MANDIR="/usr/share/man"
-DENABLE_SPLASH=ON
-DENABLE_ZLIB=ON
-DENABLE_ZLIB_UNCOMPRESS=OFF
Expand Down

0 comments on commit e54cf75

Please sign in to comment.