[Pkg-voip-commits] r5590 - in /wengophone/trunk/debian: changelog patches/generic/gcc-4_3.patch

[cavedon-guest at alioth.debian.org]

Author: cavedon-guest
Date: Tue Apr 22 22:33:03 2008
New Revision: 5590

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5590
Log:
Update patch generic/gcc-4_3.patch to resolve FTBFS with GCC 4.3. Closes: #475994


Modified:
    wengophone/trunk/debian/changelog
    wengophone/trunk/debian/patches/generic/gcc-4_3.patch

Modified: wengophone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/changelog?rev=5590&op=diff
==============================================================================
--- wengophone/trunk/debian/changelog (original)
+++ wengophone/trunk/debian/changelog Tue Apr 22 22:33:03 2008
@@ -1,3 +1,10 @@
+wengophone (2.1.2.dfsg0-4) unstable; urgency=low
+
+  * Update patch generic/gcc-4_3.patch to resolve FTBFS with GCC 4.3.
+    Closes: #475994
+
+ -- Ludovico Cavedon <cavedon at sssup.it>  Tue, 22 Apr 2008 22:29:17 +0000
+
 wengophone (2.1.2.dfsg0-3) unstable; urgency=low
 
   * Add patch generic/gcc-4_3.patch to make it compileable with GCC 4.3

Modified: wengophone/trunk/debian/patches/generic/gcc-4_3.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/generic/gcc-4_3.patch?rev=5590&op=diff
==============================================================================
--- wengophone/trunk/debian/patches/generic/gcc-4_3.patch (original)
+++ wengophone/trunk/debian/patches/generic/gcc-4_3.patch Tue Apr 22 22:33:03 2008
@@ -1,7 +1,7 @@
 Index: wengophone-2.1.2.dfsg0/libs/owutil/system/src/unix/Processes.cpp
 ===================================================================
---- wengophone-2.1.2.dfsg0.orig/libs/owutil/system/src/unix/Processes.cpp	2008-03-08 22:16:29.000000000 +0000
-+++ wengophone-2.1.2.dfsg0/libs/owutil/system/src/unix/Processes.cpp	2008-03-08 22:16:34.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/libs/owutil/system/src/unix/Processes.cpp	2007-02-25 05:15:25.000000000 -0800
++++ wengophone-2.1.2.dfsg0/libs/owutil/system/src/unix/Processes.cpp	2008-04-22 15:27:32.000000000 -0700
 @@ -22,6 +22,8 @@
  #include <dirent.h>
  #include <fcntl.h>
@@ -13,8 +13,8 @@
  #define PROCESSNAMESIZE 512
 Index: wengophone-2.1.2.dfsg0/owbuild/owbuild/getcurrentdatetime.cpp
 ===================================================================
---- wengophone-2.1.2.dfsg0.orig/owbuild/owbuild/getcurrentdatetime.cpp	2008-03-08 22:17:04.000000000 +0000
-+++ wengophone-2.1.2.dfsg0/owbuild/owbuild/getcurrentdatetime.cpp	2008-03-08 22:17:19.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/owbuild/owbuild/getcurrentdatetime.cpp	2007-03-26 05:13:43.000000000 -0700
++++ wengophone-2.1.2.dfsg0/owbuild/owbuild/getcurrentdatetime.cpp	2008-04-22 15:27:32.000000000 -0700
 @@ -7,6 +7,7 @@
  
  #include <string>
@@ -23,3 +23,24 @@
  #include <iostream>
  #include <sstream>
  
+Index: wengophone-2.1.2.dfsg0/wengophone/src/presentation/qt/chat/QtChatAvatarWidget.cpp
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wengophone/src/presentation/qt/chat/QtChatAvatarWidget.cpp	2008-04-22 15:28:30.000000000 -0700
++++ wengophone-2.1.2.dfsg0/wengophone/src/presentation/qt/chat/QtChatAvatarWidget.cpp	2008-04-22 15:28:35.000000000 -0700
+@@ -17,14 +17,14 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-#include "QtChatAvatarWidget.h"
+-
+ #include <QtGui/QtGui>
+ 
+ #include <model/profile/AvatarList.h>
+ 
+ #include <util/Logger.h>
+ 
++#include "QtChatAvatarWidget.h"
++
+ QtChatAvatarWidget::QtChatAvatarWidget(QWidget * parent, const QString & id,
+ 	QPixmap picture, const QString & nickname, const QString & contactId, PictureMode pmode, NicknameMode nmode)
+ 	: QWidget(parent), _pictureMode(pmode), _nicknameMode(nmode), _contactId(id) {