Upgraded Aptitude for 3.x.

git-svn-id: http://svn.telesphoreo.org/trunk@631 514c082c-b64e-11dc-b46d-3d985efe055d

12 files changed, 33 insertions, 69 deletions

diff --git a/data/aptitude/_metadata/apt.dep b/data/aptitude/_metadata/apt.dep
deleted file mode 120000
index e81d03f68..000000000
--- a/data/aptitude/_metadata/apt.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../apt
\ No newline at end of file
diff --git a/data/aptitude/_metadata/apt7-lib.dep b/data/aptitude/_metadata/apt7-lib.dep
new file mode 120000
index 000000000..78dc2609b
--- /dev/null
+++ b/data/aptitude/_metadata/apt7-lib.dep
@@ -0,0 +1 @@
+../../apt7-lib
\ No newline at end of file
diff --git a/data/aptitude/_metadata/cwidget.dep b/data/aptitude/_metadata/cwidget.dep
new file mode 120000
index 000000000..1374c550c
--- /dev/null
+++ b/data/aptitude/_metadata/cwidget.dep
@@ -0,0 +1 @@
+../../cwidget
\ No newline at end of file
diff --git a/data/aptitude/_metadata/version b/data/aptitude/_metadata/version
index 6f2743d65..94404405e 100644
--- a/data/aptitude/_metadata/version
+++ b/data/aptitude/_metadata/version
@@ -1 +1 @@
-0.4.4
+0.4.11.11
diff --git a/data/aptitude/aptitude_0.4.11.11.orig.tar.gz b/data/aptitude/aptitude_0.4.11.11.orig.tar.gz
new file mode 100644
index 000000000..054f18be8
--- /dev/null
+++ b/data/aptitude/aptitude_0.4.11.11.orig.tar.gz
diff --git a/data/aptitude/aptitude_0.4.4.orig.tar.gz b/data/aptitude/aptitude_0.4.4.orig.tar.gz
deleted file mode 100644
index 694922b95..000000000
--- a/data/aptitude/aptitude_0.4.4.orig.tar.gz
+++ /dev/null
diff --git a/data/aptitude/build.diff b/data/aptitude/build.diff
index a3f9c70c6..14709ad9e 100644
--- a/data/aptitude/build.diff
+++ b/data/aptitude/build.diff
@@ -1,12 +1,12 @@
-diff -ru aptitude-0.4.4.orig/Makefile.in aptitude-0.4.4.orig+iPhone/Makefile.in
---- aptitude-0.4.4.orig/Makefile.in	2006-10-27 04:28:52.000000000 +0000
-+++ aptitude-0.4.4.orig+iPhone/Makefile.in	2008-05-13 09:41:03.000000000 +0000
-@@ -209,7 +209,7 @@
+diff -ru aptitude_0.4.11.11.orig/Makefile.in aptitude_0.4.11.11.orig+iPhone/Makefile.in
+--- aptitude_0.4.11.11.orig/Makefile.in	2008-11-20 03:17:12.000000000 +0000
++++ aptitude_0.4.11.11.orig+iPhone/Makefile.in	2009-07-07 07:15:39.000000000 +0000
+@@ -215,7 +215,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in
 -SUBDIRS = $(SRCDIRS) $(DOCDIRS) m4 po tests
 +SUBDIRS = $(SRCDIRS) m4
+ dist_bin_SCRIPTS = aptitude-create-state-bundle aptitude-run-state-bundle
  MANPAGE_LOCALES = gl it pl
- TLMANPAGES = $(wildcard aptitude.??.8)
- TLHELPTXTS = help.txt $(wildcard help-??.txt) $(wildcard help-??_??.txt)
+ TLMANPAGES = $(wildcard $(srcdir)/aptitude.??.8)
diff --git a/data/aptitude/intl.diff b/data/aptitude/intl.diff
index 396733112..39fe13323 100644
--- a/data/aptitude/intl.diff
+++ b/data/aptitude/intl.diff
@@ -34,15 +34,3 @@ diff -ru aptitude-0.4.4.orig/src/Makefile.in aptitude-0.4.4.orig+iPhone/src/Make
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-diff -ru aptitude-0.4.4.orig/src/vscreen/Makefile.in aptitude-0.4.4.orig+iPhone/src/vscreen/Makefile.in
---- aptitude-0.4.4.orig/src/vscreen/Makefile.in	2006-10-27 04:28:52.000000000 +0000
-+++ aptitude-0.4.4.orig+iPhone/src/vscreen/Makefile.in	2008-05-13 09:32:48.000000000 +0000
-@@ -346,7 +346,7 @@
- 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
- testvscreen$(EXEEXT): $(testvscreen_OBJECTS) $(testvscreen_DEPENDENCIES) 
- 	@rm -f testvscreen$(EXEEXT)
--	$(CXXLINK) $(testvscreen_LDFLAGS) $(testvscreen_OBJECTS) $(testvscreen_LDADD) $(LIBS)
-+	$(CXXLINK) $(testvscreen_LDFLAGS) $(testvscreen_OBJECTS) $(testvscreen_LDADD) $(LIBS) $(INTLLIBS) -liconv
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
diff --git a/data/aptitude/make.sh b/data/aptitude/make.sh
index cf75e194d..2c972ac89 100644
--- a/data/aptitude/make.sh
+++ b/data/aptitude/make.sh
@@ -1,6 +1,6 @@
 shopt -s extglob
 pkg:setup
 pkg:configure
-make
+pkg:make
 pkg:install
-rm -f "${PKG_DEST}"/usr/share/aptitude/!(aptitude-defaults)
+rm -f "${PKG_DEST}"/usr/share/aptitude/!(aptitude-defaults|section-descriptions) #function_groups|function_pkgs
diff --git a/data/aptitude/namespace.diff b/data/aptitude/namespace.diff
new file mode 100644
index 000000000..3cc16639e
--- /dev/null
+++ b/data/aptitude/namespace.diff
@@ -0,0 +1,22 @@
+diff -ru aptitude_0.4.11.11.orig/src/generic/apt/matchers.cc aptitude_0.4.11.11.orig+iPhone/src/generic/apt/matchers.cc
+--- aptitude_0.4.11.11.orig/src/generic/apt/matchers.cc	2008-11-20 03:17:12.000000000 +0000
++++ aptitude_0.4.11.11.orig+iPhone/src/generic/apt/matchers.cc	2009-07-07 09:48:40.000000000 +0000
+@@ -4289,6 +4289,9 @@
+   return real_matcher->get_match(pkg, cache, records, stack);
+ }
+ 
++namespace
++{
++
+ class pkg_const_matcher : public pkg_matcher_real
+ {
+   pkgCache::PkgIterator match_pkg;
+@@ -4333,6 +4336,8 @@
+   }
+ };
+ 
++}
++
+ pkg_matcher *make_const_matcher(const pkgCache::PkgIterator &pkg)
+ {
+   return new pkg_const_matcher(pkg);
diff --git a/data/aptitude/port.diff b/data/aptitude/port.diff
index 1918b001a..839865d67 100644
--- a/data/aptitude/port.diff
+++ b/data/aptitude/port.diff
@@ -1,14 +1,3 @@
-diff -ru aptitude-0.4.4.orig/src/generic/util/eassert.cc aptitude-0.4.4.orig+iPhone/src/generic/util/eassert.cc
---- aptitude-0.4.4.orig/src/generic/util/eassert.cc	2006-10-27 04:26:08.000000000 +0000
-+++ aptitude-0.4.4.orig+iPhone/src/generic/util/eassert.cc	2008-05-13 09:07:58.000000000 +0000
-@@ -31,6 +31,6 @@
- 
- std::string AssertionFailure::errmsg() const
- {
--  return ssprintf("%s:%d: %s: Assertion \"%s\" failed.",
-+  return ssprintf("%s:%ld: %s: Assertion \"%s\" failed.",
- 		  file.c_str(), line, func.c_str(), exp.c_str());
- }
 diff -ru aptitude-0.4.4.orig/src/generic/util/util.cc aptitude-0.4.4.orig+iPhone/src/generic/util/util.cc
 --- aptitude-0.4.4.orig/src/generic/util/util.cc	2006-10-27 04:26:08.000000000 +0000
 +++ aptitude-0.4.4.orig+iPhone/src/generic/util/util.cc	2008-05-13 09:08:45.000000000 +0000
@@ -24,14 +13,3 @@ diff -ru aptitude-0.4.4.orig/src/generic/util/util.cc aptitude-0.4.4.orig+iPhone
  	{
  	  delete[] buf;
  
-diff -ru aptitude-0.4.4.orig/src/vscreen/transcode.cc aptitude-0.4.4.orig+iPhone/src/vscreen/transcode.cc
---- aptitude-0.4.4.orig/src/vscreen/transcode.cc	2006-10-27 04:26:08.000000000 +0000
-+++ aptitude-0.4.4.orig+iPhone/src/vscreen/transcode.cc	2008-05-13 09:30:43.000000000 +0000
-@@ -22,6 +22,7 @@
- #include <generic/util/eassert.h>
- #include <errno.h>
- #include <iconv.h>
-+#include <langinfo.h>
- 
- using namespace std;
- 
diff --git a/data/aptitude/xopen.diff b/data/aptitude/xopen.diff
deleted file mode 100644
index b43bf14b1..000000000
--- a/data/aptitude/xopen.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru aptitude-0.4.4.orig/src/vscreen/config/style.h aptitude-0.4.4.orig+iPhone/src/vscreen/config/style.h
---- aptitude-0.4.4.orig/src/vscreen/config/style.h	2006-10-27 04:26:08.000000000 +0000
-+++ aptitude-0.4.4.orig+iPhone/src/vscreen/config/style.h	2008-05-13 09:17:57.000000000 +0000
-@@ -20,8 +20,6 @@
- #ifndef STYLE_H
- #define STYLE_H
- 
--#include <ncursesw/curses.h>
--
- #include <vscreen/curses++.h>
- 
- #include <string>
-diff -ru aptitude-0.4.4.orig/src/vscreen/curses++.h aptitude-0.4.4.orig+iPhone/src/vscreen/curses++.h
---- aptitude-0.4.4.orig/src/vscreen/curses++.h	2006-10-27 04:26:08.000000000 +0000
-+++ aptitude-0.4.4.orig+iPhone/src/vscreen/curses++.h	2008-05-13 09:17:43.000000000 +0000
-@@ -22,6 +22,9 @@
- #ifndef CURSES_PLUSPLUS_H
- #define CURSES_PLUSPLUS_H
- 
-+#define _XOPEN_SOURCE
-+#define _XOPEN_SOURCE_EXTENDED 1
-+
- #include <string>
- #include <ncursesw/curses.h>
-