From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9633B1396D9 for ; Tue, 7 Nov 2017 15:07:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1B91E0CC7; Tue, 7 Nov 2017 15:07:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95E90E0CC7 for ; Tue, 7 Nov 2017 15:07:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02EEC33BF0F for ; Tue, 7 Nov 2017 15:07:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BE86982A for ; Tue, 7 Nov 2017 15:07:11 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1510067226.e54cf75538fa0428cfe4989105bdb60116d8945c.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch app-text/poppler/poppler-0.61.0-r1.ebuild app-text/poppler/poppler-0.61.0.ebuild X-VCS-Directories: app-text/poppler/files/ app-text/poppler/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e54cf75538fa0428cfe4989105bdb60116d8945c X-VCS-Branch: master Date: Tue, 7 Nov 2017 15:07:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d4e8360f-0643-42b8-abeb-8beb26b29a4c X-Archives-Hash: f16fd3bcedba48c77794cf246fed8335 commit: e54cf75538fa0428cfe4989105bdb60116d8945c Author: Lars Wendler gentoo org> AuthorDate: Tue Nov 7 15:05:38 2017 +0000 Commit: Lars Wendler gentoo 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 +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 +--- + 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