← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kopete/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/libjingle_unknown_architecture.diff

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2014-06-18 12:03:38 UTC
  • mfrom: (1.1.18) (1.2.6 sid)
  • Revision ID: package-import@ubuntu.com-20140618120338-h1af353ueu4e6vue
Tags: 4:4.13.2-0ubuntu1
new upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/libjingle_unknown_architecture.diff
 
1
Author: mallinath@google.com
 
2
Description: Allow unknown architectures
 
3
 Derived from part of libjingle r305:
 
4
 http://code.google.com/p/libjingle/source/detail?r=305
 
5
 
 
6
--- a/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.cc
 
7
+++ b/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.cc
 
8
@@ -102,7 +102,7 @@ SystemInfo::SystemInfo()
 
9
 #elif defined(CPU_X86)
 
10
   cpu_arch_ = SI_ARCH_X86;
 
11
 #else
 
12
-#error "Unknown architecture."
 
13
+  cpu_arch_ = SI_ARCH_UNKNOWN;
 
14
 #endif
 
15
 
 
16
 #ifdef WIN32
 
17
@@ -144,8 +144,8 @@ SystemInfo::SystemInfo()
 
18
     proc_info.GetNumCpus(&logical_cpus_);
 
19
     proc_info.GetNumPhysicalCpus(&physical_cpus_);
 
20
     proc_info.GetCpuFamily(&cpu_family_);
 
21
-#if !defined(__arm__)
 
22
-    // These values aren't found on ARM systems.
 
23
+#if defined(CPU_X86)
 
24
+    // These values only apply to x86 systems.
 
25
     proc_info.GetSectionIntValue(0, "model", &cpu_model_);
 
26
     proc_info.GetSectionIntValue(0, "stepping", &cpu_stepping_);
 
27
     proc_info.GetSectionIntValue(0, "cpu MHz", &cpu_speed_);
 
28
--- a/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.h
 
29
+++ b/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.h
 
30
@@ -37,6 +37,7 @@ namespace talk_base {
 
31
 class SystemInfo {
 
32
  public:
 
33
   enum Architecture {
 
34
+    SI_ARCH_UNKNOWN = -1,
 
35
     SI_ARCH_X86 = 0,
 
36
     SI_ARCH_X64 = 1,
 
37
     SI_ARCH_ARM = 2