Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f750b63cdc6cfae52509de46536878712790b201
commit f750b63cdc6cfae52509de46536878712790b201
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Sun Jun 8 13:51:27 2008 +0200
centericq-4.21.0-2-i686
- moved to extra
diff --git a/source/network-extra/centericq/FrugalBuild
b/source/network-extra/centericq/FrugalBuild
new file mode 100644
index 0000000..baecbe4
--- /dev/null
+++ b/source/network-extra/centericq/FrugalBuild
@@ -0,0 +1,32 @@
+# Compiling Time: 2.02 SBU
+# Maintainer: Zsolt Szalai <[EMAIL PROTECTED]>
+# Contributor: VMiklos <[EMAIL PROTECTED]>
+
+pkgname=centericq
+pkgver=4.21.0
+pkgrel=2
+pkgdesc="A text mode menu- and window-driven IM interface."
+groups=('network-extra')
+archs=('i686' 'x86_64')
+url="http://konst.org.ua/centericq/";
+depends=('libjpeg' 'ncurses' 'openssl' 'curl>=7.16.0' 'libstdc++')
+up2date="lynx -dump $url|grep Release|sed 's/.*e \(.*\) f.*/\1/'"
+source=(http://konst.org.ua/download/$pkgname-$pkgver.tar.gz
centericq-amd64-gcc4fix.patch)
+sha1sums=('8b5fbd8b945a5a6f0fd57e831ccfaef520a96315' \
+ '6dc34394d2946b7d876d1d1e1efabb9708241153')
+
+build() {
+ Fcd
+ [ "$CARCH" == "x86_64" ] && Fpatch centericq-amd64-gcc4fix.patch
+ # fixes "can only configure for one host and one target at a time"
+ for i in connwrap-0.1 kkconsui-0.1 kkstrtext-0.1 kksystr-0.1 \
+ libicq2000-0.1 libjabber-0.1 libmsn-0.1 libyahoo2-0.1
+ do
+ (Fcd && cd $i && autoconf)
+ done
+ Fmake
+ Fmakeinstall
+}
+
+
+# optimization OK
diff --git a/source/network-extra/centericq/centericq-amd64-gcc4fix.patch
b/source/network-extra/centericq/centericq-amd64-gcc4fix.patch
new file mode 100644
index 0000000..d7128ec
--- /dev/null
+++ b/source/network-extra/centericq/centericq-amd64-gcc4fix.patch
@@ -0,0 +1,138 @@
+diff -Naur centericq-4.20.0.orig/kkconsui-0.1/src/texteditor.cc
centericq-4.20.0/kkconsui-0.1/src/texteditor.cc
+--- centericq-4.20.0.orig/kkconsui-0.1/src/texteditor.cc 2005-08-05
17:10:43.000000000 +0200
++++ centericq-4.20.0/kkconsui-0.1/src/texteditor.cc 2005-08-05
17:21:58.000000000 +0200
+@@ -1940,7 +1940,7 @@
+ }
+
+ int texteditor::findint(void *p1, void *p2) {
+- return *(int *) p1 != (int) p2;
++ return *(int *) p1 != (long) p2;
+ }
+
+ int texteditor::findhighline(void *p1, void *p2) {
+diff -Naur centericq-4.20.0.orig/kkstrtext-0.1/kkstrtext.cc
centericq-4.20.0/kkstrtext-0.1/kkstrtext.cc
+--- centericq-4.20.0.orig/kkstrtext-0.1/kkstrtext.cc 2005-08-05
17:10:43.000000000 +0200
++++ centericq-4.20.0/kkstrtext-0.1/kkstrtext.cc 2005-08-05
17:21:58.000000000 +0200
+@@ -431,7 +431,7 @@
+ }
+
+ int intcompare(void *s1, void *s2) {
+- return (int) s1 != (int) s2;
++ return (long) s1 != (long) 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(((long) cd) != -1) {
+ string r, text(atext);
+ size_t inleft, outleft, soutleft;
+ char *inbuf, *outbuf, *sinbuf, *soutbuf;
+diff -Naur centericq-4.20.0.orig/src/icqdialogs.cc
centericq-4.20.0/src/icqdialogs.cc
+--- centericq-4.20.0.orig/src/icqdialogs.cc 2005-08-05 17:10:43.000000000
+0200
++++ centericq-4.20.0/src/icqdialogs.cc 2005-08-05 17:21:58.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) ((long) 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) ((long) 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) ((long) 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 = (long) 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() + (long) db.getmenu()->getref(n-1);
+
+ switch(b) {
+ case 0:
+diff -Naur centericq-4.20.0.orig/src/icqface.cc centericq-4.20.0/src/icqface.cc
+--- centericq-4.20.0.orig/src/icqface.cc 2005-08-05 17:10:43.000000000
+0200
++++ centericq-4.20.0/src/icqface.cc 2005-08-05 17:23:09.000000000 +0200
+@@ -392,7 +392,7 @@
+
+ m.scale();
+ m.idle = &menuidle;
+- i = (int) m.getref(m.open()-1);
++ i = (long) 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 = (long) m.getref(lastitem);
+ }
+
+ return r;
+@@ -467,7 +467,7 @@
+ g = 0;
+ }
+
+- if((unsigned int) c < 100) c = 0;
++ if((unsigned long) 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 = (long) m.getref(i-1);
+
+ m.close();
+ }
+@@ -1485,7 +1485,7 @@
+ m.close();
+
+ if(r = i) {
+- st = (imstatus) ((int) m.getref(i-1));
++ st = (imstatus) ((long) m.getref(i-1));
+ }
+ }
+
+@@ -2078,7 +2078,7 @@
+ c = (icqcontact *) cm->getref(i);
+ }
+
+- if((unsigned int) c > 100) {
++ if((unsigned long) c > 100) {
+ string current = c->getdispnick();
+ len = current.size();
+ if(len > nick.size()) len = nick.size();
diff --git a/source/network/centericq/FrugalBuild
b/source/network/centericq/FrugalBuild
deleted file mode 100644
index 50ea741..0000000
--- a/source/network/centericq/FrugalBuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Compiling Time: 2.02 SBU
-# Maintainer: Zsolt Szalai <[EMAIL PROTECTED]>
-# Contributor: VMiklos <[EMAIL PROTECTED]>
-
-pkgname=centericq
-pkgver=4.21.0
-pkgrel=2
-pkgdesc="A text mode menu- and window-driven IM interface."
-groups=('network')
-archs=('i686' 'x86_64')
-url="http://konst.org.ua/centericq/";
-depends=('libjpeg' 'ncurses' 'openssl' 'curl>=7.16.0' 'libstdc++')
-up2date="lynx -dump $url|grep Release|sed 's/.*e \(.*\) f.*/\1/'"
-source=(http://konst.org.ua/download/$pkgname-$pkgver.tar.gz
centericq-amd64-gcc4fix.patch)
-sha1sums=('8b5fbd8b945a5a6f0fd57e831ccfaef520a96315' \
- '6dc34394d2946b7d876d1d1e1efabb9708241153')
-
-build() {
- Fcd
- [ "$CARCH" == "x86_64" ] && Fpatch centericq-amd64-gcc4fix.patch
- # fixes "can only configure for one host and one target at a time"
- for i in connwrap-0.1 kkconsui-0.1 kkstrtext-0.1 kksystr-0.1 \
- libicq2000-0.1 libjabber-0.1 libmsn-0.1 libyahoo2-0.1
- do
- (Fcd && cd $i && autoconf)
- done
- Fmake
- Fmakeinstall
-}
-
-
-# optimization OK
diff --git a/source/network/centericq/centericq-amd64-gcc4fix.patch
b/source/network/centericq/centericq-amd64-gcc4fix.patch
deleted file mode 100644
index d7128ec..0000000
--- a/source/network/centericq/centericq-amd64-gcc4fix.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur centericq-4.20.0.orig/kkconsui-0.1/src/texteditor.cc
centericq-4.20.0/kkconsui-0.1/src/texteditor.cc
---- centericq-4.20.0.orig/kkconsui-0.1/src/texteditor.cc 2005-08-05
17:10:43.000000000 +0200
-+++ centericq-4.20.0/kkconsui-0.1/src/texteditor.cc 2005-08-05
17:21:58.000000000 +0200
-@@ -1940,7 +1940,7 @@
- }
-
- int texteditor::findint(void *p1, void *p2) {
-- return *(int *) p1 != (int) p2;
-+ return *(int *) p1 != (long) p2;
- }
-
- int texteditor::findhighline(void *p1, void *p2) {
-diff -Naur centericq-4.20.0.orig/kkstrtext-0.1/kkstrtext.cc
centericq-4.20.0/kkstrtext-0.1/kkstrtext.cc
---- centericq-4.20.0.orig/kkstrtext-0.1/kkstrtext.cc 2005-08-05
17:10:43.000000000 +0200
-+++ centericq-4.20.0/kkstrtext-0.1/kkstrtext.cc 2005-08-05
17:21:58.000000000 +0200
-@@ -431,7 +431,7 @@
- }
-
- int intcompare(void *s1, void *s2) {
-- return (int) s1 != (int) s2;
-+ return (long) s1 != (long) 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(((long) cd) != -1) {
- string r, text(atext);
- size_t inleft, outleft, soutleft;
- char *inbuf, *outbuf, *sinbuf, *soutbuf;
-diff -Naur centericq-4.20.0.orig/src/icqdialogs.cc
centericq-4.20.0/src/icqdialogs.cc
---- centericq-4.20.0.orig/src/icqdialogs.cc 2005-08-05 17:10:43.000000000
+0200
-+++ centericq-4.20.0/src/icqdialogs.cc 2005-08-05 17:21:58.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) ((long) 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) ((long) 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) ((long) 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 = (long) 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() + (long) db.getmenu()->getref(n-1);
-
- switch(b) {
- case 0:
-diff -Naur centericq-4.20.0.orig/src/icqface.cc centericq-4.20.0/src/icqface.cc
---- centericq-4.20.0.orig/src/icqface.cc 2005-08-05 17:10:43.000000000
+0200
-+++ centericq-4.20.0/src/icqface.cc 2005-08-05 17:23:09.000000000 +0200
-@@ -392,7 +392,7 @@
-
- m.scale();
- m.idle = &menuidle;
-- i = (int) m.getref(m.open()-1);
-+ i = (long) 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 = (long) m.getref(lastitem);
- }
-
- return r;
-@@ -467,7 +467,7 @@
- g = 0;
- }
-
-- if((unsigned int) c < 100) c = 0;
-+ if((unsigned long) 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 = (long) m.getref(i-1);
-
- m.close();
- }
-@@ -1485,7 +1485,7 @@
- m.close();
-
- if(r = i) {
-- st = (imstatus) ((int) m.getref(i-1));
-+ st = (imstatus) ((long) m.getref(i-1));
- }
- }
-
-@@ -2078,7 +2078,7 @@
- c = (icqcontact *) cm->getref(i);
- }
-
-- if((unsigned int) c > 100) {
-+ if((unsigned long) c > 100) {
- string current = c->getdispnick();
- len = current.size();
- if(len > nick.size()) len = nick.size();
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
