Date: Monday, July 29, 2013 @ 18:58:38
Author: bpiotrowski
Revision: 94730
upgpkg: ekg2 0.3.1-7
- giflib 5.0 rebuild
Added:
ekg2/trunk/ekg2-0.3.1-giflib5.patch
Modified:
ekg2/trunk/PKGBUILD
--------------------------+
PKGBUILD | 55 +++++++++++++++++++++++++--------------------
ekg2-0.3.1-giflib5.patch | 12 +++++++++
2 files changed, 43 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-29 16:54:38 UTC (rev 94729)
+++ PKGBUILD 2013-07-29 16:58:38 UTC (rev 94730)
@@ -4,41 +4,48 @@
pkgname=ekg2
pkgver=0.3.1
-pkgrel=6
-pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client"
+pkgrel=7
+pkgdesc='Ncurses based Jabber, Gadu-Gadu, Tlen and IRC client'
arch=('i686' 'x86_64')
url="http://ekg2.org/";
license=('GPL')
depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn'
'giflib')
optdepends=('xosd: xosd support'
- 'sqlite: sqlite support'
- 'gtk2: gtk support')
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('68fc05b432c34622df6561eaabef5a40')
+ 'sqlite: sqlite support'
+ 'gtk2: gtk support')
+source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz
+ ekg2-0.3.1-giflib5.patch)
+md5sums=('68fc05b432c34622df6561eaabef5a40'
+ 'f3b6979e9b8705b0b9c7efd3f3a808fd')
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h
+ patch -Np1 -i ../ekg2-0.3.1-giflib5.patch
+}
+
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
- sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure
plugins/ncurses/ecurses.h
- export PYTHON=/usr/bin/python2 #EKG2 isn't python3 friendly
+ export PYTHON=/usr/bin/python2
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/ekg2 \
+ --with-libgadu \
+ --with-xosd \
+ --enable-unicode \
+ --enable-shared \
+ --without-gpg \
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/ekg2 \
- --with-libgadu \
- --with-xosd \
- --enable-unicode \
- --enable-shared \
- --without-gpg
- make
+ make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod
- rm -rf "$pkgdir"/usr/libexec
- chmod -R 755 "$pkgdir"/usr/lib/perl5
- chmod +s "$pkgdir"/usr/lib/ekg2/ioctld
+ rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod
+ rm -rf "$pkgdir"/usr/libexec
+ chmod -R 755 "$pkgdir"/usr/lib/perl5
+ chmod +s "$pkgdir"/usr/lib/ekg2/ioctld
}
Added: ekg2-0.3.1-giflib5.patch
===================================================================
--- ekg2-0.3.1-giflib5.patch (rev 0)
+++ ekg2-0.3.1-giflib5.patch 2013-07-29 16:58:38 UTC (rev 94730)
@@ -0,0 +1,12 @@
+diff -rupN a/plugins/gg/commands.c b/plugins/gg/commands.c
+--- a/plugins/gg/commands.c 2011-03-17 18:08:11.000000000 +0100
++++ b/plugins/gg/commands.c 2013-07-29 18:45:51.296790942 +0200
+@@ -1034,7 +1034,7 @@ static int token_gif_load (char *fname,
+ goto err;
+ }
+
+- if (!(file = DGifOpenFileHandle(fd))) {
++ if (!(file = DGifOpenFileHandle(fd, NULL))) {
+ snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d",
+ GifLastError());
+ goto err2;
