johu 14/07/13 10:39:44 Modified: poppler-0.26.2.ebuild poppler-9999.ebuild ChangeLog Removed: poppler-0.26.1.ebuild Log: Remove workaround on freetype, this is fixed in current stable dev-util/cmake-2.8.12.2, bug #459394. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)
Revision Changes Path 1.2 app-text/poppler/poppler-0.26.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.26.2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.26.2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.26.2.ebuild?r1=1.1&r2=1.2 Index: poppler-0.26.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- poppler-0.26.2.ebuild 22 Jun 2014 18:57:56 -0000 1.1 +++ poppler-0.26.2.ebuild 13 Jul 2014 10:39:44 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.2.ebuild,v 1.1 2014/06/22 18:57:56 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.2.ebuild,v 1.2 2014/07/13 10:39:44 johu Exp $ EAPI=5 @@ -63,14 +63,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" ) src_configure() { - # this is needed for multilib, see bug 459394 - local ft_libdir ft_includedir - ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)" - ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)" - export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}" - einfo "Detected FreeType at ${FREETYPE_DIR}" - - mycmakeargs=( + local mycmakeargs=( -DBUILD_GTK_TESTS=OFF -DBUILD_QT4_TESTS=OFF -DBUILD_QT5_TESTS=OFF 1.2 app-text/poppler/poppler-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-9999.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-9999.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-9999.ebuild?r1=1.1&r2=1.2 Index: poppler-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- poppler-9999.ebuild 22 Jun 2014 18:57:56 -0000 1.1 +++ poppler-9999.ebuild 13 Jul 2014 10:39:44 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.1 2014/06/22 18:57:56 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.2 2014/07/13 10:39:44 johu Exp $ EAPI=5 @@ -63,14 +63,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" ) src_configure() { - # this is needed for multilib, see bug 459394 - local ft_libdir ft_includedir - ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)" - ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)" - export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}" - einfo "Detected FreeType at ${FREETYPE_DIR}" - - mycmakeargs=( + local mycmakeargs=( -DBUILD_GTK_TESTS=OFF -DBUILD_QT4_TESTS=OFF -DBUILD_QT5_TESTS=OFF 1.427 app-text/poppler/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.427&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.427&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.426&r2=1.427 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v retrieving revision 1.426 retrieving revision 1.427 diff -u -r1.426 -r1.427 --- ChangeLog 22 Jun 2014 18:57:56 -0000 1.426 +++ ChangeLog 13 Jul 2014 10:39:44 -0000 1.427 @@ -1,6 +1,11 @@ # ChangeLog for app-text/poppler # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.426 2014/06/22 18:57:56 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.427 2014/07/13 10:39:44 johu Exp $ + + 13 Jul 2014; Johannes Huber <[email protected]> -poppler-0.26.1.ebuild, + poppler-0.26.2.ebuild, poppler-9999.ebuild: + Remove workaround on freetype, this is fixed in current stable dev- + util/cmake-2.8.12.2, bug #459394. *poppler-9999 (22 Jun 2014) *poppler-0.26.2 (22 Jun 2014)
