[Pkg-telepathy-commits] [SCM] libjingle0.3 packaging branch, debian, updated. 46dcbc416bfe87eef4412bdd3fc828ea9b01dea1
Simon McVittie
smcv at debian.org
Fri Dec 26 23:35:33 UTC 2008
The following commit has been merged in the debian branch:
commit 46dcbc416bfe87eef4412bdd3fc828ea9b01dea1
Author: Simon McVittie <smcv at debian.org>
Date: Fri Dec 26 23:32:54 2008 +0000
Merge patches from unstable
* Merge patches from unstable, removing redundant patches for fixes made
in a different way upstream
- this incorporates part of Martin Michlmayr's patch to compile on g++
4.4 prereleases (which Closes: #505699); the rest didn't seem to
be required in 0.3.12, although I haven't yet tested compilation
- in the process, regenerate the patches via update-patches.mk
diff --git a/debian/changelog b/debian/changelog
index 76f5048..6eea696 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ libjingle0.3 (0.3.12-3) UNRELEASED; urgency=low
* Add README.source
* Add `debian/rules update-patches` target
* Wrap Uploaders and Build-Depends in debian/control
+ * Merge patches from unstable, removing redundant patches for fixes made
+ in a different way upstream
+ - this incorporates part of Martin Michlmayr's patch to compile on g++
+ 4.4 prereleases (which Closes: #505699); the rest didn't seem to
+ be required in 0.3.12, although I haven't yet tested compilation
+ - in the process, regenerate the patches via update-patches.mk
-- Simon McVittie <smcv at debian.org> Fri, 26 Dec 2008 23:20:44 +0000
diff --git a/debian/patches/0001-Patch-originally-by-Hubert-Figuiere-to-fix-compilati.patch b/debian/patches/0001-Patch-originally-by-Hubert-Figuiere-to-fix-compilati.patch
new file mode 100644
index 0000000..20cd42f
--- /dev/null
+++ b/debian/patches/0001-Patch-originally-by-Hubert-Figuiere-to-fix-compilati.patch
@@ -0,0 +1,88 @@
+From dcb81b492ee6150aad410a2a5b7d5922d69c7348 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at debian.org>
+Date: Fri, 26 Dec 2008 23:11:34 +0000
+Subject: [PATCH] Patch originally by Hubert Figuiere to fix compilation problems with GCC 4.3
+
+From Debian #455146, rebased onto upstream release 0.3.12 with redundant
+additions removed.
+---
+ talk/base/socketadapters.cc | 1 +
+ talk/p2p/base/port.cc | 1 +
+ talk/p2p/base/relayport.cc | 1 +
+ talk/p2p/base/relayserver_main.cc | 1 +
+ talk/p2p/base/stunserver_main.cc | 1 +
+ talk/p2p/base/tcpport.cc | 1 +
+ 6 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/talk/base/socketadapters.cc b/talk/base/socketadapters.cc
+index 840ad41..5bddfb1 100644
+--- a/talk/base/socketadapters.cc
++++ b/talk/base/socketadapters.cc
+@@ -41,6 +41,7 @@
+ #include <security.h>
+ #endif
+
++#include <cstring>
+ #include <cassert>
+
+ #include "talk/base/base64.h"
+diff --git a/talk/p2p/base/port.cc b/talk/p2p/base/port.cc
+index 8975b28..5fb1ce5 100644
+--- a/talk/p2p/base/port.cc
++++ b/talk/p2p/base/port.cc
+@@ -39,6 +39,7 @@
+ #include <algorithm>
+ #include <iostream>
+ #include <cassert>
++#include <cstring>
+ #include <vector>
+
+ #if defined(_MSC_VER) && _MSC_VER < 1300
+diff --git a/talk/p2p/base/relayport.cc b/talk/p2p/base/relayport.cc
+index 3913d50..64189ee 100644
+--- a/talk/p2p/base/relayport.cc
++++ b/talk/p2p/base/relayport.cc
+@@ -34,6 +34,7 @@
+ #include "talk/p2p/base/helpers.h"
+ #include <iostream>
+ #include <cassert>
++#include <cstring>
+ #ifdef OSX
+ #include <errno.h>
+ #endif
+diff --git a/talk/p2p/base/relayserver_main.cc b/talk/p2p/base/relayserver_main.cc
+index fd2ee27..68f18f0 100644
+--- a/talk/p2p/base/relayserver_main.cc
++++ b/talk/p2p/base/relayserver_main.cc
+@@ -26,6 +26,7 @@
+ */
+
+ #include <cassert>
++#include <cstring>
+ #include <iostream>
+ #include "talk/base/host.h"
+ #include "talk/base/thread.h"
+diff --git a/talk/p2p/base/stunserver_main.cc b/talk/p2p/base/stunserver_main.cc
+index bd8a96e..bac3e35 100644
+--- a/talk/p2p/base/stunserver_main.cc
++++ b/talk/p2p/base/stunserver_main.cc
+@@ -29,6 +29,7 @@
+ #include "talk/base/thread.h"
+ #include "talk/p2p/base/stunserver.h"
+ #include <iostream>
++#include <cstring>
+
+ #ifdef POSIX
+ extern "C" {
+diff --git a/talk/p2p/base/tcpport.cc b/talk/p2p/base/tcpport.cc
+index ac22508..2874a30 100644
+--- a/talk/p2p/base/tcpport.cc
++++ b/talk/p2p/base/tcpport.cc
+@@ -35,6 +35,7 @@
+ #endif // WIN32
+ #include <iostream>
+ #include <cassert>
++#include <cstring>
+
+ #if defined(_MSC_VER) && _MSC_VER < 1300
+ namespace std {
diff --git a/debian/patches/0002-Patch-from-Petr-Salinger-to-fix-failure-to-build-on.patch b/debian/patches/0002-Patch-from-Petr-Salinger-to-fix-failure-to-build-on.patch
new file mode 100644
index 0000000..e19b0bc
--- /dev/null
+++ b/debian/patches/0002-Patch-from-Petr-Salinger-to-fix-failure-to-build-on.patch
@@ -0,0 +1,32 @@
+From c9662e309b0d14a4f7fe3ff8554683f35b729ca9 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at debian.org>
+Date: Fri, 26 Dec 2008 22:40:06 +0000
+Subject: [PATCH] Patch from Petr Salinger to fix failure to build on GNU/kFreeBSD (Debian #493870)
+
+---
+ configure.ac | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 14bf4b8..4dfc780 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,14 +101,16 @@ dnl AC_SUBST(ILBC_LIBS)
+ dnl fi
+ dnl fi
+
+-if test `uname -s` = Linux; then
++case $host_os in
++linux*|k*bsd*-gnu*|gnu*)
+ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7g, HAVE_OPENSSL=yes, HAVE_OPENSSL=no)
+ if test x$HAVE_OPENSSL = xno; then
+ AC_ERROR([OpenSSL development files not found.])
+ fi
+ AC_SUBST(OPENSSL_CFLAGS)
+ AC_SUBST(OPENSSL_LIBS)
+-fi
++ ;;
++esac
+
+ AC_OUTPUT([Makefile
+ talk/Makefile
diff --git a/debian/patches/0003-Patch-originally-from-Martin-Michlmayr-to-fix-failur.patch b/debian/patches/0003-Patch-originally-from-Martin-Michlmayr-to-fix-failur.patch
new file mode 100644
index 0000000..e5115c3
--- /dev/null
+++ b/debian/patches/0003-Patch-originally-from-Martin-Michlmayr-to-fix-failur.patch
@@ -0,0 +1,39 @@
+From 3f34d84f237c49d502d730dcc1aac31cb57541e5 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at debian.org>
+Date: Fri, 26 Dec 2008 22:40:56 +0000
+Subject: [PATCH] Patch originally from Martin Michlmayr to fix failure to build from source on a g++ 4.4 prerelease
+
+From Debian #505699, rebased onto 0.3.12.
+---
+ talk/base/logging.cc | 3 ++-
+ talk/base/stream.cc | 1 +
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/talk/base/logging.cc b/talk/base/logging.cc
+index 8702b82..2830512 100644
+--- a/talk/base/logging.cc
++++ b/talk/base/logging.cc
+@@ -31,9 +31,10 @@
+ #undef ERROR // wingdi.h
+ #endif
+
++#include <cstdio>
++#include <cstring>
+ #include <iostream>
+ #include <iomanip>
+-#include <string.h>
+
+ #include "talk/base/logging.h"
+ #include "talk/base/stream.h"
+diff --git a/talk/base/stream.cc b/talk/base/stream.cc
+index 090a0ae..e958ade 100644
+--- a/talk/base/stream.cc
++++ b/talk/base/stream.cc
+@@ -27,6 +27,7 @@
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <cstdio>
+ #include <errno.h>
+ #include <string>
+ #include <string.h>
diff --git a/debian/patches/03_fix_bsd_ftbfs.patch b/debian/patches/03_fix_bsd_ftbfs.patch
deleted file mode 100644
index c1191e8..0000000
--- a/debian/patches/03_fix_bsd_ftbfs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.ac~ 2008-08-05 15:50:50.000000000 +0000
-+++ configure.ac 2008-08-05 15:50:50.000000000 +0000
-@@ -63,14 +63,16 @@
- AC_ERROR([Expat is required to build libjingle. You can get it from http://expat.sourceforge.net/])
- fi
-
--if test `uname -s` = Linux; then
-+case $host_os in
-+linux*|k*bsd*-gnu*|gnu*)
- PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7g, HAVE_OPENSSL=yes, HAVE_OPENSSL=no)
- if test x$HAVE_OPENSSL = xno; then
- AC_ERROR([OpenSSL development files not found.])
- fi
- AC_SUBST(OPENSSL_CFLAGS)
- AC_SUBST(OPENSSL_LIBS)
--fi
-+ ;;
-+esac
-
-
- AC_OUTPUT([Makefile
--
libjingle0.3 packaging
More information about the Pkg-telepathy-commits
mailing list