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 EE8E71381F1 for ; Mon, 7 May 2018 12:59:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 081F9E07F2; Mon, 7 May 2018 12:59:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 CB620E07F2 for ; Mon, 7 May 2018 12:59:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B426E335C72 for ; Mon, 7 May 2018 12:59:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B2F61E for ; Mon, 7 May 2018 12:59:09 +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: <1525697942.e4a3c2ef0e7dad033886a82881e495c4ef67453a.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/files/, media-gfx/inkscape/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch media-gfx/inkscape/inkscape-0.92.3.ebuild X-VCS-Directories: media-gfx/inkscape/files/ media-gfx/inkscape/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e4a3c2ef0e7dad033886a82881e495c4ef67453a X-VCS-Branch: master Date: Mon, 7 May 2018 12:59:09 +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: d3b9ae60-34d3-4703-84c4-9e99d1e1e930 X-Archives-Hash: d23dd4fd165b73f8040c6c578570817e commit: e4a3c2ef0e7dad033886a82881e495c4ef67453a Author: Lars Wendler gentoo org> AuthorDate: Mon May 7 12:58:23 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon May 7 12:59:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a3c2ef media-gfx/inkscape: Use pkg-config to find freetype Bug: https://bugs.gentoo.org/655130 Package-Manager: Portage-2.3.36, Repoman-2.3.9 .../files/inkscape-0.92.3-freetype_pkgconfig.patch | 18 +++++++++ media-gfx/inkscape/inkscape-0.92.3.ebuild | 43 ++++++++++++---------- 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch new file mode 100644 index 00000000000..0f577bd0e9a --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch @@ -0,0 +1,18 @@ +--- inkscape-0.92.3/configure.ac ++++ inkscape-0.92.3/configure.ac +@@ -252,12 +252,9 @@ + [#include ]) + ]) + +-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +-if test "x$FREETYPE_CONFIG" = "xno"; then +- AC_MSG_ERROR([Cannot find freetype-config]) +-fi +-FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` +-FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` ++PKG_CHECK_MODULES(FREETYPE, freetype2,, ++ AC_MSG_ERROR([Cannot find freetype]) ++) + AC_SUBST(FREETYPE_CFLAGS) + AC_SUBST(FREETYPE_LIBS) + diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild index 69b0c27405f..cc1ee8f61d9 100644 --- a/media-gfx/inkscape/inkscape-0.92.3.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild @@ -7,7 +7,7 @@ PYTHON_REQ_USE="xml" inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 -MY_P=${P/_/} +MY_P="${P/_/}" DESCRIPTION="A SVG based generic vector-drawing program" HOMEPAGE="https://inkscape.org/" @@ -100,9 +100,10 @@ PATCHES=( "${FILESDIR}/${PN}-0.91_pre3-exif.patch" "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" "${FILESDIR}/${PN}-0.48.4-epython.patch" + "${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch" ) -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" RESTRICT="test" @@ -128,23 +129,25 @@ src_configure() { # aliasing unsafe wrt #310393 append-flags -fno-strict-aliasing - econf \ - $(use_enable static-libs static) \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable exif) \ - $(use_enable jpeg) \ - $(use_enable lcms) \ - --enable-poppler-cairo \ - $(use_enable wpg) \ - $(use_enable visio) \ - $(use_enable cdr) \ - $(use_enable dbus dbusapi) \ - $(use_enable imagemagick magick) \ - $(use_with gnome gnome-vfs) \ - $(use_with inkjar) \ - $(use_with spell gtkspell) \ + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable nls) + $(use_enable openmp) + $(use_enable exif) + $(use_enable jpeg) + $(use_enable lcms) + --enable-poppler-cairo + $(use_enable wpg) + $(use_enable visio) + $(use_enable cdr) + $(use_enable dbus dbusapi) + $(use_enable imagemagick magick) + $(use_with gnome gnome-vfs) + $(use_with inkjar) + $(use_with spell gtkspell) $(use_with spell aspell) + ) + econf "${myeconfargs[@]}" } src_compile() { @@ -154,8 +157,8 @@ src_compile() { src_install() { default - prune_libtool_files - python_optimize "${ED}"/usr/share/${PN}/extensions + find "${ED}" -name "*.la" -delete || die + python_optimize "${ED%/}"/usr/share/${PN}/extensions } pkg_preinst() {