SOURCES: wengophone-avcodec.patch (NEW), wengophone-desktop.patch ...

[cactus]

Author: cactus                       Date: Thu Nov  8 18:41:33 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- initial

---- Files affected:
SOURCES:
   wengophone-avcodec.patch (NONE -> 1.1)  (NEW), wengophone-desktop.patch (NONE -> 1.1)  (NEW), wengophone-lrelease.patch (NONE -> 1.1)  (NEW), wengophone-qt4tools.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/wengophone-avcodec.patch
diff -u /dev/null SOURCES/wengophone-avcodec.patch:1.1
--- /dev/null	Thu Nov  8 19:41:33 2007
+++ SOURCES/wengophone-avcodec.patch	Thu Nov  8 19:41:27 2007
@@ -0,0 +1,31 @@
+--- wengophone-2.1.2-source/libs/owpixertool/include/pixertool/ffmpeg-pixertool.h.orig	2007-11-07 19:09:55.000000000 +0100
++++ wengophone-2.1.2-source/libs/owpixertool/include/pixertool/ffmpeg-pixertool.h	2007-11-07 19:10:18.000000000 +0100
+@@ -22,12 +22,12 @@
+ 
+ #include <pixertool/pixertool.h>
+ 
+-#include <avcodec.h>
++
+ 
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-
++#include <avcodec.h>
+ /**
+  * Palette identifier conversion.
+  *
+--- wengophone-2.1.2-source/wengophone/src/WengoPhoneBuildId.cpp.orig	2007-11-07 19:32:49.000000000 +0100
++++ wengophone-2.1.2-source/wengophone/src/WengoPhoneBuildId.cpp	2007-11-07 19:33:06.000000000 +0100
+@@ -27,10 +27,10 @@
+ 	#include <portaudio.h>
+ #endif
+ #include <boost/version.hpp>
+-#include <avcodec.h>
+ #include <tinyxml.h>
+ extern "C" {
+ #include <glib.h>
++#include <avcodec.h>
+ #include <gaim/core.h>
+ }
+ 

================================================================
Index: SOURCES/wengophone-desktop.patch
diff -u /dev/null SOURCES/wengophone-desktop.patch:1.1
--- /dev/null	Thu Nov  8 19:41:33 2007
+++ SOURCES/wengophone-desktop.patch	Thu Nov  8 19:41:27 2007
@@ -0,0 +1,15 @@
+--- wengophone-2.1.2-source/wengophone/res/wengophone.desktop.orig	2007-03-20 16:51:32.000000000 +0100
++++ wengophone-2.1.2-source/wengophone/res/wengophone.desktop	2007-11-08 19:30:46.000000000 +0100
+@@ -3,9 +3,10 @@
+ Name=WengoPhone
+ Comment=VOIP softphone
+ Comment[fr]=Téléphone VOIP
++Comment[pl]=Telefon VOIP
+ Exec=qtwengophone
+-Icon=wengophone
++Icon=wengophone.png
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=Qt;Network;Telephony;VideoConference
++Categories=Qt;Network;InstantMessaging;

================================================================
Index: SOURCES/wengophone-lrelease.patch
diff -u /dev/null SOURCES/wengophone-lrelease.patch:1.1
--- /dev/null	Thu Nov  8 19:41:33 2007
+++ SOURCES/wengophone-lrelease.patch	Thu Nov  8 19:41:27 2007
@@ -0,0 +1,10 @@
+--- wengophone-2.1.2-source/owbuild/owbuild/OWLocaleRelease.cmake~	2007-05-02 12:02:23.000000000 +0200
++++ wengophone-2.1.2-source/owbuild/owbuild/OWLocaleRelease.cmake	2007-11-06 21:29:45.000000000 +0100
+@@ -38,7 +38,6 @@
+ 			OUTPUT ${qmFile}
+ 			COMMAND
+ 				${QT_LRELEASE_EXECUTABLE}
+-				-nounfinished
+ 				-verbose
+ 				${tsFile}
+ 				-qm ${qmFile}

================================================================
Index: SOURCES/wengophone-qt4tools.patch
diff -u /dev/null SOURCES/wengophone-qt4tools.patch:1.1
--- /dev/null	Thu Nov  8 19:41:33 2007
+++ SOURCES/wengophone-qt4tools.patch	Thu Nov  8 19:41:28 2007
@@ -0,0 +1,13 @@
+--- wengophone-2.1.2-source/CMakeLists.txt~	2007-08-22 13:44:50.000000000 +0200
++++ wengophone-2.1.2-source/CMakeLists.txt	2007-11-06 19:58:58.000000000 +0100
+@@ -65,3 +65,10 @@
+ 		crashreport
+ 	)
+ endif (WIN32 OR LINUX)
++
++if (UNIX)
++  set( QT_QMAKE_EXECUTABLE qt4-qmake )
++  set( QT_MOC_EXECUTABLE qt4-moc )
++  set( QT_UIC_EXECUTABLE qt4-uic )
++  set( CMAKE_INSTALL_PREFIX /usr )
++endif (UNIX)
================================================================