diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-31 10:59:13 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-31 10:59:13 +0100 |
| commit | 3891a8a21b1ef695b99685a1720bc750b41361c3 (patch) | |
| tree | 5b532eed541dca9573aecfd64ae407aa8ba97730 /libre | |
| parent | e175fdd8593579f4a606206ad703f8433f7316c5 (diff) | |
| parent | a949895a0243a490d30fe355655c839fe217c580 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libpar2/PKGBUILD
extra/audacity/PKGBUILD
extra/samba/PKGBUILD
extra/xorg-xev/PKGBUILD
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/xchat-libre/PKGBUILD | 7 | ||||
| -rw-r--r-- | libre/xchat-libre/remove-non-free-suggestion.patch | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index 91f7c376b..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,7 +6,7 @@ _pkgname=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=11.1 +pkgrel=12 pkgdesc="A GTK+ based IRC client without non-free browser reference" arch=('i686' 'x86_64' 'mips64el') url="http://www.xchat.org/" @@ -32,11 +32,12 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' 'a053fba4e1911d1ee6a8248fe19e344797920fe3' '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1' 'aecaf6176a7cfd62555207b02f2793b360aa39da' - '5a58642e7da870e1d32f7c5da4e61b5c036f76eb' + '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/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch index ab4b3dc7b..f20894610 100644 --- a/libre/xchat-libre/remove-non-free-suggestion.patch +++ b/libre/xchat-libre/remove-non-free-suggestion.patch @@ -1,13 +1,12 @@ 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 @@ +--- 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 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 */ |