summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-01-19 02:28:37 -0200
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-01-19 02:28:37 -0200
commit8bd0ef69a201fbc4bd18e14815574cafdffb6e61 (patch)
treed0d962cba82f6d386e7abec4e4bcdb879d232834
parent6c48e7c4ae1876a488b35f5e6996abbcc406140f (diff)
downloadabslibre-8bd0ef69a201fbc4bd18e14815574cafdffb6e61.tar.gz
abslibre-8bd0ef69a201fbc4bd18e14815574cafdffb6e61.tar.bz2
abslibre-8bd0ef69a201fbc4bd18e14815574cafdffb6e61.zip
xchat-libre-2.8.8-11.1: fixing our patches
-rw-r--r--libre/xchat-libre/PKGBUILD6
-rw-r--r--libre/xchat-libre/no-firefox.patch13
-rw-r--r--libre/xchat-libre/remove-non-free-suggestion.patch11
3 files changed, 18 insertions, 12 deletions
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index c51bd04ef..67e7f5777 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=xchat
pkgname=xchat-libre
pkgver=2.8.8
-pkgrel=11
+pkgrel=11.1
pkgdesc="A GTK+ based IRC client without non-free browser reference"
arch=('i686' 'x86_64')
url="http://www.xchat.org/"
@@ -32,8 +32,8 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
'a053fba4e1911d1ee6a8248fe19e344797920fe3'
'70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
'aecaf6176a7cfd62555207b02f2793b360aa39da'
- 'ead8947ae0033735803a0353e3b9d23f40fff990'
- 'aae58e189481e336825f8b56bf6939d55b2e42f3')
+ 'caec47173e382e75647d86c91b5aa4503e903fdb'
+ '20aef0ae608af6b30e1b4249f9c53830f8f514f6')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch
index f1ecd6631..60c4846ee 100644
--- a/libre/xchat-libre/no-firefox.patch
+++ b/libre/xchat-libre/no-firefox.patch
@@ -1,11 +1,16 @@
---- xchat-2.8.8/src/fe-gtk/fe-gtk.c_orig 2011-06-02 04:25:03.386077554 +0200
-+++ xchat-2.8.8/src/fe-gtk/fe-gtk.c 2011-06-02 04:25:14.959410608 +0200
-@@ -956,7 +956,7 @@
+diff -Nur xchat-2.8.8.orig/src/fe-gtk/fe-gtk.c xchat-2.8.8/src/fe-gtk/fe-gtk.c
+--- xchat-2.8.8.orig/src/fe-gtk/fe-gtk.c 2010-05-16 00:15:42.000000000 -0300
++++ xchat-2.8.8/src/fe-gtk/fe-gtk.c 2013-01-19 02:11:00.691529212 -0200
+@@ -955,8 +955,10 @@
+ return;
}
- /* everything failed, what now? just try firefox */
+- /* everything failed, what now? just try firefox */
- if (try_browser ("firefox", NULL, url))
++ /* everything failed, what now? just try iceweasel or icecat */
+ if (try_browser ("iceweasel", NULL, url))
++ return;
++ if (try_browser ("icecat", NULL, url))
return;
/* fresh out of ideas... */
diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch
index 9383db521..66be5e9ae 100644
--- a/libre/xchat-libre/remove-non-free-suggestion.patch
+++ b/libre/xchat-libre/remove-non-free-suggestion.patch
@@ -1,12 +1,13 @@
-diff -urN xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
---- xchat-2.8.8.orig/src/common/xchat.c 2010-05-16 07:04:45.000000000 +0000
-+++ xchat-2.8.8/src/common/xchat.c 2010-11-09 15:29:23.322458751 +0000
-@@ -602,7 +602,7 @@
+diff -Nur xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
+--- xchat-2.8.8.orig/src/common/xchat.c 2010-05-16 04:04:45.000000000 -0300
++++ xchat-2.8.8/src/common/xchat.c 2013-01-19 01:56:02.243813379 -0200
+@@ -602,7 +602,8 @@
"NAME WII\n" "CMD quote WHOIS %2 %2\n\n";
static char defaultconf_urlhandlers[] =
- "NAME Open Link in Opera\n" "CMD !opera -remote 'openURL(%s)'\n\n";
-+ "NAME Open Link in Web Browser\n" "CMD !iceweasel '%s'\n\n";
++ "NAME Open Link in Iceweasel\n" "CMD !iceweasel '%s'\n\n";
++ "NAME Open Link in GNU IceCat\n" "CMD !icecat '%s'\n\n";
#ifdef USE_SIGACTION
/* Close and open log files on SIGUSR1. Usefull for log rotating */