[Pkg-voip-commits] r6546 - in /qutecom/trunk/debian: changelog control patches/debian/remove-extra-copying-file.patch patches/generic/libpurple-external.patch patches/generic/libpurple_HAVE_GETADDRINFO.patch patches/head/video-fix-crash.video patches/series

cavedon-guest at alioth.debian.org cavedon-guest at alioth.debian.org
Fri Dec 12 03:18:49 UTC 2008 

Author: cavedon-guest
Date: Fri Dec 12 03:18:48 2008
New Revision: 6546

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6546
Log:
no external libpurple for now, because of a bug in that library

Added:
    qutecom/trunk/debian/patches/generic/libpurple_HAVE_GETADDRINFO.patch
    qutecom/trunk/debian/patches/head/video-fix-crash.video
Removed:
    qutecom/trunk/debian/patches/generic/libpurple-external.patch
Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/control
    qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
    qutecom/trunk/debian/patches/series

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=6546&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Fri Dec 12 03:18:48 2008
@@ -13,12 +13,11 @@
     - generic/cmake-repo-revision-quotes.patch: to handle the absence of an hg
       revision number during build
     - generic/getcurrentdatetime.patch: to fix a compilation bug of a build tool
-    - generic/libpurple-external.patch: use system libpurple, instead of
-      internal one
+    - generic/libpurple-HAVE_GETADDRINFO.patch: to avoid segfault on 64-bit
   * Using cdbs cmake.mk, instead of a custom one
   * Updating Standards-Version to 3.8.0
 
- -- Ludovico Cavedon <cavedon at sssup.it>  Tue, 09 Dec 2008 00:39:10 -0800
+ -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Thu, 11 Dec 2008 18:50:56 -0800
 
 wengophone (2.1.2.dfsg0-6) unstable; urgency=low
 

Modified: qutecom/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/control?rev=6546&op=diff
==============================================================================
--- qutecom/trunk/debian/control (original)
+++ qutecom/trunk/debian/control Fri Dec 12 03:18:48 2008
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Marco Nenciarini <mnencia at debian.org>, Ludovico Cavedon <cavedon at sssup.it>
+Uploaders: Marco Nenciarini <mnencia at debian.org>, Ludovico Cavedon <ludovico.cavedon at gmail.com>
 Build-Depends: cdbs (>= 0.4.27), bzip2, debhelper (>= 4.1.0), quilt,
  patchutils (>= 0.2.25), cmake (>= 2.4.4), libqt4-dev (>= 4.1.4),
  libglib2.0-dev (>= 2.10.3), libavcodec-dev (>= 0.cvs20060823-3.1),
@@ -13,7 +13,7 @@
  libasound2-dev (>= 1.0.11), libspeex-dev (>= 1.1.12), libssl-dev (>= 0.9.8a),
  libxml2-dev (>= 2.6.24), libsamplerate0-dev (>= 0.1.2),
  libsndfile1-dev (>= 1.0.12), libcurl4-openssl-dev (>= 7.16.1),
- dpkg-dev (>= 1.13.19), libx11-dev, python-dev, libpurple-dev
+ dpkg-dev (>= 1.13.19), libx11-dev, python-dev
 Build-Conflicts: qt3-dev-tools
 Standards-Version: 3.8.0
 Homepage: http://www.qutecom.org/

Modified: qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch?rev=6546&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch (original)
+++ qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch Fri Dec 12 03:18:48 2008
@@ -1,8 +1,8 @@
 Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
 ===================================================================
---- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-10 08:40:02.000000000 +0000
-+++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-10 08:40:26.000000000 +0000
-@@ -67,7 +67,3 @@
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-11 18:46:59.000000000 -0800
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-11 18:47:06.000000000 -0800
+@@ -62,7 +62,3 @@
  		RENAME qutecom.png)
  endforeach(size)
  

Added: qutecom/trunk/debian/patches/generic/libpurple_HAVE_GETADDRINFO.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/libpurple_HAVE_GETADDRINFO.patch?rev=6546&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/libpurple_HAVE_GETADDRINFO.patch (added)
+++ qutecom/trunk/debian/patches/generic/libpurple_HAVE_GETADDRINFO.patch Fri Dec 12 03:18:48 2008
@@ -1,0 +1,12 @@
+Index: qutecom-2.2/libs/3rdparty/libpurple/CMakeLists-unix.txt
+===================================================================
+--- qutecom-2.2.orig/libs/3rdparty/libpurple/CMakeLists-unix.txt	2008-12-09 03:16:15.000000000 +0000
++++ qutecom-2.2/libs/3rdparty/libpurple/CMakeLists-unix.txt	2008-12-09 03:16:31.000000000 +0000
+@@ -34,6 +34,7 @@
+ 	-DHAVE_SSL
+ 	-DHAVE_GNUTLS
+ 	-DHAVE_OPENSSL
++	-DHAVE_GETADDRINFO
+ 	-DDATADIR=\\\\\\\\\\\\\\\\\\\\\"$(datadir)\\\\\\\\\\\\\\\\\\\\\"
+ 	-DLOCALEDIR=\\\\\\\\\\\\\\\\\\\\\"$(datadir)/locale\\\\\\\\\\\\\\\\\\\\\"
+ 	-DLIBDIR=\\\\\\\\\\\\\\\\\\\\\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)\\\\\\\\\\\\\\\\\\\\\"

Added: qutecom/trunk/debian/patches/head/video-fix-crash.video
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/head/video-fix-crash.video?rev=6546&op=file
==============================================================================
--- qutecom/trunk/debian/patches/head/video-fix-crash.video (added)
+++ qutecom/trunk/debian/patches/head/video-fix-crash.video Fri Dec 12 03:18:48 2008
@@ -1,0 +1,65 @@
+Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/main.cpp
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/main.cpp	2008-12-11 18:47:20.000000000 -0800
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/main.cpp	2008-12-11 18:48:13.000000000 -0800
+@@ -92,6 +92,10 @@
+ 
+ #include <buildconfig.h>
+ 
++#if defined(OS_LINUX)
++    #include <X11/Xlib.h>
++#endif
++
+ static const char* CONFIG_SUBDIR = "/config/";
+ 
+ 
+@@ -224,6 +228,10 @@
+ 	//Gtk get a chance to parse their command line options ('-style' for Qt for
+ 	//example)
+ 	PFactory * pFactory = NULL;
++#if defined(OS_LINUX)
++	XInitThreads();
++#endif
++
+ #ifdef GTKINTERFACE
+ 	pFactory = new GtkFactory(argc, argv);
+ #else
+Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/config/QtVideoSettings.cpp
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/config/QtVideoSettings.cpp	2008-10-21 03:31:56.000000000 -0700
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/config/QtVideoSettings.cpp	2008-12-11 18:49:27.000000000 -0800
+@@ -164,14 +164,21 @@
+ }
+ 
+ void QtVideoSettings::frameCapturedEventHandler(IWebcamDriver * sender, piximage * image) {
+-	Mutex::ScopedLock lock(_mutex);
+ 
+ 	if (!_ui->webcamSelectionGroupBox->isEnabled()) {
+ 		return;
+ 	}
++	QSize qs(_ui->webcamPreviewLabel->width(), _ui->webcamPreviewLabel->height());
++
++	QImage tmpRgbImage(qs,  QImage::Format_RGB32);
++	QtVideoQt::convertPixImageToQImage(image, qs, &tmpRgbImage);
+ 
+-	QtVideoQt::convertPixImageToQImage(image, QSize(_ui->webcamPreviewLabel->width(), _ui->webcamPreviewLabel->height()), &_rgbImage);
+-	_lastWebcamPixmap = QPixmap::fromImage(_rgbImage);
++	QPixmap tmp = QPixmap::fromImage(tmpRgbImage);
++	{
++	    Mutex::ScopedLock lock(_mutex);
++
++	    _lastWebcamPixmap =  tmp;
++	}
+ 
+ 	newWebcamImage();
+ }
+@@ -179,6 +186,9 @@
+ void QtVideoSettings::newWebcamImageCaptured() {
+ 	Mutex::ScopedLock lock(_mutex);
+ 
++	if (_lastWebcamPixmap.isNull())
++	  return;
++
+ 	_ui->webcamPreviewLabel->setPixmap(_lastWebcamPixmap);
+ }
+ 

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=6546&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Fri Dec 12 03:18:48 2008
@@ -1,9 +1,10 @@
 #generic/curl-openssl-mt-fix.patch
+head/video-fix-crash.video
 generic/getcurrentdatetime.patch
 generic/googlebreakpad-64bit.patch
 generic/install-qutecom.patch
 generic/cmake-repo-revision-quotes.patch
 generic/desktop-file-update.patch
-generic/libpurple-external.patch
+generic/libpurple_HAVE_GETADDRINFO.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-force-fpic.patch

More information about the Pkg-voip-commits mailing list