diff options
Diffstat (limited to 'package/glib')
| -rw-r--r-- | package/glib/Makefile | 6 | ||||
| -rw-r--r-- | package/glib/patches/patch-Makefile_in | 11 | ||||
| -rw-r--r-- | package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py | 9 | ||||
| -rw-r--r-- | package/glib/patches/patch-gio_gnetworkmonitor_c | 4 | ||||
| -rw-r--r-- | package/glib/patches/patch-gio_gnetworkmonitornetlink_c | 12 |
5 files changed, 11 insertions, 31 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 41edca441..730a44336 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.36.4 +PKG_VERSION:= 2.38.2 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 2.36 -PKG_MD5SUM:= 2f4b15f7ef43d8702d067ab987bf7aba +PKG_EXTRAVER:= 2.38 +PKG_MD5SUM:= 26d1d08e478fc48c181ca8be44f5b69f PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= libpthread diff --git a/package/glib/patches/patch-Makefile_in b/package/glib/patches/patch-Makefile_in deleted file mode 100644 index 92e1eb072..000000000 --- a/package/glib/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 po docs \ -+SUBDIRS = . m4macros glib gmodule gthread gobject gio po \ - $(am__append_1) - DIST_SUBDIRS = $(SUBDIRS) build $(am__append_2) - bin_SCRIPTS = glib-gettextize 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 deleted file mode 100644 index e7df26bee..000000000 --- a/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py +++ /dev/null @@ -1,9 +0,0 @@ ---- 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 index 8147a2247..dc3964c3e 100644 --- a/package/glib/patches/patch-gio_gnetworkmonitor_c +++ b/package/glib/patches/patch-gio_gnetworkmonitor_c @@ -1,5 +1,5 @@ ---- 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 +--- glib-2.38.2.orig/gio/gnetworkmonitor.c 2013-10-25 17:58:38.000000000 +0200 ++++ glib-2.38.2/gio/gnetworkmonitor.c 2014-01-10 19:31:33.528843420 +0100 @@ -18,6 +18,8 @@ * Boston, MA 02111-1307, USA. */ diff --git a/package/glib/patches/patch-gio_gnetworkmonitornetlink_c b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c index a3cac9834..25cc24711 100644 --- a/package/glib/patches/patch-gio_gnetworkmonitornetlink_c +++ b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c @@ -1,10 +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 @@ +--- glib-2.38.2.orig/gio/gnetworkmonitornetlink.c 2013-11-12 06:30:22.000000000 +0100 ++++ glib-2.38.2/gio/gnetworkmonitornetlink.c 2014-01-10 19:31:44.888881617 +0100 +@@ -20,6 +20,7 @@ + #include "config.h" + ++#include <string.h> #include <errno.h> #include <unistd.h> -+#include <string.h> - #include "gnetworkmonitornetlink.h" - #include "gcredentials.h" |