dconf: version bump 0.5 -> 0.7.2

This means that we do now need dbus and glib 2.27.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
[mol: fix url & remove obsolete patches]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 0 insertions, 169 deletions

diff --git a/patches/dconf-0.5/0001-make-dconf-editor-optional.patch b/patches/dconf-0.5/0001-make-dconf-editor-optional.patch
deleted file mode 100644
index 14e7d1aee..000000000
--- a/patches/dconf-0.5/0001-make-dconf-editor-optional.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Thu, 8 Jul 2010 14:21:32 +0200
-Subject: [PATCH 1/2] make dconf editor optional
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile.am  |    6 +++++-
- configure.ac |   11 ++++++++---
- 2 files changed, 13 insertions(+), 4 deletions(-)
-
-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}
- 
--SUBDIRS = gvdb service gsettings tests client bin engine common docs editor
-+SUBDIRS = gvdb service gsettings tests client bin engine common docs
-+
-+if ENABLE_EDITOR
-+SUBDIRS += editor
-+endif
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-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.12)
--PKG_CHECK_MODULES(gtk, gtk+-2.0)
--PKG_CHECK_MODULES(gee, gee-1.0)
--PKG_CHECK_MODULES(libxml, libxml-2.0)
-+
-+AC_ARG_ENABLE(editor, [  --disable-editor Disable the dconf editor, [default=yes]],,[enable_editor=yes])
-+if test "x$enable_editor" = "xyes"; then
-+  PKG_CHECK_MODULES(gtk, gtk+-2.0)
-+  PKG_CHECK_MODULES(gee, gee-1.0)
-+  PKG_CHECK_MODULES(libxml, libxml-2.0)
-+fi
-+AM_CONDITIONAL(ENABLE_EDITOR, test "x$enable_editor" = "xyes")
- 
- 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)
diff --git a/patches/dconf-0.5/0002-fix-autotool-stuff.patch b/patches/dconf-0.5/0002-fix-autotool-stuff.patch
deleted file mode 100644
index a69448ab9..000000000
--- a/patches/dconf-0.5/0002-fix-autotool-stuff.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Thu, 8 Jul 2010 14:22:36 +0200
-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 deletion(-)
- create mode 100644 m4/introspection.m4
-
-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
-Index: dconf-0.5/m4/introspection.m4
-===================================================================
---- /dev/null
-+++ dconf-0.5/m4/introspection.m4
-@@ -0,0 +1,88 @@
-+dnl -*- mode: autoconf -*-
-+dnl Copyright 2009 Johan Dahlin
-+dnl
-+dnl This file is free software; the author(s) gives unlimited
-+dnl permission to copy and/or distribute it, with or without
-+dnl modifications, as long as this notice is preserved.
-+dnl
-+
-+# serial 1
-+
-+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-+[
-+    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-+
-+    dnl enable/disable introspection
-+    m4_if([$2], [require],
-+    [dnl
-+        enable_introspection=yes
-+    ],[dnl
-+        AC_ARG_ENABLE(introspection,
-+                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-+                                 [Enable introspection for this build]),,
-+                                 [enable_introspection=auto])
-+    ])dnl
-+
-+    AC_MSG_CHECKING([for gobject-introspection])
-+
-+    dnl presence/version checking
-+    AS_CASE([$enable_introspection],
-+    [no], [dnl
-+        found_introspection="no (disabled, use --enable-introspection to enable)"
-+    ],dnl
-+    [yes],[dnl
-+        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-+                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-+                         found_introspection=yes,
-+                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-+    ],dnl
-+    [auto],[dnl
-+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-+    ],dnl
-+    [dnl
-+        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-+    ])dnl
-+
-+    AC_MSG_RESULT([$found_introspection])
-+
-+    INTROSPECTION_SCANNER=
-+    INTROSPECTION_COMPILER=
-+    INTROSPECTION_GENERATE=
-+    INTROSPECTION_GIRDIR=
-+    INTROSPECTION_TYPELIBDIR=
-+    if test "x$found_introspection" = "xyes"; then
-+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+    fi
-+    AC_SUBST(INTROSPECTION_SCANNER)
-+    AC_SUBST(INTROSPECTION_COMPILER)
-+    AC_SUBST(INTROSPECTION_GENERATE)
-+    AC_SUBST(INTROSPECTION_GIRDIR)
-+    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-+
-+    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-+])
-+
-+
-+dnl Usage:
-+dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-+[
-+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-+])
-+
-+dnl Usage:
-+dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-+
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-+[
-+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-+])
diff --git a/patches/dconf-0.5/autogen.sh b/patches/dconf-0.5/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/dconf-0.5/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/dconf-0.5/series b/patches/dconf-0.5/series
deleted file mode 100644
index b2b0a4263..000000000
--- a/patches/dconf-0.5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-0001-make-dconf-editor-optional.patch
-0002-fix-autotool-stuff.patch
-# fe99d5bbd2a34c41cef075c2805061c1  - git-ptx-patches magic