From 911a8d67bf979a65bfa3246f5c789588f3fc6bd6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 4 Mar 2013 16:30:40 +0100
Subject: resolve various build failures

---
 package/glib/Makefile                      |  8 +++----
 package/glib/patches/patch-gio_Makefile_in | 34 ------------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 package/glib/patches/patch-gio_Makefile_in

(limited to 'package/glib')

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 7f55e9f0f..ba9efa759 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.35.7
-PKG_EXTRAVER:=		2.35
+PKG_VERSION:=		2.28.1
+PKG_EXTRAVER:=		2.28
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d9f36f01a24fcfd568c7e45ceabcec90
+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 0bc0dbdc5..000000000
--- a/package/glib/patches/patch-gio_Makefile_in
+++ /dev/null
@@ -1,34 +0,0 @@
---- glib-2.35.7.orig/gio/Makefile.in	2013-02-05 21:44:27.000000000 +0100
-+++ glib-2.35.7/gio/Makefile.in	2013-02-12 12:07:43.000000000 +0100
-@@ -1291,6 +1291,7 @@ DISTCLEANFILES = \
- glib_compile_resources_LDADD = \
- 	$(top_builddir)/glib/libglib-2.0.la \
- 	$(top_builddir)/gobject/libgobject-2.0.la	\
-+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
- 	libgio-2.0.la
- 
- glib_compile_resources_SOURCES = \
-@@ -1318,6 +1319,7 @@ glib_compile_schemas_SOURCES = \
- gsettings_LDADD = \
- 	$(top_builddir)/glib/libglib-2.0.la		\
- 	$(top_builddir)/gobject/libgobject-2.0.la	\
-+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
- 	libgio-2.0.la
- 
- gsettings_SOURCES = gsettings-tool.c
-@@ -1326,6 +1328,7 @@ 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)/gmodule/libgmodule-2.0.la	\
- 	$(top_builddir)/gobject/libgobject-2.0.la
- 
- completiondir = $(datadir)/bash-completion/completions
-@@ -1338,6 +1341,7 @@ 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)/gmodule/libgmodule-2.0.la	\
- 	$(top_builddir)/gobject/libgobject-2.0.la \
- 	$(LIBELF_LIBS)
- 
-- 
cgit v1.2.3