diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
| commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
| tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-libs/libotf/files | |
| parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/libotf/files')
| -rw-r--r-- | dev-libs/libotf/files/libotf-0.9.13-build.patch | 22 | ||||
| -rw-r--r-- | dev-libs/libotf/files/libotf-0.9.16-freetype_pkgconfig.patch | 33 |
2 files changed, 55 insertions, 0 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 new file mode 100644 index 000000000000..41fcb834f3d4 --- /dev/null +++ b/dev-libs/libotf/files/libotf-0.9.13-build.patch @@ -0,0 +1,22 @@ +--- a/example/Makefile.am ++++ b/example/Makefile.am +@@ -37,8 +37,7 @@ + otfdump_LDADD = ${CommonLDADD} + + otfview_SOURCE = otfview.c +-otfview_LDADD = ${CommonLDADD} +-otfview_LDFLAGS = ${X_LIBS} ${X_PRE_LIBS} @X11_XT_XAW_XMU@ ${X_EXTRA_LIBS} ++otfview_LDADD = ${CommonLDADD} ${X_LIBS} ${X_PRE_LIBS} @X11_XT_XAW_XMU@ ${X_EXTRA_LIBS} + + otftobdf_SOURCE = otftobdf.c + otftobdf_LDADD = ${CommonLDADD} +--- a/libotf.pc.in ++++ b/libotf.pc.in +@@ -7,5 +7,6 @@ + Description: OpenType font library + Version: @PACKAGE_VERSION@ + Requires: freetype2 +-Libs: @FREETYPE_LD_FLAGS@ -L${libdir} -lotf ++Libs: -L${libdir} -lotf ++Libs.private: @FREETYPE_LD_FLAGS@ + Cflags: @FREETYPE_INC@ -I${includedir} 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) |