rpms/licq/devel licq-1.3.2-gcc-4_1-patch, NONE, 1.1 licq.spec, 1.1, 1.2

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20087

Modified Files:
	licq.spec 
Added Files:
	licq-1.3.2-gcc-4_1-patch 
Log Message:
compile with gcc-4.1.0



--- NEW FILE licq-1.3.2-gcc-4_1-patch ---
--- licq-1.3.2/src/icqd.cpp.gcc-4_1	2005-09-09 18:16:24.000000000 +0200
+++ licq-1.3.2/src/icqd.cpp	2006-01-12 15:12:06.000000000 +0100
@@ -39,6 +39,7 @@
 #include "licq_packets.h"
 #include "licq_plugind.h"
 #include "licq_gpg.h"    // ##
+#include "licq_threads.h"
 #include "licq.h"
 #include "support.h"
 
--- licq-1.3.2/src/icqd-srv.cpp.gcc-4_1	2005-10-20 13:18:25.000000000 +0200
+++ licq-1.3.2/src/icqd-srv.cpp	2006-01-12 15:13:03.000000000 +0100
@@ -26,6 +26,7 @@
 #include "time-fix.h"
 
 #include "licq_icqd.h"
+#include "licq_threads.h"
 #include "licq_translate.h"
 #include "licq_packets.h"
 #include "licq_socket.h"
--- licq-1.3.2/include/licq_buffer.h.gcc-4_1	2006-01-12 15:07:18.000000000 +0100
+++ licq-1.3.2/include/licq_buffer.h	2006-01-12 15:07:45.000000000 +0100
@@ -62,7 +62,7 @@
 
    char *Pack(CBuffer *);
    char *Pack(const char *data, int size);
-   char *CBuffer::PackLNTS(const char *);
+   char *PackLNTS(const char *);
    char *PackString(const char *data, unsigned short max = 0);
    char *PackUnsignedShort(unsigned short data);
    char *PackUnsignedLong(unsigned long data);
--- licq-1.3.2/include/licq_threads.h.gcc-4_1	2006-01-12 15:09:47.000000000 +0100
+++ licq-1.3.2/include/licq_threads.h	2006-01-12 15:09:17.000000000 +0100
@@ -0,0 +1,14 @@
+
+#ifndef THREADS_H
+#define THREADS_H
+
+void *MonitorSockets_tep(void *p);
+void *Ping_tep(void *p);
+void *ProcessRunningEvent_Server_tep(void *p);
+void *ProcessRunningEvent_Client_tep(void *p);
+void *UpdateUsers_tep(void *p);
+void *Shutdown_tep(void *p);
+void *ReverseConnectToUser_tep(void *v);
+
+#endif
+


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- licq.spec	12 Jan 2006 09:39:40 -0000	1.1
+++ licq.spec	12 Jan 2006 15:10:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 1
+Release: 2
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -11,6 +11,7 @@
 BuildRequires: gpgme-devel libgpg-error-devel 
 BuildRequires: openssl-devel
 BuildRequires: desktop-file-utils
+Patch1: licq-1.3.2-gcc-4_1-patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -41,9 +42,11 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b gcc-4_1
 #remove cvs 
 rm -rf `find . -name CVS`
 
+%build
 %configure --enable-gpgme --enable-openssl
 cd plugins
 cp -r qt-gui kde-gui
@@ -54,8 +57,8 @@
 cd ../osd
 %configure
 
-%build
 export OPT="$RPM_OPT_FLAGS"
+cd ../..
 make
 cd plugins/kde-gui
 make
@@ -135,6 +138,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Thu Jan 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-2
+- compile with gcc-4.1.0
+
 * Wed Nov 23 2005 Peter Vrabec <pvrabec at redhat.com> 1.3.2-1
 - initial package