summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch57
-rw-r--r--meta/recipes-devtools/apt/apt_0.7.14.bb6
2 files changed, 61 insertions, 2 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch b/meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch
new file mode 100644
index 0000000000..68cb0b0265
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch
@@ -0,0 +1,57 @@
1Fix build errors
2
3deb/deblistparser.cc: In member function 'virtual short unsigned int debListParser::VersionHash()':
4deb/deblistparser.cc:212:13: error: redeclaration of 'char* I'
5deb/deblistparser.cc:202:22: error: 'const char** I' previously declared here
6
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Index: apt-0.7.14/apt-pkg/deb/deblistparser.cc
10===================================================================
11--- apt-0.7.14.orig/apt-pkg/deb/deblistparser.cc 2012-03-30 11:17:09.112456632 -0700
12+++ apt-0.7.14/apt-pkg/deb/deblistparser.cc 2012-03-30 11:25:40.484481643 -0700
13@@ -209,18 +209,18 @@
14 /* Strip out any spaces from the text, this undoes dpkgs reformatting
15 of certain fields. dpkg also has the rather interesting notion of
16 reformatting depends operators < -> <= */
17- char *I = S;
18+ char *J = S;
19 for (; Start != End; Start++)
20 {
21 if (isspace(*Start) == 0)
22- *I++ = tolower(*Start);
23+ *J++ = tolower(*Start);
24 if (*Start == '<' && Start[1] != '<' && Start[1] != '=')
25- *I++ = '=';
26+ *J++ = '=';
27 if (*Start == '>' && Start[1] != '>' && Start[1] != '=')
28- *I++ = '=';
29+ *J++ = '=';
30 }
31
32- Result = AddCRC16(Result,S,I - S);
33+ Result = AddCRC16(Result,S,J - S);
34 }
35
36 return Result;
37Index: apt-0.7.14/cmdline/apt-get.cc
38===================================================================
39--- apt-0.7.14.orig/cmdline/apt-get.cc 2012-03-30 11:28:56.048490824 -0700
40+++ apt-0.7.14/cmdline/apt-get.cc 2012-03-30 11:32:00.248499740 -0700
41@@ -1752,12 +1752,12 @@
42 if ((*Cache)[I].Install() == false)
43 continue;
44
45- const char **J;
46- for (J = CmdL.FileList + 1; *J != 0; J++)
47- if (strcmp(*J,I.Name()) == 0)
48+ const char **K;
49+ for (K = CmdL.FileList + 1; *K != 0; J++)
50+ if (strcmp(*K,I.Name()) == 0)
51 break;
52
53- if (*J == 0) {
54+ if (*K == 0) {
55 List += string(I.Name()) + " ";
56 VersionsList += string(Cache[I].CandVersion) + "\n";
57 }
diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb
index 8464b7f904..6354f8e05f 100644
--- a/meta/recipes-devtools/apt/apt_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt_0.7.14.bb
@@ -3,10 +3,12 @@ RDEPENDS_${PN} = "dpkg"
3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" 3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
4require apt.inc 4require apt.inc
5 5
6PR = "r10" 6PR = "r11"
7 7
8SRC_URI += "file://nodoc.patch \ 8SRC_URI += "file://nodoc.patch \
9 file://includes-fix.patch " 9 file://includes-fix.patch \
10 file://remove-redeclaration.patch \
11 "
10 12
11SRC_URI[md5sum] = "19efa18fb1ef20c58b9b44e94258b814" 13SRC_URI[md5sum] = "19efa18fb1ef20c58b9b44e94258b814"
12SRC_URI[sha256sum] = "8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045" 14SRC_URI[sha256sum] = "8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045"