[arch-commits] CVS update of extra/network (5 files)
Aaron Griffin
aaron at archlinux.org
Mon Oct 22 05:25:21 UTC 2007
Date: Monday, October 22, 2007 @ 01:25:21
Author: aaron
Path: /home/cvs-extra/extra/network
Added: centerim/PKGBUILD (1.1)
Removed: centericq/PKGBUILD (1.29) centericq/centericq-kkconsui.patch (1.1)
centericq/centericq-kkstrtext.patch (1.1)
centericq/centericq-src.patch (1.1)
FS#8297: Replace centericq with centerim
-------------------------------------+
centericq/PKGBUILD | 34 -----------
centericq/centericq-kkconsui.patch | 16 -----
centericq/centericq-kkstrtext.patch | 20 ------
centericq/centericq-src.patch | 103 ----------------------------------
centerim/PKGBUILD | 24 +++++++
5 files changed, 24 insertions(+), 173 deletions(-)
Index: extra/network/centericq/PKGBUILD
diff -u extra/network/centericq/PKGBUILD:1.29 extra/network/centericq/PKGBUILD:removed
--- extra/network/centericq/PKGBUILD:1.29 Sun Jun 10 13:10:25 2007
+++ extra/network/centericq/PKGBUILD Mon Oct 22 01:25:21 2007
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD,v 1.29 2007/06/10 17:10:25 jgc Exp $
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=centericq
-pkgver=4.21.0
-pkgrel=5
-pkgdesc="A text mode menu- and window-driven IM interface (ICQ, Yahoo!, MSN, Jabber, ...)"
-arch=(i686 x86_64)
-depends=('curl>=7.16.2' 'perl' 'openssl' 'gpgme')
-license=('GPL')
-source=(http://thekonst.net/download/${pkgname}-${pkgver}.tar.gz
- centericq-kkconsui.patch centericq-kkstrtext.patch centericq-src.patch)
-md5sums=('3dbf6237a19cb41029f3abd90251edc3' '42e3ae21aa46f6111c9cd9bb158f3844'
- 'e1f5f21c4285fe1da9aab576eb0a13fc' 'f4bc82f7bd3f94c2585ffe4f724521ef')
-url="http://thekonst.net/centericq/"
-
-build() {
- unset CFLAGS
- unset CXXFLAGS
- cd ${startdir}/src/${pkgname}-${pkgver}
-
- #arch64 fixes
- if [ "${CARCH}" = "x86_64" ]; then
- patch -Np0 -i ../centericq-kkconsui.patch || return 1
- patch -Np0 -i ../centericq-kkstrtext.patch || return 1
- patch -Np0 -i ../centericq-src.patch || return 1
- fi
-
- sed -i "s|ncurses|ncursesw|g" configure
- ./configure --prefix=/usr --sysconfdir=/etc --with-ssl --without-libjpeg
- make || return 1
- make DESTDIR=${startdir}/pkg install
-}
Index: extra/network/centericq/centericq-kkconsui.patch
diff -u extra/network/centericq/centericq-kkconsui.patch:1.1 extra/network/centericq/centericq-kkconsui.patch:removed
--- extra/network/centericq/centericq-kkconsui.patch:1.1 Sat Jun 3 08:44:32 2006
+++ extra/network/centericq/centericq-kkconsui.patch Mon Oct 22 01:25:21 2007
@@ -1,16 +0,0 @@
---- kkconsui-0.1/src/texteditor.cc.orig 2005-05-30 10:07:58.000000000 +0200
-+++ kkconsui-0.1/src/texteditor.cc 2005-05-30 10:09:38.000000000 +0200
-@@ -1940,11 +1940,11 @@
- }
-
- int texteditor::findint(void *p1, void *p2) {
-- return *(int *) p1 != (int) p2;
-+ return *(intptr_t *) p1 != (intptr_t) p2;
- }
-
- int texteditor::findhighline(void *p1, void *p2) {
-- return *(int *) p1 != ((highline *) p2)->line;
-+ return *(intptr_t *) p1 != ((highline *) p2)->line;
- }
-
- void texteditor::shiftmarkedblock(int delta) {
Index: extra/network/centericq/centericq-kkstrtext.patch
diff -u extra/network/centericq/centericq-kkstrtext.patch:1.1 extra/network/centericq/centericq-kkstrtext.patch:removed
--- extra/network/centericq/centericq-kkstrtext.patch:1.1 Sat Jun 3 08:44:32 2006
+++ extra/network/centericq/centericq-kkstrtext.patch Mon Oct 22 01:25:21 2007
@@ -1,20 +0,0 @@
---- kkstrtext-0.1/kkstrtext.cc.orig 2005-05-29 09:23:07.000000000 +0200
-+++ kkstrtext-0.1/kkstrtext.cc 2005-05-29 09:27:51.000000000 +0200
-@@ -431,7 +431,7 @@
- }
-
- int intcompare(void *s1, void *s2) {
-- return (int) s1 != (int) s2;
-+ return (size_t) s1 != (size_t) s2;
- }
-
- string i2str(int i) {
-@@ -885,7 +885,7 @@
- #ifdef HAVE_ICONV
- iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str());
-
-- if(((int) cd) != -1) {
-+ if(((size_t) cd) != -1) {
- string r, text(atext);
- size_t inleft, outleft, soutleft;
- char *inbuf, *outbuf, *sinbuf, *soutbuf;
Index: extra/network/centericq/centericq-src.patch
diff -u extra/network/centericq/centericq-src.patch:1.1 extra/network/centericq/centericq-src.patch:removed
--- extra/network/centericq/centericq-src.patch:1.1 Sat Jun 3 08:44:32 2006
+++ extra/network/centericq/centericq-src.patch Mon Oct 22 01:25:21 2007
@@ -1,103 +0,0 @@
---- src/icqdialogs.cc.orig 2005-05-30 10:16:12.000000000 +0200
-+++ src/icqdialogs.cc 2005-05-30 10:18:08.000000000 +0200
-@@ -894,7 +894,7 @@
- i = m.open();
- m.close();
-
-- if(i) f = (unsigned short) ((int) m.getref(i-1));
-+ if(i) f = (unsigned short) ((intptr_t) m.getref(i-1));
- }
-
- void icqface::selectlanguage(unsigned short &f) {
-@@ -946,7 +946,7 @@
- int i = m.open();
- m.close();
-
-- if(i) f = (imgender) ((int) m.getref(i-1));
-+ if(i) f = (imgender) ((intptr_t) m.getref(i-1));
- }
-
- void icqface::selectagerange(ICQ2000::AgeRange &r) {
-@@ -967,7 +967,7 @@
- int i = m.open();
- m.close();
-
-- if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1));
-+ if(i) r = (ICQ2000::AgeRange) ((intptr_t) m.getref(i-1));
- }
-
- bool icqface::edit(string &txt, const string &header) {
-@@ -1254,7 +1254,7 @@
-
- void *p;
- finished = !db.open(n, b, &p);
-- i = (int) p;
-+ i = (intptr_t) p;
-
- if(!finished)
- switch(b) {
-@@ -1745,7 +1745,7 @@
- it = transfers.end();
-
- if(!db.gettree()->isnode(db.gettree()->getid(np-1)))
-- it = transfers.begin() + (int) db.getmenu()->getref(n-1);
-+ it = transfers.begin() + (intptr_t) db.getmenu()->getref(n-1);
-
- switch(b) {
- case 0:
---- src/icqface.cc.orig 2005-05-30 10:18:23.000000000 +0200
-+++ src/icqface.cc 2005-05-30 10:22:18.000000000 +0200
-@@ -392,7 +392,7 @@
-
- m.scale();
- m.idle = &menuidle;
-- i = (int) m.getref(m.open()-1);
-+ i = (intptr_t) m.getref(m.open()-1);
- m.close();
-
- if(i) lastr = i;
-@@ -441,7 +441,7 @@
-
- if(i) {
- lastitem = i-1;
-- r = (int) m.getref(lastitem);
-+ r = (intptr_t) m.getref(lastitem);
- }
-
- return r;
-@@ -467,7 +467,7 @@
- g = 0;
- }
-
-- if((unsigned int) c < 100) c = 0;
-+ if((uintptr_t)c < 100) c = 0;
-
- if(i) {
- switch(action = extk) {
-@@ -1430,7 +1430,7 @@
- m.scale();
-
- i = m.open();
-- choice = (int) m.getref(i-1);
-+ choice = (intptr_t) m.getref(i-1);
-
- m.close();
- }
-@@ -1485,7 +1485,7 @@
- m.close();
-
- if(r = i) {
-- st = (imstatus) ((int) m.getref(i-1));
-+ st = (imstatus) ((intptr_t) m.getref(i-1));
- }
- }
-
-@@ -2078,7 +2078,7 @@
- c = (icqcontact *) cm->getref(i);
- }
-
-- if((unsigned int) c > 100) {
-+ if((uintptr_t)c > 100) {
- string current = c->getdispnick();
- len = current.size();
- if(len > nick.size()) len = nick.size();
Index: extra/network/centerim/PKGBUILD
diff -u /dev/null extra/network/centerim/PKGBUILD:1.1
--- /dev/null Mon Oct 22 01:25:21 2007
+++ extra/network/centerim/PKGBUILD Mon Oct 22 01:25:20 2007
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD,v 1.1 2007/10/22 05:25:20 aaron Exp $
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Contributor: shild <sxp at bk.ru>
+
+pkgname=centerim
+pkgver=4.22.1
+_realver=20071003
+pkgrel=1
+pkgdesc="Fork of CenterICQ - A text mode menu- and window-driven IM interface"
+arch=('i686')
+url="http://www.centerim.org"
+license=('GPL')
+depends=('libjpeg' 'gpgme')
+source=("http://www.centerim.org/download/$pkgname-$_realver.tar.gz")
+md5sums=('ca0b169aee9f730d63fff0fb4f7af03e')
+
+build() {
+ cd $startdir/src/$pkgname-$pkgver
+
+ ./configure --prefix=/usr --with-ssl --with-openssl --enable-locales-fix
+
+ make || return 1
+ make DESTDIR=$startdir/pkg install
+}
More information about the arch-commits
mailing list