mirror of
https://github.com/dguglielmi/sunny-overlay.git
synced 2025-12-06 22:32:37 +01:00
- splashutils fix building with freetype 2.5 & libmng 2
(see bgo https://bugs.gentoo.org/show_bug.cgi?id=506124)
This commit is contained in:
39
media-gfx/splashutils/files/libmng2-lcms2.patch
Normal file
39
media-gfx/splashutils/files/libmng2-lcms2.patch
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
--- configure-old 2014-02-03 18:49:57.524228900 +0100
|
||||||
|
+++ configure 2014-02-03 18:54:31.920895855 +0100
|
||||||
|
@@ -13025,13 +13025,13 @@
|
||||||
|
MNG_LIBS="${MNG_LIBS} -lz"
|
||||||
|
fi
|
||||||
|
|
||||||
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsCloseProfile in -llcms" >&5
|
||||||
|
-$as_echo_n "checking for cmsCloseProfile in -llcms... " >&6; }
|
||||||
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsCloseProfile in -llcms2" >&5
|
||||||
|
+$as_echo_n "checking for cmsCloseProfile in -llcms2... " >&6; }
|
||||||
|
if ${ac_cv_lib_lcms_cmsCloseProfile+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
-LIBS="-llcms $LIBS"
|
||||||
|
+LIBS="-llcms2 $LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
@@ -13062,7 +13062,7 @@
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lcms_cmsCloseProfile" >&5
|
||||||
|
$as_echo "$ac_cv_lib_lcms_cmsCloseProfile" >&6; }
|
||||||
|
if test "x$ac_cv_lib_lcms_cmsCloseProfile" = xyes; then :
|
||||||
|
- MNG_LIBS="${MNG_LIBS} -llcms"
|
||||||
|
+ MNG_LIBS="${MNG_LIBS} -llcms2"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
--- configure.ac-old 2014-02-03 18:49:17.970895525 +0100
|
||||||
|
+++ configure.ac 2014-02-03 18:53:08.964229101 +0100
|
||||||
|
@@ -538,7 +538,7 @@
|
||||||
|
MNG_LIBS="${MNG_LIBS} -lmng"
|
||||||
|
MNG_LIBS="${MNG_LIBS} ${JPEG_LIBS}"
|
||||||
|
AC_CHECK_LIB([z], [zlibVersion], [MNG_LIBS="${MNG_LIBS} -lz" ])
|
||||||
|
- AC_CHECK_LIB([lcms], [cmsCloseProfile],[MNG_LIBS="${MNG_LIBS} -llcms"])
|
||||||
|
+ AC_CHECK_LIB([lcms2], [cmsCloseProfile],[MNG_LIBS="${MNG_LIBS} -llcms2"])
|
||||||
|
],
|
||||||
|
[AC_MSG_ERROR(['libmng' library file was not found.])]
|
||||||
|
)
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
diff -dNur a/fbtruetype/ttf.c b/fbtruetype/ttf.c
|
||||||
|
--- a/fbtruetype/ttf.c 2006-02-03 16:10:41.000000000 +0100
|
||||||
|
+++ b/fbtruetype/ttf.c 2014-07-24 16:39:03.645062304 +0200
|
||||||
|
@@ -13,8 +13,8 @@
|
||||||
|
#include <ft2build.h>
|
||||||
|
#include FT_FREETYPE_H
|
||||||
|
/* #include <freetype/freetype.h> */
|
||||||
|
-#include <freetype/ftoutln.h>
|
||||||
|
-#include <freetype/ttnameid.h>
|
||||||
|
+#include FT_OUTLINE_H
|
||||||
|
+#include FT_TRUETYPE_IDS_H
|
||||||
|
|
||||||
|
#include "ttf.h"
|
||||||
|
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
diff -dNur a/src/ttf.c b/src/ttf.c
|
||||||
|
--- a/src/ttf.c 2011-06-12 23:43:39.000000000 +0200
|
||||||
|
+++ b/src/ttf.c 2014-07-24 16:54:19.322207452 +0200
|
||||||
|
@@ -25,8 +25,8 @@
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include <ft2build.h>
|
||||||
|
-#include <freetype/ftoutln.h>
|
||||||
|
-#include <freetype/ttnameid.h>
|
||||||
|
+#include FT_OUTLINE_H
|
||||||
|
+#include FT_TRUETYPE_IDS_H
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
#include "render.h"
|
||||||
|
diff -dNur a/src/ttf.h b/src/ttf.h
|
||||||
|
--- a/src/ttf.h 2011-06-12 23:43:39.000000000 +0200
|
||||||
|
+++ b/src/ttf.h 2014-07-24 16:54:30.426027477 +0200
|
||||||
|
@@ -1,8 +1,8 @@
|
||||||
|
#ifndef _TTF_H
|
||||||
|
#define _TTF_H
|
||||||
|
#include <ft2build.h>
|
||||||
|
-#include <freetype/ftoutln.h>
|
||||||
|
-#include <freetype/ttnameid.h>
|
||||||
|
+#include FT_OUTLINE_H
|
||||||
|
+#include FT_TRUETYPE_IDS_H
|
||||||
|
|
||||||
|
#define CACHED_METRICS 0x10
|
||||||
|
#define CACHED_BITMAP 0x01
|
||||||
Reference in New Issue
Block a user