diff options
| author |   Eric Hameleers <alien@slackware.com> | 2015-10-01 10:24:11 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2015-10-01 10:24:11 +0000 |
| commit | 144513c060ed151d966f8c48df3fe7722b35ba7d (patch) | |
| tree | 00be1f3c610cb422116bfbd21a6ccf15e8294edf /handbrake | |
| parent | 124a0cdf9927a75b60d26491d18614150651954a (diff) | |
| download | asb-144513c060ed151d966f8c48df3fe7722b35ba7d.tar.gz asb-144513c060ed151d966f8c48df3fe7722b35ba7d.tar.xz | |
handbrake: better patch for using newer glib
Diffstat (limited to 'handbrake')
| -rw-r--r-- | handbrake/build/patches/contrib/fribidi/A01-newer-glib.patch | 76 |
1 files changed, 63 insertions, 13 deletions
diff --git a/handbrake/build/patches/contrib/fribidi/A01-newer-glib.patch b/handbrake/build/patches/contrib/fribidi/A01-newer-glib.patch index 69d7d55e..7041547e 100644 --- a/handbrake/build/patches/contrib/fribidi/A01-newer-glib.patch +++ b/handbrake/build/patches/contrib/fribidi/A01-newer-glib.patch @@ -1,19 +1,9 @@ -From 2cf85c4e17f2d53dd4f2a8d31276721f0e2ab52a Mon Sep 17 00:00:00 2001 -From: Grigori Goronzy <greg@kinoho.net> -Date: Fri, 7 Feb 2014 19:58:13 +0100 -Subject: [PATCH] Include only glib.h +http://bugs.gentoo.org/318569 +http://bugs.gentoo.org/415721 -Fixes error: #error "Only glib.h can be included directly." -with certain glib versions. ---- - charset/fribidi-char-sets.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c -index eedff8f..214105f 100644 --- a/charset/fribidi-char-sets.c +++ b/charset/fribidi-char-sets.c -@@ -114,7 +114,7 @@ static FriBidiCharSetHandler char_sets[FRIBIDI_CHAR_SETS_NUM + 1] = { +@@ -114,7 +114,7 @@ }; #if FRIBIDI_USE_GLIB+0 @@ -22,3 +12,63 @@ index eedff8f..214105f 100644 # define fribidi_strcasecmp g_ascii_strcasecmp #else /* !FRIBIDI_USE_GLIB */ static char +--- a/lib/common.h ++++ b/lib/common.h +@@ -57,7 +57,7 @@ + # define SIZEOF_VOID_P GLIB_SIZEOF_VOID_P + # endif /* !SIZEOF_VOID_P */ + # ifndef __FRIBIDI_DOC +-# include <glib/gmem.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # ifndef fribidi_malloc + # define fribidi_malloc g_try_malloc +@@ -65,12 +65,12 @@ + # endif /* !fribidi_malloc */ + # ifndef fribidi_assert + # ifndef __FRIBIDI_DOC +-# include <glib/gmessages.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define fribidi_assert g_assert + # endif /* !fribidi_assert */ + # ifndef __FRIBIDI_DOC +-# include <glib/gmacros.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # ifndef FRIBIDI_BEGIN_STMT + # define FRIBIDI_BEGIN_STMT G_STMT_START { +--- a/lib/fribidi-common.h ++++ b/lib/fribidi-common.h +@@ -62,7 +62,7 @@ + + #if FRIBIDI_USE_GLIB+0 + # ifndef __FRIBIDI_DOC +-# include <glib/gmacros.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define FRIBIDI_BEGIN_DECLS G_BEGIN_DECLS + # define FRIBIDI_END_DECLS G_END_DECLS +--- a/lib/fribidi-types.h ++++ b/lib/fribidi-types.h +@@ -40,8 +40,7 @@ + + #if FRIBIDI_USE_GLIB+0 + # ifndef __FRIBIDI_DOC +-# include <glib/gtypes.h> +-# include <glib/gunicode.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define FRIBIDI_INT8_LOCAL gint8 + # define FRIBIDI_INT16_LOCAL gint16 +--- a/lib/mem.h ++++ b/lib/mem.h +@@ -42,7 +42,7 @@ + #if FRIBIDI_USE_GLIB+0 + + #ifndef __FRIBIDI_DOC +-# include <glib/gmem.h> ++# include <glib.h> + #endif /* !__FRIBIDI_DOC */ + + #define FriBidiMemChunk GMemChunk |