From bff4145137de84981359b02343f4ee7db8cc439b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 3 Jun 2014 17:10:32 +0200
Subject: update to latest stable version

---
 package/gconf/Makefile                  | 15 ++++++++-------
 package/gconf/patches/patch-Makefile_in | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 package/gconf/patches/patch-Makefile_in

(limited to 'package')

diff --git a/package/gconf/Makefile b/package/gconf/Makefile
index 92cc9a4ed..1ba24df9c 100644
--- a/package/gconf/Makefile
+++ b/package/gconf/Makefile
@@ -4,30 +4,31 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		GConf
-PKG_VERSION:=		2.32.1
-PKG_EXTRAVER:=		2.32
+PKG_VERSION:=		3.2.6
+PKG_EXTRAVER:=		3.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		de83e70453910ac62f9ee2a86444bdab
+PKG_MD5SUM:=		2b16996d0e4b112856ee5c59130e822c
 PKG_DESCR:=		system for storing application preferences
 PKG_SECTION:=		libs/misc
 PKG_BUILDDEP:=		dbus dbus-glib orbit2
 PKG_DEPENDS:=		dbus dbus-glib orbit2
 PKG_URL:=		http://projects.gnome.org/gconf/
-PKG_SITES:=		ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
+PKG_SITES:=		ftp://ftp.gnome.org/pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
 PKG_LIBNAME:=		gconf
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!arm
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GCONF,gconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIGURE_ARGS+=	--with-gtk=2.0 \
+			--disable-documentation
+
 gconf-install:
 	$(INSTALL_DIR) $(IDIR_GCONF)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/* $(IDIR_GCONF)/usr/bin
 	$(INSTALL_DIR) $(IDIR_GCONF)/usr/lib
-	$(INSTALL_BIN) $(WRKINST)/usr/lib/libgconf*.so* \
+	$(CP) $(WRKINST)/usr/lib/libgconf*.so* \
 		$(IDIR_GCONF)/usr/lib
 	$(INSTALL_DIR) $(IDIR_GCONF)/usr/lib/GConf/2
 	$(CP) $(WRKINST)/usr/lib/GConf/2/*.so \
diff --git a/package/gconf/patches/patch-Makefile_in b/package/gconf/patches/patch-Makefile_in
new file mode 100644
index 000000000..14f9305b8
--- /dev/null
+++ b/package/gconf/patches/patch-Makefile_in
@@ -0,0 +1,14 @@
+--- GConf-3.2.6.orig/Makefile.in	2013-01-22 02:59:40.000000000 +0100
++++ GConf-3.2.6/Makefile.in	2014-06-03 15:06:15.000000000 +0200
+@@ -398,9 +398,9 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ with_sysconfsubdir = @with_sysconfsubdir@
+-SUBDIRS = gconf backends po doc examples $(am__append_1) \
++SUBDIRS = gconf backends doc examples $(am__append_1) \
+ 	$(am__append_2)
+-DIST_SUBDIRS = tests gconf backends po doc examples defaults gsettings
++DIST_SUBDIRS = tests gconf backends doc examples defaults gsettings
+ EXTRA_DIST = \
+ 	TODO                \
+ 	gtk-doc.make        \
-- 
cgit v1.2.3