[SCM] kopete packaging branch, master, updated. debian/4.11.3-1-3-g7238ef8

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kopete.git;a=commitdiff;h=906be02

The following commit has been merged in the master branch:
commit 906be025b68abaa2a429b7317c2178f7cee28bce
Author: Pino Toscano <pino at debian.org>
Date:   Sat Nov 30 22:27:26 2013 +0100

    allow building on unknown architectures
    
    import part of libjingle's r305
---
 debian/changelog                                   |  3 ++
 debian/patches/libjingle_unknown_architecture.diff | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2ace4e4..5c855a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kopete (4:4.11.3-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Import part of libjingle's r305 to allow building on unknown architectures;
+    patch libjingle_unknown_architecture.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 30 Nov 2013 22:13:16 +0100
 
diff --git a/debian/patches/libjingle_unknown_architecture.diff b/debian/patches/libjingle_unknown_architecture.diff
new file mode 100644
index 0000000..a061f8a
--- /dev/null
+++ b/debian/patches/libjingle_unknown_architecture.diff
@@ -0,0 +1,37 @@
+Author: mallinath at google.com
+Description: Allow unknown architectures
+ Derived from part of libjingle r305:
+ http://code.google.com/p/libjingle/source/detail?r=305
+
+--- a/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.cc
++++ b/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.cc
+@@ -102,7 +102,7 @@ SystemInfo::SystemInfo()
+ #elif defined(CPU_X86)
+   cpu_arch_ = SI_ARCH_X86;
+ #else
+-#error "Unknown architecture."
++  cpu_arch_ = SI_ARCH_UNKNOWN;
+ #endif
+ 
+ #ifdef WIN32
+@@ -144,8 +144,8 @@ SystemInfo::SystemInfo()
+     proc_info.GetNumCpus(&logical_cpus_);
+     proc_info.GetNumPhysicalCpus(&physical_cpus_);
+     proc_info.GetCpuFamily(&cpu_family_);
+-#if !defined(__arm__)
+-    // These values aren't found on ARM systems.
++#if defined(CPU_X86)
++    // These values only apply to x86 systems.
+     proc_info.GetSectionIntValue(0, "model", &cpu_model_);
+     proc_info.GetSectionIntValue(0, "stepping", &cpu_stepping_);
+     proc_info.GetSectionIntValue(0, "cpu MHz", &cpu_speed_);
+--- a/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.h
++++ b/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.h
+@@ -37,6 +37,7 @@ namespace talk_base {
+ class SystemInfo {
+  public:
+   enum Architecture {
++    SI_ARCH_UNKNOWN = -1,
+     SI_ARCH_X86 = 0,
+     SI_ARCH_X64 = 1,
+     SI_ARCH_ARM = 2
diff --git a/debian/patches/series b/debian/patches/series
index 5fc84a6..96159fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 new_linphone.diff
+libjingle_unknown_architecture.diff

-- 
kopete packaging