[opkg] update to 0.2.2

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-devtools / opkg / opkg / 0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch

diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch
index 575c1e1..5808c92 100644 (file)
--- a/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch
+++ b/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch
@@ -1,23 +1,11 @@
-From b925a520a63fb291675f707e602d04295236c85b Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 01:17:52 +0200
-Subject: [PATCH 07/10] pkg_hash_fetch_conflicts: move iteration over
- conflicts to subroutine
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libopkg/pkg_depends.c |   46 ++++++++++++++++++++++++----------------------
- 1 file changed, 24 insertions(+), 22 deletions(-)
-

 diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
 diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c

-index 6ff75f1..1999b64 100644
+index 512d17f..ca3acbe 100644

 --- a/libopkg/pkg_depends.c
 +++ b/libopkg/pkg_depends.c
 --- a/libopkg/pkg_depends.c
 +++ b/libopkg/pkg_depends.c

-@@ -284,39 +284,22 @@ is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
- 
+@@ -369,40 +369,22 @@ is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)

  }
  
  }
  

--
+ 

 -pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
 +static void __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_vec_t * installed_conflicts)
  {
 -pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
 +static void __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_vec_t * installed_conflicts)
  {


@@ -27,6 +15,7 @@ index 6ff75f1..1999b64 100644
      depend_t ** possible_satisfiers;
      depend_t * possible_satisfier;
      int i, j, k;
      depend_t ** possible_satisfiers;
      depend_t * possible_satisfier;
      int i, j, k;

+-    int count;

 -    abstract_pkg_t * ab_pkg;
      pkg_t **pkg_scouts;
      pkg_t *pkg_scout;
 -    abstract_pkg_t * ab_pkg;
      pkg_t **pkg_scouts;
      pkg_t *pkg_scout;


@@ -46,10 +35,11 @@ index 6ff75f1..1999b64 100644
 -    }
 -    installed_conflicts = pkg_vec_alloc();
 -
 -    }
 -    installed_conflicts = pkg_vec_alloc();
 -

+-    count = pkg->conflicts_count;

 -
 -
 +    if(!conflicts)
 -
 -
 +    if(!conflicts)

-+      return;
++        return;

  
      /* foreach conflict */
      for(i = 0; i < pkg->conflicts_count; i++){
  
      /* foreach conflict */
      for(i = 0; i < pkg->conflicts_count; i++){


@@ -57,7 +47,7 @@ index 6ff75f1..1999b64 100644
        possible_satisfiers = conflicts->possibilities;
  
        /* foreach possible satisfier */
        possible_satisfiers = conflicts->possibilities;
  
        /* foreach possible satisfier */

-@@ -352,11 +335,30 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
+@@ -438,11 +420,30 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)

        }
        conflicts++;
      }
        }
        conflicts++;
      }


@@ -89,6 +79,3 @@ index 6ff75f1..1999b64 100644
  }
  
  int version_constraints_satisfied(depend_t * depends, pkg_t * pkg)
  }
  
  int version_constraints_satisfied(depend_t * depends, pkg_t * pkg)

--- 
-1.7.9.5
-