[Pkg-voip-commits] r8176 - in /qutecom/trunk/debian: changelog patches/fix-binutils-gold.patch patches/libpurple-glib.patch patches/series
cavedon at alioth.debian.org
cavedon at alioth.debian.org
Mon Mar 8 17:19:14 UTC 2010
Author: cavedon
Date: Mon Mar 8 17:19:10 2010
New Revision: 8176
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8176
Log:
Add libpurple-glib.patch for fixing crash with external liburple.
Added:
qutecom/trunk/debian/patches/libpurple-glib.patch
Modified:
qutecom/trunk/debian/changelog
qutecom/trunk/debian/patches/fix-binutils-gold.patch
qutecom/trunk/debian/patches/series
Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=8176&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Mon Mar 8 17:19:10 2010
@@ -2,8 +2,9 @@
* Add fix-binutils-gold.patch for building with binutils-gold, although it
may still FTBFS because of #563366. Closes: #556311.
-
- -- Ludovico Cavedon <cavedon at debian.org> Sun, 03 Jan 2010 21:46:05 +0100
+ * Add libpurple-glib.patch for fixing crash with external liburple.
+
+ -- Ludovico Cavedon <cavedon at debian.org> Mon, 08 Mar 2010 18:17:03 +0100
qutecom (2.2~rc3.hg396~dfsg1-5) unstable; urgency=low
Modified: qutecom/trunk/debian/patches/fix-binutils-gold.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/fix-binutils-gold.patch?rev=8176&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/fix-binutils-gold.patch (original)
+++ qutecom/trunk/debian/patches/fix-binutils-gold.patch Mon Mar 8 17:19:10 2010
@@ -7,9 +7,10 @@
Author: Ludovico Cavedon <cavedon at debian.org>
Forwarded: http://trac.qutecom.org/ticket/182
-diff -r 59eec01c9334 -r 481975b967f7 crashreport/CMakeLists.txt
---- a/crashreport/CMakeLists.txt Mon Dec 28 15:44:15 2009 +0100
-+++ b/crashreport/CMakeLists.txt Sun Jan 03 20:41:06 2010 +0100
+Index: qutecom-2.2~rc3.hg396~dfsg1/crashreport/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/crashreport/CMakeLists.txt 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/crashreport/CMakeLists.txt 2010-03-08 18:09:23.000000000 +0100
@@ -7,6 +7,7 @@
curl
owqtutil
@@ -18,9 +19,10 @@
)
ow_add_public_include_dirs(
-diff -r 59eec01c9334 -r 481975b967f7 libs/3rdparty/boost/CMakeLists.txt
---- a/libs/3rdparty/boost/CMakeLists.txt Mon Dec 28 15:44:15 2009 +0100
-+++ b/libs/3rdparty/boost/CMakeLists.txt Sun Jan 03 20:41:06 2010 +0100
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/3rdparty/boost/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/3rdparty/boost/CMakeLists.txt 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/3rdparty/boost/CMakeLists.txt 2010-03-08 18:09:23.000000000 +0100
@@ -6,6 +6,7 @@
ow_use_public_libraries(
@@ -29,9 +31,10 @@
)
if (NOT MSVC)
-diff -r 59eec01c9334 -r 481975b967f7 libs/3rdparty/x11/CMakeLists.txt
---- a/libs/3rdparty/x11/CMakeLists.txt Mon Dec 28 15:44:15 2009 +0100
-+++ b/libs/3rdparty/x11/CMakeLists.txt Sun Jan 03 20:41:06 2010 +0100
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/3rdparty/x11/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/3rdparty/x11/CMakeLists.txt 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/3rdparty/x11/CMakeLists.txt 2010-03-08 18:09:23.000000000 +0100
@@ -10,8 +10,10 @@
X11
)
@@ -46,9 +49,10 @@
+ endif (X11_Xv_FOUND)
endif (LINUX)
-diff -r 59eec01c9334 -r 481975b967f7 libs/owutil/shlibloader/CMakeLists.txt
---- a/libs/owutil/shlibloader/CMakeLists.txt Mon Dec 28 15:44:15 2009 +0100
-+++ b/libs/owutil/shlibloader/CMakeLists.txt Sun Jan 03 20:41:06 2010 +0100
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/owutil/shlibloader/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/owutil/shlibloader/CMakeLists.txt 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/owutil/shlibloader/CMakeLists.txt 2010-03-08 18:09:23.000000000 +0100
@@ -18,6 +18,10 @@
ow_add_sources(
src/posix/PosixSharedLibLoader.cpp
@@ -60,9 +64,10 @@
endif (UNIX)
ow_create_project_binary()
-diff -r 59eec01c9334 -r 481975b967f7 libs/owutil/thread/CMakeLists.txt
---- a/libs/owutil/thread/CMakeLists.txt Mon Dec 28 15:44:15 2009 +0100
-+++ b/libs/owutil/thread/CMakeLists.txt Sun Jan 03 20:41:06 2010 +0100
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/owutil/thread/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/owutil/thread/CMakeLists.txt 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/owutil/thread/CMakeLists.txt 2010-03-08 18:09:23.000000000 +0100
@@ -2,6 +2,7 @@
ow_use_public_libraries(
@@ -71,9 +76,10 @@
)
ow_add_sources(
-diff -r 59eec01c9334 -r 481975b967f7 libs/wenbox/CMakeLists.txt
---- a/libs/wenbox/CMakeLists.txt Mon Dec 28 15:44:15 2009 +0100
-+++ b/libs/wenbox/CMakeLists.txt Sun Jan 03 20:41:06 2010 +0100
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/wenbox/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/wenbox/CMakeLists.txt 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/wenbox/CMakeLists.txt 2010-03-08 18:09:23.000000000 +0100
@@ -6,9 +6,6 @@
ow_use_public_libraries(
@@ -84,9 +90,10 @@
owshlibloader
)
-diff -r 59eec01c9334 -r 481975b967f7 owbuild/FindPTHREAD.cmake
---- a/owbuild/FindPTHREAD.cmake Mon Dec 28 15:44:15 2009 +0100
-+++ b/owbuild/FindPTHREAD.cmake Sun Jan 03 20:41:06 2010 +0100
+Index: qutecom-2.2~rc3.hg396~dfsg1/owbuild/FindPTHREAD.cmake
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/owbuild/FindPTHREAD.cmake 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/owbuild/FindPTHREAD.cmake 2010-03-08 18:09:23.000000000 +0100
@@ -2,7 +2,7 @@
# Once done this will define
#
@@ -105,10 +112,11 @@
set (PTHREAD_FOUND TRUE)
mark_as_advanced (PTHREAD_INCLUDE_DIR)
else (CMAKE_USE_PTHREADS_INIT)
-diff -r 59eec01c9334 -r 481975b967f7 wengophone/src/presentation/qt/CMakeLists.txt
---- a/wengophone/src/presentation/qt/CMakeLists.txt Mon Dec 28 15:44:15 2009 +0100
-+++ b/wengophone/src/presentation/qt/CMakeLists.txt Sun Jan 03 20:41:06 2010 +0100
-@@ -366,12 +366,12 @@
+Index: qutecom-2.2~rc3.hg396~dfsg1/wengophone/src/presentation/qt/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/wengophone/src/presentation/qt/CMakeLists.txt 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/wengophone/src/presentation/qt/CMakeLists.txt 2010-03-08 18:09:23.000000000 +0100
+@@ -367,12 +367,12 @@
macosx/QtMacApplication.cpp
)
else (APPLE)
Added: qutecom/trunk/debian/patches/libpurple-glib.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/libpurple-glib.patch?rev=8176&op=file
==============================================================================
--- qutecom/trunk/debian/patches/libpurple-glib.patch (added)
+++ qutecom/trunk/debian/patches/libpurple-glib.patch Mon Mar 8 17:19:10 2010
@@ -1,0 +1,62 @@
+Description: libpurple init and destroy in the glib thread
+Origin: http://trac.qutecom.org/changeset/519%3A7ea7b6493d47
+Bug: http://trac.qutecom.org/ticket/175
+
+# HG changeset patch
+# User nikita <nikita at mbdsys.com>
+# Date 1267096087 -3600
+# Node ID 7ea7b6493d47e9f0da593dd8b324aa3ba3cf3cfc
+# Parent 9cd89d4b669416fa05afa856aab12910ce3473fc
+libpurple init and destroy in the glib thread
+
+Index: qutecom-2.2~rc3.hg396~dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.cpp
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/imwrapper/src/purple/PurpleIMFactory.cpp 2009-05-23 05:49:45.000000000 +0200
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.cpp 2010-03-08 18:12:01.000000000 +0100
+@@ -198,6 +198,20 @@
+ NULL
+ };
+
++static gboolean purple_wg_init_lib(gpointer data) {
++ MyPurpleIMInit(*((const std::string *)data));
++ return false;
++}
++
++static gboolean purple_wg_destroy_lib(gpointer data) {
++ purple_connections_set_ui_ops(&null_conn_wg_ops);
++ purple_accounts_set_ui_ops(&null_acc_wg_ops);
++ purple_blist_set_ui_ops(&null_blist_wg_ops);
++
++ purple_core_quit();
++ return false;
++}
++
+ bool PurpleIMFactory::equals(const IMAccount & imAccount, std::string login, EnumIMProtocol::IMProtocol protocol) {
+ return ((imAccount.getLogin() == login) && (imAccount.getProtocol() == protocol));
+ }
+@@ -270,7 +284,8 @@
+ }
+
+ void PurpleIMFactory::init(const std::string & pathToProfile) {
+- PurpleIMInit(pathToProfile);
++ g_idle_add(purple_wg_init_lib, (gpointer)&pathToProfile);
++ //PurpleIMInit(pathToProfile);
+ PurpleWrapperInit();
+ }
+
+@@ -285,12 +300,12 @@
+ if (AccountMngr) {
+ AccountMngr->reset();
+ }
+-
+- purple_connections_set_ui_ops(&null_conn_wg_ops);
++ g_idle_add(purple_wg_destroy_lib, NULL);
++ /*purple_connections_set_ui_ops(&null_conn_wg_ops);
+ purple_accounts_set_ui_ops(&null_acc_wg_ops);
+ purple_blist_set_ui_ops(&null_blist_wg_ops);
+
+- purple_core_quit();
++ purple_core_quit();*/
+ }
+
+ IMConnect * PurpleIMFactory::createIMConnect(IMAccount &account) {
Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=8176&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Mon Mar 8 17:19:10 2010
@@ -10,3 +10,4 @@
#purple_perl_tcl_noload.patch
#curl-openssl-mt-fix.patch
fix-binutils-gold.patch
+libpurple-glib.patch
More information about the Pkg-voip-commits
mailing list