diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/glib/Makefile | 11 | ||||
| -rw-r--r-- | package/glib/patches/patch-gio_Makefile_in | 47 | ||||
| -rw-r--r-- | package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py | 9 | ||||
| -rw-r--r-- | package/glib/patches/patch-glib_gatomic_c | 10 | ||||
| -rw-r--r-- | package/glib/patches/patch-glib_gconvert_c | 16 | ||||
| -rw-r--r-- | package/glib/patches/patch-ltmain_sh | 6 |
6 files changed, 66 insertions, 33 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 3afdc4e13..81874a534 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,16 +4,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.28.1 -PKG_EXTRAVER:= 2.28 -PKG_RELEASE:= 4 -PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e +PKG_VERSION:= 2.33.14 +PKG_EXTRAVER:= 2.33 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 294304bc64a3e22b9278f49c04530aaa PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= libintl libiconv libpthread PKG_BUILDDEP:= gettext libiconv dbus PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/ +PKG_NOPARALLEL:= 1 + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_SUBPKGS:= GLIB GLIB_DEV PKGSC_GLIB_DEV:= devel diff --git a/package/glib/patches/patch-gio_Makefile_in b/package/glib/patches/patch-gio_Makefile_in new file mode 100644 index 000000000..9132e4b29 --- /dev/null +++ b/package/glib/patches/patch-gio_Makefile_in @@ -0,0 +1,47 @@ +--- glib-2.33.14.orig/gio/Makefile.in 2012-09-17 23:50:14.000000000 +0200 ++++ glib-2.33.14/gio/Makefile.in 2012-09-23 11:49:44.000000000 +0200 +@@ -430,7 +430,7 @@ am_glib_compile_resources_OBJECTS = gvdb + glib-compile-resources.$(OBJEXT) + glib_compile_resources_OBJECTS = $(am_glib_compile_resources_OBJECTS) + glib_compile_resources_DEPENDENCIES = \ +- $(top_builddir)/glib/libglib-2.0.la \ ++ $(top_builddir)/glib/libglib-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/gmodule/libgmodule-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la libgio-2.0.la + am_glib_compile_schemas_OBJECTS = gvdb-builder.$(OBJEXT) \ + glib-compile-schemas.$(OBJEXT) +@@ -1277,6 +1277,8 @@ BUILT_EXTRA_DIST = \ + CLEANFILES = gdbus-daemon-generated.c gdbus-daemon-generated.h gio-public-headers.txt gconstructor_as_data.h + glib_compile_resources_LDADD = \ + $(top_builddir)/glib/libglib-2.0.la \ ++ $(top_builddir)/gthread/libgthread-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ + libgio-2.0.la + +@@ -1304,6 +1306,8 @@ glib_compile_schemas_SOURCES = \ + + gsettings_LDADD = \ + $(top_builddir)/glib/libglib-2.0.la \ ++ $(top_builddir)/gthread/libgthread-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ + libgio-2.0.la + +@@ -1313,6 +1317,8 @@ dist_schema_DATA = gschema.dtd + gdbus_SOURCES = gdbus-tool.c + gdbus_LDADD = libgio-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ ++ $(top_builddir)/gthread/libgthread-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la + + completiondir = $(datadir)/bash-completion/completions +@@ -1325,6 +1331,8 @@ gresource_SOURCES = gresource-tool.c + gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS) + gresource_LDADD = libgio-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ ++ $(top_builddir)/gthread/libgthread-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ + $(LIBELF_LIBS) + 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..d9642d91e --- /dev/null +++ b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py @@ -0,0 +1,9 @@ +--- glib-2.33.14.orig/gio/gdbus-2.0/codegen/config.py 2012-09-17 23:50:37.000000000 +0200 ++++ glib-2.33.14/gio/gdbus-2.0/codegen/config.py 2012-09-23 11:08:10.000000000 +0200 +@@ -23,5 +23,5 @@ + + DATADIR = "${prefix}/share" + DATADIR = DATADIR.replace( +- "${prefix}", "/usr/local") ++ "${prefix}", "/usr") + VERSION = "2.33.14" diff --git a/package/glib/patches/patch-glib_gatomic_c b/package/glib/patches/patch-glib_gatomic_c deleted file mode 100644 index 42d41196b..000000000 --- a/package/glib/patches/patch-glib_gatomic_c +++ /dev/null @@ -1,10 +0,0 @@ ---- glib-2.27.5.orig/glib/gatomic.c 2010-09-05 06:20:56.000000000 +0200 -+++ glib-2.27.5/glib/gatomic.c 2011-02-18 20:52:37.703561782 +0100 -@@ -882,6 +882,7 @@ g_atomic_pointer_compare_and_exchange (v - - #ifdef DEFINE_WITH_MUTEXES - /* We have to use the slow, but safe locking method */ -+#include "gthread.h" - static GMutex *g_atomic_mutex; - - /** diff --git a/package/glib/patches/patch-glib_gconvert_c b/package/glib/patches/patch-glib_gconvert_c deleted file mode 100644 index bd9db0404..000000000 --- a/package/glib/patches/patch-glib_gconvert_c +++ /dev/null @@ -1,16 +0,0 @@ ---- glib-2.27.5.orig/glib/gconvert.c 2010-09-13 15:40:53.000000000 +0200 -+++ glib-2.27.5/glib/gconvert.c 2011-01-14 17:17:40.000000000 +0100 -@@ -58,13 +58,6 @@ - - #include "glibintl.h" - --#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) --#error GNU libiconv in use but included iconv.h not from libiconv --#endif --#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) --#error GNU libiconv not in use but included iconv.h is from libiconv --#endif -- - - /** - * SECTION:conversions diff --git a/package/glib/patches/patch-ltmain_sh b/package/glib/patches/patch-ltmain_sh index 559afa25c..16078c020 100644 --- a/package/glib/patches/patch-ltmain_sh +++ b/package/glib/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ ---- glib-2.27.5.orig/ltmain.sh 2010-12-06 15:06:25.000000000 +0100 -+++ glib-2.27.5/ltmain.sh 2011-01-14 17:22:21.000000000 +0100 -@@ -5840,7 +5840,7 @@ func_mode_link () +--- glib-2.33.14.orig/ltmain.sh 2012-09-17 23:25:27.000000000 +0200 ++++ glib-2.33.14/ltmain.sh 2012-09-23 11:07:23.000000000 +0200 +@@ -5853,7 +5853,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=*| \ |