| 1 |
commit: 42938eb5ccb07d39b4dcce0b6e04e30899e9925c |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 7 21:01:12 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 7 21:01:26 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42938eb5 |
| 7 |
|
| 8 |
x11-libs/fltk: Use pkg-config to find freetype |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/654752 |
| 11 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
| 12 |
|
| 13 |
.../fltk/files/fltk-1.3.4-freetype_pkgconfig.patch | 33 ++++++++++++++++++++++ |
| 14 |
x11-libs/fltk/fltk-1.3.4.ebuild | 2 ++ |
| 15 |
2 files changed, 35 insertions(+) |
| 16 |
|
| 17 |
diff --git a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..70183412229 |
| 20 |
--- /dev/null |
| 21 |
+++ b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch |
| 22 |
@@ -0,0 +1,33 @@ |
| 23 |
+--- fltk-1.3.4/configure.ac |
| 24 |
++++ fltk-1.3.4/configure.ac |
| 25 |
+@@ -1005,13 +1005,13 @@ |
| 26 |
+ AC_ARG_ENABLE(xft, [ --enable-xft turn on Xft support [[default=yes]]]) |
| 27 |
+ |
| 28 |
+ xft_found=no |
| 29 |
+- if test x$enable_xft != xno; then |
| 30 |
+- AC_PATH_PROG(FTCONFIG, freetype-config) |
| 31 |
+- |
| 32 |
+- if test "x$FTCONFIG" != x; then |
| 33 |
+- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS" |
| 34 |
+- CFLAGS="`$FTCONFIG --cflags` $CFLAGS" |
| 35 |
+- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS" |
| 36 |
++ AS_IF([test x$enable_xft != xno], [ |
| 37 |
++ PKG_PROG_PKG_CONFIG |
| 38 |
++ PKG_CHECK_MODULES(FREETYPE, freetype2, [ |
| 39 |
++ CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS" |
| 40 |
++ CFLAGS="$FREETYPE_CFLAGS $CFLAGS" |
| 41 |
++ CXXFLAGS="$FREETYPE_CFLAGS $CXXFLAGS" |
| 42 |
++ ],AC_MSG_ERROR([No freetype found])) |
| 43 |
+ |
| 44 |
+ AC_CHECK_LIB(fontconfig, FcPatternCreate) |
| 45 |
+ AC_CHECK_HEADER(X11/Xft/Xft.h, |
| 46 |
+@@ -1019,8 +1019,7 @@ |
| 47 |
+ [AC_DEFINE(USE_XFT) |
| 48 |
+ LIBS="-lXft $LIBS" |
| 49 |
+ xft_found=yes] )) |
| 50 |
+- fi |
| 51 |
+- fi |
| 52 |
++ ]) |
| 53 |
+ |
| 54 |
+ dnl Issue a warning message if Xft was not found, abort configure |
| 55 |
+ dnl if Xft was requested explicitly (but not found) |
| 56 |
|
| 57 |
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild |
| 58 |
index b1786d70018..4c20b2501ec 100644 |
| 59 |
--- a/x11-libs/fltk/fltk-1.3.4.ebuild |
| 60 |
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild |
| 61 |
@@ -33,6 +33,7 @@ RDEPEND=" |
| 62 |
" |
| 63 |
DEPEND=" |
| 64 |
${RDEPEND} |
| 65 |
+ virtual/pkgconfig |
| 66 |
x11-proto/xextproto |
| 67 |
doc? ( app-doc/doxygen ) |
| 68 |
xinerama? ( x11-proto/xineramaproto ) |
| 69 |
@@ -56,6 +57,7 @@ PATCHES=( |
| 70 |
"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch |
| 71 |
"${FILESDIR}"/${PN}-1.3.3-visibility.patch |
| 72 |
"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch |
| 73 |
+ "${FILESDIR}"/${PN}-1.3.4-freetype_pkgconfig.patch |
| 74 |
) |
| 75 |
|
| 76 |
src_prepare() { |
Archives