diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2018-05-07 14:11:04 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-05-07 14:49:17 +0200 |
| commit | 187e9e33af5de84492219471628e301be03b5539 (patch) | |
| tree | f68231dda735fec39ddbbc3843aebc57b72a431d /dev-libs/libotf/files | |
| parent | media-video/smplayer: drop -Werror to allow gcc-8, bug #654724 (diff) | |
| download | gentoo-187e9e33af5de84492219471628e301be03b5539.tar.gz gentoo-187e9e33af5de84492219471628e301be03b5539.tar.bz2 gentoo-187e9e33af5de84492219471628e301be03b5539.zip | |
dev-libs/libotf: 0.9.16 version bump. Use pkg-config to find freetype
Closes: https://bugs.gentoo.org/655042
Package-Manager: Portage-2.3.36, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8298
Diffstat (limited to 'dev-libs/libotf/files')
| -rw-r--r-- | dev-libs/libotf/files/libotf-0.9.13-build.patch | 8 | ||||
| -rw-r--r-- | dev-libs/libotf/files/libotf-0.9.16-freetype_pkgconfig.patch | 33 |
2 files changed, 37 insertions, 4 deletions
diff --git a/dev-libs/libotf/files/libotf-0.9.13-build.patch b/dev-libs/libotf/files/libotf-0.9.13-build.patch index 519722f43371..41fcb834f3d4 100644 --- a/dev-libs/libotf/files/libotf-0.9.13-build.patch +++ b/dev-libs/libotf/files/libotf-0.9.13-build.patch @@ -1,5 +1,5 @@ ---- example/Makefile.am -+++ example/Makefile.am +--- a/example/Makefile.am ++++ b/example/Makefile.am @@ -37,8 +37,7 @@ otfdump_LDADD = ${CommonLDADD} @@ -10,8 +10,8 @@ otftobdf_SOURCE = otftobdf.c otftobdf_LDADD = ${CommonLDADD} ---- libotf.pc.in -+++ libotf.pc.in +--- a/libotf.pc.in ++++ b/libotf.pc.in @@ -7,5 +7,6 @@ Description: OpenType font library Version: @PACKAGE_VERSION@ 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 new file mode 100644 index 000000000000..a57e92e1b1c2 --- /dev/null +++ b/dev-libs/libotf/files/libotf-0.9.16-freetype_pkgconfig.patch @@ -0,0 +1,33 @@ +--- libotf-0.9.16/configure.ac ++++ libotf-0.9.16/configure.ac +@@ -48,23 +48,24 @@ + AC_FUNC_ALLOCA + AC_FUNC_MALLOC + ++PKG_PROG_PKG_CONFIG ++ + # Check for Freetype2 usability. +-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) +-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then +- FREETYPE_INC=`freetype-config --cflags` ++PKG_CHECK_MODULES(FREETYPE, freetype2, [ ++ FREETYPE_INC="$FREETYPE_CFLAGS" + CPPFLAGS="$CPPFLAGS $FREETYPE_INC" + AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS) + if test "x$HAVE_FREETYPE" = "xyes" ; then +- FREETYPE_LD_FLAGS=`freetype-config --libs`; ++ FREETYPE_LD_FLAGS="$FREETYPE_LIBS" + LIBS="$LIBS $FREETYPE_LD_FLAGS" + AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no) + fi +-fi ++]) + + if test "x$HAVE_FREETYPE" != "xyes" ; then +- echo "Freetype library wan't found in your system!" ++ echo "Freetype library not found in your system!" + exit 1 + fi + AC_SUBST(FREETYPE_INC) |