| 1 |
commit: e4a3c2ef0e7dad033886a82881e495c4ef67453a |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 7 12:58:23 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 7 12:59:02 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a3c2ef |
| 7 |
|
| 8 |
media-gfx/inkscape: Use pkg-config to find freetype |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/655130 |
| 11 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
| 12 |
|
| 13 |
.../files/inkscape-0.92.3-freetype_pkgconfig.patch | 18 +++++++++ |
| 14 |
media-gfx/inkscape/inkscape-0.92.3.ebuild | 43 ++++++++++++---------- |
| 15 |
2 files changed, 41 insertions(+), 20 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..0f577bd0e9a |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch |
| 22 |
@@ -0,0 +1,18 @@ |
| 23 |
+--- inkscape-0.92.3/configure.ac |
| 24 |
++++ inkscape-0.92.3/configure.ac |
| 25 |
+@@ -252,12 +252,9 @@ |
| 26 |
+ [#include <malloc.h>]) |
| 27 |
+ ]) |
| 28 |
+ |
| 29 |
+-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) |
| 30 |
+-if test "x$FREETYPE_CONFIG" = "xno"; then |
| 31 |
+- AC_MSG_ERROR([Cannot find freetype-config]) |
| 32 |
+-fi |
| 33 |
+-FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` |
| 34 |
+-FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` |
| 35 |
++PKG_CHECK_MODULES(FREETYPE, freetype2,, |
| 36 |
++ AC_MSG_ERROR([Cannot find freetype]) |
| 37 |
++) |
| 38 |
+ AC_SUBST(FREETYPE_CFLAGS) |
| 39 |
+ AC_SUBST(FREETYPE_LIBS) |
| 40 |
+ |
| 41 |
|
| 42 |
diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild |
| 43 |
index 69b0c27405f..cc1ee8f61d9 100644 |
| 44 |
--- a/media-gfx/inkscape/inkscape-0.92.3.ebuild |
| 45 |
+++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild |
| 46 |
@@ -7,7 +7,7 @@ PYTHON_REQ_USE="xml" |
| 47 |
|
| 48 |
inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 |
| 49 |
|
| 50 |
-MY_P=${P/_/} |
| 51 |
+MY_P="${P/_/}" |
| 52 |
|
| 53 |
DESCRIPTION="A SVG based generic vector-drawing program" |
| 54 |
HOMEPAGE="https://inkscape.org/" |
| 55 |
@@ -100,9 +100,10 @@ PATCHES=( |
| 56 |
"${FILESDIR}/${PN}-0.91_pre3-exif.patch" |
| 57 |
"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" |
| 58 |
"${FILESDIR}/${PN}-0.48.4-epython.patch" |
| 59 |
+ "${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch" |
| 60 |
) |
| 61 |
|
| 62 |
-S=${WORKDIR}/${MY_P} |
| 63 |
+S="${WORKDIR}/${MY_P}" |
| 64 |
|
| 65 |
RESTRICT="test" |
| 66 |
|
| 67 |
@@ -128,23 +129,25 @@ src_configure() { |
| 68 |
# aliasing unsafe wrt #310393 |
| 69 |
append-flags -fno-strict-aliasing |
| 70 |
|
| 71 |
- econf \ |
| 72 |
- $(use_enable static-libs static) \ |
| 73 |
- $(use_enable nls) \ |
| 74 |
- $(use_enable openmp) \ |
| 75 |
- $(use_enable exif) \ |
| 76 |
- $(use_enable jpeg) \ |
| 77 |
- $(use_enable lcms) \ |
| 78 |
- --enable-poppler-cairo \ |
| 79 |
- $(use_enable wpg) \ |
| 80 |
- $(use_enable visio) \ |
| 81 |
- $(use_enable cdr) \ |
| 82 |
- $(use_enable dbus dbusapi) \ |
| 83 |
- $(use_enable imagemagick magick) \ |
| 84 |
- $(use_with gnome gnome-vfs) \ |
| 85 |
- $(use_with inkjar) \ |
| 86 |
- $(use_with spell gtkspell) \ |
| 87 |
+ local myeconfargs=( |
| 88 |
+ $(use_enable static-libs static) |
| 89 |
+ $(use_enable nls) |
| 90 |
+ $(use_enable openmp) |
| 91 |
+ $(use_enable exif) |
| 92 |
+ $(use_enable jpeg) |
| 93 |
+ $(use_enable lcms) |
| 94 |
+ --enable-poppler-cairo |
| 95 |
+ $(use_enable wpg) |
| 96 |
+ $(use_enable visio) |
| 97 |
+ $(use_enable cdr) |
| 98 |
+ $(use_enable dbus dbusapi) |
| 99 |
+ $(use_enable imagemagick magick) |
| 100 |
+ $(use_with gnome gnome-vfs) |
| 101 |
+ $(use_with inkjar) |
| 102 |
+ $(use_with spell gtkspell) |
| 103 |
$(use_with spell aspell) |
| 104 |
+ ) |
| 105 |
+ econf "${myeconfargs[@]}" |
| 106 |
} |
| 107 |
|
| 108 |
src_compile() { |
| 109 |
@@ -154,8 +157,8 @@ src_compile() { |
| 110 |
src_install() { |
| 111 |
default |
| 112 |
|
| 113 |
- prune_libtool_files |
| 114 |
- python_optimize "${ED}"/usr/share/${PN}/extensions |
| 115 |
+ find "${ED}" -name "*.la" -delete || die |
| 116 |
+ python_optimize "${ED%/}"/usr/share/${PN}/extensions |
| 117 |
} |
| 118 |
|
| 119 |
pkg_preinst() { |
Archives