From c7fb23005fe7fcc9a49b93831b499d70cf11a9b6 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 2 Jun 2012 12:42:20 -0300 Subject: xchat-libre-2.8.8-10: updating release with new patches --- libre/xchat-libre/PKGBUILD | 57 ++++++++++++-------- libre/xchat-libre/no-firefox.patch | 2 +- libre/xchat-libre/remove-non-free-suggestion.patch | 2 +- libre/xchat-libre/xchat-2.8.8-glib-2.31.patch | 62 ++++++++++++++++++++++ libre/xchat-libre/xchat-2.8.8-libnotify07.patch | 1 - .../xchat-2.8.8-link-against-libnotify.patch | 1 - libre/xchat-libre/xchat.install | 11 ++++ 7 files changed, 110 insertions(+), 26 deletions(-) create mode 100644 libre/xchat-libre/xchat-2.8.8-glib-2.31.patch create mode 100644 libre/xchat-libre/xchat.install (limited to 'libre/xchat-libre') diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index f04ec2f47..223eaff72 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -1,10 +1,12 @@ -# Maintainer: Eric Belanger -# Maintainer: Henry Jensen +# $Id: PKGBUILD 159467 2012-05-24 17:52:29Z eric $ +# Maintainer: Eric Bélanger +# Maintainer (ConnochaetOS): Henry Jensen +# Maintainet (Parabola): André Silva -pkgbasename=xchat +_pkgname=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=7 +pkgrel=10 pkgdesc="A GTK+ based IRC client without non-free browser reference" arch=('i686' 'x86_64') url="http://www.xchat.org/" @@ -12,39 +14,50 @@ provides=("xchat=$pkgver") replaces=('xchat') conflicts=('xchat') license=('GPL') -depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify') -makedepends=('tcl' 'perl' 'python2') +depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme') +makedepends=('tcl' 'perl' 'python2' 'librsvg') optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' 'python2: for python plugin') options=('!libtool') -changelog=ChangeLog -source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz +install=xchat.install +source=(http://www.xchat.org/files/source/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz + http://xchat.org/files/icons/xchat-svg.tar.bz2 xchat-2.8.8-libnotify07.patch xchat-2.8.8-link-against-libnotify.patch + xchat-2.8.8-glib-2.31.patch remove-non-free-suggestion.patch no-firefox.patch) +sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' + '0d366346cc11e0efb57fc2648fe423c94a3469bd' + 'a053fba4e1911d1ee6a8248fe19e344797920fe3' + '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1' + 'aecaf6176a7cfd62555207b02f2793b360aa39da' + 'ead8947ae0033735803a0353e3b9d23f40fff990' + 'aae58e189481e336825f8b56bf6939d55b2e42f3') build() { - cd "${srcdir}/${pkgbasename}-${pkgver}" - patch -Np1 -i ${srcdir}/remove-non-free-suggestion.patch - patch -Np1 -i ${srcdir}/no-firefox.patch - patch -Np1 -i ${srcdir}/xchat-2.8.8-libnotify07.patch - patch -Np1 -i ${srcdir}/xchat-2.8.8-link-against-libnotify.patch + cd "${srcdir}/${_pkgname}-${pkgver}" + 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" + patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" + patch -p1 -i "${srcdir}/no-firefox.patch" autoconf autoheader - ./configure --prefix=/usr --sysconfdir=/etc --enable-openssl --enable-dbus \ - --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static + LIBS+="-lgmodule-2.0" ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share \ + --enable-openssl --enable-dbus --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static make } package() { - cd "${srcdir}/${pkgbasename}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install -} -md5sums=('9a11f13121ff0af787bba3b014378e58' - '8f0ba48dc3d151cd9b4fbef3255e8c95' - '805893e0d8f7c9713d703f34b6bb4b89' - 'd0968310982fa9e30d43dd43536b7387' - 'ba11c3e889509d1b46307d6ebf74509c') + for i in 24 32 48 64 128 256 ; do + install -d "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps" + rsvg-convert -w $i -h $i -o "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/xchat.png" ../xchat-cloned.svg + done + install -D -m644 ../xchat-cloned.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat.svg" + install -D -m644 ../xchat-used.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat2.svg" +} diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch index 7fb5190de..f1ecd6631 100644 --- a/libre/xchat-libre/no-firefox.patch +++ b/libre/xchat-libre/no-firefox.patch @@ -5,7 +5,7 @@ /* everything failed, what now? just try firefox */ - if (try_browser ("firefox", NULL, url)) -+ if (try_browser ("icecat", NULL, url)) ++ if (try_browser ("iceweasel", 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 943daff60..9383db521 100644 --- a/libre/xchat-libre/remove-non-free-suggestion.patch +++ b/libre/xchat-libre/remove-non-free-suggestion.patch @@ -6,7 +6,7 @@ diff -urN xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c 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 !icecat '%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 */ diff --git a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch b/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch new file mode 100644 index 000000000..63f562ff8 --- /dev/null +++ b/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch @@ -0,0 +1,62 @@ +Author: Dominique Leuenberger + +http://sourceforge.net/tracker/?func=detail&aid=3446968&group_id=239&atid=100239 + +glib got stricter in checking includes. Only glib.h (and a few exceptions) +are to be included directly. + +Index: xchat-2.8.8/src/common/servlist.c +=================================================================== +--- xchat-2.8.8.orig/src/common/servlist.c ++++ xchat-2.8.8/src/common/servlist.c +@@ -24,7 +24,7 @@ + #include + + #include "xchat.h" +-#include ++#include + + #include "cfgfiles.h" + #include "fe.h" +Index: xchat-2.8.8/src/common/text.c +=================================================================== +--- xchat-2.8.8.orig/src/common/text.c ++++ xchat-2.8.8/src/common/text.c +@@ -28,7 +28,7 @@ + #include + + #include "xchat.h" +-#include ++#include + #include "cfgfiles.h" + #include "chanopt.h" + #include "plugin.h" +Index: xchat-2.8.8/src/common/util.c +=================================================================== +--- xchat-2.8.8.orig/src/common/util.c ++++ xchat-2.8.8/src/common/util.c +@@ -39,7 +39,7 @@ + #include + #include "xchat.h" + #include "xchatc.h" +-#include ++#include + #include + #include "util.h" + #include "../../config.h" +Index: xchat-2.8.8/src/common/xchat.h +=================================================================== +--- xchat-2.8.8.orig/src/common/xchat.h ++++ xchat-2.8.8/src/common/xchat.h +@@ -1,10 +1,6 @@ + #include "../../config.h" + +-#include +-#include +-#include +-#include +-#include ++#include + #include /* need time_t */ + + #ifndef XCHAT_H diff --git a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch index 95d429542..2a6dce9a2 100644 --- a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch +++ b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch @@ -22,4 +22,3 @@ diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new)) goto bad; if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show)) - diff --git a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch index 6dad938ea..31e6c0854 100644 --- a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch +++ b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch @@ -341,4 +341,3 @@ diff -p -U8 xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 xchat-2.8.8/src/fe #endif return 1; } - diff --git a/libre/xchat-libre/xchat.install b/libre/xchat-libre/xchat.install new file mode 100644 index 000000000..eab82d16f --- /dev/null +++ b/libre/xchat-libre/xchat.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} -- cgit v1.2.3-54-g00ecf