rpms/apt/devel apt-0.5.15lorg3.93-gcc43.patch, NONE, 1.1 apt.spec, 1.48, 1.49

Fri Jan 4 08:33:32 UTC 2008

Author: pmatilai

Update of /cvs/pkgs/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29796

Modified Files:
	apt.spec 
Added Files:
	apt-0.5.15lorg3.93-gcc43.patch 
Log Message:
- fix build with gcc 4.3


apt-0.5.15lorg3.93-gcc43.patch:

--- NEW FILE apt-0.5.15lorg3.93-gcc43.patch ---
diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmmisc.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmmisc.h
--- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmmisc.h.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmmisc.h	2008-01-04 10:12:07.000000000 +0200
@@ -3,6 +3,8 @@
 
 #include <apt-pkg/aptconf.h>
 
+#include <cstring>
+
 #ifdef APT_WITH_GNU_HASH_MAP
 
 #include <ext/hash_map>
diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmpm.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmpm.cc
--- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmpm.cc.gcc43	2007-07-11 10:28:26.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmpm.cc	2008-01-04 10:12:07.000000000 +0200
@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <iostream>
+#include <cstring>
 
 #if RPM_VERSION >= 0x040100
 #include <rpm/rpmdb.h>
diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmrecords.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmrecords.cc
--- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmrecords.cc.gcc43	2007-07-09 10:03:30.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmrecords.cc	2008-01-04 10:12:07.000000000 +0200
@@ -25,6 +25,8 @@
 
 #include <apti18n.h>
 
+#include <cstring>
+
 using namespace std;
 
 // RecordParser::rpmRecordParser - Constructor				/*{{{*/
diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.cc
--- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.cc.gcc43	2007-08-17 13:49:37.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.cc	2008-01-04 10:12:07.000000000 +0200
@@ -19,6 +19,7 @@
 #include <signal.h>
 #include <assert.h>
 #include <libgen.h>
+#include <cstring>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
@@ -1434,7 +1435,7 @@ bool RPMRepomdReaderHandler::Skip()
    return true;
 }
 
-string RPMRepomdReaderHandler::FindTag(char *Tag)
+string RPMRepomdReaderHandler::FindTag(const char *Tag)
 {
    string str = "";
    if (NodeP) {
@@ -1447,7 +1448,7 @@ string RPMRepomdReaderHandler::FindTag(c
    return str;
 }
 
-string RPMRepomdReaderHandler::FindVerTag(char *Tag)
+string RPMRepomdReaderHandler::FindVerTag(const char *Tag)
 {
    string str = "";
    for (xmlNode *n = NodeP->children; n; n = n->next) {
diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmcallback.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmcallback.cc
--- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmcallback.cc.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmcallback.cc	2008-01-04 10:12:07.000000000 +0200
@@ -9,7 +9,7 @@
 #include <iostream>
 using namespace std;
 
-static char *copyTags[] = {"name", 
+static const char *copyTags[] = {"name", 
 			   "version", 
 			   "release", 
 			   "arch", 
@@ -18,7 +18,7 @@ static char *copyTags[] = {"name", 
 
 static void getPackageData(const Header h, map<string,string> &Data)
 {
-   char **Tag = &copyTags[0];
+   const char **Tag = &copyTags[0];
    char rTag[20];
    Data.clear();
    for (Tag = &copyTags[0]; *Tag != NULL; *Tag++) {
diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/repomd.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/repomd.cc
--- apt-0.5.15lorg3.93/apt-pkg/rpm/repomd.cc.gcc43	2007-07-09 10:03:30.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/rpm/repomd.cc	2008-01-04 10:12:07.000000000 +0200
@@ -19,6 +19,8 @@
 #ifdef APT_WITH_REPOMD
 
 #include <iostream>
+#include <cstring>
+
 #include <apt-pkg/repomd.h>
 #include <apt-pkg/error.h>
 #include <libxml/parser.h>
@@ -27,6 +29,7 @@
 
 #include <apti18n.h>
 
+
 using namespace std;
 
 // Parse repomd.xml file for checksums
diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmsystem.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmsystem.cc
--- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmsystem.cc.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmsystem.cc	2008-01-04 10:12:07.000000000 +0200
@@ -31,6 +31,7 @@
 
 #include <apti18n.h>
     
+#include <cstring>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.h
--- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.h.gcc43	2007-07-09 10:03:30.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.h	2008-01-04 10:12:07.000000000 +0200
@@ -24,6 +24,9 @@
 #include <rpm/rpmlib.h>
 #include <rpm/rpmmacro.h>
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include <vector>
 
 // Our Extra RPM tags. These should not be accessed directly. Use
@@ -328,8 +331,8 @@ class RPMRepomdReaderHandler : public RP
    string XmlPath;
    xmlNode *NodeP;
 
-   string FindTag(char *Tag);
-   string FindVerTag(char *Tag);
+   string FindTag(const char *Tag);
+   string FindVerTag(const char *Tag);
 
    public:
    virtual bool Skip();
diff -up apt-0.5.15lorg3.93/apt-pkg/indexfile.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/indexfile.cc
--- apt-0.5.15lorg3.93/apt-pkg/indexfile.cc.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/indexfile.cc	2008-01-04 10:12:07.000000000 +0200
@@ -15,6 +15,7 @@
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/error.h>
 									/*}}}*/
+#include <cstring>
 
 // Global list of Item supported
 static  pkgIndexFile::Type *ItmList[10];
diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/fileutl.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/fileutl.cc
--- apt-0.5.15lorg3.93/apt-pkg/contrib/fileutl.cc.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/contrib/fileutl.cc	2008-01-04 10:12:07.000000000 +0200
@@ -22,6 +22,7 @@
 #include <apt-pkg/sptr.h>
 
 #include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>
diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/progress.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/progress.cc
--- apt-0.5.15lorg3.93/apt-pkg/contrib/progress.cc.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/contrib/progress.cc	2008-01-04 10:12:07.000000000 +0200
@@ -17,6 +17,7 @@
 
 #include <apti18n.h>
 
+#include <cstring>
 #include <iostream>
 #include <iomanip>
 #include <stdio.h>
diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/sqlite.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/sqlite.cc
--- apt-0.5.15lorg3.93/apt-pkg/contrib/sqlite.cc.gcc43	2007-07-09 10:03:30.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/contrib/sqlite.cc	2008-01-04 10:12:07.000000000 +0200
@@ -9,6 +9,8 @@
 #include <apt-pkg/sqlite.h>
 #include <apt-pkg/error.h>
 
+#include <cstdlib>
+
 // debug stuff..
 #include <iostream>
 using namespace std;
diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/strutl.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/strutl.h
--- apt-0.5.15lorg3.93/apt-pkg/contrib/strutl.h.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/contrib/strutl.h	2008-01-04 10:12:07.000000000 +0200
@@ -21,6 +21,7 @@
 #endif 
 
 #include <stdlib.h>
+#include <cstring>
 #include <string>
 #include <vector>
 #include <iostream>
diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/error.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/error.cc
--- apt-0.5.15lorg3.93/apt-pkg/contrib/error.cc.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/contrib/error.cc	2008-01-04 10:12:07.000000000 +0200
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <errno.h>
 #include <stdio.h>
+#include <cstring>
 #include <string>
 #include <stdarg.h>
 #include <unistd.h>
diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/md5.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/md5.h
--- apt-0.5.15lorg3.93/apt-pkg/contrib/md5.h.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/contrib/md5.h	2008-01-04 10:12:07.000000000 +0200
@@ -28,6 +28,7 @@
 #endif 
 
 #include <string>
+#include <cstring>
 
 using std::string;
 
diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/sha1.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/sha1.h
--- apt-0.5.15lorg3.93/apt-pkg/contrib/sha1.h.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/contrib/sha1.h	2008-01-04 10:12:07.000000000 +0200
@@ -18,6 +18,7 @@
 #pragma interface "apt-pkg/sha1.h"
 #endif 
 
+#include <cstring>
 #include <string>
 
 using std::string;
diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/cmndline.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/cmndline.cc
--- apt-0.5.15lorg3.93/apt-pkg/contrib/cmndline.cc.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/contrib/cmndline.cc	2008-01-04 10:12:07.000000000 +0200
@@ -19,6 +19,8 @@
 #include <apt-pkg/strutl.h>
 
 #include <apti18n.h>    
+
+#include <cstring>
 									/*}}}*/
 using namespace std;
 
diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/mmap.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/mmap.cc
--- apt-0.5.15lorg3.93/apt-pkg/contrib/mmap.cc.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/contrib/mmap.cc	2008-01-04 10:12:07.000000000 +0200
@@ -30,6 +30,7 @@
 
 #include <apti18n.h>
 
+#include <cstring>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff -up apt-0.5.15lorg3.93/apt-pkg/pkgsystem.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/pkgsystem.cc
--- apt-0.5.15lorg3.93/apt-pkg/pkgsystem.cc.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/pkgsystem.cc	2008-01-04 10:12:07.000000000 +0200
@@ -17,6 +17,7 @@
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/policy.h>
 									/*}}}*/
+#include <cstring>
 
 pkgSystem *_system = 0;
 static pkgSystem *SysList[10];
diff -up apt-0.5.15lorg3.93/apt-pkg/algorithms.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/algorithms.cc
--- apt-0.5.15lorg3.93/apt-pkg/algorithms.cc.gcc43	2008-01-04 10:12:07.000000000 +0200
+++ apt-0.5.15lorg3.93/apt-pkg/algorithms.cc	2008-01-04 10:12:07.000000000 +0200
@@ -29,6 +29,7 @@
 #include <apti18n.h>
     
 #include <iostream>
+#include <cstring>
 									/*}}}*/
 using namespace std;
 
diff -up apt-0.5.15lorg3.93/apt-pkg/clean.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/clean.cc
--- apt-0.5.15lorg3.93/apt-pkg/clean.cc.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/clean.cc	2008-01-04 10:12:07.000000000 +0200
@@ -19,6 +19,7 @@
 
 #include <apti18n.h>    
 
+#include <cstring>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff -up apt-0.5.15lorg3.93/apt-pkg/pkgcachegen.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/pkgcachegen.h
--- apt-0.5.15lorg3.93/apt-pkg/pkgcachegen.h.gcc43	2007-05-14 12:01:55.000000000 +0300
+++ apt-0.5.15lorg3.93/apt-pkg/pkgcachegen.h	2008-01-04 10:12:07.000000000 +0200
@@ -59,7 +59,7 @@ class pkgCacheGenerator
    public:
 
    // CNC:2003-02-27 - We need this in rpmListParser.
-   bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg);
+   bool NewPackage(pkgCache::PkgIterator &Pkg,string Name);
 
    unsigned long WriteUniqString(const char *S,unsigned int Size);
    inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());};
diff -up apt-0.5.15lorg3.93/apt-pkg/init.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/init.cc
--- apt-0.5.15lorg3.93/apt-pkg/init.cc.gcc43	2008-01-04 10:19:47.000000000 +0200
+++ apt-0.5.15lorg3.93/apt-pkg/init.cc	2008-01-04 10:19:56.000000000 +0200
@@ -13,6 +13,7 @@
 #include <apt-pkg/error.h>
 
 #include <cstdlib>
+#include <cstring>
 #include <apti18n.h>
 #include <config.h>
 #include <sys/stat.h>


Index: apt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apt/devel/apt.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- apt.spec	19 Nov 2007 07:13:52 -0000	1.48
+++ apt.spec	4 Jan 2008 08:32:46 -0000	1.49
@@ -6,7 +6,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: 0.5.15lorg3.93
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Base
 URL: http://apt-rpm.org/
 # SourceLicense: GPLv2+ except lua/ which is MIT
@@ -40,6 +40,8 @@
 Patch2: apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch
 # avoid assertion failure when repomd.xml doesn't exist
 Patch3: apt-0.5.15lorg3.93-repomd-assert.patch
+# assorted correctness fixes to make gcc 4.3 happier
+Patch4: apt-0.5.15lorg3.93-gcc43.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -126,6 +128,7 @@
 %patch1 -p0 -b .mmap
 %patch2 -p1 -b .obsoletes-hack
 %patch3 -p1 -b .repomd-assert
+%patch4 -p1 -b .gcc43
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
@@ -291,6 +294,9 @@
 
 
 %changelog
+* Fri Jan 04 2008 Panu Matilainen <pmatilai at redhat.com> 0.5.15lorg3.93-5
+- fix build with gcc 4.3
+
 * Mon Nov 19 2007 Panu Matilainen <pmatilai at redhat.com> 0.5.15lorg3.93-4
 - Fix assert failure when repomd.xml isn't available locally (#389361)
 


