1 |
commit: 187e9e33af5de84492219471628e301be03b5539 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 7 12:11:04 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 7 12:49:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187e9e33 |
7 |
|
8 |
dev-libs/libotf: 0.9.16 version bump. Use pkg-config to find freetype |
9 |
|
10 |
Closes: https://bugs.gentoo.org/655042 |
11 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/8298 |
13 |
|
14 |
dev-libs/libotf/Manifest | 1 + |
15 |
dev-libs/libotf/files/libotf-0.9.13-build.patch | 8 ++-- |
16 |
.../files/libotf-0.9.16-freetype_pkgconfig.patch | 33 ++++++++++++++ |
17 |
dev-libs/libotf/libotf-0.9.16.ebuild | 50 ++++++++++++++++++++++ |
18 |
4 files changed, 88 insertions(+), 4 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest |
21 |
index 974a5849421..4e5bb767bce 100644 |
22 |
--- a/dev-libs/libotf/Manifest |
23 |
+++ b/dev-libs/libotf/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST libotf-0.9.13.tar.gz 388832 BLAKE2B 73d15db54457afe98016b3958668fd5d62e81c8f53d34bc8ddd6ce5c18e54085a9d3ff1648e2170c7a97823dcbd9ef117f3e66befbea272dd98193baf63d6039 SHA512 86ddf071df371ee44910afc02432352356bfa1c2a55b44274c95fc4e7ec4fca982a7fcde35aaa63a8cb332e98388a9faf9a94fbf0f39e85668630f77d841ef31 |
26 |
+DIST libotf-0.9.16.tar.gz 423979 BLAKE2B 838e7c855f93ebb30bcccd1d3055f662da1736bb85fa398f9ffe84411249f63e4f66908b55534c2f07446b45ae7912745a92bbf0404f8d62eeb3a9119a604b37 SHA512 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4 |
27 |
|
28 |
diff --git a/dev-libs/libotf/files/libotf-0.9.13-build.patch b/dev-libs/libotf/files/libotf-0.9.13-build.patch |
29 |
index 519722f4337..41fcb834f3d 100644 |
30 |
--- a/dev-libs/libotf/files/libotf-0.9.13-build.patch |
31 |
+++ b/dev-libs/libotf/files/libotf-0.9.13-build.patch |
32 |
@@ -1,5 +1,5 @@ |
33 |
---- example/Makefile.am |
34 |
-+++ example/Makefile.am |
35 |
+--- a/example/Makefile.am |
36 |
++++ b/example/Makefile.am |
37 |
@@ -37,8 +37,7 @@ |
38 |
otfdump_LDADD = ${CommonLDADD} |
39 |
|
40 |
@@ -10,8 +10,8 @@ |
41 |
|
42 |
otftobdf_SOURCE = otftobdf.c |
43 |
otftobdf_LDADD = ${CommonLDADD} |
44 |
---- libotf.pc.in |
45 |
-+++ libotf.pc.in |
46 |
+--- a/libotf.pc.in |
47 |
++++ b/libotf.pc.in |
48 |
@@ -7,5 +7,6 @@ |
49 |
Description: OpenType font library |
50 |
Version: @PACKAGE_VERSION@ |
51 |
|
52 |
diff --git a/dev-libs/libotf/files/libotf-0.9.16-freetype_pkgconfig.patch b/dev-libs/libotf/files/libotf-0.9.16-freetype_pkgconfig.patch |
53 |
new file mode 100644 |
54 |
index 00000000000..a57e92e1b1c |
55 |
--- /dev/null |
56 |
+++ b/dev-libs/libotf/files/libotf-0.9.16-freetype_pkgconfig.patch |
57 |
@@ -0,0 +1,33 @@ |
58 |
+--- libotf-0.9.16/configure.ac |
59 |
++++ libotf-0.9.16/configure.ac |
60 |
+@@ -48,23 +48,24 @@ |
61 |
+ AC_FUNC_ALLOCA |
62 |
+ AC_FUNC_MALLOC |
63 |
+ |
64 |
++PKG_PROG_PKG_CONFIG |
65 |
++ |
66 |
+ # Check for Freetype2 usability. |
67 |
+-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) |
68 |
+-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then |
69 |
+- FREETYPE_INC=`freetype-config --cflags` |
70 |
++PKG_CHECK_MODULES(FREETYPE, freetype2, [ |
71 |
++ FREETYPE_INC="$FREETYPE_CFLAGS" |
72 |
+ CPPFLAGS="$CPPFLAGS $FREETYPE_INC" |
73 |
+ AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, |
74 |
+ HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS) |
75 |
+ if test "x$HAVE_FREETYPE" = "xyes" ; then |
76 |
+- FREETYPE_LD_FLAGS=`freetype-config --libs`; |
77 |
++ FREETYPE_LD_FLAGS="$FREETYPE_LIBS" |
78 |
+ LIBS="$LIBS $FREETYPE_LD_FLAGS" |
79 |
+ AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, |
80 |
+ HAVE_FREETYPE=no) |
81 |
+ fi |
82 |
+-fi |
83 |
++]) |
84 |
+ |
85 |
+ if test "x$HAVE_FREETYPE" != "xyes" ; then |
86 |
+- echo "Freetype library wan't found in your system!" |
87 |
++ echo "Freetype library not found in your system!" |
88 |
+ exit 1 |
89 |
+ fi |
90 |
+ AC_SUBST(FREETYPE_INC) |
91 |
|
92 |
diff --git a/dev-libs/libotf/libotf-0.9.16.ebuild b/dev-libs/libotf/libotf-0.9.16.ebuild |
93 |
new file mode 100644 |
94 |
index 00000000000..1fdded3749e |
95 |
--- /dev/null |
96 |
+++ b/dev-libs/libotf/libotf-0.9.16.ebuild |
97 |
@@ -0,0 +1,50 @@ |
98 |
+# Copyright 1999-2017 Gentoo Foundation |
99 |
+# Distributed under the terms of the GNU General Public License v2 |
100 |
+ |
101 |
+EAPI=6 |
102 |
+inherit autotools |
103 |
+ |
104 |
+DESCRIPTION="Library for handling OpenType fonts (OTF)" |
105 |
+HOMEPAGE="http://www.nongnu.org/m17n/" |
106 |
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz" |
107 |
+ |
108 |
+LICENSE="LGPL-2.1" |
109 |
+SLOT="0" |
110 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
111 |
+IUSE="static-libs X" |
112 |
+ |
113 |
+RDEPEND=">=media-libs/freetype-2.4.9 |
114 |
+ X? ( |
115 |
+ x11-libs/libX11 |
116 |
+ x11-libs/libXaw |
117 |
+ x11-libs/libXt |
118 |
+ )" |
119 |
+DEPEND="${RDEPEND} |
120 |
+ virtual/pkgconfig |
121 |
+ X? ( |
122 |
+ x11-libs/libICE |
123 |
+ x11-libs/libXmu |
124 |
+ x11-proto/xproto |
125 |
+ )" |
126 |
+ |
127 |
+DOCS="AUTHORS ChangeLog NEWS README" |
128 |
+ |
129 |
+PATCHES=( |
130 |
+ "${FILESDIR}"/${PN}-0.9.13-build.patch |
131 |
+ "${FILESDIR}"/${PN}-0.9.16-freetype_pkgconfig.patch |
132 |
+) |
133 |
+ |
134 |
+src_prepare() { |
135 |
+ default |
136 |
+ eautoreconf |
137 |
+} |
138 |
+ |
139 |
+src_configure() { |
140 |
+ export ac_cv_header_X11_Xaw_Command_h=$(usex X) |
141 |
+ econf $(use_enable static-libs static) |
142 |
+} |
143 |
+ |
144 |
+src_install() { |
145 |
+ default |
146 |
+ find "${ED}" -name "*.la" -delete || die |
147 |
+} |