summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2007-03-08 11:20:44 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2007-03-08 11:20:44 +0000
commit8da86c82cf296fe0df95523f22b5ba36d36691bf (patch)
treee52d99c6d215767c654153c4b19f73c3ad8a98ac /packages
parent6566744b4b5b65be7782dafdd012657927d31a51 (diff)
gpe-scap: Add patch to fix device information on ARM devices.
Diffstat (limited to 'packages')
-rw-r--r--packages/gpe-scap/gpe-scap-1.2/.mtn2git_empty0
-rw-r--r--packages/gpe-scap/gpe-scap-1.2/deviceinfo.patch22
-rw-r--r--packages/gpe-scap/gpe-scap_1.2.bb3
3 files changed, 24 insertions, 1 deletions
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
--- /dev/null
+++ b/packages/gpe-scap/gpe-scap-1.2/.mtn2git_empty
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"