Merge remote branch 'rsc/for-mainline'

8 files changed, 27 insertions, 70 deletions

diff --git a/patches/dconf-0.4.1/0001-make-dconf-editor-optional.patch b/patches/dconf-0.5/0001-make-dconf-editor-optional.patch
index ae2cb6826..14e7d1aee 100644
--- a/patches/dconf-0.4.1/0001-make-dconf-editor-optional.patch
+++ b/patches/dconf-0.5/0001-make-dconf-editor-optional.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  configure.ac |   11 ++++++++---
  2 files changed, 13 insertions(+), 4 deletions(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index 2a56d9b..219d5a1 100644
---- a/Makefile.am
-+++ b/Makefile.am
+Index: dconf-0.5/Makefile.am
+===================================================================
+--- dconf-0.5.orig/Makefile.am
++++ dconf-0.5/Makefile.am
 @@ -1,5 +1,9 @@
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
@@ -23,14 +23,14 @@ index 2a56d9b..219d5a1 100644
 +endif
  
  DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-diff --git a/configure.ac b/configure.ac
-index 5353483..2073946 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,9 +25,14 @@ GTK_DOC_CHECK([1.14])
+Index: dconf-0.5/configure.ac
+===================================================================
+--- dconf-0.5.orig/configure.ac
++++ dconf-0.5/configure.ac
+@@ -22,9 +22,14 @@ GTK_DOC_CHECK([1.15])
  
  # Dependencies
- PKG_CHECK_MODULES(gio, gio-2.0 >= 2.25.10)
+ PKG_CHECK_MODULES(gio, gio-2.0 >= 2.25.12)
 -PKG_CHECK_MODULES(gtk, gtk+-2.0)
 -PKG_CHECK_MODULES(gee, gee-1.0)
 -PKG_CHECK_MODULES(libxml, libxml-2.0)
@@ -45,6 +45,3 @@ index 5353483..2073946 100644
  
  AC_ARG_WITH(gio_modules_dir, [  --with-gio-modules-dir=PATH choose directory for the GIO module, [default=LIBDIR/gio/modules]], giomodulesdir="$withval", giomodulesdir=${libdir}/gio/modules)
  AC_SUBST(giomodulesdir)
--- 
-1.7.1
-
diff --git a/patches/dconf-0.4.1/0002-fix-autotool-stuff.patch b/patches/dconf-0.5/0002-fix-autotool-stuff.patch
index 462b6a3af..a69448ab9 100644
--- a/patches/dconf-0.4.1/0002-fix-autotool-stuff.patch
+++ b/patches/dconf-0.5/0002-fix-autotool-stuff.patch
@@ -4,29 +4,28 @@ Subject: [PATCH 2/2] fix autotool stuff
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- configure.ac        |    2 +-
- m4/introspection.m4 |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 89 insertions(+), 1 deletions(-)
+ configure.ac        |    2 -
+ m4/introspection.m4 |   88 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 89 insertions(+), 1 deletion(-)
  create mode 100644 m4/introspection.m4
 
-diff --git a/configure.ac b/configure.ac
-index 2073946..a639b2b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,7 +6,7 @@ AC_INIT([dconf],
- AC_CONFIG_SRCDIR([configure.ac])
+Index: dconf-0.5/configure.ac
+===================================================================
+--- dconf-0.5.orig/configure.ac
++++ dconf-0.5/configure.ac
+@@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([configure.ac])
  AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_AUX_DIR([aux])
  
 -AM_INIT_AUTOMAKE([1.11 -Wno-portability])
 +AM_INIT_AUTOMAKE([foreign])
  AM_SILENT_RULES([yes])
  
  # Check for programs
-diff --git a/m4/introspection.m4 b/m4/introspection.m4
-new file mode 100644
-index 0000000..bb3a0da
+Index: dconf-0.5/m4/introspection.m4
+===================================================================
 --- /dev/null
-+++ b/m4/introspection.m4
++++ dconf-0.5/m4/introspection.m4
 @@ -0,0 +1,88 @@
 +dnl -*- mode: autoconf -*-
 +dnl Copyright 2009 Johan Dahlin
@@ -116,6 +115,3 @@ index 0000000..bb3a0da
 +[
 +  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
 +])
--- 
-1.7.1
-
diff --git a/patches/dconf-0.4.1/autogen.sh b/patches/dconf-0.5/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/dconf-0.4.1/autogen.sh
+++ b/patches/dconf-0.5/autogen.sh
diff --git a/patches/dconf-0.4.1/series b/patches/dconf-0.5/series
index b2b0a4263..b2b0a4263 100644
--- a/patches/dconf-0.4.1/series
+++ b/patches/dconf-0.5/series
diff --git a/patches/glib-2.25.10/0001-HACK-don-t-drop-dependency-libs.patch b/patches/glib-2.25.10/0001-HACK-don-t-drop-dependency-libs.patch
deleted file mode 100644
index 353fa0c7a..000000000
--- a/patches/glib-2.25.10/0001-HACK-don-t-drop-dependency-libs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ec38987a4850b2bd613e45dd952faf9af72b8c20 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 6 Jul 2010 12:28:03 +0200
-Subject: [PATCH] HACK: don't drop dependency libs
-
-On Linux the configure script generates a libtool that will drop dependency
-libs when linking a library/program. This is done to avoid explicitly
-linking to implicit depencencies. This is usually the right thing to do.
-However it breaks if the implicit depencencies are not installed.
-
-This patch ensures that libtool will link to all dependency libs to avoid
-the problem.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- configure |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index 046d740..f8220a4 100755
---- a/configure
-+++ b/configure
-@@ -13920,9 +13920,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
-   openbsd*)
-     with_gnu_ld=no
-     ;;
--  linux* | k*bsd*-gnu)
--    link_all_deplibs=no
--    ;;
-   esac
- 
-   ld_shlibs=yes
--- 
-1.7.1
-
diff --git a/patches/glib-2.25.10/series b/patches/glib-2.25.10/series
deleted file mode 100644
index 645fbe819..000000000
--- a/patches/glib-2.25.10/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-HACK-don-t-drop-dependency-libs.patch
diff --git a/rules/dconf.make b/rules/dconf.make
index 2a9092ccf..497179953 100644
--- a/rules/dconf.make
+++ b/rules/dconf.make
@@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_DCONF) += dconf
 #
 # Paths and names
 #
-DCONF_VERSION	:= 0.4.1
+DCONF_VERSION	:= 0.5
 DCONF		:= dconf-$(DCONF_VERSION)
 DCONF_SUFFIX	:= tar.bz2
-DCONF_URL	:= http://download.gnome.org/sources/dconf/0.4/$(DCONF).$(DCONF_SUFFIX)
+DCONF_URL	:= http://download.gnome.org/sources/dconf/0.5/$(DCONF).$(DCONF_SUFFIX)
 DCONF_SOURCE	:= $(SRCDIR)/$(DCONF).$(DCONF_SUFFIX)
 DCONF_DIR	:= $(BUILDDIR)/$(DCONF)
 DCONF_LICENSE	:= LGPLv2.1
diff --git a/rules/glib.make b/rules/glib.make
index 84bb76896..2ece7eeb3 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_GLIB) += glib
 # Paths and names
 #
 ifdef PTXCONF_GLIB_EXPERIMENTAL
-GLIB_VERSION	:= 2.25.10
+GLIB_VERSION	:= 2.25.12
 else
 GLIB_VERSION	:= 2.24.1
 endif
@@ -28,7 +28,7 @@ GLIB_SUFFIX	:= tar.bz2
 GLIB_SOURCE	:= $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX)
 GLIB_DIR	:= $(BUILDDIR)/$(GLIB)
 
-GLIB_URL	:= http://ftp.gtk.org/pub/glib/$(basename $(GLIB_VERSION))/glib-$(GLIB_VERSION).$(GLIB_SUFFIX)
+GLIB_URL	:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(basename $(GLIB_VERSION))/glib-$(GLIB_VERSION).$(GLIB_SUFFIX)
 
 GLIB_LICENSE	:= LGPLv2+
 
@@ -105,7 +105,7 @@ endif
 # ----------------------------------------------------------------------------
 
 ifdef PTXCONF_GLIB_EXPERIMENTAL
-GLIB_LIB_VERSION := 0.2510.0
+GLIB_LIB_VERSION := 0.2512.0
 else
 GLIB_LIB_VERSION := 0.2400.1
 endif