[oe-commits] Stefan Schmidt : illume: Actually use a patch that applies. Sorry.

[GIT User account]

Module: openembedded.git
Branch: shared/xorg-7.4-update
Commit: 79db433025da916140571151ba6bdbd5de33f8fe
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=79db433025da916140571151ba6bdbd5de33f8fe

Author: Stefan Schmidt <stefan at datenfreihafen.org>
Date:   Mon Nov 10 16:20:41 2008 +0000

illume: Actually use a patch that applies. Sorry.

---

 packages/e17/illume/gsm-segfault.patch |   21 ++++++++++-----------
 packages/e17/illume_svn.bb             |    2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/e17/illume/gsm-segfault.patch b/packages/e17/illume/gsm-segfault.patch
index f7bf87a..f9fc264 100644
--- a/packages/e17/illume/gsm-segfault.patch
+++ b/packages/e17/illume/gsm-segfault.patch
@@ -1,28 +1,27 @@
-Index: src/e_mod_gad_gsm.c
+Index: illume/src/e_mod_gad_gsm.c
 ===================================================================
---- src/e_mod_gad_gsm.c	(revision 37564)
-+++ src/e_mod_gad_gsm.c	(working copy)
-@@ -353,7 +353,7 @@
+--- illume.orig/src/e_mod_gad_gsm.c	2008-11-10 16:15:08.000000000 +0000
++++ illume/src/e_mod_gad_gsm.c	2008-11-10 16:16:23.000000000 +0000
+@@ -357,7 +357,7 @@
  {
     /* We care only about the provider name right now. All the other status
      * informations get ingnored for the gadget for now */
 -   const char *provider, *name, *reg_stat;
 +   const char *provider = 0 , *name = 0, *reg_stat = 0;
     DBusMessageIter iter, a_iter, s_iter, v_iter;
-
+    
     if (!dbus_message_has_signature(msg, "a{sv}")) return NULL;
-@@ -380,10 +380,13 @@
-	dbus_message_iter_next(&a_iter);
+@@ -384,10 +384,13 @@
+ 	dbus_message_iter_next(&a_iter);
       }
-
+    
 +   if (!reg_stat) return NULL;
     if (strcmp(reg_stat, "unregistered") == 0) provider = "No Service";
     else if (strcmp(reg_stat, "busy") == 0) provider = "Searching...";
     else if (strcmp(reg_stat, "denied") == 0) provider = "SOS only";
--
-+
+    
 +   if (!provider) return NULL;
 +
     return strdup(provider);
  }
-
+ 
diff --git a/packages/e17/illume_svn.bb b/packages/e17/illume_svn.bb
index 6c4519b..de73821 100644
--- a/packages/e17/illume_svn.bb
+++ b/packages/e17/illume_svn.bb
@@ -7,7 +7,7 @@ PV = "0.0+svnr${SRCREV}"
 PR = "r14"
 
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=illume;proto=http \
-           file://gsm-segfault.patch;patch=1;pnum=0"
+           file://gsm-segfault.patch;patch=1;pnum=1"
 S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig