From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 10:10:31 +0000 Subject: Rename /openembedded/ -> /meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/gnome/gconf-dbus/69gconfd-dbus | 3 --- .../gnome/gconf-dbus/gconf-dbus-update.patch | 31 ---------------------- .../packages/gnome/gconf-dbus/no-deprecation.patch | 11 -------- .../gnome/gconf-dbus/remove-old-translations.patch | 11 -------- .../gconf-dbus/xml-backend-locks-compile-fix.patch | 16 ----------- .../gconf-dbus/xml-backend-oldxml-Makefile.patch | 11 -------- 6 files changed, 83 deletions(-) delete mode 100755 openembedded/packages/gnome/gconf-dbus/69gconfd-dbus delete mode 100755 openembedded/packages/gnome/gconf-dbus/gconf-dbus-update.patch delete mode 100644 openembedded/packages/gnome/gconf-dbus/no-deprecation.patch delete mode 100644 openembedded/packages/gnome/gconf-dbus/remove-old-translations.patch delete mode 100644 openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch delete mode 100644 openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch (limited to 'openembedded/packages/gnome/gconf-dbus') diff --git a/openembedded/packages/gnome/gconf-dbus/69gconfd-dbus b/openembedded/packages/gnome/gconf-dbus/69gconfd-dbus deleted file mode 100755 index c2add042f..000000000 --- a/openembedded/packages/gnome/gconf-dbus/69gconfd-dbus +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/libexec/gconfd-2 & diff --git a/openembedded/packages/gnome/gconf-dbus/gconf-dbus-update.patch b/openembedded/packages/gnome/gconf-dbus/gconf-dbus-update.patch deleted file mode 100755 index 9870078b8..000000000 --- a/openembedded/packages/gnome/gconf-dbus/gconf-dbus-update.patch +++ /dev/null @@ -1,31 +0,0 @@ -? gconf/gconf.service -Index: gconf/Makefile.am -=================================================================== -RCS file: /cvs/gnome/gconf/gconf/Makefile.am,v -retrieving revision 1.78.4.8 -diff -u -r1.78.4.8 Makefile.am ---- gconf/Makefile.am 21 Dec 2003 14:21:15 -0000 1.78.4.8 -+++ gconf/Makefile.am 22 Jan 2005 00:30:13 -0000 -@@ -155,6 +155,7 @@ - - libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined - libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(GCONF_IPC_LIBS) -+libgconf_2_la_CFLAGS = $(AM_CFLAGS) - - if HAVE_DBUS - servicedir = $(DBUS_SERVICE_DIR) -Index: backends/Makefile.am -=================================================================== -RCS file: /cvs/gnome/gconf/backends/Makefile.am,v -retrieving revision 1.30 -diff -u -r1.30 Makefile.am ---- backends/Makefile.am 3 Nov 2003 00:19:33 -0000 1.30 -+++ backends/Makefile.am 22 Jan 2005 00:30:14 -0000 -@@ -17,6 +17,7 @@ - - libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined - libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la -+libgconfbackend_oldxml_la_CFLAGS = $(AM_CFLAGS) - - libgconfbackend_xml_la_SOURCES = \ - markup-backend.c \ diff --git a/openembedded/packages/gnome/gconf-dbus/no-deprecation.patch b/openembedded/packages/gnome/gconf-dbus/no-deprecation.patch deleted file mode 100644 index 133ea550e..000000000 --- a/openembedded/packages/gnome/gconf-dbus/no-deprecation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/examples/basic-gconf-app.c.old 2006-04-25 20:39:48.000000000 +0100 -+++ trunk/examples/basic-gconf-app.c 2006-04-25 20:40:11.000000000 +0100 -@@ -80,7 +80,7 @@ - - /* Be clean and pure */ - #define GTK_DISABLE_DEPRECATED --#define G_DISABLE_DEPRECATED -+/*#define G_DISABLE_DEPRECATED*/ - - #include - #include diff --git a/openembedded/packages/gnome/gconf-dbus/remove-old-translations.patch b/openembedded/packages/gnome/gconf-dbus/remove-old-translations.patch deleted file mode 100644 index 486570040..000000000 --- a/openembedded/packages/gnome/gconf-dbus/remove-old-translations.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/configure.in.old 2006-06-21 13:49:59.000000000 +0100 -+++ trunk/configure.in 2006-06-21 13:50:21.000000000 +0100 -@@ -189,7 +189,7 @@ - - AC_CHECK_FUNCS(flockfile) - --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" -+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" - - AM_GLIB_GNU_GETTEXT - diff --git a/openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch deleted file mode 100644 index c195aad63..000000000 --- a/openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- trunk/backends/xml-backend.c~ 2006-01-18 09:57:39.000000000 -0800 -+++ trunk/backends/xml-backend.c 2006-01-19 11:38:37.000000000 -0800 -@@ -115,6 +115,13 @@ - - typedef struct _XMLSource XMLSource; - -+extern GConfLock* -+gconf_get_lock (const gchar *lock_directory, -+ GError **err); -+extern gboolean -+gconf_release_lock (GConfLock *lock, -+ GError **err); -+ - /* XMLSource **/ - - struct _XMLSource { diff --git a/openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch deleted file mode 100644 index 312a356c8..000000000 --- a/openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/backends/Makefile~ 2006-01-19 09:52:22.000000000 -0800 -+++ trunk/backends/Makefile 2006-01-19 13:13:23.000000000 -0800 -@@ -84,7 +84,7 @@ - xml_test_OBJECTS = $(am_xml_test_OBJECTS) - xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \ -- $(top_builddir)/backends/libgconfbackend-oldxml.la -+ libgconfbackend-oldxml.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -- cgit v1.2.3