[arch-commits] Commit in xchat/trunk (3 files)

Eric Bélanger eric at archlinux.org
Thu Apr 26 16:48:19 EDT 2012


    Date: Thursday, April 26, 2012 @ 16:48:19
  Author: eric
Revision: 157264

upgpkg: xchat 2.8.8-8

Add build patch, Add high res icons (close FS#26182), Fix replacement icons support (close FS#26728)

Added:
  xchat/trunk/xchat-2.8.8-glib-2.31.patch
  xchat/trunk/xchat.install
Modified:
  xchat/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   35 ++++++++++++++++-------
 xchat-2.8.8-glib-2.31.patch |   62 ++++++++++++++++++++++++++++++++++++++++++
 xchat.install               |   11 +++++++
 3 files changed, 97 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-26 20:32:45 UTC (rev 157263)
+++ PKGBUILD	2012-04-26 20:48:19 UTC (rev 157264)
@@ -3,36 +3,49 @@
 
 pkgname=xchat
 pkgver=2.8.8
-pkgrel=7
+pkgrel=8
 pkgdesc="A GTK+ based IRC client"
 arch=('i686' 'x86_64')
 url="http://www.xchat.org/"
 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')
+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)
-md5sums=('9a11f13121ff0af787bba3b014378e58'
-         '83359a807fa4f7faee90297576fb17a7'
-         'dc30fd1203a93b19d47734ba55713b7a')
+        xchat-2.8.8-link-against-libnotify.patch
+        xchat-2.8.8-glib-2.31.patch)
+sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
+          '0d366346cc11e0efb57fc2648fe423c94a3469bd'
+          'a053fba4e1911d1ee6a8248fe19e344797920fe3'
+          '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
+          'aecaf6176a7cfd62555207b02f2793b360aa39da')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/xchat-2.8.8-libnotify07.patch
-  patch -Np1 -i ${srcdir}/xchat-2.8.8-link-against-libnotify.patch
+  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"
   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}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+
+  for i in 24 32 48 64 128 256 ; do
+    install -d "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps"
+    rsvg-convert -d $i -p $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"
 }

Added: xchat-2.8.8-glib-2.31.patch
===================================================================
--- xchat-2.8.8-glib-2.31.patch	                        (rev 0)
+++ xchat-2.8.8-glib-2.31.patch	2012-04-26 20:48:19 UTC (rev 157264)
@@ -0,0 +1,62 @@
+Author: Dominique Leuenberger <dimstar at opensuse.org>
+
+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 <unistd.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #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 <sys/mman.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ #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 <errno.h>
+ #include "xchat.h"
+ #include "xchatc.h"
+-#include <glib/gmarkup.h>
++#include <glib.h>
+ #include <ctype.h>
+ #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 <glib/gslist.h>
+-#include <glib/glist.h>
+-#include <glib/gutils.h>
+-#include <glib/giochannel.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <time.h>			/* need time_t */
+ 
+ #ifndef XCHAT_H

Added: xchat.install
===================================================================
--- xchat.install	                        (rev 0)
+++ xchat.install	2012-04-26 20:48:19 UTC (rev 157264)
@@ -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
+}



More information about the arch-commits mailing list