diff options
Diffstat (limited to 'libre/xchat-libre')
-rw-r--r-- | libre/xchat-libre/PKGBUILD | 11 | ||||
-rw-r--r-- | libre/xchat-libre/no-firefox.patch | 13 | ||||
-rw-r--r-- | libre/xchat-libre/remove-non-free-suggestion.patch | 8 |
3 files changed, 19 insertions, 13 deletions
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index c51bd04ef..e7805a9b4 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173686 2012-12-21 02:00:14Z eric $ +# $Id: PKGBUILD 176357 2013-01-30 21:29:22Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,9 +6,9 @@ _pkgname=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=11 +pkgrel=12 pkgdesc="A GTK+ based IRC client without non-free browser reference" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.xchat.org/" provides=("xchat=$pkgver") replaces=('xchat') @@ -32,11 +32,12 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' 'a053fba4e1911d1ee6a8248fe19e344797920fe3' '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1' 'aecaf6176a7cfd62555207b02f2793b360aa39da' - 'ead8947ae0033735803a0353e3b9d23f40fff990' - 'aae58e189481e336825f8b56bf6939d55b2e42f3') + 'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911' + '20aef0ae608af6b30e1b4249f9c53830f8f514f6') build() { cd "${srcdir}/${_pkgname}-${pkgver}" + sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch" patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch" patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch" 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..f20894610 100644 --- a/libre/xchat-libre/remove-non-free-suggestion.patch +++ b/libre/xchat-libre/remove-non-free-suggestion.patch @@ -1,12 +1,12 @@ -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 +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-30 22:23:44.481258504 -0200 @@ -602,7 +602,7 @@ "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"; ++ "" ""; #ifdef USE_SIGACTION /* Close and open log files on SIGUSR1. Usefull for log rotating */ |