[oe-commits] org.oe.dev gpe-scap: Add patch to fix device information on ARM devices.

[florian commit]

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

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 40bad367ae1fefd425dbef847df2559f3b436b7d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=40bad367ae1fefd425dbef847df2559f3b436b7d
Files:
1
packages/gpe-scap/gpe-scap-1.2
packages/gpe-scap/gpe-scap-1.2/deviceinfo.patch
packages/gpe-scap/gpe-scap_1.2.bb
Diffs:

#
# mt diff -r06296810795c121aba4a5607d1e6e154bec0c768 -r40bad367ae1fefd425dbef847df2559f3b436b7d
#
# 
# 
# add_dir "packages/gpe-scap/gpe-scap-1.2"
# 
# add_file "packages/gpe-scap/gpe-scap-1.2/deviceinfo.patch"
#  content [f586f65fa27b107f167e8795431fa4e9a123f3f0]
# 
# patch "packages/gpe-scap/gpe-scap_1.2.bb"
#  from [3860582cd573bb34a686c10dd143cfeae357aef8]
#    to [e5e06d776113f0c5833e265ed6555dc13931bf33]
# 
============================================================
--- packages/gpe-scap/gpe-scap-1.2/deviceinfo.patch	f586f65fa27b107f167e8795431fa4e9a123f3f0
+++ packages/gpe-scap/gpe-scap-1.2/deviceinfo.patch	f586f65fa27b107f167e8795431fa4e9a123f3f0
@@ -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
============================================================
--- packages/gpe-scap/gpe-scap_1.2.bb	3860582cd573bb34a686c10dd143cfeae357aef8
+++ packages/gpe-scap/gpe-scap_1.2.bb	e5e06d776113f0c5833e265ed6555dc13931bf33
@@ -1,8 +1,8 @@ SECTION = "gpe"
 DESCRIPTION = "GPE screenshot application"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "gpe"
-PR = "r0"
+PR = "r1"
 
 RREPLACES = "gpe-screenshot"
 
@@ -12,3 +12,4 @@ inherit gpe autotools
 
 inherit gpe autotools
 
+SRC_URI += " file://deviceinfo.patch;patch=1;pnum=0"