app-text/poppler: add patch to ensure that qt4 is always detected properly

Gentoo-bug: 572382

Package-Manager: portage-2.2.27

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 (file)
index 0000000..84c58d5
--- /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)

diff --git a/app-text/poppler/poppler-0.40.0-r1.ebuild b/app-text/poppler/poppler-0.40.0-r1.ebuild
new file mode 100644 (file)
index 0000000..0346703
--- /dev/null
+++ b/app-text/poppler/poppler-0.40.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]] ; then
+       inherit git-r3
+       EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+       SLOT="0/9999"
+else
+       SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+       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"
+       SLOT="0/58"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+       >=media-libs/fontconfig-2.6.0
+       >=media-libs/freetype-2.3.9
+       sys-libs/zlib
+       cairo? (
+               dev-libs/glib:2
+               >=x11-libs/cairo-1.10.0
+               introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
+       )
+       curl? ( net-misc/curl )
+       jpeg? ( virtual/jpeg:0 )
+       jpeg2k? ( media-libs/openjpeg:2= )
+       lcms? ( media-libs/lcms:2 )
+       png? ( media-libs/libpng:0= )
+       qt4? (
+               dev-qt/qtcore:4
+               dev-qt/qtgui:4
+       )
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtxml:5
+       )
+       tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+       virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+       cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=(
+       "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+       "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+       "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+       "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+       "${FILESDIR}/${PN}-0.40-FindQt4.patch"
+)
+
+src_prepare() {
+       cmake-utils_src_prepare
+
+       # Clang doesn't grok this flag, the configure nicely tests that, but
+       # cmake just uses it, so remove it if we use clang
+       if [[ ${CC} == clang ]] ; then
+               sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+       fi
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DBUILD_GTK_TESTS=OFF
+               -DBUILD_QT4_TESTS=OFF
+               -DBUILD_QT5_TESTS=OFF
+               -DBUILD_CPP_TESTS=OFF
+               -DENABLE_SPLASH=ON
+               -DENABLE_ZLIB=ON
+               -DENABLE_XPDF_HEADERS=ON
+               $(cmake-utils_use_enable curl LIBCURL)
+               $(cmake-utils_use_enable cxx CPP)
+               $(cmake-utils_use_enable utils)
+               $(cmake-utils_use_with cairo)
+               $(cmake-utils_use_with introspection GObjectIntrospection)
+               $(cmake-utils_use_with jpeg)
+               $(cmake-utils_use_with png)
+               $(cmake-utils_use_with qt4)
+               $(cmake-utils_use_find_package qt5 Qt5Core)
+               $(cmake-utils_use_with tiff)
+       )
+       if use jpeg2k; then
+               mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+       else
+               mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+       fi
+       if use lcms; then
+               mycmakeargs+=(-DENABLE_CMS=lcms2)
+       else
+               mycmakeargs+=(-DENABLE_CMS=)
+       fi
+
+       cmake-utils_src_configure
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       # live version doesn't provide html documentation
+       if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+               # For now install gtk-doc there
+               insinto /usr/share/gtk-doc/html/poppler
+               doins -r "${S}"/glib/reference/html/*
+       fi
+}

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index b888f2892a7755d43f34632b36d3463526c22ecf..cbb19028ba9a9d904239c08756371d9ac167f1bd 100644 (file)
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -64,6 +64,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
        "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
        "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+       "${FILESDIR}/${PN}-0.40-FindQt4.patch"
 )
 
 src_prepare() {