Add patch for crash on opening preferences dialog

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 114 insertions, 5 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 735f9d0e1edc..5ee1919edd58 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.122 2009/10/08 03:27:01 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.123 2009/10/08 03:33:30 tester Exp $
+
+*deskbar-applet-2.26.2-r1 (08 Oct 2009)
+
+  08 Oct 2009; Olivier Crête <tester@gentoo.org>
+  +deskbar-applet-2.26.2-r1.ebuild,
+  +files/deskbar-applet-2.26.2-double-label.patch:
+  Add patch for crash on opening preferences dialog
 
   08 Oct 2009; Olivier Crête <tester@gentoo.org>
   deskbar-applet-2.26.2.ebuild:
diff --git a/gnome-extra/deskbar-applet/Manifest b/gnome-extra/deskbar-applet/Manifest
index f2ec667acd65..5dc220075aa9 100644
--- a/gnome-extra/deskbar-applet/Manifest
+++ b/gnome-extra/deskbar-applet/Manifest
@@ -2,16 +2,18 @@
 Hash: SHA1
 
 AUX deskbar-applet-2.24.1-multilib.patch 8612 RMD160 7f22e4708189a5f68b9deed5532cdf75c5af5b9c SHA1 c056ae90dbb7471e92ef871d73779be00ad82ac4 SHA256 05f1e68a00a0007ffac40fb198705212add8b0da94175712fcf1e86cac84192a
+AUX deskbar-applet-2.26.2-double-label.patch 819 RMD160 88fd0989d067e9f0cbf3e28689959e6155041a1a SHA1 dcd80257c79126dc71cde28414089c34d8c021bb SHA256 cf41b7f4a59a399aa432cc2158d2bfd54b7018db38ba0ac934d298b47e7758c9
 DIST deskbar-applet-2.24.3.tar.bz2 933238 RMD160 bb75ae2bc3e740641578b771b5ad74679cde7b23 SHA1 d52ffb898847f505c052b79b80cec0e20026ebf6 SHA256 8bf875f051553c9cef6ba9c27ad9f7477395e15cf954013cc0fe228e66dda5f6
 DIST deskbar-applet-2.26.2.tar.bz2 981493 RMD160 439be94415675764d94aac06f8cb63ef56fef941 SHA1 4a203f094020ad3c743f2e1c888f3003302ecfcc SHA256 9c40f81d96c172311f4ca4c05c6718401d0958a3eb0dd7bee1dae580be0d78f6
 EBUILD deskbar-applet-2.24.3.ebuild 2488 RMD160 e7d347822239fd395a481b17f1e53ee3aaa5bf89 SHA1 59c5188926df0834e36eb8e388b68c46b3214425 SHA256 001ce7c2308ed7e7cb0e3e39624076f4ebe0caa161aacb233ea06d4e9af07bab
+EBUILD deskbar-applet-2.26.2-r1.ebuild 2426 RMD160 0158574595a10f8e62758d8793a3c84190d55e5d SHA1 5bef3b32be693f51f76f249b06e142c1cf52fbc5 SHA256 c6927504df1de59857cbd753908b04c36100d0816c104c7052c55ee44b325b90
 EBUILD deskbar-applet-2.26.2.ebuild 2361 RMD160 d92954656048a6fe9cba3b68e6c42abeda921cf6 SHA1 bafdc43cc35656bfb4ae91afc440648e65ef2ed0 SHA256 00b0ac1e7181cfcaf20a20a8db00aac586544b679512a495502e772ea7914857
-MISC ChangeLog 17939 RMD160 3d5857a7ee930d0e04e15cffc196345e7b7d94fb SHA1 e6b01b992e35e235ee6ebdec3597c6eeddf46767 SHA256 73bf9aa586fbc38132033ad7d9e1e3603b9603663da5b8727e9d2b28185b680a
+MISC ChangeLog 18170 RMD160 4f478594a1af177ecd68554a27cf9d129ff29f89 SHA1 0081c31d0744e1e380a24ac3eab0c334253561da SHA256 85f68b7e383bcec49397e6a10084f6da2af01b3ff1642e183b5ddff0cb5e50bf
 MISC metadata.xml 413 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa SHA1 278ad1cb047bfb613a7575d35875b01754776d8d SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrNXAoACgkQmOfEJZHYOKei7QCgg/8+8RdbXzUQMjrRsVAbIDtB
-FkcAniImuV2QWG9aWlAHLN+Qjx5KA9SK
-=A0yE
+iEYEARECAAYFAkrNXZAACgkQmOfEJZHYOKfJmgCeMmszZrbnQoSLQnhHsjrCjQld
+6X8AoLmm2BagkcK7PEt3OGReUU9c1Qx8
+=EDBX
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild
new file mode 100644
index 000000000000..ac5cbf444f3f
--- /dev/null
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild,v 1.1 2009/10/08 03:33:30 tester Exp $
+
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="An Omnipresent Versatile Search Interface"
+HOMEPAGE="http://raphael.slinckx.net/deskbar/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="eds spell test"
+
+RDEPEND=">=dev-lang/python-2.4
+	>=x11-libs/gtk+-2.12
+	>=gnome-base/gnome-desktop-2.10
+	>=gnome-base/gconf-2
+
+	>=dev-python/pygtk-2.12
+	>=dev-python/pygobject-2.15.3
+	>=dev-python/dbus-python-0.80.2
+
+	>=dev-python/gconf-python-2.22.1
+	>=dev-python/libgnome-python-2.22.1
+	>=dev-python/gnome-applets-python-2.22.0
+	>=dev-python/gnome-desktop-python-2.22.0
+	>=dev-python/gnome-keyring-python-2.22.0
+	>=dev-python/libwnck-python-2.22.0
+
+	eds? ( >=gnome-extra/evolution-data-server-1.7.92 )
+	spell? ( >=gnome-extra/gnome-utils-2.16.2 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	dev-util/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.2 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable eds evolution)
+		--exec-prefix=/usr
+		--disable-scrollkeeper"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch ${FILESDIR}/deskbar-applet-2.26.2-double-label.patch
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+src_compile() {
+	# Needed for import gnomedesktop in configure, bug #270524
+	addpredict "$(unset HOME; echo ~)/.gnome2"
+
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_need_rebuild
+	python_mod_optimize $(python_get_sitedir)/deskbar
+	python_mod_optimize /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
+
+	ebeep 5
+	ewarn "The dictionary plugin in deskbar-applet uses the dictionary from "
+	ewarn "gnome-extra/gnome-utils.  If it is not present, the dictionary "
+	ewarn "plugin will fail silently."
+	epause 5
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/deskbar
+	python_mod_cleanup /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
+}
diff --git a/gnome-extra/deskbar-applet/files/deskbar-applet-2.26.2-double-label.patch b/gnome-extra/deskbar-applet/files/deskbar-applet-2.26.2-double-label.patch
new file mode 100644
index 000000000000..edf59922f3a3
--- /dev/null
+++ b/gnome-extra/deskbar-applet/files/deskbar-applet-2.26.2-double-label.patch
@@ -0,0 +1,11 @@
+--- deskbar-applet-2.26.2/data/prefs-dialog.ui.orig	2009-10-07 23:24:09.000000000 -0400
++++ deskbar-applet-2.26.2/data/prefs-dialog.ui	2009-10-07 23:24:17.000000000 -0400
+@@ -1229,7 +1229,7 @@
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+-                                  <object class="GtkLabel" id="label1315">
++                                  <object class="GtkLabel" id="label1315b">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">_Keyboard shortcut to focus:</property>
+                                     <property name="use_underline">True</property>