[Frugalware-git] frugalware-current: centericq-4.21.0-3-i686
Miklos Vajna
vmiklos at frugalware.org
Tue Feb 24 23:59:31 CET 2009
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f627219df76f064d5fd3cbbf8774f36739599d3
commit 1f627219df76f064d5fd3cbbf8774f36739599d3
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Tue Feb 24 23:58:42 2009 +0100
centericq-4.21.0-3-i686
- bin, replaced by centerim
- closes #2637
diff --git a/source/network-extra/centericq/FrugalBuild b/source/network-extra/centericq/FrugalBuild
deleted file mode 100644
index 54f2938..0000000
--- a/source/network-extra/centericq/FrugalBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Compiling Time: 2.02 SBU
-# Maintainer: Zsolt Szalai <xbit.lists at chello.hu>
-# Contributor: VMiklos <vmiklos at frugalware.org>
-
-pkgname=centericq
-pkgver=4.21.0
-pkgrel=3
-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.19.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 gcc43_includes.diff)
-sha1sums=('8b5fbd8b945a5a6f0fd57e831ccfaef520a96315' \
- '6dc34394d2946b7d876d1d1e1efabb9708241153' \
- '412ab7b6e8840b9894c12fa4130cba21d3e20d03')
-
-build() {
- Fcd
- [ "$CARCH" == "x86_64" ] && Fpatch centericq-amd64-gcc4fix.patch
- Fpatch gcc43_includes.diff
- # 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
deleted file mode 100644
index d7128ec..0000000
--- a/source/network-extra/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();
diff --git a/source/network-extra/centericq/gcc43_includes.diff b/source/network-extra/centericq/gcc43_includes.diff
deleted file mode 100644
index 26db56c..0000000
--- a/source/network-extra/centericq/gcc43_includes.diff
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -aur centericq-4.21.0/libicq2000-0.1/libicq2000/ContactTree.h fw_centericq-4.21.0/libicq2000-0.1/libicq2000/ContactTree.h
---- centericq-4.21.0/libicq2000-0.1/libicq2000/ContactTree.h 2004-03-06 20:02:12.000000000 +0100
-+++ fw_centericq-4.21.0/libicq2000-0.1/libicq2000/ContactTree.h 2008-10-02 01:29:19.000000000 +0200
-@@ -23,6 +23,7 @@
- #ifndef CONTACTTREE_H
- #define CONTACTTREE_H
-
-+#include <algorithm>
- #include <list>
- #include <string>
- #include <map>
-diff -aur centericq-4.21.0/libicq2000-0.1/src/Capabilities.cpp fw_centericq-4.21.0/libicq2000-0.1/src/Capabilities.cpp
---- centericq-4.21.0/libicq2000-0.1/src/Capabilities.cpp 2004-06-28 10:46:14.000000000 +0200
-+++ fw_centericq-4.21.0/libicq2000-0.1/src/Capabilities.cpp 2008-10-02 01:57:13.000000000 +0200
-@@ -21,6 +21,8 @@
-
- #include "Capabilities.h"
-
-+#include <string.h>
-+
- using std::set;
-
- namespace ICQ2000 {
-diff -aur centericq-4.21.0/libicq2000-0.1/src/ICQ.cpp fw_centericq-4.21.0/libicq2000-0.1/src/ICQ.cpp
---- centericq-4.21.0/libicq2000-0.1/src/ICQ.cpp 2004-02-11 00:51:11.000000000 +0100
-+++ fw_centericq-4.21.0/libicq2000-0.1/src/ICQ.cpp 2008-10-02 01:51:44.000000000 +0200
-@@ -23,6 +23,7 @@
-
- #include "sstream_fix.h"
- #include <memory>
-+#include <stdlib.h>
-
- using std::string;
- using std::list;
-diff -aur centericq-4.21.0/libicq2000-0.1/src/socket.cpp fw_centericq-4.21.0/libicq2000-0.1/src/socket.cpp
---- centericq-4.21.0/libicq2000-0.1/src/socket.cpp 2005-01-07 22:28:28.000000000 +0100
-+++ fw_centericq-4.21.0/libicq2000-0.1/src/socket.cpp 2008-10-02 01:44:24.000000000 +0200
-@@ -21,6 +21,7 @@
-
- #include "sstream_fix.h"
- #include <algorithm>
-+#include <string.h>
-
- #include "socket.h"
-
-diff -aur centericq-4.21.0/libmsn-0.1/msn/connection.cpp fw_centericq-4.21.0/libmsn-0.1/msn/connection.cpp
---- centericq-4.21.0/libmsn-0.1/msn/connection.cpp 2004-06-29 01:17:07.000000000 +0200
-+++ fw_centericq-4.21.0/libmsn-0.1/msn/connection.cpp 2008-10-02 02:07:58.000000000 +0200
-@@ -38,6 +38,7 @@
- #include <time.h>
- #include <cassert>
- #include <cerrno>
-+#include <cstring>
-
- namespace MSN
- {
-diff -aur centericq-4.21.0/libmsn-0.1/msn/filetransfer.cpp fw_centericq-4.21.0/libmsn-0.1/msn/filetransfer.cpp
---- centericq-4.21.0/libmsn-0.1/msn/filetransfer.cpp 2004-06-29 12:59:04.000000000 +0200
-+++ fw_centericq-4.21.0/libmsn-0.1/msn/filetransfer.cpp 2008-10-02 02:06:58.000000000 +0200
-@@ -35,6 +35,8 @@
-
- #include <cassert>
- #include <cerrno>
-+#include <cstdlib>
-+#include <cstring>
-
- namespace MSN
- {
-diff -aur centericq-4.21.0/libmsn-0.1/msn/message.cpp fw_centericq-4.21.0/libmsn-0.1/msn/message.cpp
---- centericq-4.21.0/libmsn-0.1/msn/message.cpp 2004-06-21 23:57:38.000000000 +0200
-+++ fw_centericq-4.21.0/libmsn-0.1/msn/message.cpp 2008-10-02 01:29:19.000000000 +0200
-@@ -25,6 +25,7 @@
- #include <msn/util.h>
- #include <iomanip>
- #include <cassert>
-+#include <cstdlib>
-
- namespace MSN
- {
-diff -aur centericq-4.21.0/libmsn-0.1/msn/notificationserver.cpp fw_centericq-4.21.0/libmsn-0.1/msn/notificationserver.cpp
---- centericq-4.21.0/libmsn-0.1/msn/notificationserver.cpp 2004-12-19 03:50:29.000000000 +0100
-+++ fw_centericq-4.21.0/libmsn-0.1/msn/notificationserver.cpp 2008-10-02 02:20:35.000000000 +0200
-@@ -29,6 +29,7 @@
- #include <algorithm>
- #include <cassert>
- #include <cctype>
-+#include <cstring>
-
- #ifndef WIN32
- #include <unistd.h>
-diff -aur centericq-4.21.0/libmsn-0.1/msn/util.cpp fw_centericq-4.21.0/libmsn-0.1/msn/util.cpp
---- centericq-4.21.0/libmsn-0.1/msn/util.cpp 2004-06-29 01:17:07.000000000 +0200
-+++ fw_centericq-4.21.0/libmsn-0.1/msn/util.cpp 2008-10-02 08:57:52.000000000 +0200
-@@ -23,6 +23,8 @@
- #include <msn/util.h>
- #include <cerrno>
- #include <cctype>
-+#include <cstdlib>
-+#include <cstring>
-
- namespace MSN
- {
More information about the Frugalware-git
mailing list