diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-20 15:38:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-20 15:38:15 -0300 |
| commit | c28258d27bd9d58760eb647f912bb98a536aa753 (patch) | |
| tree | 261e61872b291c02790e5483c769710942547731 /libre/xchat-libre | |
| parent | eefed5e3db847eccce0207f89c7430b9ec4994b7 (diff) | |
| parent | 949fa4e5ed405aaddcebff7e21008f03cdffa580 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/geda-gaf/PKGBUILD
community/mplayer2/PKGBUILD
community/parcellite/PKGBUILD
community/python2-pytables/PKGBUILD
community/ruby-gtk2/PKGBUILD
core/kbd/PKGBUILD
core/systemd/PKGBUILD
extra/calligra/PKGBUILD
extra/dmapi/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gvfs/PKGBUILD
extra/libcdio/PKGBUILD
extra/libtorrent-rasterbar/PKGBUILD
extra/llvm/PKGBUILD
extra/nx/PKGBUILD
extra/ocaml/PKGBUILD
extra/php-xcache/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/vcdimager/PKGBUILD
extra/w3m/PKGBUILD
extra/xorg-bdftopcf/PKGBUILD
extra/xorg-xcalc/PKGBUILD
extra/xorg-xconsole/PKGBUILD
extra/xorg-xedit/PKGBUILD
extra/xorg-xmag/PKGBUILD
extra/xorg-xmessage/PKGBUILD
extra/xorg-xvidtune/PKGBUILD
libre/unzip-libre/PKGBUILD
social/opentracker/PKGBUILD
Diffstat (limited to 'libre/xchat-libre')
| -rw-r--r-- | libre/xchat-libre/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/xchat-libre/no-firefox.patch | 13 | ||||
| -rw-r--r-- | libre/xchat-libre/remove-non-free-suggestion.patch | 11 |
3 files changed, 20 insertions, 14 deletions
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index 9a08d20c0..91f7c376b 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 159467 2012-05-24 17:52:29Z eric $ +# $Id: PKGBUILD 173686 2012-12-21 02:00:14Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> -# Maintainet (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=10 +pkgrel=11.1 pkgdesc="A GTK+ based IRC client without non-free browser reference" arch=('i686' 'x86_64' 'mips64el') url="http://www.xchat.org/" @@ -32,8 +32,8 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' 'a053fba4e1911d1ee6a8248fe19e344797920fe3' '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1' 'aecaf6176a7cfd62555207b02f2793b360aa39da' - 'ead8947ae0033735803a0353e3b9d23f40fff990' - 'aae58e189481e336825f8b56bf6939d55b2e42f3') + '5a58642e7da870e1d32f7c5da4e61b5c036f76eb' + '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..ab4b3dc7b 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 */ |