Date: Saturday, August 31, 2013 @ 11:41:14
Author: bpiotrowski
Revision: 96537
archrelease: copy trunk to community-i686, community-x86_64
Added:
ekg2/repos/community-i686/PKGBUILD
(from rev 96536, ekg2/trunk/PKGBUILD)
ekg2/repos/community-i686/ekg2-0.3.1-giflib5.patch
(from rev 96536, ekg2/trunk/ekg2-0.3.1-giflib5.patch)
ekg2/repos/community-x86_64/PKGBUILD
(from rev 96536, ekg2/trunk/PKGBUILD)
ekg2/repos/community-x86_64/ekg2-0.3.1-giflib5.patch
(from rev 96536, ekg2/trunk/ekg2-0.3.1-giflib5.patch)
Deleted:
ekg2/repos/community-i686/PKGBUILD
ekg2/repos/community-i686/ekg2-0.3.1-giflib5.patch
ekg2/repos/community-x86_64/PKGBUILD
ekg2/repos/community-x86_64/ekg2-0.3.1-giflib5.patch
-------------------------------------------+
/PKGBUILD | 102 ++++++++++++++++++++++++++++
/ekg2-0.3.1-giflib5.patch | 60 ++++++++++++++++
community-i686/PKGBUILD | 51 --------------
community-i686/ekg2-0.3.1-giflib5.patch | 12 ---
community-x86_64/PKGBUILD | 51 --------------
community-x86_64/ekg2-0.3.1-giflib5.patch | 12 ---
6 files changed, 162 insertions(+), 126 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-08-31 09:41:04 UTC (rev 96536)
+++ community-i686/PKGBUILD 2013-08-31 09:41:14 UTC (rev 96537)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <[email protected]>
-# Contributor: Mateusz Herych <[email protected]>
-
-pkgname=ekg2
-pkgver=0.3.1
-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
- 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 $pkgname-$pkgver
-
- export PYTHON=/usr/bin/python2
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/ekg2 \
- --with-libgadu \
- --with-xosd \
- --enable-unicode \
- --enable-shared \
- --without-gpg \
-
- make
-}
-
-package() {
- 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
-}
Copied: ekg2/repos/community-i686/PKGBUILD (from rev 96536, ekg2/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-08-31 09:41:14 UTC (rev 96537)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <[email protected]>
+# Contributor: Mateusz Herych <[email protected]>
+
+pkgname=ekg2
+pkgver=0.3.1
+pkgrel=8
+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
+ ekg2-0.3.1-giflib5.patch)
+md5sums=('68fc05b432c34622df6561eaabef5a40'
+ 'e5855316bf7e9b456ebabb7cb9340e98')
+
+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 $pkgname-$pkgver
+
+ export PYTHON=/usr/bin/python2
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/ekg2 \
+ --with-libgadu \
+ --with-xosd \
+ --enable-unicode \
+ --enable-shared \
+ --without-gpg \
+
+ make
+}
+
+package() {
+ 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
+}
Deleted: community-i686/ekg2-0.3.1-giflib5.patch
===================================================================
--- community-i686/ekg2-0.3.1-giflib5.patch 2013-08-31 09:41:04 UTC (rev
96536)
+++ community-i686/ekg2-0.3.1-giflib5.patch 2013-08-31 09:41:14 UTC (rev
96537)
@@ -1,12 +0,0 @@
-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;
Copied: ekg2/repos/community-i686/ekg2-0.3.1-giflib5.patch (from rev 96536,
ekg2/trunk/ekg2-0.3.1-giflib5.patch)
===================================================================
--- community-i686/ekg2-0.3.1-giflib5.patch (rev 0)
+++ community-i686/ekg2-0.3.1-giflib5.patch 2013-08-31 09:41:14 UTC (rev
96537)
@@ -0,0 +1,30 @@
+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-08-31 11:31:42.521377436 +0200
+@@ -1029,14 +1029,15 @@ static int token_gif_load (char *fname,
+ GifFileType *file;
+ int fd;
+ fd = open(fname, O_RDONLY);
++ int giferror;
+ if (fd == -1) {
+ snprintf(errbuf, sizeof(errbuf), "open(%s): %m", fname);
+ goto err;
+ }
+
+- if (!(file = DGifOpenFileHandle(fd))) {
++ if (!(file = DGifOpenFileHandle(fd, giferror))) {
+ snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d",
+- GifLastError());
++ GifErrorString(giferror));
+ goto err2;
+ }
+
+@@ -1046,7 +1047,7 @@ static int token_gif_load (char *fname,
+ }
+
+ if (DGifSlurp(file) != GIF_OK) {
+- snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d",
GifLastError());
++ snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d",
GifErrorString(GIF_ERROR));
+ goto err3;
+ }
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-08-31 09:41:04 UTC (rev 96536)
+++ community-x86_64/PKGBUILD 2013-08-31 09:41:14 UTC (rev 96537)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <[email protected]>
-# Contributor: Mateusz Herych <[email protected]>
-
-pkgname=ekg2
-pkgver=0.3.1
-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
- 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 $pkgname-$pkgver
-
- export PYTHON=/usr/bin/python2
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/ekg2 \
- --with-libgadu \
- --with-xosd \
- --enable-unicode \
- --enable-shared \
- --without-gpg \
-
- make
-}
-
-package() {
- 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
-}
Copied: ekg2/repos/community-x86_64/PKGBUILD (from rev 96536,
ekg2/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-08-31 09:41:14 UTC (rev 96537)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <[email protected]>
+# Contributor: Mateusz Herych <[email protected]>
+
+pkgname=ekg2
+pkgver=0.3.1
+pkgrel=8
+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
+ ekg2-0.3.1-giflib5.patch)
+md5sums=('68fc05b432c34622df6561eaabef5a40'
+ 'e5855316bf7e9b456ebabb7cb9340e98')
+
+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 $pkgname-$pkgver
+
+ export PYTHON=/usr/bin/python2
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/ekg2 \
+ --with-libgadu \
+ --with-xosd \
+ --enable-unicode \
+ --enable-shared \
+ --without-gpg \
+
+ make
+}
+
+package() {
+ 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
+}
Deleted: community-x86_64/ekg2-0.3.1-giflib5.patch
===================================================================
--- community-x86_64/ekg2-0.3.1-giflib5.patch 2013-08-31 09:41:04 UTC (rev
96536)
+++ community-x86_64/ekg2-0.3.1-giflib5.patch 2013-08-31 09:41:14 UTC (rev
96537)
@@ -1,12 +0,0 @@
-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;
Copied: ekg2/repos/community-x86_64/ekg2-0.3.1-giflib5.patch (from rev 96536,
ekg2/trunk/ekg2-0.3.1-giflib5.patch)
===================================================================
--- community-x86_64/ekg2-0.3.1-giflib5.patch (rev 0)
+++ community-x86_64/ekg2-0.3.1-giflib5.patch 2013-08-31 09:41:14 UTC (rev
96537)
@@ -0,0 +1,30 @@
+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-08-31 11:31:42.521377436 +0200
+@@ -1029,14 +1029,15 @@ static int token_gif_load (char *fname,
+ GifFileType *file;
+ int fd;
+ fd = open(fname, O_RDONLY);
++ int giferror;
+ if (fd == -1) {
+ snprintf(errbuf, sizeof(errbuf), "open(%s): %m", fname);
+ goto err;
+ }
+
+- if (!(file = DGifOpenFileHandle(fd))) {
++ if (!(file = DGifOpenFileHandle(fd, giferror))) {
+ snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d",
+- GifLastError());
++ GifErrorString(giferror));
+ goto err2;
+ }
+
+@@ -1046,7 +1047,7 @@ static int token_gif_load (char *fname,
+ }
+
+ if (DGifSlurp(file) != GIF_OK) {
+- snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d",
GifLastError());
++ snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d",
GifErrorString(GIF_ERROR));
+ goto err3;
+ }
+
