diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
| commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
| tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/libotf/files | |
| parent | d87262dd706fec50cd150aab3e93883b6337466d (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, 0 insertions, 55 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 deleted file mode 100644 index 41fcb834f3d4..000000000000 --- a/dev-libs/libotf/files/libotf-0.9.13-build.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 deleted file mode 100644 index a57e92e1b1c2..000000000000 --- a/dev-libs/libotf/files/libotf-0.9.16-freetype_pkgconfig.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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) |