From ac7bde56d63418ece6ccb2c574730723337d845f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 5 Oct 2012 11:22:44 +0200
Subject: make firefox work again on lemote yeelong

---
 package/glib/Makefile                              | 10 ++---
 package/glib/patches/patch-gio_Makefile_in         | 47 ----------------------
 .../patches/patch-gio_gdbus-2_0_codegen_config_py  |  9 -----
 3 files changed, 5 insertions(+), 61 deletions(-)
 delete mode 100644 package/glib/patches/patch-gio_Makefile_in
 delete mode 100644 package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py

(limited to 'package/glib')

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 81874a534..3f1def14f 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.33.14
-PKG_EXTRAVER:=		2.33
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		294304bc64a3e22b9278f49c04530aaa
+PKG_VERSION:=		2.28.1
+PKG_EXTRAVER:=		2.28
+PKG_RELEASE:=		4
+PKG_MD5SUM:=		9f6e85e1e38490c3956f4415bcd33e6e
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libintl libiconv libpthread
@@ -16,7 +16,7 @@ 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
+#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
deleted file mode 100644
index 9132e4b29..000000000
--- a/package/glib/patches/patch-gio_Makefile_in
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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
deleted file mode 100644
index d9642d91e..000000000
--- a/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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"
-- 
cgit v1.2.3