tzdata: update bbappend for 2013i
[opendreambox.git] / meta-opendreambox / recipes-devtools / opkg / opkg / 0011-Keep-auto-installed-recommends-when-moved-from-depen.patch
1 From c4f480d03a97478cf682b1d0b15e00b4f12b0bea Mon Sep 17 00:00:00 2001
2 From: Andreas Monzner <andreas.monzner@dream-property.net>
3 Date: Tue, 5 Mar 2013 22:23:21 +0100
4 Subject: [PATCH 11/19] Keep auto-installed recommends when moved from depends
5  to recommends
6 To: opkg-devel@googlegroups.com
7 Cc: paul@paulbarker.me.uk
8
9 ---
10  libopkg/opkg_install.c | 7 ++++---
11  1 file changed, 4 insertions(+), 3 deletions(-)
12
13 diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c
14 index 0ff7705..6d0ff1f 100644
15 --- a/libopkg/opkg_install.c
16 +++ b/libopkg/opkg_install.c
17 @@ -366,11 +366,12 @@ pkg_remove_orphan_dependent(pkg_t *pkg, pkg_t *old_pkg)
18  
19                         for (k=0; k<count1; k++) {
20                                 cd1 = &pkg->depends[k];
21 -                               if (cd1->type != DEPEND)
22 +                               if (cd1->type != DEPEND && cd1->type != RECOMMEND)
23                                         continue;
24                                 for (l=0; l<cd1->possibility_count; l++) {
25 -                                       if (cd0->possibilities[j]
26 -                                        == cd1->possibilities[l]) {
27 +                                       if ( (cd0->type == cd1->type && cd0->possibilities[j] == cd1->possibilities[l]) ||
28 +                                            (cd0->type != cd1->type && !strcmp(cd0->possibilities[j]->pkg->name, cd1->possibilities[l]->pkg->name) )
29 +                                          ) {
30                                                 found = 1;
31                                                 break;
32                                         }
33 -- 
34 1.9.1
35