Version bump (to unofficial .orig.tar.gz from Debian) with patch for libxfce4util >= 4.9.0 compability wrt #411949

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 122 insertions, 8 deletions

diff --git a/xfce-extra/xfce4-linelight-plugin/ChangeLog b/xfce-extra/xfce4-linelight-plugin/ChangeLog
index ebcb2bb2e0b7..7d80f1dc9609 100644
--- a/xfce-extra/xfce4-linelight-plugin/ChangeLog
+++ b/xfce-extra/xfce4-linelight-plugin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-extra/xfce4-linelight-plugin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-linelight-plugin/ChangeLog,v 1.8 2011/05/19 20:37:31 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-linelight-plugin/ChangeLog,v 1.9 2012/04/20 11:24:58 ssuominen Exp $
+
+*xfce4-linelight-plugin-0.1.7 (20 Apr 2012)
+
+  20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-linelight-plugin-0.1.7.ebuild,
+  +files/xfce4-linelight-plugin-0.1.7-port-to-xfcerc.patch:
+  Version bump (to unofficial .orig.tar.gz from Debian) with patch for
+  libxfce4util >= 4.9.0 compability wrt #411949
 
   19 May 2011; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-linelight-plugin-0.1.6-r1.ebuild:
diff --git a/xfce-extra/xfce4-linelight-plugin/Manifest b/xfce-extra/xfce4-linelight-plugin/Manifest
index 3e6adbdd3e96..fa5412b2d79f 100644
--- a/xfce-extra/xfce4-linelight-plugin/Manifest
+++ b/xfce-extra/xfce4-linelight-plugin/Manifest
@@ -1,16 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX xfce4-linelight-plugin-0.1.6-libxfce4panel_h.patch 696 RMD160 e97d6da328a2ad66b35e2b0e4b4fcce9c7c9d970 SHA1 7bc6c3d132c9168e5946ebc66f404bbef2acfac1 SHA256 ddb3117858228fbe989609432d069ac06109d76025c7a8f707f5f402f8195f37
 AUX xfce4-linelight-plugin-0.1.6-port-to-gio.patch 9167 RMD160 d5c2a86c367bebcf534234352b310e81c5945c0b SHA1 2c35faf0440cabbe4fa43c838d2813953d091699 SHA256 ad1aaadaa6ab9eb0eacc7389f9ac79cdaf599aaeaf66219f7be84a1bb38f046f
+AUX xfce4-linelight-plugin-0.1.7-port-to-xfcerc.patch 2439 RMD160 220a6882013e520d07d480a5a463074f5ce04a7d SHA1 2db71611d371bfd0e93d23a7fb1d10b0290e69a6 SHA256 f554e67969269f84690538ce022f258fdf91449574290a35e794f2836fcc6590
 DIST xfce4-linelight-plugin-0.1.6.tar.bz2 234256 RMD160 7abf7874c68466cc4a3bc2d59f49aaea68230895 SHA1 34cf2b0bb8ed6623b021ad2a3331dab7b4cf08b1 SHA256 66a5ed34cad23d0bbdc7ca03ddc45cd21e0363cd0edf50e358790288f58bbf05
+DIST xfce4-linelight-plugin_0.1.7.orig.tar.bz2 239068 RMD160 da4506ebce917ef2098a5dff59506cfed23c4c32 SHA1 0b6b08f071ae52db5cda933049bc25170f27bcf0 SHA256 0226ac62fd3b3875353cccaf8b2b971b923e1e6a560483c7e163141f7fe6b8ea
 EBUILD xfce4-linelight-plugin-0.1.6-r1.ebuild 948 RMD160 733d0e984508052efa6720e85f69dca43a24e58b SHA1 7161f67899fcda2683fbdb4b273e451b686524e5 SHA256 03e06272e01463718fc4799d3f0108320017590dab162d3829685acde6df0e5d
-MISC ChangeLog 1550 RMD160 4afbbd8f57d038336e491c6205e432cb829275d4 SHA1 56a9bc51f4c6e07488b7f0950ad01d211df49e0e SHA256 9bf48c3426c5044b9cceff4e208c00c0e5fb7c1d6fdeed3ddf36d5dfed08c88a
+EBUILD xfce4-linelight-plugin-0.1.7.ebuild 989 RMD160 872360fdade0dda074f3f16ed9eb4c798a8f60a7 SHA1 38f3be7b0e3f3a0f588f5d22d233ff67f8931794 SHA256 31d7ed4256a042604f02f73a7181b62958d7dd183608c41674f5289a813622b3
+MISC ChangeLog 1869 RMD160 407fe598465b056f7671917a36a9af33e15f1b5b SHA1 2cddcb4ad95e9164b1bcb206d1a8f7f2745d878b SHA256 1f677574c7f6d8fa297a21236e518d2ddb6a150503af6d6287af5f05e0c7126c
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk3Vf0MACgkQXkR9YqOcLPEkFQD/TaCmAbaM/nwUaHc3LmZgn1uF
-4+IoPj0pH8/CxGV84wQBAI+TDOMVjJipY3aD4ogTdO2Kw4f9YOchmkN/VFUL2f1T
-=dTuc
+iQEcBAEBAgAGBQJPkUctAAoJEEdUh39IaPFN2GMH/ihrPyovLlM3522G3TJkXZwg
+eEvXeWn5XHB5InLDrSk2TE5tWj5mzazaTDq585Ebq+llXxpGC1ptXGnhkOMU+7ma
+88eE9DK3alXQRmYgEKn1uYWj8Kk6oXE1mp4bb2OeXgdgMmeMWM07VvAI+4+cz5Q8
+bTZxX19cFr726imKCyLA2gle8UjzsZPDknpVNWJ90QsF3A6yUOiv3LwuzqwJl+zB
+zhMzH96h+4g7gONV9EdHsHaWpfbGuAtYC5mIVDroeRyThgH0Ry7CwouRTlB7Dxn8
+uac1GSjWaIOPn9LW5plucyNbIDPsA1eHK6CrjSevNaxoaC/dHjwDbmnOGgHZBJo=
+=8XRo
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-linelight-plugin/files/xfce4-linelight-plugin-0.1.7-port-to-xfcerc.patch b/xfce-extra/xfce4-linelight-plugin/files/xfce4-linelight-plugin-0.1.7-port-to-xfcerc.patch
new file mode 100644
index 000000000000..2c7bb4795248
--- /dev/null
+++ b/xfce-extra/xfce4-linelight-plugin/files/xfce4-linelight-plugin-0.1.7-port-to-xfcerc.patch
@@ -0,0 +1,61 @@
+http://bugs.gentoo.org/411949
+http://bugs.ganymede.ch/
+http://lionel.lefolgoc.net/misc/01_port-to-xfcerc.patch
+
+--- panel-plugin/linelight.c
++++ panel-plugin/linelight.c
+@@ -207,7 +207,7 @@ void linelight_add_list_entry(LineLightD
+     remove_newline(entry);
+ 
+     GtkTreeIter iter;
+-    char *icon;
++    const gchar *icon = NULL;
+     GdkPixbuf *pixbuf;
+ 
+     gtk_list_store_insert(data->list, &iter, data->listPointer[sec]);
+@@ -218,13 +218,15 @@ void linelight_add_list_entry(LineLightD
+     //icon
+     if (g_file_query_exists (file, NULL) && sec == BIN_SECTION )
+     {
+-        XfceDesktopEntry* app = xfce_desktop_entry_new(entry,categories,3);
++        XfceRc* app = xfce_rc_simple_open(entry, TRUE);
+ 
+-        if (app != NULL && xfce_desktop_entry_get_string(app, "Icon", TRUE, &icon)  && NULL != (pixbuf= load_icon(icon)))
++        if (app != NULL)
+         {
+-            gtk_list_store_set(data->list, &iter, ICON_COL, pixbuf, -1);
+-            g_object_unref(app);
+-            free(icon);
++            xfce_rc_set_group(app, G_KEY_FILE_DESKTOP_GROUP);
++            icon = xfce_rc_read_entry(app, G_KEY_FILE_DESKTOP_KEY_ICON, NULL);
++            if (icon != NULL && NULL != (pixbuf= load_icon(icon)))
++                gtk_list_store_set(data->list, &iter, ICON_COL, pixbuf, -1);
++            xfce_rc_close(app);
+         }
+     }
+     else if (file != NULL)
+--- panel-plugin/main.c
++++ panel-plugin/main.c
+@@ -155,14 +155,15 @@ static void cell_renderer(GtkTreeViewCol
+     }
+     else if (strstr(name,".desktop") != NULL) //Application names based on .desktop files
+     {
+-        XfceDesktopEntry *application = xfce_desktop_entry_new(path,categories,3);
+-        if (XFCE_IS_DESKTOP_ENTRY(application))
++        XfceRc *application = xfce_rc_simple_open(path, TRUE);
++        if (application != NULL)
+         {
+-            char* app_name;
+-            xfce_desktop_entry_get_string(application, "Name", TRUE, &app_name);
+-            g_object_unref(application);
+-            g_object_set(cell,"text", app_name,NULL);
+-            free(app_name);
++            const gchar* app_name = NULL;
++            xfce_rc_set_group(application, G_KEY_FILE_DESKTOP_GROUP);
++            app_name = xfce_rc_read_entry(application, G_KEY_FILE_DESKTOP_KEY_NAME, NULL);
++            if (app_name != NULL)
++                g_object_set(cell,"text", app_name, NULL);
++            xfce_rc_close(application);
+         }
+     }
+     else
diff --git a/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7.ebuild b/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7.ebuild
new file mode 100644
index 000000000000..5f2a69998d19
--- /dev/null
+++ b/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7.ebuild,v 1.1 2012/04/20 11:24:58 ssuominen Exp $
+
+EAPI=4
+EAUTORECONF=yes
+inherit multilib xfconf
+
+DESCRIPTION="A simple locate based search plug-in for the Xfce panel"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-linelight-plugin"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.12:2
+	>=xfce-base/xfce4-panel-4.8
+	>=xfce-base/libxfcegui4-4.8"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/mlocate"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-port-to-xfcerc.patch
+		)
+
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS )
+}