[Pkg-voip-commits] r7939 - in /qutecom/trunk/debian: changelog patches/fix-binutils-gold.patch patches/series

cavedon at alioth.debian.org cavedon at alioth.debian.org
Sun Jan 3 20:49:13 UTC 2010 

Author: cavedon
Date: Sun Jan  3 20:49:13 2010
New Revision: 7939

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7939
Log:
Add fix-binutils-gold.patch for building with binutils-gold, although it may still FTBFS because of #563366. Closes: #556311.

Added:
    qutecom/trunk/debian/patches/fix-binutils-gold.patch
Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/patches/series

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=7939&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Sun Jan  3 20:49:13 2010
@@ -1,3 +1,10 @@
+qutecom (2.2~rc3.hg396~dfsg1-6) UNRELEASED; urgency=low
+
+  * 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
+
 qutecom (2.2~rc3.hg396~dfsg1-5) unstable; urgency=low
 
   * Remove calls to quilt from debian/rules in order to allow unpacking with

Added: 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=7939&op=file
==============================================================================
--- qutecom/trunk/debian/patches/fix-binutils-gold.patch (added)
+++ qutecom/trunk/debian/patches/fix-binutils-gold.patch Sun Jan  3 20:49:13 2010
@@ -1,0 +1,127 @@
+# HG changeset patch
+# User Ludovico Cavedon <ludovico.cavedon at gmail.com>
+# Date 1262547666 -3600
+# Node ID 481975b967f70c28a582265132e1074ad7f2eef5
+# Parent  59eec01c933404233a091a2328e15339d545adc6
+Description: fix compilation with binutils-gold (or --no-add-needed)
+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
+@@ -7,6 +7,7 @@
+ 	curl
+ 	owqtutil
+ 	owsettings
++	boost
+ )
+ 
+ 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
+@@ -6,6 +6,7 @@
+ 
+ ow_use_public_libraries(
+ 	BOOST
++	pthread
+ )
+ 
+ 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
+@@ -10,8 +10,10 @@
+ 		X11
+ 	)
+ 
+-	ow_add_public_libraries(
+-		${X11_Xv_LIB}
+-	)
++	if (X11_Xv_FOUND)
++		ow_add_public_libraries(
++			${X11_Xv_LIB}
++		)
++	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
+@@ -18,6 +18,10 @@
+ 	ow_add_sources(
+ 		src/posix/PosixSharedLibLoader.cpp
+ 	)
++
++	ow_add_public_link_flags(
++	    -ldl
++	)
+ 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
+@@ -2,6 +2,7 @@
+ 
+ ow_use_public_libraries(
+ 	owutil
++	boost
+ )
+ 
+ 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
+@@ -6,9 +6,6 @@
+ 
+ ow_use_public_libraries(
+ 	owutil
+-)
+-
+-ow_use_private_libraries(
+ 	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
+@@ -2,7 +2,7 @@
+ # Once done this will define
+ #
+ #  PTHREAD_FOUND - system has PTHREAD
+-#  PTHREAD_LINK_FLAGS - linker flags to use PTHREAD
++#  PTHREAD_PUBLIC_LINK_FLAGS - linker flags to use PTHREAD
+ #
+ #  Copyright (c) 2007 Wengo
+ #
+@@ -16,7 +16,7 @@
+ if (CMAKE_USE_PTHREADS_INIT)
+ 	# hack to pass OWBuild check
+ 	set (PTHREAD_INCLUDE_DIR "/usr/include")
+-	set (PTHREAD_LINK_FLAGS ${CMAKE_THREAD_LIBS_INIT})
++	set (PTHREAD_PUBLIC_LINK_FLAGS ${CMAKE_THREAD_LIBS_INIT})
+ 	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 @@
+ 			macosx/QtMacApplication.cpp
+ 		)
+ 	else (APPLE)
++		ow_use_private_libraries(
++			x11
++		)
++
+ 		if (WENGOPHONE_XV_SUPPORT)
+ 			if (X11_XV_FOUND)
+-				ow_use_private_libraries(
+-					x11
+-				)
+-
+ 				ow_add_private_definitions(
+ 					-DXV_HWACCEL
+ 				)

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=7939&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Sun Jan  3 20:49:13 2010
@@ -9,3 +9,4 @@
 force-palette.patch
 #purple_perl_tcl_noload.patch
 #curl-openssl-mt-fix.patch
+fix-binutils-gold.patch

More information about the Pkg-voip-commits mailing list