diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-01-29 21:51:19 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-01-29 21:53:18 +1100 |
| commit | c05a126fc8e2f1c17b1657c3483a337bcce63094 (patch) | |
| tree | 3a4af6ef92cac1d71e43a48e6be248e3d107d74b /app-text/poppler/files | |
| parent | www-servers/varnish: version bump to 4.1.1, fix bug #567756 (diff) | |
| download | gentoo-c05a126fc8e2f1c17b1657c3483a337bcce63094.tar.gz gentoo-c05a126fc8e2f1c17b1657c3483a337bcce63094.tar.bz2 gentoo-c05a126fc8e2f1c17b1657c3483a337bcce63094.zip | |
app-text/poppler: add patch to ensure that qt4 is always detected properly
Gentoo-bug: 572382
Package-Manager: portage-2.2.27
Diffstat (limited to 'app-text/poppler/files')
| -rw-r--r-- | app-text/poppler/files/poppler-0.40-FindQt4.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/app-text/poppler/files/poppler-0.40-FindQt4.patch b/app-text/poppler/files/poppler-0.40-FindQt4.patch new file mode 100644 index 000000000000..84c58d5f7c7f --- /dev/null +++ b/app-text/poppler/files/poppler-0.40-FindQt4.patch @@ -0,0 +1,31 @@ + +Ensure that the correct version of Qt is always used. + +With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to +/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. + +There is no guarantee to which version of Qt these symlinks might point, so it +is necessary to find the correct version explicitly. + +Once qmake is found, it is queried for the correct location of all other items. + +Gentoo-bug: 572382 + +--- a/cmake/modules/FindQt4.cmake ++++ b/cmake/modules/FindQt4.cmake +@@ -313,11 +313,10 @@ + + GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) + # check for qmake +-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS +- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" +- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" +- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" +- $ENV{QTDIR}/bin ++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS ++ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin ++ /usr/bin ++ NO_DEFAULT_PATH + ) + + IF (QT_QMAKE_EXECUTABLE) |