8 files changed, 38 insertions, 54 deletions
diff --git a/package/glib/patches/patch-Makefile_in b/package/glib/patches/patch-Makefile_in
index b53217f1e..92e1eb072 100644
--- a/package/glib/patches/patch-Makefile_in
+++ b/package/glib/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
---- glib-2.28.1.orig/Makefile.in	2011-02-18 16:22:03.000000000 +0100
-+++ glib-2.28.1/Makefile.in	2013-10-31 19:55:48.000000000 +0100
-@@ -422,7 +422,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLo
- 	gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
+--- glib-2.36.4.orig/Makefile.in	2013-08-07 16:43:05.000000000 +0200
++++ glib-2.36.4/Makefile.in	2013-11-19 11:35:29.000000000 +0100
+@@ -686,7 +686,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLo
+ 	gio-unix-2.0.pc.in gio-windows-2.0.pc.in check-abis.sh
  TEST_PROGS = 
  ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po
- DIST_SUBDIRS = $(SUBDIRS) build
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs \
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po \
+ 	$(am__append_1)
+ DIST_SUBDIRS = $(SUBDIRS) build $(am__append_2)
  bin_SCRIPTS = glib-gettextize
- AM_CPPFLAGS = \
diff --git a/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
new file mode 100644
index 000000000..e7df26bee
--- /dev/null
+++ b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
@@ -0,0 +1,9 @@
+--- glib-2.36.4.orig/gio/gdbus-2.0/codegen/config.py	2013-08-07 16:43:20.000000000 +0200
++++ glib-2.36.4/gio/gdbus-2.0/codegen/config.py	2013-11-29 16:50:05.000000000 +0100
+@@ -23,5 +23,5 @@
+ 
+ DATADIR = "${prefix}/share"
+ DATADIR = DATADIR.replace(
+-    "${prefix}", "/usr/local")
++    "${prefix}", "/usr")
+ VERSION = "2.36.4"
diff --git a/package/glib/patches/patch-gio_gnetworkmonitor_c b/package/glib/patches/patch-gio_gnetworkmonitor_c
new file mode 100644
index 000000000..8147a2247
--- /dev/null
+++ b/package/glib/patches/patch-gio_gnetworkmonitor_c
@@ -0,0 +1,11 @@
+--- glib-2.36.4.orig/gio/gnetworkmonitor.c	2013-05-07 20:26:07.000000000 +0200
++++ glib-2.36.4/gio/gnetworkmonitor.c	2013-11-29 16:58:28.000000000 +0100
+@@ -18,6 +18,8 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include <string.h>
++
+ #include "config.h"
+ #include "glib.h"
+ #include "glibintl.h"
diff --git a/package/glib/patches/patch-gio_gnetworkmonitornetlink_c b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c
new file mode 100644
index 000000000..a3cac9834
--- /dev/null
+++ b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c
@@ -0,0 +1,10 @@
+--- glib-2.36.4.orig/gio/gnetworkmonitornetlink.c	2013-08-07 16:36:32.000000000 +0200
++++ glib-2.36.4/gio/gnetworkmonitornetlink.c	2013-11-29 17:14:56.000000000 +0100
+@@ -22,6 +22,7 @@
+ 
+ #include <errno.h>
+ #include <unistd.h>
++#include <string.h>
+ 
+ #include "gnetworkmonitornetlink.h"
+ #include "gcredentials.h"
diff --git a/package/glib/patches/patch-glib_gstrfuncs_c b/package/glib/patches/patch-glib_gstrfuncs_c
deleted file mode 100644
index ec0543675..000000000
--- a/package/glib/patches/patch-glib_gstrfuncs_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- glib-2.28.1.orig/glib/gstrfuncs.c	2011-02-16 03:55:33.000000000 +0100
-+++ glib-2.28.1/glib/gstrfuncs.c	2013-11-06 18:24:29.973270200 +0100
-@@ -1423,12 +1423,6 @@ g_strsignal (gint signum)
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
- 
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
--extern const char *strsignal(int);
--#else
--  /* this is declared differently (const) in string.h on BeOS */
--  extern char *strsignal (int sig);
--#endif /* !G_OS_BEOS && !G_WITH_CYGWIN */
-   msg_locale = strsignal (signum);
-   if (g_get_charset (NULL))
-     return msg_locale;
diff --git a/package/glib/patches/patch-gmodule-2_0_pc_in b/package/glib/patches/patch-gmodule-2_0_pc_in
deleted file mode 100644
index db8446fed..000000000
--- a/package/glib/patches/patch-gmodule-2_0_pc_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- glib-2.28.1.orig/gmodule-2.0.pc.in	2010-04-13 15:33:16.000000000 +0200
-+++ glib-2.28.1/gmodule-2.0.pc.in	2011-03-25 19:49:39.000000000 +0100
-@@ -9,6 +9,6 @@ Name: GModule
- Description: Dynamic module loader for GLib
- Requires: glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@
-+Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@
- Libs.private: @G_MODULE_LIBS@
- Cflags: @G_THREAD_CFLAGS@
diff --git a/package/glib/patches/patch-gmodule-export-2_0_pc_in b/package/glib/patches/patch-gmodule-export-2_0_pc_in
deleted file mode 100644
index bf61551fd..000000000
--- a/package/glib/patches/patch-gmodule-export-2_0_pc_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- glib-2.28.1.orig/gmodule-export-2.0.pc.in	2010-04-13 15:33:16.000000000 +0200
-+++ glib-2.28.1/gmodule-export-2.0.pc.in	2011-03-25 19:49:59.000000000 +0100
-@@ -9,6 +9,6 @@ Name: GModule
- Description: Dynamic module loader for GLib
- Requires: glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@
-+Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@
- Libs.private: @G_MODULE_LIBS@
- Cflags: @G_THREAD_CFLAGS@
diff --git a/package/glib/patches/patch-ltmain_sh b/package/glib/patches/patch-ltmain_sh
deleted file mode 100644
index b69b349d4..000000000
--- a/package/glib/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.28.1.orig/ltmain.sh	2011-02-08 13:25:07.000000000 +0100
-+++ glib-2.28.1/ltmain.sh	2013-10-31 19:37:51.000000000 +0100
-@@ -5840,7 +5840,7 @@ func_mode_link ()
-       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"