diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-10 07:45:02 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-10 07:45:02 +0000 |
| commit | 4cf08bd1e4eb8a35084c2fa063ce3b8e2d60f7a2 (patch) | |
| tree | 720fd0c9570e97a30e528b56e983b1c06b2fdff2 /xfce-extra/xfce4-places-plugin | |
| parent | tidy (diff) | |
| download | historical-4cf08bd1e4eb8a35084c2fa063ce3b8e2d60f7a2.tar.gz historical-4cf08bd1e4eb8a35084c2fa063ce3b8e2d60f7a2.tar.bz2 historical-4cf08bd1e4eb8a35084c2fa063ce3b8e2d60f7a2.zip | |
Port xfce4-places-plugin to exo-0.5 API wrt upstream #5754.
Package-Manager: portage-2.2_rc78/cvs/Linux x86_64
Diffstat (limited to 'xfce-extra/xfce4-places-plugin')
4 files changed, 54 insertions, 5 deletions
diff --git a/xfce-extra/xfce4-places-plugin/ChangeLog b/xfce-extra/xfce4-places-plugin/ChangeLog index 37abae65994c..20246cc0ae79 100644 --- a/xfce-extra/xfce4-places-plugin/ChangeLog +++ b/xfce-extra/xfce4-places-plugin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-extra/xfce4-places-plugin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/ChangeLog,v 1.11 2010/03/26 09:33:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/ChangeLog,v 1.12 2010/09/10 07:45:02 ssuominen Exp $ + + 10 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> + xfce4-places-plugin-1.2.0.ebuild, + +files/xfce4-places-plugin-1.2.0-exo.patch: + Port xfce4-places-plugin to exo-0.5 API wrt upstream #5754. 26 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> xfce4-places-plugin-1.2.0.ebuild: diff --git a/xfce-extra/xfce4-places-plugin/Manifest b/xfce-extra/xfce4-places-plugin/Manifest index b791df241340..842465216fcc 100644 --- a/xfce-extra/xfce4-places-plugin/Manifest +++ b/xfce-extra/xfce4-places-plugin/Manifest @@ -1,4 +1,5 @@ +AUX xfce4-places-plugin-1.2.0-exo.patch 1264 RMD160 f8cfd5859fcbaae15eed0ca6b5bc46bf2621dfac SHA1 f8129252e09eac1f270c4f376c047b508c5296b6 SHA256 69b61b1c8291e2736edb6fff82a6a58b1e4e181b35a395c20596be4b9c1460c6 DIST xfce4-places-plugin-1.2.0.tar.bz2 295239 RMD160 5911c724ccd0f171cacaba4f914ffc5b46867614 SHA1 24aebeccb3d45c511762bc4174dfc075f082e3d9 SHA256 a77c0a85d03cbf149ba518c46927fe314b8ef39e0f5d040a849f1b05996f62b0 -EBUILD xfce4-places-plugin-1.2.0.ebuild 1043 RMD160 f1971c29e6ca2595b10e3f8e715612ee8046127f SHA1 7271b8dcd61238f4aedc880ad9b54acc9bd9dbd2 SHA256 b3749e7e85fa0fdf1583e320c4a208f7e51d796f7f48c608ca97aa2ed14ead61 -MISC ChangeLog 1587 RMD160 ac25829e016476f84512865e8c1a55f5dea285bc SHA1 cc1f293308379ac8994315b931cefbe40fa0b55d SHA256 14651f314d233d60a0db936180e015e152ed123f09df9feb9a74519ca52466be +EBUILD xfce4-places-plugin-1.2.0.ebuild 1131 RMD160 83bd3e28d8443efc03e7c74a442af74c6d1c7e8e SHA1 d9c8da4d7373406b6adc3c1c539603c31c1c15d2 SHA256 da57129e54be12a7ea12970cb1859803d9a1f0b51caef18ba98db3be0196c23f +MISC ChangeLog 1786 RMD160 82cd29b94a1550e620e8523dd1f0bb71e7ab88fd SHA1 9ede35ccfe453cad34d8b198caccfb02e37d9cc7 SHA256 b3d2724ad90fab1a05d2b4c46f5dc330df6b5dcfcce3954f88496d7ea7a7f3be MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 diff --git a/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-exo.patch b/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-exo.patch new file mode 100644 index 000000000000..a137688a7bd4 --- /dev/null +++ b/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-exo.patch @@ -0,0 +1,39 @@ +http://bugzilla.xfce.org/show_bug.cgi?id=5754 + +--- configure.in ++++ configure.in +@@ -25,7 +25,7 @@ + XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2]) + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2]) + XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.3.2]) +-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1]) ++XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5]) + + dnl check for optional packages/versions + XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL_46], [libxfce4panel-1.0], [4.5.92], [libxfce4panel46], [Take advantage of Xfce 4.6 panel changes]) +--- panel-plugin/support.c ++++ panel-plugin/support.c +@@ -52,10 +52,9 @@ + + if(path != NULL && *path != '\0'){ + +- DBG("exo_url_show(%s)", path); +- exo_success = exo_url_show(path, NULL, NULL); ++ GError *error = NULL; + +- if(!exo_success){ ++ if ( !gtk_show_uri (NULL, path, 0, &error)){ + gchar *cmd = g_strconcat("thunar \"", path, "\"", NULL); + DBG("exec: %s", cmd); + places_gui_exec(cmd); +@@ -114,8 +113,9 @@ + void + places_load_file(const gchar *path) + { ++ GError *error = NULL; + if(path != NULL && *path != '\0') +- exo_url_show(path, NULL, NULL); ++ gtk_show_uri (NULL , path, 0, &error); + } + + /** diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild index 5f65adfaf98e..bd32be90862e 100644 --- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild +++ b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild,v 1.12 2010/09/10 07:39:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild,v 1.13 2010/09/10 07:45:02 ssuominen Exp $ EAPI=2 +EAUTORECONF=yes inherit xfconf DESCRIPTION="Places menu plug-in for panel, like GNOME's" @@ -19,13 +20,16 @@ RDEPEND=">=x11-libs/gtk+-2.6:2 >=xfce-base/libxfcegui4-4.3.90.2 || ( xfce-extra/thunar-vfs <xfce-base/thunar-1.1.0 ) >=xfce-base/exo-0.3.1.1 - <xfce-base/exo-0.5 >=xfce-base/xfce4-panel-4.5.92" DEPEND="${RDEPEND} dev-util/pkgconfig dev-util/intltool" pkg_setup() { + if has_version ">=xfce-base/exo-0.5"; then + PATCHES=( "${FILESDIR}"/${P}-exo.patch ) + fi + XFCONF="--disable-dependency-tracking $(xfconf_use_debug)" DOCS="AUTHORS ChangeLog NEWS README TODO" |