Backport some crash fixes from upstream.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 165 insertions, 11 deletions

diff --git a/xfce-base/xfce4-appfinder/ChangeLog b/xfce-base/xfce4-appfinder/ChangeLog
index f33838f73fbf..339125a5bcc8 100644
--- a/xfce-base/xfce4-appfinder/ChangeLog
+++ b/xfce-base/xfce4-appfinder/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-base/xfce4-appfinder
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-appfinder/ChangeLog,v 1.16 2012/11/28 12:30:11 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-appfinder/ChangeLog,v 1.17 2013/03/31 04:49:14 ssuominen Exp $
+
+*xfce4-appfinder-4.10.0-r1 (31 Mar 2013)
+
+  31 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-appfinder-4.10.0-r1.ebuild,
+  +files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch,
+  +files/xfce4-appfinder-4.10.0-null-pointers.patch:
+  Backport some crash fixes from upstream.
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-appfinder-4.10.0.ebuild:
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 2bc56a238a87..bfa3855be38e 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST xfce4-appfinder-4.10.0.tar.bz2 429196 SHA256 042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439
+AUX xfce4-appfinder-4.10.0-icon-theme-segfault.patch 2712 SHA256 9f9f9069ecb41adc2834081505779294b433e5b545e953a5b8b4be986ed332d3 SHA512 123643aeb7ca201e3133a04bf0ca71b81b21a224522cf806f908209d203a88683b6844bf47c605b5e02b943b73c6e4e83f06fcb7448ea3916b7e7fcd851bda7f WHIRLPOOL ba0669d0eb5c51e7f38eb9ecd82e4f69b8bb0d6d3a9faf10f00c7b7f532e0fd50710abd4b6e779888bb6ce417d9cad9a65db5c1f93c81b5b34c005982f8c3ced
+AUX xfce4-appfinder-4.10.0-null-pointers.patch 1594 SHA256 ea2d1673f003bc5043abca1d5f5bac74d3fee206b3b1ad81d3e6d5e3e7837da2 SHA512 ae17bcc81580caa3294a378e8ed19e2190891e9943b8ecf7fcd76e3a5874be1e637c75a4a59998f4f2dad3b8b2fde09a6bf1f85758b99f7053a23c20c589e1aa WHIRLPOOL 223ef12c4a65302f564884bc6a107241be7d71752654b7c42836b2fad29fa5f27b2494b6882867a98e37b9d7cb5eb6a5106edae99ce2ae880ba6debe9bce931e
+DIST xfce4-appfinder-4.10.0.tar.bz2 429196 SHA256 042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439 SHA512 a43844132d9593d715c1c08a187825757bda9efd20008b517c0f353411c4d0c1409c0f3a595bc751ba4ec7801813e3e33381e46b78d7a7c9ac30522201a40ce0 WHIRLPOOL 1a471bed8d311b340a1e384a17227fb12f7b40f103368a3ba78ad4d2355b324198365a38eb58852b590aad9b080837fa74dd49239654645e51708308feb6d791
+EBUILD xfce4-appfinder-4.10.0-r1.ebuild 1145 SHA256 3a1a5c1c17ad7904877da59b9e7e04f63693bf0d41f917e59ea6fb14afe33446 SHA512 10be5c8bd07dab8fedc9d47864ae061044564643add51bfcde8bee3cfe902a606e74cbe4768300a5c6549e223c7fee17a29161ed99b3da4de26760f2aa8f2023 WHIRLPOOL cd874c3fb2458eee3865e2a0b14639625f83f3644d2f487cb3609ffa28235da284c79d1ec918d70b76595a26c9eba514d6ae0b768da1c21ae65cbf16177425bd
 EBUILD xfce4-appfinder-4.10.0.ebuild 1024 SHA256 dde40368761858bfd76347a49a1170c016aedf15cab4bad0dd085b71ea98149e SHA512 a25663dfeb2cab6e6ca93717a589fa265fa9613484691e6c912c8cc8c007a719f87eaaf1e0617d7c607b52051933eb395a56480a9284b5dcc5e619f4331b3fe7 WHIRLPOOL 2e3e5fce20b9faea423606d50e3f8107c5da7e8ebcdf9f49d192a757a7de55feaee0cc5b911c3b0079c62b6bc5ddce6832bb52efb42948d36e0f1bf9b4a67428
-MISC ChangeLog 15854 SHA256 814d260cf39e0e60d95945b4df2643bc9c57e04189b9bccda2c78a60558c7a30 SHA512 bbb1bfad5f5e8b69f412fc5cf6dd5a8c41a946ff6a24f243ee22b749dda94e928b2b359c0f5ecccb4fea467e3aa29adf3976f81dcc21d18e503e6c6f99bc69e2 WHIRLPOOL 770070e5055db1b7ae8be23851b582c7340d4fadb67771a2d9e2327f2dd47a0d7ecb16e09759fc975c42d916ca37663c543c60d2e014cc88d77a5a0d8884a59c
+MISC ChangeLog 16143 SHA256 8f90754c57064caebcebecc9bc8325d14eabbc20ca75fb2b34c1ebeeef236508 SHA512 e053a0b2f3856dea963cc7ae67b6f31425b22994b7050d13e4cde07abebd9e3b06efdc42ea2ac01df0523b98b740796f3e1bfe7dcb7c826db6fccf12c0ccec4f WHIRLPOOL 5a76efc16911ddb07f042aba9d49449e6ecdee5d9bcef5ce19e8333558859446c4667189feedf3fd7083a53f70cec184114c818cc63e7568316c04ac6d224efd
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQtgOfAAoJEEdUh39IaPFNhaIH/2+QD8LisPV98Ab3bPWfvSxU
-YLqKQme4G3II9PXXd+jRqE4O1wa+Cpkh0LRqqaYr1cuDKBKBK1QibOtpcdQ09k4j
-yG6mspD52Cx8Y/DgVich75bl6vuxCxghRKcnQGfM34uWxSvnxz3A57D5QZTEZqcb
-Tnhwjosdo29ObK1YhuJMhJyxxVhToj9Cat4S35QRyDaTj1yqCUFvwK6q7VWuLbhW
-9tdQivP6iYPvssCpXpjfi5w5ysVO9MRDR6I8VyaSHP7zJ0lckNGpy22vVpOA7B7z
-279rhx5ba6rNqI1/uMu0aGSpref8llHxMImLLuTuKz0gUfQ/uaQVVD7GDcbdNzc=
-=oPrF
+iQEcBAEBCAAGBQJRV8BKAAoJEEdUh39IaPFNhCQIAKUJj5ETNEKbcWveloM9XnCN
+WLeH9gbUn80H2aAIT/kkXzC773kHTTFMgapRqiYhmxowflP3sZZvFbPH/8EZkl5g
+izBQgwLpbevpklGq0Z6299SyUKIdPv5rbhW0nSWXvmpPDTLvWAfG1SwWyjp5GI/6
+XM6pPibHBwb3ZVZhcT6WhKDIrKyxp/4jvq2TldVM6In9oE3UmvKcVB9EjA6v0aQb
+p+QT7HA8rZ3e2NxROKI79caVmdRzoV1ZT6O7DQt8zv5hg+q5i2Ha1g0M1UhALvM6
+RJpxiW5juMEwb7ssArPeVCEmtlt8VVZMT/Z/xSG4R4NtvWxTVv+MCQ9yVkKMCAw=
+=nL4/
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch b/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch
new file mode 100644
index 000000000000..02e3e7b1256e
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch
@@ -0,0 +1,63 @@
+From eb46f5acd4b0b985a94bee6942d6527f9f620b84 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Sat, 16 Mar 2013 18:03:01 +0000
+Subject: Detatch from icon theme to avoid segfault (bug #9730).
+
+---
+diff --git a/src/appfinder-window.c b/src/appfinder-window.c
+index d3cd567..b5ca272 100644
+--- a/src/appfinder-window.c
++++ b/src/appfinder-window.c
+@@ -129,6 +129,8 @@ struct _XfceAppfinderWindow
+ 
+   XfceAppfinderActions       *actions;
+ 
++  GtkIconTheme               *icon_theme;
++
+   GtkEntryCompletion         *completion;
+ 
+   XfconfChannel              *channel;
+@@ -204,7 +206,6 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
+   GtkWidget          *bbox;
+   GtkWidget          *button;
+   GtkEntryCompletion *completion;
+-  GtkIconTheme       *icon_theme;
+   gint                integer;
+ 
+   window->channel = xfconf_channel_get ("xfce4-appfinder");
+@@ -400,9 +401,10 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
+   image = gtk_image_new_from_stock (GTK_STOCK_EXECUTE, GTK_ICON_SIZE_BUTTON);
+   gtk_button_set_image (GTK_BUTTON (button), image);
+ 
+-  icon_theme = gtk_icon_theme_get_for_screen (gtk_window_get_screen (GTK_WINDOW (window)));
+-  g_signal_connect_swapped (G_OBJECT (icon_theme), "changed",
++  window->icon_theme = gtk_icon_theme_get_for_screen (gtk_window_get_screen (GTK_WINDOW (window)));
++  g_signal_connect_swapped (G_OBJECT (window->icon_theme), "changed",
+       G_CALLBACK (xfce_appfinder_window_icon_theme_changed), window);
++  g_object_ref (G_OBJECT (window->icon_theme));
+ 
+   /* load categories in the model */
+   xfce_appfinder_window_category_set_categories (NULL, window);
+@@ -432,6 +434,11 @@ xfce_appfinder_window_finalize (GObject *object)
+   g_signal_handler_disconnect (window->channel, window->property_watch_id);
+   g_signal_handler_disconnect (window->model, window->categories_changed_id);
+ 
++  /* release our reference on the icon theme */
++  g_signal_handlers_disconnect_by_func (G_OBJECT (window->icon_theme),
++      xfce_appfinder_window_icon_theme_changed, window);
++  g_object_unref (G_OBJECT (window->icon_theme));
++
+   g_object_unref (G_OBJECT (window->model));
+   g_object_unref (G_OBJECT (window->category_model));
+   g_object_unref (G_OBJECT (window->completion));
+@@ -1520,6 +1527,8 @@ xfce_appfinder_window_row_activated (XfceAppfinderWindow *window)
+ static void
+ xfce_appfinder_window_icon_theme_changed (XfceAppfinderWindow *window)
+ {
++  appfinder_return_if_fail (XFCE_IS_APPFINDER_WINDOW (window));
++
+   if (window->icon_find != NULL)
+     g_object_unref (G_OBJECT (window->icon_find));
+   window->icon_find = xfce_appfinder_model_load_pixbuf (GTK_STOCK_FIND, XFCE_APPFINDER_ICON_SIZE_48);
+--
+cgit v0.9.1
diff --git a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch b/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch
new file mode 100644
index 000000000000..fa333fd09464
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch
@@ -0,0 +1,39 @@
+From 2a14564c8e1677c002ffac8643f706b334050988 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Sat, 08 Sep 2012 09:55:19 +0000
+Subject: Protect against possible null pointers (bug #9109).
+
+(cherry picked from commit 424418316733e3f8b9b17cd7345fe6d967b06ef8)
+---
+diff --git a/src/appfinder-category-model.c b/src/appfinder-category-model.c
+index 483c4cc..3f3a060 100644
+--- a/src/appfinder-category-model.c
++++ b/src/appfinder-category-model.c
+@@ -589,6 +589,7 @@ xfce_appfinder_category_model_icon_theme_changed (XfceAppfinderCategoryModel *mo
+   for (li = model->categories, idx = 0; li != NULL; li = li->next, idx++)
+     {
+       item = li->data;
++      appfinder_assert (item != NULL);
+ 
+       if (item->pixbuf != NULL)
+         {
+diff --git a/src/appfinder-window.c b/src/appfinder-window.c
+index 155e011..4f99c6a 100644
+--- a/src/appfinder-window.c
++++ b/src/appfinder-window.c
+@@ -1453,8 +1453,11 @@ xfce_appfinder_window_icon_theme_changed (XfceAppfinderWindow *window)
+   window->icon_find = xfce_appfinder_model_load_pixbuf (GTK_STOCK_FIND, XFCE_APPFINDER_ICON_SIZE_48);
+ 
+   /* drop cached pixbufs */
+-  xfce_appfinder_model_icon_theme_changed (window->model);
+-  xfce_appfinder_category_model_icon_theme_changed (window->category_model);
++  if (G_LIKELY (window->model != NULL))
++    xfce_appfinder_model_icon_theme_changed (window->model);
++
++  if (G_LIKELY (window->category_model != NULL))
++    xfce_appfinder_category_model_icon_theme_changed (window->category_model);
+ 
+   /* update state */
+   xfce_appfinder_window_entry_changed (window);
+--
+cgit v0.9.0.3
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.0-r1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.0-r1.ebuild
new file mode 100644
index 000000000000..3f3a1ea05ef9
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.0-r1.ebuild,v 1.1 2013/03/31 04:49:14 ssuominen Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.24
+	>=x11-libs/gtk+-2.20:2
+	>=xfce-base/garcon-0.2
+	>=xfce-base/libxfce4util-4.10
+	>=xfce-base/libxfce4ui-4.10
+	>=xfce-base/xfconf-4.10
+	!xfce-base/xfce-utils"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-null-pointers.patch
+		"${FILESDIR}"/${P}-icon-theme-segfault.patch
+		)
+
+	XFCONF=(
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS )
+}