old

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

5 files changed, 15 insertions, 162 deletions

diff --git a/xfce-base/xfce4-appfinder/ChangeLog b/xfce-base/xfce4-appfinder/ChangeLog
index 0ec879830641..9f8049a59a38 100644
--- a/xfce-base/xfce4-appfinder/ChangeLog
+++ b/xfce-base/xfce4-appfinder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce4-appfinder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-appfinder/ChangeLog,v 1.38 2014/04/19 17:46:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-appfinder/ChangeLog,v 1.39 2014/04/22 13:51:06 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch,
+  -files/xfce4-appfinder-4.10.0-null-pointers.patch,
+  -xfce4-appfinder-4.10.0-r1.ebuild:
+  old
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xfce4-appfinder-4.10.1.ebuild:
   Stable for sparc, wrt bug #507432
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 466f473efdda..e0a568ab22d5 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,30 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
 DIST xfce4-appfinder-4.10.1.tar.bz2 446043 SHA256 65ee74ffa76334d273e4c9ae501ec7f81f7de028813849f7d1441cbf7788eb77 SHA512 5a9e1ac2d140549fa332bb8578cd12291a331ed017b72b0684aba9d36b16bf3231552a2d5f6aa5b0ccaf9fe2b899d42872f6726a80e4f68a80474092dd245a28 WHIRLPOOL 08284445624ab935ab38a12eb4d0faaf61fc717a3343b91ee3bf91002c282c1afd3f6ae5dcbba0ab04dba15b7ffa921ddcefe6f05cbdaeb724cca9e68a35c7a3
 DIST xfce4-appfinder-4.11.0.tar.bz2 451004 SHA256 49bfe38623b5a6e65b8a654d353f439e6dcf981aaf831fe2e31d59dacd95c618 SHA512 e7eb2408ab345db5322d95a3b1ffc494f1170d47b242d1d78985af1afacc023af9bfc74c8975a9507e219f9883119f7573075a581782ff92c467773ab3d633c3 WHIRLPOOL 8088b4a00b69efc84777ebee743afa7ecb65b4cb42fda6666a865d85c985c541fe5978fa46ee5f8d76382a00faaabb0ddacb0b383438c901c11d6d1ef2911061
-EBUILD xfce4-appfinder-4.10.0-r1.ebuild 1131 SHA256 769147eaa7b7f038622ab28604d78ec704c7704c21df40fa4de1ca7c3a4ebb40 SHA512 213775e70b1cdf78be1ecef2be8f7cd2707c376910db49dbb224caad47db1197323c10bd40ab62936dd7a63bcbad7e66b1e4546ba3abcc5b9d923fdf63916a68 WHIRLPOOL b5308cc80b63c1920bd70590ddfaecd587da722d45c034c418d0a40cd3b70cc7f457fa3d8348639d3e6d7f62c9c4811b83f606b868273b8982a0376cd7b3a934
 EBUILD xfce4-appfinder-4.10.1.ebuild 1024 SHA256 f123982f7c553e0b64238a84365b2b17fb11f2d0157dd76dd53fbe7e9dadd961 SHA512 601c9eb7832850b7cae84623b5b35f7507943ac2db8a852e06b32c582f95ae51c8e13a42e1ce0663f3aa93420fb6b96da7feaffe1d01d075c2f7ba6f4c752950 WHIRLPOOL a3ad6827c85b68ae89d5ea24d41d44c6d23b2d265a34510c3b9e4e90c754b412e002098e68409894999aaca0e0626d778c1c099c83fff7ebabef3c07965a7eda
 EBUILD xfce4-appfinder-4.11.0.ebuild 1053 SHA256 74c216bb8823041fa91c34246a632c5432f43eb3f66a99481375a21e77a7a066 SHA512 18d6846c705a110d1a97c1fc6ed7f1c2fb620c2a035e12bf152355a34ca27b7c62f05b44d79deafa7d76c1fde9dd08320266cb2b2510ed8f5d1cd4e63cac5169 WHIRLPOOL 79e52efba6fa1fde094dc97e6c942f918deec943bbbc541efe19788b3b067cc42bd8153cd6ddacee99c07d551dc976ceff338ba8fc467295103140758dce5660
-MISC ChangeLog 18636 SHA256 73367e65f29ea3a9c0a8c55651224c04e0d7164444d15fbab022405ba095d9de SHA512 9387f1bb033dafa6f0274b166c8c3594be2dcf1e0e39b94d0976f6dd428253893341234f1659530aecc8b907cbf4c79c76e96cc8228801e7c3f2ebe49555138d WHIRLPOOL 948875c913256ade084f076ad764dc5198999e822fdd6048ba313de41a77a78dd26dd93394fef3a8f0491004e8605259b90856d1e3eeeeac63983220bc096491
+MISC ChangeLog 18852 SHA256 11ca5272bd7e9e8c7190c87db6491562c338452ade0e73fe349454efcde4601c SHA512 d42ee1b0e8635b3dd9f5d76039ece20757065d3b2acd3e98b45d33f48de963f084e18d468e5e46d66ef53a385031c0a4038a70e7fbe60d6c65d3d61237c1d057 WHIRLPOOL 71f1ba17f99a05b2f91d10b60b14779460b20f9f84571d6a00ab5521ba29bf4146dd9884caf33138332a1e820e4271fa47c47e485265e088ee2f9ff51aa754af
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrZgAAoJELp701BxlEWftRUQAKB6PZM7fy2NgZHVn7NdvuIv
-oiaom3OzgkrtJ0Fyq+ZQITvzkTxalZbThAuvtH1u+IRl/x2kpmsBoHuT1sL3ylrd
-+u5V3P2RJGwcMTq7LVCSRIsSOoS/HPlX4QnD9OQ5tJJGrZoCVSPxKBOafwJhJMQL
-hAVQdISICJhQnSwNILD2L68wcIaUqHkfaYuKaElxxY9xkK9Ue0DE/j2L1MxrvdCQ
-m6Aemivg3uUA2iSNGIaFg+D/ACrWzzSCcTjZ60rFOPVXk3cUPc8+JnUSkI44l4N9
-lPksc6dxMv6jB0Vvcp0fNxipl0QYa2tid+gM5jy02N6ug5jBpM+JIlG2d6aIuST4
-DcZBOx/2FhrfGaJN78EyUSCjY3CtaS9gGFNBWZDX33bPdSV5cr3a6URCg5JBPhRy
-gNq1+ipWdVdtwwbtILTUN4H7icdnbR1XRb8Pn4nkchZwsUuIaUSrXFzvzwXnNZ2h
-NWkrh4rgxwcawizQ9R0OS0/xr0o+KVjrj9TuV6Wlkl7rPCHH3goEXxHrJBo2W9Np
-9fYaZPVvHtwn0zDSXUjuLWopUsuTy8IxpkOMci9vJh1Tq8B4PW/HXrJdwc04Ufjc
-97qhm0lXgS8ItckTCa2V5cacBXmGx74Q2BxgMZWIZQeirVapadnOJ+zkc1VrkLnU
-sh2x1KjtB6ZM1b5CXqTI
-=Unbo
+iQEcBAEBCAAGBQJTVnPLAAoJEEdUh39IaPFNj24H/18INshwZm9LuTv14n3rlSIq
+hjIfQtaEEkCyE7BmxAMhclCMBJ0A/jcUNEi2Qm1fVTxIdEkH63pUi5OcR3uytc7f
+aefb6puHtnT3Ku2RHsstKTcWsABBqyVgujXFYS3HKNRhttwZ4NLuU/t7WMmEeihq
+HR0ue3r9c3FUXaHQ8wDxQDhw7kwm+CLIA2IxI5Ddsv6Wv5LaPJwupM0Ii4z2Te/k
+G1C/3AFkxCby2TtWQ6Y9eo8yTUGpFgzur0ZYLG5CuXkbmxqafMmhkhW/py305XMv
+D70lKObp8+QqgziZ6XBtJaaiCPF+Fu01PkOfYXqUBwQd4vt31+soAI0bT8PlJfc=
+=tm2S
 -----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
deleted file mode 100644
index 02e3e7b1256e..000000000000
--- a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index fa333fd09464..000000000000
--- a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 32eb7e73dc66..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.10 2013/04/13 07:19:50 ago 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 )
-}