Finally commiting aptitude.

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

19 files changed, 170 insertions, 0 deletions

diff --git a/data/aptitude/_metadata/apt.dep b/data/aptitude/_metadata/apt.dep
new file mode 120000
index 000000000..e81d03f68
--- /dev/null
+++ b/data/aptitude/_metadata/apt.dep
@@ -0,0 +1 @@
+../../apt
\ No newline at end of file
diff --git a/data/aptitude/_metadata/description b/data/aptitude/_metadata/description
new file mode 100644
index 000000000..0d0dc0d86
--- /dev/null
+++ b/data/aptitude/_metadata/description
@@ -0,0 +1 @@
+advanced command-line APT frontend
diff --git a/data/aptitude/_metadata/gettext.dep b/data/aptitude/_metadata/gettext.dep
new file mode 120000
index 000000000..e8dbd8996
--- /dev/null
+++ b/data/aptitude/_metadata/gettext.dep
@@ -0,0 +1 @@
+../../gettext
\ No newline at end of file
diff --git a/data/aptitude/_metadata/libsigc++.dep b/data/aptitude/_metadata/libsigc++.dep
new file mode 120000
index 000000000..ae3968723
--- /dev/null
+++ b/data/aptitude/_metadata/libsigc++.dep
@@ -0,0 +1 @@
+../../libsigc++
\ No newline at end of file
diff --git a/data/aptitude/_metadata/license b/data/aptitude/_metadata/license
new file mode 120000
index 000000000..9c13a9a0f
--- /dev/null
+++ b/data/aptitude/_metadata/license
@@ -0,0 +1 @@
+../../../licenses/gpl-2
\ No newline at end of file
diff --git a/data/aptitude/_metadata/maintainer b/data/aptitude/_metadata/maintainer
new file mode 120000
index 000000000..0fa66e077
--- /dev/null
+++ b/data/aptitude/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/saurik
\ No newline at end of file
diff --git a/data/aptitude/_metadata/name b/data/aptitude/_metadata/name
new file mode 100644
index 000000000..d26ba9410
--- /dev/null
+++ b/data/aptitude/_metadata/name
@@ -0,0 +1 @@
+Aptitude
diff --git a/data/aptitude/_metadata/ncurses.dep b/data/aptitude/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/aptitude/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
\ No newline at end of file
diff --git a/data/aptitude/_metadata/ncurses.ver b/data/aptitude/_metadata/ncurses.ver
new file mode 100644
index 000000000..ec7d5a80a
--- /dev/null
+++ b/data/aptitude/_metadata/ncurses.ver
@@ -0,0 +1 @@
+5.6-9
diff --git a/data/aptitude/_metadata/priority b/data/aptitude/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/aptitude/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/aptitude/_metadata/section b/data/aptitude/_metadata/section
new file mode 100644
index 000000000..702b7b8d3
--- /dev/null
+++ b/data/aptitude/_metadata/section
@@ -0,0 +1 @@
+Packaging
diff --git a/data/aptitude/_metadata/version b/data/aptitude/_metadata/version
new file mode 100644
index 000000000..6f2743d65
--- /dev/null
+++ b/data/aptitude/_metadata/version
@@ -0,0 +1 @@
+0.4.4
diff --git a/data/aptitude/aptitude_0.4.4.orig.tar.gz b/data/aptitude/aptitude_0.4.4.orig.tar.gz
new file mode 100644
index 000000000..694922b95
--- /dev/null
+++ b/data/aptitude/aptitude_0.4.4.orig.tar.gz
diff --git a/data/aptitude/build.diff b/data/aptitude/build.diff
new file mode 100644
index 000000000..a3f9c70c6
--- /dev/null
+++ b/data/aptitude/build.diff
@@ -0,0 +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 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in
+-SUBDIRS = $(SRCDIRS) $(DOCDIRS) m4 po tests
++SUBDIRS = $(SRCDIRS) m4
+ MANPAGE_LOCALES = gl it pl
+ TLMANPAGES = $(wildcard aptitude.??.8)
+ TLHELPTXTS = help.txt $(wildcard help-??.txt) $(wildcard help-??_??.txt)
diff --git a/data/aptitude/const.diff b/data/aptitude/const.diff
new file mode 100644
index 000000000..9a3ee38da
--- /dev/null
+++ b/data/aptitude/const.diff
@@ -0,0 +1,30 @@
+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
+@@ -105,7 +106,7 @@
+   while(inremaining>0)
+     {
+       if(iconv(state,
+-	       const_cast<char **>(&inbuf), &inremaining,
++	       &inbuf, &inremaining,
+ 	       &outbufcur, &outremaining) == ((size_t)-1))
+ 	{
+ 	  // Some error conditions can be corrected.  There are three
+@@ -154,7 +155,7 @@
+ 	      const char *errbuf = "?";
+ 	      size_t errbufsize = strlen(errbuf);
+ 
+-	      result = iconv(state2, const_cast<char **>(&errbuf),
++	      result = iconv(state2, &errbuf,
+ 			     &errbufsize, &outbufcur, &outremaining);
+ 
+ 
+@@ -173,7 +174,7 @@
+ 		  outbuf = (char *) realloc(outbuf, outbufsize);
+ 		  outbufcur = outbuf+idx;
+ 
+-		  result = iconv(state2, const_cast<char **>(&errbuf),
++		  result = iconv(state2, &errbuf,
+ 				 &errbufsize, &outbufcur, &outremaining);
+ 		}
+ 
diff --git a/data/aptitude/intl.diff b/data/aptitude/intl.diff
new file mode 100644
index 000000000..396733112
--- /dev/null
+++ b/data/aptitude/intl.diff
@@ -0,0 +1,48 @@
+diff -ru aptitude-0.4.4.orig/src/generic/apt/Makefile.in aptitude-0.4.4.orig+iPhone/src/generic/apt/Makefile.in
+--- aptitude-0.4.4.orig/src/generic/apt/Makefile.in	2006-10-27 04:28:51.000000000 +0000
++++ aptitude-0.4.4.orig+iPhone/src/generic/apt/Makefile.in	2008-05-13 09:13:50.000000000 +0000
+@@ -305,7 +305,7 @@
+ 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+ pkg_hier_dump$(EXEEXT): $(pkg_hier_dump_OBJECTS) $(pkg_hier_dump_DEPENDENCIES) 
+ 	@rm -f pkg_hier_dump$(EXEEXT)
+-	$(CXXLINK) $(pkg_hier_dump_LDFLAGS) $(pkg_hier_dump_OBJECTS) $(pkg_hier_dump_LDADD) $(LIBS)
++	$(CXXLINK) $(pkg_hier_dump_LDFLAGS) $(pkg_hier_dump_OBJECTS) $(pkg_hier_dump_LDADD) $(LIBS) $(INTLLIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+diff -ru aptitude-0.4.4.orig/src/generic/problemresolver/Makefile.in aptitude-0.4.4.orig+iPhone/src/generic/problemresolver/Makefile.in
+--- aptitude-0.4.4.orig/src/generic/problemresolver/Makefile.in	2006-10-27 04:28:51.000000000 +0000
++++ aptitude-0.4.4.orig+iPhone/src/generic/problemresolver/Makefile.in	2008-05-13 09:10:29.000000000 +0000
+@@ -234,7 +234,7 @@
+ 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+ test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
+ 	@rm -f test$(EXEEXT)
+-	$(CXXLINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
++	$(CXXLINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS) $(INTLLIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+diff -ru aptitude-0.4.4.orig/src/Makefile.in aptitude-0.4.4.orig+iPhone/src/Makefile.in
+--- aptitude-0.4.4.orig/src/Makefile.in	2006-10-27 04:28:50.000000000 +0000
++++ aptitude-0.4.4.orig+iPhone/src/Makefile.in	2008-05-13 09:36:20.000000000 +0000
+@@ -374,7 +374,7 @@
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ aptitude$(EXEEXT): $(aptitude_OBJECTS) $(aptitude_DEPENDENCIES) 
+ 	@rm -f aptitude$(EXEEXT)
+-	$(CXXLINK) $(aptitude_LDFLAGS) $(aptitude_OBJECTS) $(aptitude_LDADD) $(LIBS)
++	$(CXXLINK) $(aptitude_LDFLAGS) $(aptitude_OBJECTS) $(aptitude_LDADD) $(LIBS) -liconv
+ 
+ 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
new file mode 100644
index 000000000..cf75e194d
--- /dev/null
+++ b/data/aptitude/make.sh
@@ -0,0 +1,6 @@
+shopt -s extglob
+pkg:setup
+pkg:configure
+make
+pkg:install
+rm -f "${PKG_DEST}"/usr/share/aptitude/!(aptitude-defaults)
diff --git a/data/aptitude/port.diff b/data/aptitude/port.diff
new file mode 100644
index 000000000..1918b001a
--- /dev/null
+++ b/data/aptitude/port.diff
@@ -0,0 +1,37 @@
+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
+@@ -154,9 +154,9 @@
+     {
+       char *buf = new char[bufsize];
+ 
+-      char *result = strerror_r(errnum, buf, bufsize);
++      int result = strerror_r(errnum, buf, bufsize);
+ 
+-      if(result == NULL)
++      if(result == -1)
+ 	{
+ 	  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
new file mode 100644
index 000000000..b43bf14b1
--- /dev/null
+++ b/data/aptitude/xopen.diff
@@ -0,0 +1,25 @@
+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>
+