From b2245330c5156111667da01a5ee7f5af0c27d219 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Tue, 28 Dec 2004 08:41:47 +0000 Subject: [PATCH] Revision bump, closes bug #75378 --- app-office/openoffice/ChangeLog | 12 +- app-office/openoffice/Manifest | 33 +- .../openoffice/files/1.1.0/fixed-gcc.patch | 16 - app-office/openoffice/files/1.1.0/neon.patch | 227 -------- .../files/1.1.0/newstlportfix.patch | 511 ------------------ .../openoffice/files/1.1.0/no-mozab.patch | 78 --- app-office/openoffice/files/1.1.0/nptl.patch | 42 -- .../openoffice-1.1.0-linux-2.6-fix.patch | 16 - .../1.1.0/openoffice-1.1.0-sparc64-fix.patch | 13 - .../openoffice/files/1.1.4/freetype-217.patch | 24 + .../openoffice/files/1.1.4/gcc-instlib.patch | 12 + .../files/1.1.4/gcc34-nojava-fix.patch | 11 + .../files/1.1.4/gcc34-nptl-fix.patch | 14 + .../openoffice/files/1.1.4/gcc34.patch.bz2 | Bin 0 -> 34342 bytes .../files/1.1.4/newstlportfix-patch | 100 ++++ .../{1.1.0 => 1.1.4}/ooffice-wrapper-1.3 | 21 +- .../{1.1.0 => 1.1.4}/openoffice-java.patch | 0 .../files/digest-openoffice-1.1.0-r4 | 3 - .../openoffice/files/digest-openoffice-1.1.4 | 2 + ....1.0-r4.ebuild => openoffice-1.1.4.ebuild} | 404 +++++--------- 20 files changed, 341 insertions(+), 1198 deletions(-) delete mode 100644 app-office/openoffice/files/1.1.0/fixed-gcc.patch delete mode 100644 app-office/openoffice/files/1.1.0/neon.patch delete mode 100644 app-office/openoffice/files/1.1.0/newstlportfix.patch delete mode 100644 app-office/openoffice/files/1.1.0/no-mozab.patch delete mode 100644 app-office/openoffice/files/1.1.0/nptl.patch delete mode 100644 app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch delete mode 100644 app-office/openoffice/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch create mode 100644 app-office/openoffice/files/1.1.4/freetype-217.patch create mode 100644 app-office/openoffice/files/1.1.4/gcc-instlib.patch create mode 100644 app-office/openoffice/files/1.1.4/gcc34-nojava-fix.patch create mode 100644 app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch create mode 100644 app-office/openoffice/files/1.1.4/gcc34.patch.bz2 create mode 100644 app-office/openoffice/files/1.1.4/newstlportfix-patch rename app-office/openoffice/files/{1.1.0 => 1.1.4}/ooffice-wrapper-1.3 (91%) rename app-office/openoffice/files/{1.1.0 => 1.1.4}/openoffice-java.patch (100%) delete mode 100644 app-office/openoffice/files/digest-openoffice-1.1.0-r4 create mode 100644 app-office/openoffice/files/digest-openoffice-1.1.4 rename app-office/openoffice/{openoffice-1.1.0-r4.ebuild => openoffice-1.1.4.ebuild} (52%) diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 6affbe88d9c6..95b06e4ea69c 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.93 2004/12/04 15:35:31 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.94 2004/12/28 08:41:47 suka Exp $ + +*openoffice-1.1.4 (28 Dec 2004) + + 28 Dec 2004; Andreas Proschofsky + +files/1.1.4/gcc-instlib.patch, +files/1.1.4/gcc34-nojava-fix.patch, + +files/1.1.4/gcc34-nptl-fix.patch, +files/1.1.4/gcc34.patch.bz2, + +files/1.1.4/newstlportfix-patch, +files/1.1.4/ooffice-wrapper-1.3, + +files/1.1.4/openoffice-java.patch, +openoffice-1.1.4.ebuild: + Revison bump, closes bug #75378 Also includes a fix for build problems + with recent freetype versions, taken from Mandrake. 04 Dec 2004; Sven Wegener : Added missing digest entries for the ppc files. diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 616a7b98b6fe..751add49129e 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,16 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 ea7129ffd5ce5b014c22234eed1ec303 openoffice-1.1.4.ebuild 15654 MD5 e7fff1cdeac61f986e2375f8fcb110dc openoffice-1.0.3-r2.ebuild 20531 MD5 f63e879f61fb812d064f2e524150b667 openoffice-1.1.1-r1.ebuild 15777 -MD5 028221961eab58410eac58393c7840e5 openoffice-1.1.0-r4.ebuild 20022 MD5 40675e126c7b38c1f5f223a101a3ca1b openoffice-1.1.3.ebuild 15687 -MD5 0d1005d461e3eacc719377dcf72f3d9c ChangeLog 20516 +MD5 5cdec46f02fa941302ccc9c3882c2ca5 ChangeLog 20998 MD5 2e4e0aa812a48bacf4b33b838b5df978 openoffice-1.1.3-r1.ebuild 15841 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73 +MD5 daab23b72cdb79ffdb992414239a828f files/digest-openoffice-1.1.4 136 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r2 330 -MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r4 195 MD5 8382af8b277f267e568feab0f7976f3c files/digest-openoffice-1.1.1-r1 130 MD5 e1faaa628102992e72c3784052850778 files/digest-openoffice-1.1.3-r1 327 MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207 @@ -31,15 +28,6 @@ MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.p MD5 ce580b49f86ec9ab3ceba58268c886df files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 15843 MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch 14774 MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch 596 -MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644 -MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972 -MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.0/openoffice-java.patch 2092 -MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400 -MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603 -MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.0/neon.patch 8300 -MD5 309ec50c6facc777068caebd51640c92 files/1.1.0/no-mozab.patch 2741 -MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285 -MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655 MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.1/openoffice-java.patch 2092 MD5 866e4e913af8431072dab7ec53269c31 files/1.1.1/linux-sparc.patch 14494 @@ -55,10 +43,11 @@ MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.3/openoffice-java.patch 2092 MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.3/gcc34-nojava-fix.patch 329 MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618 MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.3/newstlportfix.patch 10032 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFBsdlNI1lqEGTUzyQRAsKgAKC6/dgv2wr6j/KuhiUHYGrXC1xonwCgs4Zj -dM1HIoXuyju2jFhebWK5vXM= -=Nxvb ------END PGP SIGNATURE----- +MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342 +MD5 5b5b02ecb719c0a553b740edd3544bc7 files/1.1.4/ooffice-wrapper-1.3 9471 +MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393 +MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092 +MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329 +MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.4/gcc34-nptl-fix.patch 618 +MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766 +MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix-patch 3638 diff --git a/app-office/openoffice/files/1.1.0/fixed-gcc.patch b/app-office/openoffice/files/1.1.0/fixed-gcc.patch deleted file mode 100644 index 3f2ee40700af..000000000000 --- a/app-office/openoffice/files/1.1.0/fixed-gcc.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- config_office/configure.orig 2003-08-13 15:03:11.000000000 +0200 -+++ config_office/configure 2003-08-13 15:03:46.000000000 +0200 -@@ -2895,13 +2895,6 @@ - - if test "$_gcc_major" = "3"; then - USE_GCC3="TRUE" -- if test "$_gcc_longver" -eq "030203"; then -- { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\" -- gives internal error, use another version please." >&5 --echo "$as_me: error: found version \"$_gcc_version\" -- gives internal error, use another version please." >&2;} -- { (exit 1); exit 1; }; } -- fi - else - USE_GCC3="FALSE" - if test "$_gcc_longver" -lt "029502"; then diff --git a/app-office/openoffice/files/1.1.0/neon.patch b/app-office/openoffice/files/1.1.0/neon.patch deleted file mode 100644 index d68adb2eb353..000000000000 --- a/app-office/openoffice/files/1.1.0/neon.patch +++ /dev/null @@ -1,227 +0,0 @@ ---- /work/ooo/gnome-ooo/openoffice/build/OOO_1_1_1/neon/neon.patch 2004-03-19 17:32:52.000000000 -0500 -+++ neon/neon.patch 2004-04-05 12:38:42.000000000 -0400 -@@ -135,8 +134,8 @@ - ! #define read _read - ! - ! #endif --*** misc/neon-0.23.5/src/makefile.mk Tue Oct 22 17:55:55 2002 ----- misc/build/neon-0.23.5/src/makefile.mk Tue Oct 22 17:35:49 2002 -+*** misc/neon-0.23.5/src/makefile.mk 2004-04-05 12:38:37.706437510 -0400 -+--- misc/build/neon-0.23.5/src/makefile.mk 2004-04-05 12:21:47.810143789 -0400 - *************** - *** 1 **** - ! dummy -@@ -190,8 +189,173 @@ - ! # --- Targets ------------------------------------------------------ - ! - ! .INCLUDE : target.mk --*** misc/neon-0.23.5/src/ne_props.c Sun Jul 14 13:18:06 2002 ----- misc/build/neon-0.23.5/src/ne_props.c Tue Oct 22 17:35:49 2002 -+*** misc/neon-0.23.5/src/ne_207.c 2002-06-23 10:04:36.000000000 -0400 -+--- misc/build/neon-0.23.5/src/ne_207.c 2004-04-05 12:38:18.221460697 -0400 -+*************** -+*** 1,6 **** -+ /* -+ WebDAV 207 multi-status response handling -+! Copyright (C) 1999-2002, Joe Orton -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+--- 1,6 ---- -+ /* -+ WebDAV 207 multi-status response handling -+! Copyright (C) 1999-2004, Joe Orton -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+*************** -+*** 358,369 **** -+ if (ne_get_status(req)->code == 207) { -+ if (!ne_xml_valid(p)) { -+ /* The parse was invalid */ -+! ne_set_error(sess, ne_xml_get_error(p)); -+ ret = NE_ERROR; -+ } else if (ctx.is_error) { -+ /* If we've actually got any error information -+ * from the 207, then set that as the error */ -+! ne_set_error(sess, ctx.buf->data); -+ ret = NE_ERROR; -+ } -+ } else if (ne_get_status(req)->klass != 2) { -+--- 358,369 ---- -+ if (ne_get_status(req)->code == 207) { -+ if (!ne_xml_valid(p)) { -+ /* The parse was invalid */ -+! ne_set_error(sess, "%s", ne_xml_get_error(p)); -+ ret = NE_ERROR; -+ } else if (ctx.is_error) { -+ /* If we've actually got any error information -+ * from the 207, then set that as the error */ -+! ne_set_error(sess, "%s", ctx.buf->data); -+ ret = NE_ERROR; -+ } -+ } else if (ne_get_status(req)->klass != 2) { -+*** misc/neon-0.23.5/src/ne_auth.c 2002-10-07 16:33:17.000000000 -0400 -+--- misc/build/neon-0.23.5/src/ne_auth.c 2004-04-05 12:38:18.223460387 -0400 -+*************** -+*** 908,914 **** -+ if (areq->auth_info_hdr != NULL && -+ verify_response(areq, sess, areq->auth_info_hdr)) { -+ NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n"); -+! ne_set_error(sess->sess, _(sess->spec->fail_msg)); -+ ret = NE_ERROR; -+ } else if (status->code == sess->spec->status_code && -+ areq->auth_hdr != NULL) { -+--- 908,914 ---- -+ if (areq->auth_info_hdr != NULL && -+ verify_response(areq, sess, areq->auth_info_hdr)) { -+ NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n"); -+! ne_set_error(sess->sess, "%s", _(sess->spec->fail_msg)); -+ ret = NE_ERROR; -+ } else if (status->code == sess->spec->status_code && -+ areq->auth_hdr != NULL) { -+*** misc/neon-0.23.5/src/ne_compress.c 2002-09-18 16:50:34.000000000 -0400 -+--- misc/build/neon-0.23.5/src/ne_compress.c 2004-04-05 12:38:18.225460077 -0400 -+*************** -+*** 1,6 **** -+ /* -+ Handling of compressed HTTP responses -+! Copyright (C) 2001-2002, Joe Orton -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+--- 1,6 ---- -+ /* -+ Handling of compressed HTTP responses -+! Copyright (C) 2001-2004, Joe Orton -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+*************** -+*** 252,258 **** -+ * doesn't work, and this does, but I have no idea why.. -+ * Google showed me the way. */ -+ if (inflateInit2(&ctx->zstr, -MAX_WBITS) != Z_OK) { -+! ne_set_error(ctx->session, ctx->zstr.msg); -+ ctx->state = NE_Z_ERROR; -+ return; -+ } -+--- 252,258 ---- -+ * doesn't work, and this does, but I have no idea why.. -+ * Google showed me the way. */ -+ if (inflateInit2(&ctx->zstr, -MAX_WBITS) != Z_OK) { -+! ne_set_error(ctx->session, "%s", ctx->zstr.msg); -+ ctx->state = NE_Z_ERROR; -+ return; -+ } -+*** misc/neon-0.23.5/src/ne_locks.c 2002-08-05 16:10:53.000000000 -0400 -+--- misc/build/neon-0.23.5/src/ne_locks.c 2004-04-05 12:38:18.227459766 -0400 -+*************** -+*** 723,729 **** -+ } -+ else if (parse_failed) { -+ ret = NE_ERROR; -+! ne_set_error(sess, ne_xml_get_error(parser)); -+ } -+ else if (ne_get_status(req)->code == 207) { -+ ret = NE_ERROR; -+--- 723,729 ---- -+ } -+ else if (parse_failed) { -+ ret = NE_ERROR; -+! ne_set_error(sess, "%s", ne_xml_get_error(parser)); -+ } -+ else if (ne_get_status(req)->code == 207) { -+ ret = NE_ERROR; -+*************** -+*** 792,798 **** -+ if (ret == NE_OK && ne_get_status(req)->klass == 2) { -+ if (parse_failed) { -+ ret = NE_ERROR; -+! ne_set_error(sess, ne_xml_get_error(parser)); -+ } -+ else if (ne_get_status(req)->code == 207) { -+ ret = NE_ERROR; -+--- 792,798 ---- -+ if (ret == NE_OK && ne_get_status(req)->klass == 2) { -+ if (parse_failed) { -+ ret = NE_ERROR; -+! ne_set_error(sess, "%s", ne_xml_get_error(parser)); -+ } -+ else if (ne_get_status(req)->code == 207) { -+ ret = NE_ERROR; -+*** misc/neon-0.23.5/src/ne_props.c 2002-07-14 07:18:06.000000000 -0400 -+--- misc/build/neon-0.23.5/src/ne_props.c 2004-04-05 12:38:27.458027606 -0400 -+*************** -+*** 1,6 **** -+ /* -+ WebDAV property manipulation -+! Copyright (C) 2000-2002, Joe Orton -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+--- 1,6 ---- -+ /* -+ WebDAV property manipulation -+! Copyright (C) 2000-2004, Joe Orton -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+*************** -+*** 136,142 **** -+ if (ret == NE_OK && ne_get_status(req)->klass != 2) { -+ ret = NE_ERROR; -+ } else if (!ne_xml_valid(handler->parser)) { -+! ne_set_error(handler->sess, ne_xml_get_error(handler->parser)); -+ ret = NE_ERROR; -+ } -+ -+--- 136,142 ---- -+ if (ret == NE_OK && ne_get_status(req)->klass != 2) { -+ ret = NE_ERROR; -+ } else if (!ne_xml_valid(handler->parser)) { -+! ne_set_error(handler->sess, "%s", ne_xml_get_error(handler->parser)); -+ ret = NE_ERROR; -+ } -+ - *************** - *** 457,462 **** - --- 457,465 ---- -@@ -204,3 +368,37 @@ - /* If we get a non-2xx response back here, we wipe the value for - * each of the properties in this propstat, so the caller knows to - * look at the status instead. It's annoying, since for each prop -+*** misc/neon-0.23.5/src/ne_xml.c 2002-10-08 15:11:31.000000000 -0400 -+--- misc/build/neon-0.23.5/src/ne_xml.c 2004-04-05 12:38:18.232458991 -0400 -+*************** -+*** 1,6 **** -+ /* -+ Higher Level Interface to XML Parsers. -+! Copyright (C) 1999-2002, Joe Orton -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+--- 1,6 ---- -+ /* -+ Higher Level Interface to XML Parsers. -+! Copyright (C) 1999-2004, Joe Orton -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+*************** -+*** 860,866 **** -+ -+ void ne_xml_set_error(ne_xml_parser *p, const char *msg) -+ { -+! ne_snprintf(p->error, ERR_SIZE, msg); -+ } -+ -+ #ifdef HAVE_LIBXML -+--- 860,866 ---- -+ -+ void ne_xml_set_error(ne_xml_parser *p, const char *msg) -+ { -+! ne_snprintf(p->error, ERR_SIZE, "%s", msg); -+ } -+ -+ #ifdef HAVE_LIBXML diff --git a/app-office/openoffice/files/1.1.0/newstlportfix.patch b/app-office/openoffice/files/1.1.0/newstlportfix.patch deleted file mode 100644 index 88a77fb47048..000000000000 --- a/app-office/openoffice/files/1.1.0/newstlportfix.patch +++ /dev/null @@ -1,511 +0,0 @@ -diff -urN stlport.orig/STLport-4.5.3.patch stlport/STLport-4.5.3.patch ---- stlport.orig/STLport-4.5.3.patch 1970-01-01 01:00:00.000000000 +0100 -+++ stlport/STLport-4.5.3.patch 2003-08-13 14:10:51.000000000 +0200 -@@ -0,0 +1,247 @@ -+*** misc/STLport-4.5.3/src/fstream.cpp Tue Sep 4 19:10:12 2001 -+--- misc/build/STLport-4.5.3/src/fstream.cpp Fri Jan 11 17:22:40 2002 -+*************** -+*** 293,299 **** -+ #ifdef __MINGW32__ -+ __MINGW_IMPORT ioinfo * __pioinfo[]; -+ #else -+! extern _CRTIMP ioinfo * __pioinfo[]; -+ #endif -+ -+ } // extern "C" -+--- 293,299 ---- -+ #ifdef __MINGW32__ -+ __MINGW_IMPORT ioinfo * __pioinfo[]; -+ #else -+! extern __declspec( dllimport ) ioinfo * __pioinfo[]; -+ #endif -+ -+ } // extern "C" -+*** misc/STLport-4.5.3/src/gcc-3.0.mak Fri Jan 11 12:48:44 2002 -+--- misc/build/STLport-4.5.3/src/gcc-3.0.mak Fri Jan 11 12:47:21 2002 -+*************** -+*** 1 **** -+! dummy -+--- 1,59 ---- -+! # -+! # Note : this makefile is for gcc-3 ! -+! # -+! -+! # -+! # compiler -+! # -+! CC = $(CCCOMP) -+! CXX = $(CXXCOMP) -D_REENTRANT -fexceptions -+! -+! # -+! # Basename for libraries -+! # -+! LIB_BASENAME = libstlport_gcc -+! -+! # -+! # guts for common stuff -+! # -+! # -+! LINK=ar cr -+! DYN_LINK=$(CXX) --fexceptions -shared -o -+! -+! OBJEXT=o -+! DYNEXT=so -+! STEXT=a -+! RM=rm -rf -+! PATH_SEP=/ -+! MKDIR=mkdir -p -+! COMP=GCC$(ARCH) -+! INSTALL_STEP = install_unix -+! -+! all: all_dynamic all_static symbolic_links -+! -+! include common_macros.mak -+! -+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32 -+! -+! CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -+! -+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC -+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC -+! -+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC -+! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC -+! -+! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -+! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -+! -+! include common_percent_rules.mak -+! include common_rules.mak -+! -+! -+! #install: all -+! # cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib -+! -+! #%.s: %.cpp -+! # $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@ -+! -+! -+*** misc/STLport-4.5.3/src/vc6.mak Mon Jul 30 00:18:15 2001 -+--- misc/build/STLport-4.5.3/src/vc6.mak Fri Jan 11 17:41:08 2002 -+*************** -+*** 10,16 **** -+ COMP=VC6 -+ -+ # EXTRA_COMMON_FLAGS=/D "_MBCS" -+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS" -+ EXTRA_DEBUG_FLAGS= -+ EXTRA_NDEBUG_FLAGS= -+ -+--- 10,16 ---- -+ COMP=VC6 -+ -+ # EXTRA_COMMON_FLAGS=/D "_MBCS" -+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS" /D "_NTSDK" /D "_CRTIMP=" -+ EXTRA_DEBUG_FLAGS= -+ EXTRA_NDEBUG_FLAGS= -+ -+*** misc/STLport-4.5.3/src/vc_common.mak Tue Sep 4 19:10:12 2001 -+--- misc/build/STLport-4.5.3/src/vc_common.mak Fri Jan 11 12:48:14 2002 -+*************** -+*** 62,68 **** -+ LDFLAGS_RELEASE=/opt:ref -+ -+ LDFLAGS_COMMON_static=$(LDFLAGS_COMMON) -+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /dll /incremental:no -+ -+ -+ CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch -+--- 62,68 ---- -+ LDFLAGS_RELEASE=/opt:ref -+ -+ LDFLAGS_COMMON_static=$(LDFLAGS_COMMON) -+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no -+ -+ -+ CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch -+*************** -+*** 79,87 **** -+ -+ -+ LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) -+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" -+ LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) -+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" -+ -+ # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /DEBUGTYPE:CV -+ # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" -+--- 79,87 ---- -+ -+ -+ LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) -+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" -+ LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) -+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" -+ -+ # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /DEBUGTYPE:CV -+ # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" -+*************** -+*** 95,101 **** -+ CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch -+ -+ LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static) -+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" -+ # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" -+ -+ RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res -+--- 95,101 ---- -+ CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch -+ -+ LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static) -+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" -+ # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" -+ -+ RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res -+*** misc/STLport-4.5.3/stlport/stdexcept Tue May 22 02:50:21 2001 -+--- misc/build/STLport-4.5.3/stlport/stdexcept Mon Jan 14 18:26:09 2002 -+*************** -+*** 49,54 **** -+--- 49,59 ---- -+ -+ _STLP_BEGIN_NAMESPACE -+ -++ /* maybe limit to gcc 3.x */ -++ #if defined( __GNUC__) -++ #define _STLP_NOTHROW_INHERENTLY throw() -++ #endif -++ -+ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE { -+ public: -+ __Named_exception(const string& __str) -+*** misc/STLport-4.5.3/stlport/config/stl_gcc.h Thu Jun 6 22:53:04 2002 -+--- misc/build/STLport-4.5.3/stlport/config/stl_gcc.h Thu Jun 6 22:53:56 2002 -+*************** -+*** 226,233 **** -+ -+ # if (__GNUC__ >= 3) -+ -+! # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 -+! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward -+ -+ # elif (__GNUC_MINOR__ < 8) -+ -+--- 226,233 ---- -+ -+ # if (__GNUC__ >= 3) -+ -+! # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 -+! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward -+ -+ # elif (__GNUC_MINOR__ < 8) -+ -+*************** -+*** 285,298 **** -+ # if defined(__DJGPP) -+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx -+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97) -+! # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3 -+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) ) -+! # define _STLP_NATIVE_INCLUDE_PATH ../g++-3 -+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ ) -+ // this really sucks, as GNUpro does not really identifies itself, so we have to guess -+ // depending on a platform -+ # ifdef __hpux -+! # define _STLP_NATIVE_INCLUDE_PATH ../g++-3 -+ # else -+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-2 -+ # endif -+--- 285,298 ---- -+ # if defined(__DJGPP) -+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx -+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97) -+! # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3 -+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) ) -+! # define _STLP_NATIVE_INCLUDE_PATH ../g++-v32 -+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ ) -+ // this really sucks, as GNUpro does not really identifies itself, so we have to guess -+ // depending on a platform -+ # ifdef __hpux -+! # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 -+ # else -+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-2 -+ # endif -+*** misc/STLport-4.5.3/src/common_rules.mak Tue Sep 10 23:41:05 2002 -+--- misc/build/STLport-4.5.3/src/common_rules.mak Tue Sep 10 23:39:45 2002 -+*************** -+*** 84,90 **** -+ $(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) -+ $(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) -+ ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT) -+! -ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) -+ ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) -+ -+ install_unix : -+--- 84,90 ---- -+ $(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) -+ $(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) -+ ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT) -+! -ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) -+ ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) -+ -+ install_unix : -diff -urN stlport.orig/makefile.mk stlport/makefile.mk ---- stlport.orig/makefile.mk 2003-08-13 14:09:29.000000000 +0200 -+++ stlport/makefile.mk 2003-08-13 14:12:38.000000000 +0200 -@@ -72,8 +72,8 @@ - # --- Files -------------------------------------------------------- - .EXPORT : CC CXX - .IF "$(COMID)"=="gcc3" -- TARFILE_NAME=STLport-4.5 -- PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch -+ TARFILE_NAME=STLport-4.5.3 -+ PATCH_FILE_NAME=$(MISC)$/STLport-4.5.3.patch - .ELSE # "$(COMID)"=="gcc3" - .IF "$(OS)"=="MACOSX" - # [ed] For gcc2, we need to use STLport 4.0. 4.5 will not compile with gcc2 on OS X. -@@ -189,10 +189,10 @@ - .INCLUDE : target.mk - .INCLUDE : tg_ext.mk - --$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.patch -+$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.3.patch - --$(MISC)$/STLport-4.5.patch : STLport-4.5.patch -- +$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch -+$(MISC)$/STLport-4.5.3.patch : STLport-4.5.3.patch -+ +$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.3.patch > $(MISC)$/STLport-4.5.3.patch - - .IF "$(GUI)"=="WNT" - .IF "$(CCNUMVER)"<="001300000000" -diff -urN stlport.orig/makefile.mk.orig stlport/makefile.mk.orig ---- stlport.orig/makefile.mk.orig 1970-01-01 01:00:00.000000000 +0100 -+++ stlport/makefile.mk.orig 2003-08-13 14:10:17.000000000 +0200 -@@ -0,0 +1,228 @@ -+#************************************************************************* -+# -+# $RCSfile: newstlportfix.patch,v $ -+# -+# $Revision: 1.1 $ -+# -+# last change: $Author: pauldv $ $Date: 2003/10/03 11:39:26 $ -+# -+# The Contents of this file are made available subject to the terms of -+# either of the following licenses -+# -+# - GNU Lesser General Public License Version 2.1 -+# - Sun Industry Standards Source License Version 1.1 -+# -+# Sun Microsystems Inc., October, 2000 -+# -+# GNU Lesser General Public License Version 2.1 -+# ============================================= -+# Copyright 2000 by Sun Microsystems, Inc. -+# 901 San Antonio Road, Palo Alto, CA 94303, USA -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License version 2.1, as published by the Free Software Foundation. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+# -+# Sun Industry Standards Source License Version 1.1 -+# ================================================= -+# The contents of this file are subject to the Sun Industry Standards -+# Source License Version 1.1 (the "License"); You may not use this file -+# except in compliance with the License. You may obtain a copy of the -+# License at http://www.openoffice.org/license.html. -+# -+# Software provided under this License is provided on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+# See the License for the specific provisions governing your rights and -+# obligations concerning the Software. -+# -+# The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+# -+# Copyright: 2000 by Sun Microsystems, Inc. -+# -+# All Rights Reserved. -+# -+# Contributor(s): _______________________________________ -+# -+# -+# -+#************************************************************************* -+ -+PRJ=. -+ -+PRJNAME=so_stlport -+TARGET=so_stlport -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : settings.mk -+ -+# --- Files -------------------------------------------------------- -+.EXPORT : CC CXX -+.IF "$(COMID)"=="gcc3" -+ TARFILE_NAME=STLport-4.5 -+ PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch -+.ELSE # "$(COMID)"=="gcc3" -+ .IF "$(OS)"=="MACOSX" -+ # [ed] For gcc2, we need to use STLport 4.0. 4.5 will not compile with gcc2 on OS X. -+ TARFILE_NAME=STLport-4.0 -+ PATCH_FILE_NAME=STLport-4.0.macosx.patch -+ .ELSE -+ TARFILE_NAME=STLport-4.0 -+ PATCH_FILE_NAME=STLport-4.0.patch -+ .ENDIF # "$(OS)"=="MACOSX" -+.ENDIF # "$(COMID)"=="gcc3" -+ -+.IF "$(GUI)"=="WNT" -+.IF "$(CCNUMVER)"<="001300000000" -+TARFILE_NAME=STLport-4.0 -+PATCH_FILE_NAME=STLport-4.0.patch -+.ELSE # "$(CCNUMVER)"<="001300000000" -+TARFILE_NAME=STLport-4.5-0119 -+PATCH_FILE_NAME=STLport-4.5-0119.patch -+.ENDIF # "$(CCNUMVER)"<="001300000000" -+.ENDIF -+ -+.IF "$(USE_SHELL)"=="4nt" -+TAR_EXCLUDES=*/SC5/* -+.ENDIF # "$(USE_SHELL)"=="4nt" -+ -+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak -+ -+ -+CONFIGURE_ACTION=none -+CONFIGURE_FLAGS= -+ -+BUILD_DIR=src -+ -+.IF "$(COM)"=="MSC" -+BUILD_ACTION=nmake -+.IF "$(CCNUMVER)"<="001300000000" -+BUILD_FLAGS=-f vc6.mak -+.ELSE # "$(CCNUMVER)"<="001300000000" -+BUILD_FLAGS=-f vc7.mak -+.ENDIF # "$(CCNUMVER)"<="001300000000" -+.ENDIF -+ -+.IF "$(COM)"=="GCC" -+ .IF "$(COMID)"=="gcc3" -+ # FreeBSD needs a special makefile -+ .IF "$(OS)"=="FREEBSD" -+ BUILD_FLAGS=-f gcc-3.0-freebsd.mak -+ .ELIF "$(OS)"=="MACOSX" -+ BUILD_FLAGS=-f gcc-3.0-macosx.mak -+ .ELSE -+ BUILD_FLAGS=-f gcc-3.0.mak -+ .ENDIF -+ .ELSE # "$(COMID)"=="gcc3" -+ # MacOS X/Darwin need a special makefile -+ .IF "$(OS)"=="MACOSX" -+ BUILD_FLAGS=-f gcc-apple-macosx.mak -+ .ELIF "$(OS)"=="FREEBSD" -+ BUILD_FLAGS=-f gcc-freebsd.mak -+ .ELSE # "$(OS)"=="MACOSX" -+ BUILD_FLAGS=-f gcc.mak -+ .ENDIF # "$(OS)"=="MACOSX" -+ .ENDIF # "$(COMID)"=="gcc3" -+ BUILD_ACTION=$(GNUMAKE) -+ # build in parallel -+ BUILD_FLAGS+= -j$(MAXPROCESS) -+.ENDIF -+ -+.IF "$(COM)"=="C52" -+BUILD_ACTION=make -+BUILD_FLAGS=-f sunpro6.mak -+ -+OUT2INC= \ -+ stlport$/SC5$/*.SUNWCCh -+.ENDIF -+ -+.IF "$(OS)"=="IRIX" -+TARFILE_NAME=STLport-4.5 -+PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch -+BUILD_ACTION=gmake -+BUILD_FLAGS=-f gcc-3.0.mak -+BUILD_FLAGS+= -j$(MAXPROCESS) -+.ENDIF -+ -+OUTDIR2INC= \ -+ stlport -+ -+.IF "$(GUI)"=="WNT" -+ -+OUT2LIB= \ -+ lib$/*.lib -+ -+OUT2BIN= \ -+ lib$/*.dll \ -+ lib$/*.pdb -+ -+.ELSE # "$(GUI)"=="WNT" -+ -+OUT2LIB= \ -+ lib$/lib* -+ -+.ENDIF # "$(GUI)"=="WNT" -+ -+# --- Targets ------------------------------------------------------ -+ -+.IF "$(STLPORT4)"!="NO_STLPORT4" -+all : -+ @echo " An already available installation of STLport has been chosen in the configure process." -+ @echo " Therefore the version provided here does not need to be built in addition." -+ +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST) -+.ENDIF -+ -+.INCLUDE : set_ext.mk -+.INCLUDE : target.mk -+.INCLUDE : tg_ext.mk -+ -+$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.patch -+ -+$(MISC)$/STLport-4.5.patch : STLport-4.5.patch -+ +$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch -+ -+.IF "$(GUI)"=="WNT" -+.IF "$(CCNUMVER)"<="001300000000" -+ -+$(MISC)$/$(TARFILE_ROOTDIR) : avoid_win32_patches -+avoid_win32_patches : -+ @+$(ECHONL) -+ @+echo ERROR! this module can't use automated patch creation -+ @+echo on windows. -+ @+$(ECHONL) -+ force_dmake_to_error -+ -+$(PACKAGE_DIR)$/so_custom_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) -+.IF "$(USE_SHELL)"=="4nt" -+ +win32_custom.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@ -+.ELSE # "$(USE_SHELL)"=="4nt" -+ +win32_custom.sh $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@ -+.ENDIF # "$(USE_SHELL)"=="4nt" -+ -+$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_custom_patch -+ -+.IF "$(USE_NEW_SDK)"!="" -+$(PACKAGE_DIR)$/win32_sdk_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) -+.IF "$(USE_SHELL)"=="4nt" -+ +win32_sdk.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@ -+.ELSE # "$(USE_SHELL)"=="4nt" -+ +win32_sdk.sh $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@ -+.ENDIF # "$(USE_SHELL)"=="4nt" -+ -+$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch -+.ENDIF # "$(USE_NEW_SDK)"!="" -+.ENDIF # COMVER<=001300000000 -+.ENDIF # "$(GUI)"=="WNT" diff --git a/app-office/openoffice/files/1.1.0/no-mozab.patch b/app-office/openoffice/files/1.1.0/no-mozab.patch deleted file mode 100644 index f8ccda1bda3b..000000000000 --- a/app-office/openoffice/files/1.1.0/no-mozab.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -urN oo_1.1rc2_src/connectivity/prj/build.lst oo_1.1rc2_src.new/connectivity/prj/build.lst ---- oo_1.1rc2_src/connectivity/prj/build.lst 2003-06-02 09:53:47.000000000 +0200 -+++ oo_1.1rc2_src.new/connectivity/prj/build.lst 2003-08-08 11:56:21.000000000 +0200 -@@ -1,4 +1,4 @@ --cn connectivity : comphelper moz svtools unixODBC NULL -+cn connectivity : comphelper svtools unixODBC NULL - cn connectivity usr1 - all cn_mkout NULL - cn connectivity\source\types nmake - all cn_types NULL - cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_types NULL -@@ -7,8 +7,6 @@ - cn connectivity\source\resource nmake - all cn_res NULL - cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL - cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL --cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL --cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL - cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL - cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL - cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL -diff -urN oo_1.1rc2_src/scp/source/office/files.scp oo_1.1rc2_src.new/scp/source/office/files.scp ---- oo_1.1rc2_src/scp/source/office/files.scp 2003-07-16 16:37:14.000000000 +0200 -+++ oo_1.1rc2_src.new/scp/source/office/files.scp 2003-08-08 12:15:21.000000000 +0200 -@@ -433,19 +433,6 @@ - Styles = (PACKED); - End - --#ifndef MACOSX --File GID_FILE_LIB_MOZABDRV -- TXT_FILE_BODY; -- #ifdef UNX -- Name = STRING(CONCAT2(libmozabdrv2,UNXSUFFIX)); -- #else -- Name = "mozabdrv2.dll"; -- #endif -- Dir = GID_DIR_PROGRAM; -- Styles = (PACKED); --End --#endif -- - STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu ) - STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba) - -@@ -795,20 +782,6 @@ - #endif - End - --#ifndef MACOSX --File GID_FILE_LIB_MOZAB_2 -- TXT_FILE_BODY; -- Styles = (PACKED,UNO_COMPONENT); -- RegistryID = GID_STARREGISTRY_SERVICES_RDB; -- Dir = GID_DIR_PROGRAM; -- #ifdef UNX -- Name = STRING(CONCAT2(libmozab2,UNXSUFFIX)); -- #else -- Name = "mozab2.dll"; -- #endif --End --#endif -- - #ifdef UNX - - File GID_FILE_LIB_EVOAB_1 -@@ -3241,15 +3214,6 @@ - #endif - - #endif -- // of #ifdef SOLAR_JAVA --#ifndef MACOSX --File GID_FILE_MOZILLA_RUNTIME -- TXT_FILE_BODY; -- Styles = (ARCHIVE); -- Dir = GID_DIR_PROGRAM; -- Name = "mozruntime.zip"; --End --#endif - - File GID_FILE_HTML_THIRDPARTYLICENSEREADME - Name = "THIRDPARTYLICENSEREADME.html"; diff --git a/app-office/openoffice/files/1.1.0/nptl.patch b/app-office/openoffice/files/1.1.0/nptl.patch deleted file mode 100644 index 212ff05c51b6..000000000000 --- a/app-office/openoffice/files/1.1.0/nptl.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- oo_1.1rc3_src/sal/osl/unx/semaphor.c.jj 2003-08-28 10:24:23.736357952 +0100 -+++ oo_1.1rc3_src/sal/osl/unx/semaphor.c 2003-08-28 10:24:26.260974152 +0100 -@@ -79,7 +79,7 @@ - /* osl_createSemaphore */ - /*****************************************************************************/ - --#ifdef LINUX -+#if 0 - /* sem_t from glibc-2.1 (/usr/include/semaphore.h) */ - - typedef struct { -@@ -100,7 +100,7 @@ - * larger of both - * XXX - */ --#ifdef LINUX -+#if 0 - if ( sizeof(glibc_21_sem_t) > sizeof(sem_t) ) - Semaphore= malloc(sizeof(glibc_21_sem_t)); - else ---- oo_1.1rc3_src/tools/source/solar/solar.c.jj 2003-08-28 11:50:57.589772216 +0100 -+++ oo_1.1rc3_src/tools/source/solar/solar.c 2003-08-28 11:50:05.167741576 +0100 -@@ -577,7 +577,7 @@ - - { - char* p = NULL; -- InfoMemoryAccess( p ); -+ /*InfoMemoryAccess( p );*/ - p = (char*)&p; - InfoMemoryAccess( p ); - InfoMemoryTypeAccess( t_short ); ---- oo_1.1_src/neon/neon.patch.jj 2003-10-04 10:32:18.341106008 +0100 -+++ oo_1.1_src/neon/neon.patch 2003-10-04 10:32:49.123426384 +0100 -@@ -19,7 +19,7 @@ - ! - ! /* Define as __inline if that's what the C compiler calls it. */ - ! #ifdef UNX --! #define inline -+! #define inline inline - ! #endif - ! - ! /* Define if you need to in order for stat and other things to work. */ diff --git a/app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch b/app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch deleted file mode 100644 index 15c90b2e456c..000000000000 --- a/app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Submitted By: Mark Hymers -Date: 2003-10-05 -Initial Package Version: 1.1.0 -Origin: http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2003-September/003771.html -Description: Fixes critical segmentation fault on linux-2.6.0 based systems ---- oo_1.1_src/tools/source/solar/solar.c 2003-04-15 12:55:43.000000000 -0500 -+++ oo_1.1_src/tools/source/solar/solar.c.new 2003-10-05 12:31:58.000000000 -0500 -@@ -76,7 +76,7 @@ - #include - #endif - --#define NO_USE_FORK_TO_CHECK -+#define USE_FORK_TO_CHECK - #ifdef USE_FORK_TO_CHECK - #include - #else diff --git a/app-office/openoffice/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch b/app-office/openoffice/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch deleted file mode 100644 index 2455c273a05a..000000000000 --- a/app-office/openoffice/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- oo_1.1_src/solenv/bin/checkdll.sh.org 2003-11-13 10:54:00.000000000 -0600 -+++ oo_1.1_src/solenv/bin/checkdll.sh 2003-11-13 10:54:15.000000000 -0600 -@@ -52,8 +52,8 @@ - export LD_LIBRARY_PATH;; - esac - -- $checkdll "$*" -- if [ $? -ne 0 ]; then exit 1 ; fi -+# $checkdll "$*" -+# if [ $? -ne 0 ]; then exit 1 ; fi - - for parameter in $*; do - library=$parameter; diff --git a/app-office/openoffice/files/1.1.4/freetype-217.patch b/app-office/openoffice/files/1.1.4/freetype-217.patch new file mode 100644 index 000000000000..12ed2b2f8691 --- /dev/null +++ b/app-office/openoffice/files/1.1.4/freetype-217.patch @@ -0,0 +1,24 @@ +--- oo_1.1_src/vcl/source/glyphs/gcach_ftyp.cxx.ft217 2004-01-08 03:36:33.000000000 -0500 ++++ oo_1.1_src/vcl/source/glyphs/gcach_ftyp.cxx 2004-01-08 11:02:21.000000000 -0500 +@@ -77,7 +77,8 @@ + #include + #include + +-#include "freetype/freetype.h" ++#include ++#include FT_FREETYPE_H + #include "freetype/ftglyph.h" + #include "freetype/ftoutln.h" + #include "freetype/tttables.h" +--- oo_1.1_src/vcl/source/glyphs/gcach_layout.cxx.217 2004-01-08 03:36:46.000000000 -0500 ++++ oo_1.1_src/vcl/source/glyphs/gcach_layout.cxx 2004-01-08 11:03:04.000000000 -0500 +@@ -68,7 +68,8 @@ + #endif + + #ifndef _SV_GCACHFTYP_HXX +-#include ++#include ++#include FT_FREETYPE_H + #include + #endif + diff --git a/app-office/openoffice/files/1.1.4/gcc-instlib.patch b/app-office/openoffice/files/1.1.4/gcc-instlib.patch new file mode 100644 index 000000000000..99e424abed01 --- /dev/null +++ b/app-office/openoffice/files/1.1.4/gcc-instlib.patch @@ -0,0 +1,12 @@ +diff -urN solenv/bin/gccinstlib.pl oo_1.1.2_src/solenv/bin/gccinstlib.pl +--- solenv/bin/gccinstlib.pl 2004-03-16 11:15:42.000000000 +0100 ++++ solenv/bin/gccinstlib.pl 2004-09-27 10:36:02.338394960 +0200 +@@ -63,7 +63,7 @@ + # + #************************************************************************* + +-$ENV{'LC_MESSAGES'} = 'C'; ++$ENV{'LC_ALL'} = 'C'; + + %SearchDirs = GetGccSearchDirs (); + diff --git a/app-office/openoffice/files/1.1.4/gcc34-nojava-fix.patch b/app-office/openoffice/files/1.1.4/gcc34-nojava-fix.patch new file mode 100644 index 000000000000..73017c1bae19 --- /dev/null +++ b/app-office/openoffice/files/1.1.4/gcc34-nojava-fix.patch @@ -0,0 +1,11 @@ +--- sfx2/util/makefile.mk 2004-11-06 18:49:27.753988376 +0100 ++++ sfx2/util/makefile.mk 2004-11-06 18:39:19.706425656 +0100 +@@ -70,6 +70,8 @@ + GEN_HID=TRUE + GEN_HID_OTHER=TRUE + ++LINKFLAGSDEFS = # do not fail with missing symbols ++ + # --- Settings ----------------------------------------------------- + + .INCLUDE : settings.mk diff --git a/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch b/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch new file mode 100644 index 000000000000..3e3360b2f422 --- /dev/null +++ b/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch @@ -0,0 +1,14 @@ +--- ./sal/osl/unx/process.c.orig 2003-07-02 15:34:17.000000000 +0200 ++++ ./sal/osl/unx/process.c 2004-11-01 15:16:40.976815960 +0100 +@@ -1017,11 +1017,6 @@ + for (i = 0; data.m_pszEnv[i] != NULL; i++) + putenv(data.m_pszEnv[i]); + +-#if defined(LINUX) +- /* mfe: linux likes to have just one thread when the exec family is called */ +- /* this np function has this purpose ... */ +- pthread_kill_other_threads_np(); +-#endif + OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]); + + /* Connect std IO to pipe ends */ diff --git a/app-office/openoffice/files/1.1.4/gcc34.patch.bz2 b/app-office/openoffice/files/1.1.4/gcc34.patch.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..2c3a4e35594919b194267c7f6bba4b589c6e7457 GIT binary patch literal 34342 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 3) && (__GNUC_MAJOR__ >= 4) ++ # define _STLP_NO_MEMBER_TEMPLATE_KEYWORD +++#endif ++ ++ # if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) ) ++ # define _STLP_NO_WCHAR_T ++@@ -263,7 +265,7 @@ ++ ++ # if (__GNUC__ >= 3) ++ ++-# if ((__GNUC_MINOR__ == 0) || (__APPLE__)) +++# if 1 || ((__GNUC_MINOR__ == 0) || (__APPLE__)) ++ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 ++ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward ++ # else ++--- misc/build/STLport-4.6.2/stlport/stdexcept 2003-11-02 09:59:01.000000000 +0100 +++++ misc/build/STLport-4.6.2/stlport/stdexcept 2004-11-04 15:26:12.474545632 +0100 ++@@ -60,6 +60,11 @@ ++ # endif ++ # define _STLP_EXCEPTION_BASE exception ++ +++#if (__GNUC__ >= 3) +++#undef _STLP_NOTHROW_INHERENTLY +++#define _STLP_NOTHROW_INHERENTLY throw() +++#endif +++ ++ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE { ++ public: ++ __Named_exception(const string& __str) ++--- misc/build/STLport-4.6.2/src/common_rules.mak 2004-11-04 21:25:58.322997872 +0100 +++++ misc/build/STLport-4.6.2/src/common_rules.mak 2004-11-04 21:26:15.731351400 +0100 ++@@ -84,7 +84,8 @@ ++ $(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) ++ $(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) ++ ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT) ++- -ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) +++# not needed ? +++# -ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) ++ ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) ++ ++ install_unix : diff --git a/app-office/openoffice/files/1.1.0/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3 similarity index 91% rename from app-office/openoffice/files/1.1.0/ooffice-wrapper-1.3 rename to app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3 index c168e6eb803c..bb980f3f6082 100644 --- a/app-office/openoffice/files/1.1.0/ooffice-wrapper-1.3 +++ b/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3 @@ -30,6 +30,19 @@ OOVERSION="OpenOffice.org ${PV}" ## [ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf +# Migration to new user install dir +if [ -d "$HOME/.openoffice/1.1.3" ] ; then + mv $HOME/.openoffice/1.1.3 $HOME/.openoffice/1.1.4 + sed -i -e s/'.openoffice\/1.1.3'/'.openoffice\/1.1.4'/g $HOME/.sversionrc + sed -i -e s/1.1.3/1.1.4/g $HOME/.openoffice/1.1.4/user/basic/*.xlc + echo "Your user install dir has been moved over to the new version" +fi + +#Make smooth up- and downgrading between minor versions possible +if [ -e "$HOME/.sversionrc" ] ; then + sed -i -e s/1.1.3/1.1.4/g $HOME/.sversionrc +fi + ### ### Get user settings directory from ~/.sversionrc and echo directory name to stdout ### get_settings_dir @@ -146,7 +159,7 @@ if [ -z "$OOHOME" ] ; then fi echo "running openoffice.org setup..." - if ! /opt/OpenOffice.org${PV}/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-.conf >& /dev/null; then + if ! /opt/OpenOffice.org/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-.conf >& /dev/null; then echo "setup failed.. abort" exit 1 fi @@ -205,15 +218,15 @@ fi if [ ! -s $OOHOME/setup ]; then echo "${OOHOME}/setup links to nothing, resetting link" - ln -sf /opt/OpenOffice.org${PV}/program/setup ${OOHOME}/setup + ln -sf /opt/OpenOffice.org/program/setup ${OOHOME}/setup fi if [ ! -s $OOHOME/soffice ]; then echo "${OOHOME}/soffice links to nothing, resetting link" - ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/soffice + ln -sf /opt/OpenOffice.org/program/soffice ${OOHOME}/soffice fi if [ ! -s $OOHOME/spadmin ]; then echo "${OOHOME}/spadmin links to nothing, resetting link" - ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/spadmin + ln -sf /opt/OpenOffice.org/program/soffice ${OOHOME}/spadmin fi diff --git a/app-office/openoffice/files/1.1.0/openoffice-java.patch b/app-office/openoffice/files/1.1.4/openoffice-java.patch similarity index 100% rename from app-office/openoffice/files/1.1.0/openoffice-java.patch rename to app-office/openoffice/files/1.1.4/openoffice-java.patch diff --git a/app-office/openoffice/files/digest-openoffice-1.1.0-r4 b/app-office/openoffice/files/digest-openoffice-1.1.0-r4 deleted file mode 100644 index ca3bad69d473..000000000000 --- a/app-office/openoffice/files/digest-openoffice-1.1.0-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bec8b41089ebdad2831f3c456973ad4e OOo_1.1.0_source.tar.bz2 189164050 -MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917 -MD5 1fc0b188f1fe1216776e5855d2da141f freetype-2.1.4.tar.bz2 806647 diff --git a/app-office/openoffice/files/digest-openoffice-1.1.4 b/app-office/openoffice/files/digest-openoffice-1.1.4 new file mode 100644 index 000000000000..18e361b8e0c4 --- /dev/null +++ b/app-office/openoffice/files/digest-openoffice-1.1.4 @@ -0,0 +1,2 @@ +MD5 20c10db97865ae4c51dc827d668b8939 OOo_1.1.4_source.tar.gz 219743530 +MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958 diff --git a/app-office/openoffice/openoffice-1.1.0-r4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild similarity index 52% rename from app-office/openoffice/openoffice-1.1.0-r4.ebuild rename to app-office/openoffice/openoffice-1.1.4.ebuild index 3db7270e44d1..d9db53a6090d 100644 --- a/app-office/openoffice/openoffice-1.1.0-r4.ebuild +++ b/app-office/openoffice/openoffice-1.1.4.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r4.ebuild,v 1.10 2004/11/11 23:28:16 suka Exp $ - -# IMPORTANT: This is extremely alpha!!! +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.1 2004/12/28 08:41:47 suka Exp $ # Notes: # @@ -26,104 +24,69 @@ # Get support going for installing a custom language pack. Also # need to be able to install more than one language pack. -inherit flag-o-matic eutils gcc - -# We want gcc3 if possible!!!! -export WANT_GCC_3="yes" - -inherit virtualx - -# Set $ECPUS to amount of processes multiprocessing build should use. -# NOTE: Setting this too high might cause dmake to segfault!! -# Setting this to anything but "1" on my pentium4 causes things -# to segfault :( -[ -z "${ECPUS}" ] && export ECPUS="1" +inherit flag-o-matic eutils toolchain-funcs +IUSE="gnome kde java curl nptl zlib" LOC="/opt" -FT_VER="2.1.4" -STLP_VER="4.5.3" -MY_PV="${PV/_rc/rc}" -INSTDIR="${LOC}/OpenOffice.org${PV}" -S="${WORKDIR}/oo_${MY_PV/1.1.0/1.1}_src" +INSTDIR="${LOC}/OpenOffice.org" +S="${WORKDIR}" DESCRIPTION="OpenOffice.org, a full office productivity suite." -SRC_URI="mirror://openoffice/stable/${MY_PV}/OOo_${MY_PV}_source.tar.bz2 - ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z - mirror://sourceforge/freetype/freetype-${FT_VER}.tar.bz2" +SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}_source.tar.gz + http://www.stlport.org/archive/STLport-4.6.2.tar.gz" + HOMEPAGE="http://www.openoffice.org/" LICENSE="|| ( LGPL-2 SISSL-1.1 )" SLOT="0" -KEYWORDS="x86 sparc" -IUSE="gnome kde" +KEYWORDS="~x86" -RDEPEND=">=sys-libs/glibc-2.1 +RDEPEND="!app-office/openoffice-bin + >=sys-libs/glibc-2.1 !=sys-libs/glibc-2.3.1* >=dev-lang/perl-5.0 + >=media-libs/libart_lgpl-2.3.13 + >=x11-libs/startup-notification-0.5 + >=media-libs/freetype-2.1.4 virtual/x11 app-arch/zip app-arch/unzip dev-libs/expat - >=virtual/jdk-1.4.1 + java? ( >=virtual/jre-1.4.1 ) virtual/lpr ppc? ( >=sys-libs/glibc-2.2.5-r7 - >=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced + >=sys-devel/gcc-3.2.1 )" DEPEND="${RDEPEND} + >=sys-apps/findutils-4.1.20-r1 app-shells/tcsh - !app-office/openoffice-bin - sys-apps/findutils + dev-util/pkgconfig + curl? ( net-misc/curl ) + zlib? ( sys-libs/zlib ) sys-libs/pam - !app-arch/star - !dev-util/dmake" - -# fix a bug with tcsh and dircolors -# -# Azarah -- 10 April 2002 -export LS_COLORS="" - + !dev-util/dmake + java? ( >=virtual/jdk-1.4.1 ) + !java? ( dev-libs/libxslt )" pkg_setup() { - if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ] + if use java then - eerror - eerror "This build needs gcc-3.{2,3}.x, but due to profile" - eerror "settings, it cannot DEPEND on it, so please merge it" - eerror "manually:" - eerror - eerror " # ebuild ${PORTDIR}/sys-devel/gcc/gcc-3.2.1.ebuild merge" - eerror - eerror "Please make sure that you use the latest availible revision of" - eerror "gcc." - eerror - die - fi - - if [ -z "$(/usr/bin/java-config -O | grep "blackdown-jdk")" ] && [ "${FORCE_JAVA}" != "yes" ] - then - eerror - eerror "This ebuild has only been tested with the blackdown port of" - eerror "java. If you use another java implementation, it could fail" - eerror "horribly, so please merge the blackdown-jdk and set it as" - eerror "system VM before proceeding:" - eerror - eerror " # emerge blackdown-jdk" - eerror " # java-config --set-system-vm=blackdown-jdk-" - eerror " # env-update" - eerror " # source /etc/profile" - eerror - eerror "Please adjust according to the version installed in" - eerror "/opt." - eerror - eerror "If you however want to test another JDK (not officially supported)," - eerror "you could do the following:" - eerror - eerror " # export FORCE_JAVA=yes" - eerror - die + if [ -z "${JDK_HOME}" ] || [ ! -d "${JDK_HOME}" ] + then + eerror "In order to compile java sources you have to set the" + eerror "\$JDK_HOME environment properly." + eerror "" + eerror "You can achieve this by using the java-config tool:" + eerror " emerge java-config" + die "Couldn't find a valid JDK home" + fi fi + ewarn " This version should now also compile fine with gcc 3.4.x " + ewarn " If you encounter problems in relation to this, please report " + ewarn " them to http://bugs.gentoo.org " + ewarn "" ewarn " It is important to note that OpenOffice.org is a very fragile " ewarn " build when it comes to CFLAGS. A number of flags have already " ewarn " been filtered out. If you experience difficulty merging this " @@ -131,10 +94,10 @@ pkg_setup() { ewarn " merge again. " set_languages - } set_languages () { + if [ -z "$LANGUAGE" ]; then LANGUAGE=01 fi @@ -210,19 +173,17 @@ oo_setup() { unset LANGUAGE unset LANG - - export NEW_GCC="0" + unset LC_ALL if [ -x /usr/sbin/gcc-config ] then # Do we have a gcc that use the new layout and gcc-config ? if /usr/sbin/gcc-config --get-current-profile &> /dev/null then - export NEW_GCC="1" export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)" # Just recheck gcc version ... - if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ] + if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ] && [ "$(gcc-version)" != "3.4" ] then # See if we can get a gcc profile we know is proper ... if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null @@ -230,7 +191,7 @@ oo_setup() { export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1):${PATH}" export GCC_PROFILE="${CHOST}-3.2.1" else - eerror "This build needs gcc-3.2 or gcc-3.3!" + eerror "This build needs gcc-3.2, gcc-3.3 or gcc-3.4!" eerror eerror "Use gcc-config to change your gcc profile:" eerror @@ -242,8 +203,6 @@ oo_setup() { fi fi fi - - export JAVA_BINARY="`which java`" } src_unpack() { @@ -251,52 +210,45 @@ src_unpack() { oo_setup cd ${WORKDIR} - unpack OOo_${MY_PV}_source.tar.bz2 gpc231.tar.Z - - # Install gpc - cd ${WORKDIR}/gpc231 - cp gpc.* ${S}/external/gpc - + unpack ${A} cd ${S} - cd ${S}/stlport - rm STLport-4.5.3.patch - epatch ${FILESDIR}/${PV}/newstlportfix.patch - cd ${S} - epatch ${FILESDIR}/${PV}/no-mozab.patch - - epatch ${FILESDIR}/${PV}/nptl.patch - - epatch ${FILESDIR}/${PV}/openoffice-1.1.0-linux-2.6-fix.patch - - if [ ${ARCH} = "sparc" ]; then - epatch ${FILESDIR}/${PV}/openoffice-1.1.0-sparc64-fix.patch + # Fix for missing ppc mozilla includes bug #71268 + if use ppc; then + cp ${DISTDIR}/LINUXGCCPinc.zip ${S}/moz/zipped || die + cp ${DISTDIR}/LINUXGCCPlib.zip ${S}/moz/zipped || die + cp ${DISTDIR}/LINUXGCCPruntime.zip ${S}/moz/zipped || die fi - #Security fix - epatch ${FILESDIR}/${PV}/neon.patch + #Still needed: The STLport patch + cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die + epatch ${FILESDIR}/${PV}/newstlportfix.patch + + epatch ${FILESDIR}/${PV}/openoffice-java.patch - #The gcc-3.2.3 version in gentoo is fixed for the internal error that - #blocks compilation with it, so remove the check from the configure script -# epatch ${FILESDIR}/${PV}/fixed-gcc.patch + epatch ${FILESDIR}/${PV}/gcc-instlib.patch -# epatch ${FILESDIR}/${PV}/no-crashrep.patch + #Fix for newer Freetype + epatch ${FILESDIR}/${PV}/freetype-217.patch -# einfo "Fixing up crashrep/source/unx/makefile.mk" -# sed -i -e "s,\(PRODUCT[^a-zA-Z]*\)\(FULL\),\1full," ${S}/crashrep/source/unx/makefile.mk||die -# einfo "Removing crashrep from the installed set" -# sed -i -e "s,\(crashrep \),," ${S}/instsetoo/prj/build.lst + # GCC 3.4.x fixes + if [ "$(gcc-version)" = "3.4" ] + then + epatch ${FILESDIR}/${PV}/gcc34.patch.bz2 + use !java && epatch ${FILESDIR}/${PV}/gcc34-nojava-fix.patch + use nptl && epatch ${FILESDIR}/${PV}/gcc34-nptl-fix.patch + fi # Compile problems with these ... filter-flags "-funroll-loops" filter-flags "-fomit-frame-pointer" filter-flags "-fprefetch-loop-arrays" filter-flags "-fno-default-inline" + filter-flags "-fstack-protector" + filter-flags "-ftracer" append-flags "-fno-strict-aliasing" replace-flags "-O3" "-O2" - - # Enable Bytecode Interpreter for freetype ... - append-flags "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER" + replace-flags "-Os" "-O2" if [ "$(gcc-version)" == "3.2" ]; then einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3" @@ -304,19 +256,11 @@ src_unpack() { fi # Now for our optimization flags ... - perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \ - ${S}/solenv/inc/unxlngi3.mk + export CXXFLAGS="${CXXFLAGS} -fno-for-scope -fpermissive -fno-rtti" perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \ ${S}/solenv/inc/unxlngi4.mk - - # Some makefiles are not multiprocess ready (Mandrake) - cd ${S}; einfo "Fixing makefiles for multiprocess builds..." - for x in io/source/stm dtrans/source/X11 idlc/source nas zlib toolkit/util \ - comphelper/util padmin/source svtools/util bridges/source/prot_uno \ - framework/util framework/source/unotypes - do - perl -pi -e "s/^(PRJNAME)/MAXPROCESS=1\n\1/" ${x}/makefile.mk - done + perl -pi -e "s|^CFLAGSCXX=.*|CFLAGSCXX=${CXXFLAGS}|g" \ + ${S}/solenv/inc/unxlngi4.mk #Do our own branding by setting gentoo linux as the vendor sed -i -e "s,\(//\)\(.*\)\(my company\),\2Gentoo Linux," ${S}/offmgr/source/offapp/intro/ooo.src @@ -325,14 +269,14 @@ src_unpack() { get_EnvSet() { # Determine what Env file we should be using (Az) - export LinuxEnvSet="LinuxIntelEnv.Set" - use sparc && export LinuxEnvSet="LinuxSparcEnv.Set" - use ppc && export LinuxEnvSet="LinuxPPCEnv.Set" - use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set" + export LinuxEnvSet="LinuxIntelEnv.Set.sh" + use sparc && export LinuxEnvSet="LinuxSparcEnv.Set.sh" + use ppc && export LinuxEnvSet="LinuxPPCEnv.Set.sh" + use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set.sh" # Get build specific stuff (Az) - export SOLVER="$(awk '/^setenv UPD / {gsub(/\"/, ""); print $3}' ${LinuxEnvSet})" - export SOLPATH="$(awk '/^setenv INPATH / {gsub(/\"/, ""); print $3}' ${LinuxEnvSet})" + export SOLVER="$(awk '/^UPD=/ {gsub(/\"/, ""); gsub(/UPD=/, ""); print $0}' ${LinuxEnvSet})" + export SOLPATH="$(awk '/^INPATH=/ {gsub(/\"/, ""); gsub(/INPATH=/, ""); print $0}' ${LinuxEnvSet})" } src_compile() { @@ -340,48 +284,26 @@ src_compile() { addpredict /bin addpredict /root/.gconfd local buildcmd="" + export MYCONF="" - set_languages - - oo_setup - - # Setup default compilers (We overide gcc2 if that is default here) - export CC="$(gcc-getCC)" - export CXX="$(gcc-getCXX)" - - # Enable ccache for this build (Az) - if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \ - "${FEATURES/ccache/}" != "${FEATURES}" -a \ - -d /usr/bin/ccache -a -x /usr/bin/ccache/ccache ] - then - # Build uses its own env with $PATH, etc, so - # we take the easy way out. (Az) - export CC="/usr/bin/ccache/ccache ${CC}" - export CXX="/usr/bin/ccache/ccache ${CXX}" - - # Enable new ccache for this build - elif [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \ - "${FEATURES/ccache/}" != "${FEATURES}" -a \ - -x /usr/bin/ccache -a ! -d /usr/bin/ccache ] + #Check if we use java + if use java then - # Build uses its own env with $PATH, etc, so - # we take the easy way out. (Az) - export CC="/usr/bin/ccache ${CC}" - export CXX="/usr/bin/ccache ${CXX}" + MYCONF="${MYCONF} --with-jdk-home=${JAVA_HOME}" + else + MYCONF="${MYCONF} --disable-java" fi - # Enable distcc for this build (Az) - if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \ - "${FEATURES/distcc/}" != "${FEATURES}" -a \ - -x /usr/bin/distcc ] + #See if we use system-curl + if use curl then - # Do not bump ECPUS if the user did not touch it, as currently - # it -PP do not work properly (segfaulting). (Az) - [ "$(echo ${DISTCC_HOSTS} | wc -w)" -gt 1 -a "${ECPUS}" -qt 1 ] && \ - export ECPUS="$(echo ${DISTCC_HOSTS} | wc -w)" + MYCONF="${MYCONF} --with-system-curl" + fi - export CC="distcc ${CC}" - export CXX="distcc ${CXX}" + #See if we use system-zlib + if use zlib + then + MYCONF="${MYCONF} --with-system-zlib" fi # Do NOT compile with a external STLport, as gcc-2.95.3 users will @@ -390,87 +312,55 @@ src_compile() { einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..." cd ${S}/config_office rm -f config.cache + if [ "LANGNAME" != "ENUS" ]; then LANGNAME="${LANGNAME},ENUS" fi - ./configure --enable-gcc3 \ - --with-jdk-home=${JAVA_HOME} \ - --with-lang=${LANGNAME}\ - --with-x || die - cd ${S} - get_EnvSet + use sparc && MYCONF="${MYCONF} --disable-mozilla" - # Do not include /usr/include in header search path, and - # same thing for internal gcc include dir, as gcc3 handles - # it correctly by default! (Az) - perl -pi -e "s| -I/usr/include||g" ${LinuxEnvSet} -# perl -pi -e "s| -I$(gcc-libpath)/include||g" ${LinuxEnvSet} + MYCONF="${MYCONF} --enable-libart \ + --with-lang=${LANGNAME} \ + --enable-libsn \ + --without-fonts \ + --with-system-freetype" - if [ "${NEW_GCC}" -eq "1" ] - then - local gcc_path="$(/usr/sbin/gcc-config --get-bin-path ${GCC_PROFILE})" + ./configure ${MYCONF} || die - # Setup path for new gcc layout in $LinuxEnvSet, else the build - # environment will not find gcc ... (Az) - perl -pi -e "s|PATH \.:\$SOLARVER|PATH \.:${gcc_path}:\$SOLARVER|" ${LinuxEnvSet} - # New builds start quoting stuff ... - perl -pi -e "s|PATH \"\.:\$SOLARVER|PATH \"\.:${gcc_path}:\$SOLARVER|" ${LinuxEnvSet} - fi + cd ${S} + get_EnvSet + + # Set $ECPUS to amount of processes multiprocessing build should use. + # NOTE: Setting this too high might cause dmake to segfault!! + # Setting this to anything but "1" on my pentium4 causes things + # to segfault :( + [ -z "${ECPUS}" ] && export ECPUS="1" # Should the build use multiprocessing? # We use build.pl directly, as dmake tends to segfault. (Az) if [ "${ECPUS}" -gt 1 ] then - buildcmd="${S}/solenv/bin/build.pl --all -P ${ECPUS} product=full" + buildcmd="${S}/solenv/bin/build.pl --all -P${ECPUS} product=full strip=true --dlv_switch link" else - buildcmd="${S}/solenv/bin/build.pl --all product=full" + buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link" fi if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ] then # Set CCCOMP and CXXCOMP. This is still needed for STLport - echo "setenv CCCOMP \"${CC}\"" >> ${S}/${LinuxEnvSet} - echo "setenv CXXCOMP \"${CXX}\"" >> ${S}/${LinuxEnvSet} - fi - - if [ "$(gcc-major-version)" -eq 3 ] - then - mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/{lib,inc} - - einfo "Installing GCC related libs..." - # Workaround for missing libs with GCC3 (thanks to Debian) (Az) - cd ${S}/solver/${SOLVER}/${SOLPATH}/lib - cp $(gcc-libpath)/libstdc++.so.$(gcc-libstdcxx-major-version)* . || \ - die "Could not copy gcc-libs!" - cp $(gcc-libpath)/libgcc_s.so* . || die "Could not copy gcc-libs!" - cd ${S} + export CCCOMP="$(tc-getCC)" + export CXXCOMP="$(tc-getCXX)" fi einfo "Bootstrapping OpenOffice.org..." # Get things ready for bootstrap (Az) chmod 0755 ${S}/solenv/bin/*.pl - mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/inc - touch ${S}/solver/${SOLVER}/${SOLPATH}/inc/minormkchanged.flg # Bootstrap ... - ./bootstrap - - if [ "$(gcc-major-version)" -eq 3 ] - then - local LIBFILE="$(readlink `gcc-libpath`/libstdc++.so.`gcc-libstdcxx-major-version`)" - local LIBVERSION="$(echo ${LIBFILE} | sed -e 's|libstdc++\.so\.||g')" - # Get this beast to use the right version of libstdc++ ... (Az) - echo "LIBSTDCPP3:=${LIBVERSION}" >> \ - ${S}/solver/${SOLVER}/${SOLPATH}/inc/comp_ver.mk - cd ${S} - fi + ./bootstrap || die einfo "Building OpenOffice.org..." - # Setup virtualmake - export maketype="tcsh" - echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${buildcmd}" > build.tcsh - # Build needs X to compile! (Az) - virtualmake build.tcsh || die "Build failed!" + echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && LINK=g++ ${buildcmd}" > build.sh + sh build.sh || die "Build failed!" [ -d ${S}/instsetoo/${SOLPATH} ] || die "Cannot find build directory!" } @@ -483,23 +373,12 @@ src_install() { addpredict "/dev/dri" addpredict "/usr/bin/soffice" addpredict "/pspfontcache" - - # This allows us to change languages without editing the ebuild. - # - # languages1="ENUS,FREN,GERM,SPAN,ITAL,DTCH,PORT,SWED,POL,RUSS" - # languages2="DAN,GREEK,TURK,CHINSIM,CHINTRAD,JAPN,KOREAN,CZECH,CAT" - # - # Supported languages for localized help files - # - # helplangs="ENUS,FREN,GERM,SPAN,ITAL,SWED" - # - set_languages - - get_EnvSet + addpredict "/opt/OpenOffice.org/foo.tmp" + addpredict "/opt/OpenOffice.org/delme" # The install part should now be relatively OK compared to # what it was. Basically we use autoresponse files to install - # unattended, running under a Xvfb if needed. Afterwards we + # unattended. Afterwards we # just cleanout ${D} from the registry, etc. This way we # do not need pre-generated registry, and also fixes some weird # bugs related to the old way we did things. @@ -520,7 +399,7 @@ src_install() { JavaSupport=preinstalled_or_none END_RS - # Autoresponse file for user isntallation + # Autoresponse file for user installation cat > ${T}/rsfile-local <<-"END_RS" [ENVIRONMENT] INSTALLATIONMODE=INSTALL_WORKSTATION @@ -533,20 +412,17 @@ src_install() { # Fixing install location in response file sed -e "s||${D}${INSTDIR}|" \ - ${T}/rsfile-global > ${T}/autoresponse + ${T}/rsfile-global > ${T}/autoresponse || die einfo "Installing OpenOffice.org into build root..." dodir ${INSTDIR} cd ${S}/instsetoo/${SOLPATH}/${LANGNO}/normal - # Setup virtualmake - export maketype="./setup" - # We need X to install... - virtualmake "-v -r:${T}/autoresponse" ||die + ./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed" echo einfo "Removing build root from registry..." # Remove totally useless stuff. - rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh} + rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh} || die # Remove build root from registry and co egrep -rl "${D}" ${D}${INSTDIR}/* | \ xargs -i perl -pi -e "s|${D}||g" {} || : @@ -567,7 +443,7 @@ src_install() { # Install user autoresponse file insinto /etc/openoffice - sed -e "s||${PV//_rc3/.0}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf + sed -e "s||${PV}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf doins ${T}/autoresponse-${PV}.conf # Install wrapper script @@ -575,15 +451,11 @@ src_install() { sed -e "s||${PV}|g" \ ${FILESDIR}/${PV}/ooffice-wrapper-1.3 > ${T}/ooffice doexe ${T}/ooffice + # Component symlinks - dosym ooffice /usr/bin/oocalc - dosym ooffice /usr/bin/oodraw - dosym ooffice /usr/bin/ooimpress - dosym ooffice /usr/bin/oomath - dosym ooffice /usr/bin/oowriter - dosym ooffice /usr/bin/ooweb - dosym ooffice /usr/bin/oosetup - dosym ooffice /usr/bin/oopadmin + for app in calc draw impress math writer web setup padmin; do + dosym ooffice /usr/bin/oo${app} + done einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..." if use gnome @@ -593,7 +465,10 @@ src_install() { doins ${D}${INSTDIR}/share/gnome/net/.directory doins ${D}${INSTDIR}/share/gnome/net/.order - for x in ${D}${INSTDIR}/share/gnome/net/*.desktop + # Change this to ooo*.desktop from *.desktop for now, since + # otherwise two sets of icons will appear in the GNOME menu. + # (04 Aug 2003) + for x in ${D}${INSTDIR}/share/gnome/net/ooo*.desktop do # We have to handle soffice and setup differently perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x} @@ -626,19 +501,21 @@ src_install() { done fi - # Unneeded, as they get installed into /usr/share... - # They are needed else user installation fails. -# rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde} + # Do not actually install the desktop bindings for users, we have + # installed them globally + for module in gid_Module_Optional_Gnome gid_Module_Optional_Kde gid_Module_Optional_Cde + do + perl -pi -e "/^Module $module/ .. /^End/ and s|(Installed.*)=.*|\1= NO;|" \ + ${D}${INSTDIR}/program/instdb.ins + done + + + + # Remove unneeded stuff rm -rf ${D}${INSTDIR}/share/cde -# -# for f in ${D}/usr/share/gnome/apps/OpenOffice.org/* ; do -# echo 'Categories=Application;Office;' >> ${f} -# done # Make sure these do not get nuked. - keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} - keepdir ${INSTDIR}/user/psprint/{driver,fontmetric} - keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template} + keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} ${INSTDIR}/user/psprint/{driver,fontmetric} ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template} } pkg_postinst() { @@ -650,8 +527,5 @@ pkg_postinst() { einfo " Also, for individual components, you can use any of:" einfo einfo " oocalc, oodraw, ooimpress, oomath, ooweb or oowriter" - einfo - einfo " If the fonts appear garbled in the user interface refer to " - einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8" } -- 2.26.2