| 1 |
commit: c05a126fc8e2f1c17b1657c3483a337bcce63094 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 29 10:51:19 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 29 10:53:18 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05a126f |
| 7 |
|
| 8 |
app-text/poppler: add patch to ensure that qt4 is always detected properly |
| 9 |
|
| 10 |
Gentoo-bug: 572382 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.27 |
| 13 |
|
| 14 |
app-text/poppler/files/poppler-0.40-FindQt4.patch | 31 ++++++++++++++++++++++ |
| 15 |
...oppler-9999.ebuild => poppler-0.40.0-r1.ebuild} | 5 ++-- |
| 16 |
app-text/poppler/poppler-9999.ebuild | 3 ++- |
| 17 |
3 files changed, 36 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-text/poppler/files/poppler-0.40-FindQt4.patch b/app-text/poppler/files/poppler-0.40-FindQt4.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..84c58d5 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-text/poppler/files/poppler-0.40-FindQt4.patch |
| 24 |
@@ -0,0 +1,31 @@ |
| 25 |
+ |
| 26 |
+Ensure that the correct version of Qt is always used. |
| 27 |
+ |
| 28 |
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to |
| 29 |
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. |
| 30 |
+ |
| 31 |
+There is no guarantee to which version of Qt these symlinks might point, so it |
| 32 |
+is necessary to find the correct version explicitly. |
| 33 |
+ |
| 34 |
+Once qmake is found, it is queried for the correct location of all other items. |
| 35 |
+ |
| 36 |
+Gentoo-bug: 572382 |
| 37 |
+ |
| 38 |
+--- a/cmake/modules/FindQt4.cmake |
| 39 |
++++ b/cmake/modules/FindQt4.cmake |
| 40 |
+@@ -313,11 +313,10 @@ |
| 41 |
+ |
| 42 |
+ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) |
| 43 |
+ # check for qmake |
| 44 |
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS |
| 45 |
+- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" |
| 46 |
+- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" |
| 47 |
+- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" |
| 48 |
+- $ENV{QTDIR}/bin |
| 49 |
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS |
| 50 |
++ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin |
| 51 |
++ /usr/bin |
| 52 |
++ NO_DEFAULT_PATH |
| 53 |
+ ) |
| 54 |
+ |
| 55 |
+ IF (QT_QMAKE_EXECUTABLE) |
| 56 |
|
| 57 |
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-0.40.0-r1.ebuild |
| 58 |
similarity index 95% |
| 59 |
copy from app-text/poppler/poppler-9999.ebuild |
| 60 |
copy to app-text/poppler/poppler-0.40.0-r1.ebuild |
| 61 |
index b888f28..0346703 100644 |
| 62 |
--- a/app-text/poppler/poppler-9999.ebuild |
| 63 |
+++ b/app-text/poppler/poppler-0.40.0-r1.ebuild |
| 64 |
@@ -1,4 +1,4 @@ |
| 65 |
-# Copyright 1999-2015 Gentoo Foundation |
| 66 |
+# Copyright 1999-2016 Gentoo Foundation |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
# $Id$ |
| 69 |
|
| 70 |
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then |
| 71 |
else |
| 72 |
SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz" |
| 73 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 74 |
- SLOT="0/52" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
| 75 |
+ SLOT="0/58" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
| 76 |
fi |
| 77 |
|
| 78 |
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
| 79 |
@@ -64,6 +64,7 @@ PATCHES=( |
| 80 |
"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" |
| 81 |
"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" |
| 82 |
"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" |
| 83 |
+ "${FILESDIR}/${PN}-0.40-FindQt4.patch" |
| 84 |
) |
| 85 |
|
| 86 |
src_prepare() { |
| 87 |
|
| 88 |
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild |
| 89 |
index b888f28..cbb1902 100644 |
| 90 |
--- a/app-text/poppler/poppler-9999.ebuild |
| 91 |
+++ b/app-text/poppler/poppler-9999.ebuild |
| 92 |
@@ -1,4 +1,4 @@ |
| 93 |
-# Copyright 1999-2015 Gentoo Foundation |
| 94 |
+# Copyright 1999-2016 Gentoo Foundation |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
# $Id$ |
| 97 |
|
| 98 |
@@ -64,6 +64,7 @@ PATCHES=( |
| 99 |
"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" |
| 100 |
"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" |
| 101 |
"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" |
| 102 |
+ "${FILESDIR}/${PN}-0.40-FindQt4.patch" |
| 103 |
) |
| 104 |
|
| 105 |
src_prepare() { |
Archives