rev 3328 - in trunk/packages/kdenetwork/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-03-21 16:27:21 +0000 (Tue, 21 Mar 2006)
New Revision: 3328

Added:
   trunk/packages/kdenetwork/debian/patches/19_meanwhile_gcc41.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
Log:
Add gcc-4.1 patch.


Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2006-03-20 21:07:32 UTC (rev 3327)
+++ trunk/packages/kdenetwork/debian/changelog	2006-03-21 16:27:21 UTC (rev 3328)
@@ -1,3 +1,12 @@
+kdenetwork (4:3.5.1-3) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Add a gcc-4.1 build fix for the meanwhile patch from Martin Michlmayr.
+    Thanks! (Closes: #356893)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdenetwork (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:

Added: trunk/packages/kdenetwork/debian/patches/19_meanwhile_gcc41.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/19_meanwhile_gcc41.diff	2006-03-20 21:07:32 UTC (rev 3327)
+++ trunk/packages/kdenetwork/debian/patches/19_meanwhile_gcc41.diff	2006-03-21 16:27:21 UTC (rev 3328)
@@ -0,0 +1,10 @@
+--- kde.orig/kopete/protocols/meanwhile/meanwhilesession.h
++++ kde.patched/kopete/protocols/meanwhile/meanwhilesession.h
+@@ -182,7 +182,7 @@
+      *                    conversation
+      * @return The created conversation data struct
+      */
+-    struct ConversationData *MeanwhileSession::createConversationData(
++    struct ConversationData *createConversationData(
+             struct mwConversation *conv, MeanwhileContact *contact,
+             bool createQueue = false);