[neon/kde/kopete/Neon/release] debian: Fix compilation errors (Closes: #979388)

Norbert Preining null at kde.org
Wed Aug 17 14:36:42 BST 2022


Git commit efc8c9f9d4cb4b6d01ba9f85f0a5fd5ffe43d1b2 by Norbert Preining.
Committed on 12/01/2021 at 03:14.
Pushed by jriddell into branch 'Neon/release'.

Fix compilation errors (Closes: #979388)

M  +1    -0    debian/changelog
A  +31   -0    debian/patches/fix-compile-error-template-extern
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/kde/kopete/commit/efc8c9f9d4cb4b6d01ba9f85f0a5fd5ffe43d1b2

diff --git a/debian/changelog b/debian/changelog
index e02412b..efd41c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ kopete (4:20.12.1-0r1) UNRELEASED; urgency=medium
 
   [ Norbert Preining ]
   * Update maintainer name part.
+  * Fix compilation errors (Closes: #979388)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 09 Jan 2021 14:00:22 +0100
 
diff --git a/debian/patches/fix-compile-error-template-extern b/debian/patches/fix-compile-error-template-extern
new file mode 100644
index 0000000..8121d8c
--- /dev/null
+++ b/debian/patches/fix-compile-error-template-extern
@@ -0,0 +1,31 @@
+---
+ protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc |    2 --
+ protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h  |    2 --
+ 2 files changed, 4 deletions(-)
+
+--- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -34,11 +34,9 @@
+ #ifdef HAVE_LINPHONE
+ 
+ // LinphoneMediaEngine is a Linphone implementation of MediaEngine
+-extern "C" {
+ #include <mediastreamer2/mediastream.h>
+ #include <mediastreamer2/mssndcard.h>
+ #include <mediastreamer2/msfilter.h>
+-}
+ 
+ #include "talk/session/phone/linphonemediaengine.h"
+ 
+--- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h
++++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h
+@@ -35,9 +35,7 @@
+ #include <string>
+ #include <vector>
+ 
+-extern "C" {
+ #include <mediastreamer2/mediastream.h>
+-}
+ 
+ #include "talk/base/scoped_ptr.h"
+ #include "talk/session/phone/codec.h"
diff --git a/debian/patches/series b/debian/patches/series
index 03598d1..5ae1122 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kopete-17.08.3-openssl-1.1.patch
 fix-mediastreamer-ftbfs.patch
 kopete-srtp2.patch
+fix-compile-error-template-extern



More information about the Neon-commits mailing list