ipkg: add patch courtesy of Phil Blundell to fix handling of locale package dependencies.

diff --git a/org.handhelds.familiar/packages/ipkg/files/sw.patch b/org.handhelds.familiar/packages/ipkg/files/sw.patch
new file mode 100644 (file)
index 0000000..3352f2d
--- /dev/null
+++ b/org.handhelds.familiar/packages/ipkg/files/sw.patch
@@ -0,0 +1,27 @@
+Index: pkg_depends.c
+===================================================================
+RCS file: /cvs/familiar/dist/ipkg/C/pkg_depends.c,v
+retrieving revision 1.65
+diff -u -r1.65 pkg_depends.c
+--- C/pkg_depends.c    16 Sep 2005 20:03:48 -0000      1.65
++++ C/pkg_depends.c    17 Apr 2006 18:36:41 -0000
+@@ -106,6 +108,11 @@
+         satisfier_entry_pkg = NULL;
+ 
+         if (compound_depend->type == GREEDY_DEPEND) {
++             int old_sw = pkg->state_want;
++             /* Mark this package as to-be-installed temporarily,
++                since some of the dependent packages may in turn
++                depend on this one.  */
++             pkg->state_want = SW_INSTALL;
+              /* foreach possible satisfier */
+              for (j = 0; j < compound_depend->possibility_count; j++) {
+                   /* foreach provided_by, which includes the abstract_pkg itself */
+@@ -161,6 +171,7 @@
+                        }
+                   }
+              }
++             pkg->state_want = old_sw;
+ 
+              continue;
+         }

diff --git a/org.handhelds.familiar/packages/ipkg/ipkg-native_0.99.154.bb b/org.handhelds.familiar/packages/ipkg/ipkg-native_0.99.154.bb
index d59eab3a611d5ea1c5558cdab8a9b571cd702a62..35d654b07e005c46f234042bcc8229ba1fb8647d 100644 (file)
--- a/org.handhelds.familiar/packages/ipkg/ipkg-native_0.99.154.bb
+++ b/org.handhelds.familiar/packages/ipkg/ipkg-native_0.99.154.bb
@@ -1,2 +1,6 @@
 include ipkg_${PV}.bb
 include ipkg-native.inc
+
+PR = "r1"
+
+SRC_URI += "file://sw.patch;patch=1"

diff --git a/org.handhelds.familiar/packages/ipkg/ipkg_0.99.159.bb b/org.handhelds.familiar/packages/ipkg/ipkg_0.99.159.bb
index 47feccd27c772dd524789ff3e829a4601694c520..20e547d4b24f4a5d956fa976bfe830b07cee31b3 100644 (file)
--- a/org.handhelds.familiar/packages/ipkg/ipkg_0.99.159.bb
+++ b/org.handhelds.familiar/packages/ipkg/ipkg_0.99.159.bb
@@ -1,3 +1,6 @@
 include ipkg.inc
 
+PR = "r1"
+
 #SRC_URI += "file://interceptor.patch;patch=1;pnum=1"
+SRC_URI += "file://sw.patch;patch=1"