diff options
author | Jay Freeman <saurik@saurik.com> | 2008-01-13 22:26:23 +0000 |
---|---|---|
committer | Jay Freeman <saurik@saurik.com> | 2008-01-13 22:26:23 +0000 |
commit | f1b662bacaed63f6eb0774dda7be0fd78ad19054 (patch) | |
tree | 1e96f8ed4cd5b879fa4bdfdc3bf88b736ff49bbe /data/apt | |
parent | 35ef70353227e4dff60fc36437f08293be752b25 (diff) |
Added some graphics libraries, handled a few requests, fixed bus error on apt close, got links compiling with the right compiler, and switched JamVM back to its internal libffi.
git-svn-id: http://svn.telesphoreo.org/trunk@13 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'data/apt')
-rw-r--r-- | data/apt/port.diff | 227 |
1 files changed, 3 insertions, 224 deletions
diff --git a/data/apt/port.diff b/data/apt/port.diff index 3ac2c0c6f..28e69180d 100644 --- a/data/apt/port.diff +++ b/data/apt/port.diff @@ -167,19 +167,6 @@ diff -r -u apt-0.6.46.4/buildlib/program.mak apt-0.6.46.4.1+iPhone/buildlib/prog diff -r -u apt-0.6.46.4/cmdline/apt-cache.cc apt-0.6.46.4.1+iPhone/cmdline/apt-cache.cc --- apt-0.6.46.4/cmdline/apt-cache.cc 2006-12-04 14:37:35.000000000 +0000 +++ apt-0.6.46.4.1+iPhone/cmdline/apt-cache.cc 2007-12-25 03:50:15.000000000 +0000 -@@ -1704,7 +1704,11 @@ - } - /*}}}*/ - --int main(int argc,const char *argv[]) -+int main_(int argc,const char *argv[]); -+int main(int argc,const char *argv[]) { -+ _exit(main_(argc, argv)); -+} -+int main_(int argc,const char *argv[]) - { - CommandLine::Args Args[] = { - {'h',"help","help",0}, @@ -1748,7 +1752,7 @@ // Set up gettext support @@ -192,19 +179,6 @@ diff -r -u apt-0.6.46.4/cmdline/apt-cache.cc apt-0.6.46.4.1+iPhone/cmdline/apt-c diff -r -u apt-0.6.46.4/cmdline/apt-cdrom.cc apt-0.6.46.4.1+iPhone/cmdline/apt-cdrom.cc --- apt-0.6.46.4/cmdline/apt-cdrom.cc 2006-12-04 14:37:35.000000000 +0000 +++ apt-0.6.46.4.1+iPhone/cmdline/apt-cdrom.cc 2007-12-25 03:50:24.000000000 +0000 -@@ -165,7 +165,11 @@ - } - /*}}}*/ - --int main(int argc,const char *argv[]) -+int main_(int argc,const char *argv[]); -+int main(int argc,const char *argv[]) { -+ _exit(main_(argc, argv)); -+} -+int main_(int argc,const char *argv[]) - { - CommandLine::Args Args[] = { - {'h',"help","help",0}, @@ -188,7 +192,7 @@ // Set up gettext support @@ -217,19 +191,6 @@ diff -r -u apt-0.6.46.4/cmdline/apt-cdrom.cc apt-0.6.46.4.1+iPhone/cmdline/apt-c diff -r -u apt-0.6.46.4/cmdline/apt-config.cc apt-0.6.46.4.1+iPhone/cmdline/apt-config.cc --- apt-0.6.46.4/cmdline/apt-config.cc 2006-12-04 14:37:35.000000000 +0000 +++ apt-0.6.46.4.1+iPhone/cmdline/apt-config.cc 2007-12-25 03:50:35.000000000 +0000 -@@ -89,7 +89,11 @@ - } - /*}}}*/ - --int main(int argc,const char *argv[]) -+int main_(int argc,const char *argv[]); -+int main(int argc,const char *argv[]) { -+ _exit(main_(argc, argv)); -+} -+int main_(int argc,const char *argv[]) - { - CommandLine::Args Args[] = { - {'h',"help","help",0}, @@ -103,7 +107,7 @@ // Set up gettext support @@ -242,19 +203,6 @@ diff -r -u apt-0.6.46.4/cmdline/apt-config.cc apt-0.6.46.4.1+iPhone/cmdline/apt- diff -r -u apt-0.6.46.4/cmdline/apt-extracttemplates.cc apt-0.6.46.4.1+iPhone/cmdline/apt-extracttemplates.cc --- apt-0.6.46.4/cmdline/apt-extracttemplates.cc 2006-12-04 14:37:35.000000000 +0000 +++ apt-0.6.46.4.1+iPhone/cmdline/apt-extracttemplates.cc 2007-12-25 03:50:39.000000000 +0000 -@@ -349,7 +349,11 @@ - } - /*}}}*/ - --int main(int argc, const char **argv) -+int main_(int argc,const char *argv[]); -+int main(int argc,const char *argv[]) { -+ _exit(main_(argc, argv)); -+} -+int main_(int argc,const char *argv[]) - { - CommandLine::Args Args[] = { - {'h',"help","help",0}, @@ -361,7 +365,7 @@ // Set up gettext support @@ -282,19 +230,6 @@ diff -r -u apt-0.6.46.4/cmdline/apt-get.cc apt-0.6.46.4.1+iPhone/cmdline/apt-get unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */ // class CacheFile - Cover class for some dependency cache functions /*{{{*/ -@@ -2501,7 +2502,11 @@ - } - /*}}}*/ - --int main(int argc,const char *argv[]) -+int main_(int argc,const char *argv[]); -+int main(int argc,const char *argv[]) { -+ _exit(main_(argc, argv)); -+} -+int main_(int argc,const char *argv[]) - { - CommandLine::Args Args[] = { - {'h',"help","help",0}, @@ -2560,7 +2565,7 @@ // Set up gettext support @@ -304,11 +239,12 @@ diff -r -u apt-0.6.46.4/cmdline/apt-get.cc apt-0.6.46.4.1+iPhone/cmdline/apt-get // Parse the command line and initialize the package library CommandLine CmdL(Args,_config); -@@ -2588,6 +2593,8 @@ +@@ -2588,6 +2593,9 @@ if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) _config->Set("quiet","1"); -+ ofstream devnull("/dev/null"); ++ ofstream devnull; ++ devnull.open("/dev/null"); + // Setup the output streams c0out.rdbuf(cout.rdbuf()); @@ -316,19 +252,6 @@ diff -r -u apt-0.6.46.4/cmdline/apt-get.cc apt-0.6.46.4.1+iPhone/cmdline/apt-get diff -r -u apt-0.6.46.4/cmdline/apt-sortpkgs.cc apt-0.6.46.4.1+iPhone/cmdline/apt-sortpkgs.cc --- apt-0.6.46.4/cmdline/apt-sortpkgs.cc 2006-12-04 14:37:35.000000000 +0000 +++ apt-0.6.46.4.1+iPhone/cmdline/apt-sortpkgs.cc 2007-12-25 03:50:52.000000000 +0000 -@@ -162,7 +162,11 @@ - } - /*}}}*/ - --int main(unsigned int argc,const char *argv[]) -+int main_(int argc,const char *argv[]); -+int main(int argc,const char *argv[]) { -+ _exit(main_(argc, argv)); -+} -+int main_(int argc,const char *argv[]) - { - CommandLine::Args Args[] = { - {'h',"help","help",0}, @@ -174,7 +178,7 @@ // Set up gettext support @@ -379,147 +302,3 @@ diff -r -u apt-0.6.46.4/Makefile apt-0.6.46.4.1+iPhone/Makefile # Some very common aliases .PHONY: maintainer-clean dist-clean distclean pristine sanity -diff -r -u apt-0.6.46.4/methods/cdrom.cc apt-0.6.46.4.1+iPhone/methods/cdrom.cc ---- apt-0.6.46.4/methods/cdrom.cc 2006-12-04 14:37:36.000000000 +0000 -+++ apt-0.6.46.4.1+iPhone/methods/cdrom.cc 2007-12-25 03:53:13.000000000 +0000 -@@ -191,7 +191,11 @@ - } - /*}}}*/ - --int main() -+int main_(); -+int main() { -+ _exit(main_()); -+} -+int main_() - { - setlocale(LC_ALL, ""); - -diff -r -u apt-0.6.46.4/methods/copy.cc apt-0.6.46.4.1+iPhone/methods/copy.cc ---- apt-0.6.46.4/methods/copy.cc 2006-12-04 14:37:36.000000000 +0000 -+++ apt-0.6.46.4.1+iPhone/methods/copy.cc 2007-12-25 03:53:07.000000000 +0000 -@@ -84,7 +84,11 @@ - } - /*}}}*/ - --int main() -+int main_(); -+int main() { -+ _exit(main_()); -+} -+int main_() - { - setlocale(LC_ALL, ""); - -diff -r -u apt-0.6.46.4/methods/file.cc apt-0.6.46.4.1+iPhone/methods/file.cc ---- apt-0.6.46.4/methods/file.cc 2006-12-04 14:37:36.000000000 +0000 -+++ apt-0.6.46.4.1+iPhone/methods/file.cc 2007-12-25 03:53:02.000000000 +0000 -@@ -87,7 +87,11 @@ - } - /*}}}*/ - --int main() -+int main_(); -+int main() { -+_exit(main_()); -+} -+int main_() - { - setlocale(LC_ALL, ""); - -diff -r -u apt-0.6.46.4/methods/ftp.cc apt-0.6.46.4.1+iPhone/methods/ftp.cc ---- apt-0.6.46.4/methods/ftp.cc 2006-12-04 14:37:36.000000000 +0000 -+++ apt-0.6.46.4.1+iPhone/methods/ftp.cc 2007-12-25 03:53:38.000000000 +0000 -@@ -1084,7 +1084,11 @@ - } - /*}}}*/ - --int main(int argc,const char *argv[]) -+int main_(int argc, const char *argv[]); -+int main(int argc, const char *argv[]) { -+ _exit(main_(argc, argv)); -+} -+int main_(int argc, const char *argv[]) - { - setlocale(LC_ALL, ""); - -diff -r -u apt-0.6.46.4/methods/gpgv.cc apt-0.6.46.4.1+iPhone/methods/gpgv.cc ---- apt-0.6.46.4/methods/gpgv.cc 2006-12-04 14:37:36.000000000 +0000 -+++ apt-0.6.46.4.1+iPhone/methods/gpgv.cc 2007-12-25 03:53:27.000000000 +0000 -@@ -300,7 +300,11 @@ - } - - --int main() -+int main_(); -+int main() { -+_exit(main_()); -+} -+int main_() - { - setlocale(LC_ALL, ""); - -diff -r -u apt-0.6.46.4/methods/gzip.cc apt-0.6.46.4.1+iPhone/methods/gzip.cc ---- apt-0.6.46.4/methods/gzip.cc 2006-12-04 14:37:36.000000000 +0000 -+++ apt-0.6.46.4.1+iPhone/methods/gzip.cc 2007-12-25 03:53:44.000000000 +0000 -@@ -160,7 +160,11 @@ - } - /*}}}*/ - --int main(int argc, char *argv[]) -+int main_(int argc, const char *argv[]); -+int main(int argc, const char *argv[]) { -+ _exit(main_(argc, argv)); -+} -+int main_(int argc, const char *argv[]) - { - setlocale(LC_ALL, ""); - -diff -r -u apt-0.6.46.4/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc ---- apt-0.6.46.4/methods/http.cc 2006-12-04 14:37:36.000000000 +0000 -+++ apt-0.6.46.4.1+iPhone/methods/http.cc 2007-12-25 03:53:57.000000000 +0000 -@@ -1222,7 +1222,11 @@ - } - /*}}}*/ - --int main() -+int main_(); -+int main() { -+_exit(main_()); -+} -+int main_() - { - setlocale(LC_ALL, ""); - -diff -r -u apt-0.6.46.4/methods/rred.cc apt-0.6.46.4.1+iPhone/methods/rred.cc ---- apt-0.6.46.4/methods/rred.cc 2006-12-04 14:37:36.000000000 +0000 -+++ apt-0.6.46.4.1+iPhone/methods/rred.cc 2007-12-25 03:54:23.000000000 +0000 -@@ -251,7 +251,11 @@ - return true; - } - --int main(int argc, char *argv[]) -+int main_(int argc, const char *argv[]); -+int main(int argc, const char *argv[]) { -+_exit(main_(argc, argv)); -+} -+int main_(int argc,const char *argv[]) - { - RredMethod Mth; - -diff -r -u apt-0.6.46.4/methods/rsh.cc apt-0.6.46.4.1+iPhone/methods/rsh.cc ---- apt-0.6.46.4/methods/rsh.cc 2006-12-04 14:37:36.000000000 +0000 -+++ apt-0.6.46.4.1+iPhone/methods/rsh.cc 2007-12-25 03:54:38.000000000 +0000 -@@ -509,7 +509,11 @@ - } - /*}}}*/ - --int main(int argc, const char *argv[]) -+int main_(int argc, const char *argv[]); -+int main(int argc, const char *argv[]) { -+_exit(main_(argc, argv)); -+} -+int main_(int argc,const char *argv[]) - { - setlocale(LC_ALL, ""); - |