summaryrefslogtreecommitdiffstats
path: root/meta/packages/gnome/gconf-dbus
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-07-21 10:10:31 +0000
committerRichard Purdie <richard@openedhand.com>2006-07-21 10:10:31 +0000
commitb2f192faabe412adce79534e22efe9fb69ee40e2 (patch)
tree7076c49d4286f8a1733650bd8fbc7161af200d57 /meta/packages/gnome/gconf-dbus
parent2cf0eadf9f730027833af802d7e6c90b44248f80 (diff)
downloadpoky-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gnome/gconf-dbus')
-rwxr-xr-xmeta/packages/gnome/gconf-dbus/69gconfd-dbus3
-rwxr-xr-xmeta/packages/gnome/gconf-dbus/gconf-dbus-update.patch31
-rw-r--r--meta/packages/gnome/gconf-dbus/no-deprecation.patch11
-rw-r--r--meta/packages/gnome/gconf-dbus/remove-old-translations.patch11
-rw-r--r--meta/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch16
-rw-r--r--meta/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch11
6 files changed, 83 insertions, 0 deletions
diff --git a/meta/packages/gnome/gconf-dbus/69gconfd-dbus b/meta/packages/gnome/gconf-dbus/69gconfd-dbus
new file mode 100755
index 0000000000..c2add042f6
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/69gconfd-dbus
@@ -0,0 +1,3 @@
1#!/bin/sh
2
3/usr/libexec/gconfd-2 &
diff --git a/meta/packages/gnome/gconf-dbus/gconf-dbus-update.patch b/meta/packages/gnome/gconf-dbus/gconf-dbus-update.patch
new file mode 100755
index 0000000000..9870078b86
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/gconf-dbus-update.patch
@@ -0,0 +1,31 @@
1? gconf/gconf.service
2Index: gconf/Makefile.am
3===================================================================
4RCS file: /cvs/gnome/gconf/gconf/Makefile.am,v
5retrieving revision 1.78.4.8
6diff -u -r1.78.4.8 Makefile.am
7--- gconf/Makefile.am 21 Dec 2003 14:21:15 -0000 1.78.4.8
8+++ gconf/Makefile.am 22 Jan 2005 00:30:13 -0000
9@@ -155,6 +155,7 @@
10
11 libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined
12 libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(GCONF_IPC_LIBS)
13+libgconf_2_la_CFLAGS = $(AM_CFLAGS)
14
15 if HAVE_DBUS
16 servicedir = $(DBUS_SERVICE_DIR)
17Index: backends/Makefile.am
18===================================================================
19RCS file: /cvs/gnome/gconf/backends/Makefile.am,v
20retrieving revision 1.30
21diff -u -r1.30 Makefile.am
22--- backends/Makefile.am 3 Nov 2003 00:19:33 -0000 1.30
23+++ backends/Makefile.am 22 Jan 2005 00:30:14 -0000
24@@ -17,6 +17,7 @@
25
26 libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined
27 libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
28+libgconfbackend_oldxml_la_CFLAGS = $(AM_CFLAGS)
29
30 libgconfbackend_xml_la_SOURCES = \
31 markup-backend.c \
diff --git a/meta/packages/gnome/gconf-dbus/no-deprecation.patch b/meta/packages/gnome/gconf-dbus/no-deprecation.patch
new file mode 100644
index 0000000000..133ea550ee
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/no-deprecation.patch
@@ -0,0 +1,11 @@
1--- trunk/examples/basic-gconf-app.c.old 2006-04-25 20:39:48.000000000 +0100
2+++ trunk/examples/basic-gconf-app.c 2006-04-25 20:40:11.000000000 +0100
3@@ -80,7 +80,7 @@
4
5 /* Be clean and pure */
6 #define GTK_DISABLE_DEPRECATED
7-#define G_DISABLE_DEPRECATED
8+/*#define G_DISABLE_DEPRECATED*/
9
10 #include <gconf/gconf-client.h>
11 #include <gtk/gtk.h>
diff --git a/meta/packages/gnome/gconf-dbus/remove-old-translations.patch b/meta/packages/gnome/gconf-dbus/remove-old-translations.patch
new file mode 100644
index 0000000000..486570040f
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/remove-old-translations.patch
@@ -0,0 +1,11 @@
1--- trunk/configure.in.old 2006-06-21 13:49:59.000000000 +0100
2+++ trunk/configure.in 2006-06-21 13:50:21.000000000 +0100
3@@ -189,7 +189,7 @@
4
5 AC_CHECK_FUNCS(flockfile)
6
7-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_GB es eu fa fi fr ga gl hi hr hu id it ja ko lt lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi yi zh_CN zh_TW ta"
8+ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_GB es eu fa fi fr ga gl hi hr hu id it ja ko lt lv mk ml ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi yi zh_CN zh_TW ta"
9
10 AM_GLIB_GNU_GETTEXT
11
diff --git a/meta/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/meta/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
new file mode 100644
index 0000000000..c195aad639
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
@@ -0,0 +1,16 @@
1--- trunk/backends/xml-backend.c~ 2006-01-18 09:57:39.000000000 -0800
2+++ trunk/backends/xml-backend.c 2006-01-19 11:38:37.000000000 -0800
3@@ -115,6 +115,13 @@
4
5 typedef struct _XMLSource XMLSource;
6
7+extern GConfLock*
8+gconf_get_lock (const gchar *lock_directory,
9+ GError **err);
10+extern gboolean
11+gconf_release_lock (GConfLock *lock,
12+ GError **err);
13+
14 /* XMLSource **/
15
16 struct _XMLSource {
diff --git a/meta/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/meta/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
new file mode 100644
index 0000000000..312a356c84
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
@@ -0,0 +1,11 @@
1--- trunk/backends/Makefile~ 2006-01-19 09:52:22.000000000 -0800
2+++ trunk/backends/Makefile 2006-01-19 13:13:23.000000000 -0800
3@@ -84,7 +84,7 @@
4 xml_test_OBJECTS = $(am_xml_test_OBJECTS)
5 xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
6 $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
7- $(top_builddir)/backends/libgconfbackend-oldxml.la
8+ libgconfbackend-oldxml.la
9 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
10 depcomp = $(SHELL) $(top_srcdir)/depcomp
11 am__depfiles_maybe = depfiles