diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-03-08 11:25:47 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-03-08 11:25:47 +0000 |
| commit | 7db8984b275181a30ec7fcc47e2b78dbfe1ca698 (patch) | |
| tree | b0d614dd3490f2a79bfe67496033278531f913ef /packages | |
| parent | f86643c366f641c34d8050fde2576007709d7c40 (diff) | |
| parent | 8da86c82cf296fe0df95523f22b5ba36d36691bf (diff) | |
merge of '3a81a92297b91a0316a744c06361a9cdf470ede8'
and '40bad367ae1fefd425dbef847df2559f3b436b7d'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gpe-scap/gpe-scap-1.2/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gpe-scap/gpe-scap-1.2/deviceinfo.patch | 22 | ||||
| -rw-r--r-- | packages/gpe-scap/gpe-scap_1.2.bb | 3 |
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" |