From: Rene Wagner Date: Sat, 13 May 2006 16:05:04 +0000 (+0200) Subject: ipkg: add patch courtesy of Phil Blundell to fix handling of locale package dependencies. X-Git-Tag: familiar-v0.8.4-rc2.3-tag~13 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=98f8f0415d8f6cd0fb1e4b251f8c016d9c8de0a9;p=familiar-h63xx-build.git 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 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 d59eab3..35d654b 100644 --- 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 47feccd..20e547d 100644 --- 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"