commit: e54cf75538fa0428cfe4989105bdb60116d8945c Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Nov 7 15:05:38 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Nov 7 15:07:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54cf755
app-text/poppler: Revbump to fix broken pkgconfig files. Bug: https://bugs.gentoo.org/636708 Package-Manager: Portage-2.3.13, Repoman-2.3.4 .../files/poppler-0.61.0-qt5_pc_in_typo.patch | 24 ++++++++++++++++++++++ ...pler-0.61.0.ebuild => poppler-0.61.0-r1.ebuild} | 5 +++++ 2 files changed, 29 insertions(+) diff --git a/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch new file mode 100644 index 00000000000..906989aa8ba --- /dev/null +++ b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch @@ -0,0 +1,24 @@ +From 950d19a00a454098831ca42ffbe0b61d323f0f89 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomia...@gentoo.org> +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 <polynomia...@gentoo.org> +--- + 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 + diff --git a/app-text/poppler/poppler-0.61.0.ebuild b/app-text/poppler/poppler-0.61.0-r1.ebuild similarity index 94% rename from app-text/poppler/poppler-0.61.0.ebuild rename to app-text/poppler/poppler-0.61.0-r1.ebuild index 2cfa1ed7abe..e1fa049c01c 100644 --- a/app-text/poppler/poppler-0.61.0.ebuild +++ b/app-text/poppler/poppler-0.61.0-r1.ebuild @@ -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() { @@ -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
