Remove bad translations from gnome-vfs-dbus and gconf-dbus (to build with newer glib)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@489 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 27 insertions, 3 deletions

diff --git a/openembedded/packages/gnome/gconf-dbus/remove-old-translations.patch b/openembedded/packages/gnome/gconf-dbus/remove-old-translations.patch
new file mode 100644
index 0000000000..486570040f
--- /dev/null
+++ b/openembedded/packages/gnome/gconf-dbus/remove-old-translations.patch
@@ -0,0 +1,11 @@
+--- 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_svn.bb b/openembedded/packages/gnome/gconf-dbus_svn.bb
index 1b843f2222..1aba51c56c 100644
--- a/openembedded/packages/gnome/gconf-dbus_svn.bb
+++ b/openembedded/packages/gnome/gconf-dbus_svn.bb
@@ -8,12 +8,13 @@ RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "2.10.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
            file://gconf-dbus-update.patch;patch=1;pnum=0 \
            file://xml-backend-locks-compile-fix.patch;patch=1 \
            file://no-deprecation.patch;patch=1 \
+           file://remove-old-translations.patch;patch=1 \
            file://xml-backend-oldxml-Makefile.patch \
            file://69gconfd-dbus"
 
diff --git a/openembedded/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch b/openembedded/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch
new file mode 100644
index 0000000000..a5a13f73c3
--- /dev/null
+++ b/openembedded/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch
@@ -0,0 +1,11 @@
+--- trunk/configure.in.old      2006-06-21 14:15:24.000000000 +0100
++++ trunk/configure.in  2006-06-21 14:19:35.000000000 +0100
+@@ -127,7 +127,7 @@
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Name of the gettext package])
+ 
+-ALL_LINGUAS="af am ar az be bg bn bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko li lt lv mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tr uk vi wa xh yi zh_CN zh_TW zu"
++ALL_LINGUAS="af am az bg bn bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko li lt lv mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tr uk vi wa xh yi zh_CN zh_TW zu"
+ AM_GLIB_GNU_GETTEXT
+ 
+ 
diff --git a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
index 4a890ac32c..9ccd23e414 100755
--- a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
+++ b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
@@ -9,12 +9,13 @@ RPROVIDES_${PN}-dev = "gnome-vfs-dev"
 RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
 
 PV = "2.12.0+cvs${SRCDATE}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "svn://anonymous@developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \
            file://no-gtk-doc.patch;patch=1 \
            file://gconftool-lossage.patch;patch=1 \
-           file://gssapi.patch;patch=1"
+           file://gssapi.patch;patch=1 \
+           file://remove-old-translations.patch;patch=1"
 S = "${WORKDIR}/trunk"
 
 inherit pkgconfig autotools