X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-devtools%2Fopkg%2Fopkg%2F0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch;fp=meta-openvuplus%2Frecipes-devtools%2Fopkg%2Fopkg%2F0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch;h=0000000000000000000000000000000000000000;hp=e95828927878f309116748203b448b27ffb36495;hb=ace0665511bd0f288a33f4aa1b6ab44c9a766c5c;hpb=89fe5e2d4ab32d17585aaf80418c7d31ed559a14

diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch
deleted file mode 100644
index e958289..0000000
--- a/meta-openvuplus/recipes-devtools/opkg/opkg/0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 53de52b533ee30676d051ee941cfc0a517e9190e Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 01:18:42 +0200
-Subject: [PATCH 08/10] pkg_hash_fetch_conflicts: take into account conflicts
- of installed packages
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libopkg/pkg_depends.c |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
-index 1999b64..f237733 100644
---- a/libopkg/pkg_depends.c
-+++ b/libopkg/pkg_depends.c
-@@ -337,6 +337,22 @@ static void __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_vec_t * installed_confli
-     }
- }
- 
-+static void __pkg_hash_fetch_conflictees(pkg_t *pkg, pkg_vec_t *installed_conflicts)
-+{
-+    int i;
-+
-+    pkg_vec_t *available_pkgs = pkg_vec_alloc();
-+    pkg_hash_fetch_all_installed(available_pkgs);
-+
-+    for (i = 0; i < available_pkgs->len; i++) {
-+        pkg_t *cpkg = available_pkgs->pkgs[i];
-+        if (pkg_conflicts(cpkg, pkg) && !is_pkg_in_pkg_vec(installed_conflicts, cpkg))
-+            pkg_vec_insert(installed_conflicts, cpkg);
-+    }
-+
-+    pkg_vec_free(available_pkgs);
-+}
-+
- pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
- {
-     pkg_vec_t * installed_conflicts;
-@@ -354,6 +370,7 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
-     installed_conflicts = pkg_vec_alloc();
- 
-     __pkg_hash_fetch_conflicts(pkg, installed_conflicts);
-+    __pkg_hash_fetch_conflictees(pkg, installed_conflicts);
- 
-     if (installed_conflicts->len)
- 	    return installed_conflicts;
--- 
-1.7.9.5
-