From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 8 Mar 2007 11:20:44 +0000 (+0000)
Subject: gpe-scap: Add patch to fix device information on ARM devices.
X-Git-Tag: Release-2010-05/1~8868^2~1105^2~12^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8da86c82cf296fe0df95523f22b5ba36d36691bf;p=openembedded.git

gpe-scap: Add patch to fix device information on ARM devices.
---

diff --git a/packages/gpe-scap/gpe-scap-1.2/.mtn2git_empty b/packages/gpe-scap/gpe-scap-1.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gpe-scap/gpe-scap-1.2/deviceinfo.patch b/packages/gpe-scap/gpe-scap-1.2/deviceinfo.patch
new file mode 100644
index 0000000000..57e611d85e
--- /dev/null
+++ b/packages/gpe-scap/gpe-scap-1.2/deviceinfo.patch
@@ -0,0 +1,22 @@
+Index: src/scr-shot-common.c
+===================================================================
+--- src/scr-shot-common.c	(.../base/gpe-scap/src/scr-shot-common.c)	(Revision 8890)
++++ src/scr-shot-common.c	(.../extra/gpe-scap/src/scr-shot-common.c)	(Arbeitskopie)
+@@ -37,7 +37,7 @@
+ gchar *
+ get_device_model (void)
+ {
+-  gchar *result;
++  gchar *result = NULL;
+   struct utsname uinfo;
+   gchar **strv;
+   gint i = 0;
+@@ -62,6 +62,8 @@
+         }
+       g_strfreev (strv);
+     }
++  if (result)
++    return result;
+ #ifdef __arm__
+   result = g_strdup_printf ("%s,%s",_("ARM"), uinfo.machine);
+ #endif
diff --git a/packages/gpe-scap/gpe-scap_1.2.bb b/packages/gpe-scap/gpe-scap_1.2.bb
index d53f041bbe..1fc8f9a57a 100644
--- a/packages/gpe-scap/gpe-scap_1.2.bb
+++ b/packages/gpe-scap/gpe-scap_1.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GPE screenshot application"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "gpe"
-PR = "r0"
+PR = "r1"
 
 RREPLACES = "gpe-screenshot"
 
@@ -12,3 +12,4 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpe autotools
 
+SRC_URI += " file://deviceinfo.patch;patch=1;pnum=0"