From d9e1957f38b94d087a8f485048134bd6893e2aec Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 21 Aug 2014 21:06:24 +0000 Subject: [PATCH] glib2: update patchset for strings.h --- dev-libs/glib/glib2-2.38.1.recipe | 4 +- ...ib2-2.38.1.patch => glib2-2.38.1.patchset} | 63 ++++++++++++------- 2 files changed, 42 insertions(+), 25 deletions(-) rename dev-libs/glib/patches/{glib2-2.38.1.patch => glib2-2.38.1.patchset} (92%) diff --git a/dev-libs/glib/glib2-2.38.1.recipe b/dev-libs/glib/glib2-2.38.1.recipe index 1c0669576..a9a8f62c5 100644 --- a/dev-libs/glib/glib2-2.38.1.recipe +++ b/dev-libs/glib/glib2-2.38.1.recipe @@ -24,7 +24,7 @@ COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald 2008-2010 Collabora Ltd. 1995-2010 Several others" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -79,7 +79,7 @@ BUILD_PREREQUIRES=" cmd:python " -PATCHES="glib2-2.38.1.patch" +PATCHES="glib2-2.38.1.patchset" SOURCE_DIR="glib-2.38.1" diff --git a/dev-libs/glib/patches/glib2-2.38.1.patch b/dev-libs/glib/patches/glib2-2.38.1.patchset similarity index 92% rename from dev-libs/glib/patches/glib2-2.38.1.patch rename to dev-libs/glib/patches/glib2-2.38.1.patchset index 4774b8c3e..4eb7311ce 100644 --- a/dev-libs/glib/patches/glib2-2.38.1.patch +++ b/dev-libs/glib/patches/glib2-2.38.1.patchset @@ -1,3 +1,9 @@ +From 1e9681c8659dd586e0ade5f29334ceee195c88e3 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Tue, 17 Jun 2014 19:57:08 +0000 +Subject: applying patch glib2-2.38.1.patch + + diff --git a/configure.ac b/configure.ac index f0840d5..f7df259 100644 --- a/configure.ac @@ -431,29 +437,40 @@ index 2620cb6..34f1edd 100644 #if defined(G_OS_WIN32) static void load_user_special_dirs (void) -From 76b841117910d28f624d0758a276ef9e6816bb73 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Wed, 23 Jul 2014 17:39:04 +0200 -Subject: [PATCH] Fix path in glib-gettextize - -Why define datadir if you use $prefix/share/ ? ---- - glib-gettextize.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib-gettextize.in b/glib-gettextize.in -index 7166cf7..a175578 100644 ---- a/glib-gettextize.in -+++ b/glib-gettextize.in -@@ -52,7 +52,7 @@ esac - datarootdir=@datarootdir@ - datadir=@datadir@ - --gettext_dir=$prefix/share/glib-2.0/gettext -+gettext_dir=$datadir/glib-2.0/gettext - - while test $# -gt 0; do - case "$1" in +-- +1.8.3.4 + + +From 092577e9398f25dc86c5dff1b9baea92a13c78e4 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 21 Aug 2014 17:08:30 +0000 +Subject: strings.h for strcasecmp + + +diff --git a/glib/glib-init.c b/glib/glib-init.c +index 0032ee8..384257f 100644 +--- a/glib/glib-init.c ++++ b/glib/glib-init.c +@@ -27,6 +27,7 @@ + #include "gconstructor.h" + + #include ++#include + #include + #include + #include +diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c +index 4fcd91c..676c2df 100644 +--- a/glib/gstrfuncs.c ++++ b/glib/gstrfuncs.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #include + #include + #include /* For tolower() */ -- 1.8.3.4