Attachment 262371 Details for Bug 388521 – Use xdg-utils

[patch] Use xdg-utils

pidgin.patch (text/plain), 3.88 KB, created by Ville Skyttä on 2007-11-17 16:44:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2007-11-17 16:44:12 UTC

Size: 3.88 KB

patch

obsolete

>Index: pidgin-2.2.1-xdg-open.patch
>===================================================================
>RCS file: pidgin-2.2.1-xdg-open.patch
>diff -N pidgin-2.2.1-xdg-open.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ pidgin-2.2.1-xdg-open.patch	2 Oct 2007 19:28:09 -0000
>@@ -0,0 +1,27 @@
>+diff -up pidgin-2.2.1/pidgin/gtkprefs.c~ pidgin-2.2.1/pidgin/gtkprefs.c
>+--- pidgin-2.2.1/pidgin/gtkprefs.c~	2007-09-29 19:39:14.000000000 +0300
>++++ pidgin-2.2.1/pidgin/gtkprefs.c	2007-10-02 22:18:41.000000000 +0300
>+@@ -1330,7 +1330,7 @@ static GList *get_available_browsers()
>+ 		{N_("Netscape"), "netscape"},
>+ 		{N_("Mozilla"), "mozilla"},
>+ 		{N_("Konqueror"), "kfmclient"},
>+-		{N_("GNOME Default"), "gnome-open"},
>++		{N_("Desktop Default"), "xdg-open"},
>+ 		{N_("Galeon"), "galeon"},
>+ 		{N_("Firefox"), "firefox"},
>+ 		{N_("Firebird"), "mozilla-firebird"},
>+diff -up pidgin-2.2.1/pidgin/gtknotify.c~ pidgin-2.2.1/pidgin/gtknotify.c
>+--- pidgin-2.2.1/pidgin/gtknotify.c~	2007-10-02 22:16:29.000000000 +0300
>++++ pidgin-2.2.1/pidgin/gtknotify.c	2007-10-02 22:19:15.000000000 +0300
>+@@ -1064,9 +1060,9 @@ pidgin_notify_uri(const char *uri)
>+ 		else
>+ 			command = g_strdup_printf("%s %s", web_browser, escaped);
>+ 	}
>+-	else if (!strcmp(web_browser, "gnome-open"))
>++	else if (!strcmp(web_browser, "xdg-open"))
>+ 	{
>+-		command = g_strdup_printf("gnome-open %s", escaped);
>++		command = g_strdup_printf("xdg-open %s", escaped);
>+ 	}
>+ 	else if (!strcmp(web_browser, "kfmclient"))
>+ 	{
>Index: pidgin.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
>retrieving revision 1.36
>diff -u -r1.36 pidgin.spec
>--- pidgin.spec	1 Oct 2007 15:28:48 -0000	1.36
>+++ pidgin.spec	2 Oct 2007 19:28:10 -0000
>@@ -4,8 +4,6 @@
> %define krb_integration		1
> # OPTION: gtkspell integration (FC1+)
> %define gtkspell_integration	1
>-# OPTION: Preferred Applications with gnome-open (FC1+)
>-%define gnome_open_integration	1
> # OPTION: Evolution 1.5+ integration (FC3+)
> %define evolution_integration	1
> # OPTION: SILC integration (FC3+)
>@@ -59,6 +57,7 @@
> Patch0: pidgin-2.0.0-beta7-reread-resolvconf.patch
> 
> ## Patches 100+: To be Included in Future Upstream
>+Patch100: pidgin-2.2.1-xdg-open.patch
> 
> BuildRoot:	%{_tmppath}/%{name}-%{version}-root
> Summary:	A Gtk+ based multiprotocol instant messaging client
>@@ -98,12 +97,8 @@
> %if %{gtkspell_integration}
> BuildRequires:	gtkspell-devel, aspell-devel
> %endif
>-# Preferred Applications (FC1+)
>-%if %{gnome_open_integration}
>-Requires:	libgnome
>-%else
>-Requires:	htmlview
>-%endif
>+# Preferred Applications (FC6+)
>+Requires:	xdg-utils
> # Evolution integration (FC3+)
> %if %{evolution_integration}
> BuildRequires:	evolution-data-server-devel
>@@ -287,17 +282,14 @@
> %patch0 -p1
> 
> ## Patches 100+: To be Included in Future Upstream
>+%patch100 -p1
> 
> # Relabel internal version for support purposes
> sed -i "s/%{version}/%{version}-%{release}/g" configure
> chmod 755 configure
> 
>-# If not using gnome-open, then default to htmlview 
>+# Our preferences
> cp %{SOURCE1} prefs.xml
>-if [ "%{gnome_open_integration}" == "0" ]; then
>-	sed -i "s/gnome-open/custom/g" prefs.xml
>-	sed -i "s/pref name='command' type='string' value=''/pref name='command' type='string' value='htmlview'/" prefs.xml
>-fi
> 
> 
> %build
>Index: purple-fedora-prefs.xml
>===================================================================
>RCS file: /cvs/pkgs/rpms/pidgin/devel/purple-fedora-prefs.xml,v
>retrieving revision 1.1
>diff -u -r1.1 purple-fedora-prefs.xml
>--- purple-fedora-prefs.xml	4 May 2007 17:11:26 -0000	1.1
>+++ purple-fedora-prefs.xml	2 Oct 2007 19:28:10 -0000
>@@ -278,7 +278,7 @@
> 		<pref name='browsers'>
> 			<pref name='place' type='int' value='0'/>
> 			<pref name='command' type='path' value=''/>
>-			<pref name='browser' type='string' value='gnome-open'/>
>+			<pref name='browser' type='string' value='xdg-open'/>
> 		</pref>
> 		<pref name='plugins'>
> 			<pref name='loaded' type='pathlist'>

Actions: View | Diff

Attachments on bug 388521: 262371 | 298081