[xfce4-places-plugin] Add patch from Debian for new exo version.
Kevin Fenzi
kevin at fedoraproject.org
Thu Jan 13 23:14:45 UTC 2011
commit ce344780d46f1d0fd520557cc67e1ca6e1bb9c44
Author: Kevin Fenzi <kevin at tummy.com>
Date: Thu Jan 13 16:14:33 2011 -0700
Add patch from Debian for new exo version.
xfce4-places-plugin-port-to-exo-1.patch | 44 +++++++++++++++++++++++++++++++
xfce4-places-plugin.spec | 11 ++++++-
2 files changed, 53 insertions(+), 2 deletions(-)
---
diff --git a/xfce4-places-plugin-port-to-exo-1.patch b/xfce4-places-plugin-port-to-exo-1.patch
new file mode 100644
index 0000000..ae3974a
--- /dev/null
+++ b/xfce4-places-plugin-port-to-exo-1.patch
@@ -0,0 +1,44 @@
+Description: Port to exo-1
+Origin: backport, http://bugzilla.xfce.org/show_bug.cgi?id=5754
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=5754
+--- xfce4-places-plugin-1.2.0.orig/panel-plugin/support.c
++++ xfce4-places-plugin-1.2.0/panel-plugin/support.c
+@@ -48,14 +48,11 @@
+ void
+ places_load_file_browser(const gchar *path)
+ {
+- gboolean exo_success;
++ GError *error = NULL;
+
+ if(path != NULL && *path != '\0'){
+
+- DBG("exo_url_show(%s)", path);
+- exo_success = exo_url_show(path, NULL, 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 +111,9 @@ places_load_terminal(const gchar *const_
+ 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);
+ }
+
+ /**
+--- xfce4-places-plugin-1.2.0.orig/configure.in
++++ xfce4-places-plugin-1.2.0/configure.in
+@@ -25,7 +25,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxf
+ 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.0])
+
+ 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])
diff --git a/xfce4-places-plugin.spec b/xfce4-places-plugin.spec
index bad0a39..dffa58c 100644
--- a/xfce4-places-plugin.spec
+++ b/xfce4-places-plugin.spec
@@ -1,6 +1,6 @@
Name: xfce4-places-plugin
Version: 1.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Places menu for the Xfce panel
Group: User Interface/Desktops
@@ -9,11 +9,13 @@ URL: http://goodies.xfce.org/projects/panel-plugins/%{name}
Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.2/%{name}-%{version}.tar.bz2
Patch0: xfce4-places-plugin-1.2.0-dsofix.patch
Patch1: xfce4-places-plugin-1.2.0-icon-naming.patch
+Patch2: xfce4-places-plugin-port-to-exo-1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.99.1
-BuildRequires: Thunar-devel >= 0.4.0
+BuildRequires: Thunar-devel >= 0.4.0, thunar-vfs-devel, exo-devel
BuildRequires: libxml2-devel, gettext, intltool
+BuildRequires: autoconf
Requires: xfce4-panel >= 4.4.1, Thunar >= 0.9.0
%description
@@ -30,9 +32,11 @@ a menu with 4 sections:
%setup -q
%patch0 -p1 -b .dsofix
%patch1 -p1 -b .icon-naming
+%patch2 -p1 -b .exo-1
%build
+autoconf
%configure --disable-static
make %{?_smp_mflags}
@@ -56,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jan 13 2011 Kevin Fenzi <kevin at tummy.com> - 1.2.0-4
+- Add patch from Debian for new exo version.
+
* Sat Nov 06 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.2.0-3
- Fix missing icons (#650504)
More information about the scm-commits
mailing list