Fri Jul 22 03:03:28 2011 UTC ()
- apply some "const" so this builds with new bison; from jakllsch
- include <string.h> when using stdrup
- enable compilation with GCC 4.5


(mrg)
diff -r1.29 -r1.30 pkgsrc/misc/openoffice3/distinfo
diff -r0 -r1.1 pkgsrc/misc/openoffice3/patches/patch-aj
diff -r0 -r1.1 pkgsrc/misc/openoffice3/patches/patch-al
diff -r0 -r1.1 pkgsrc/misc/openoffice3/patches/patch-at
diff -r0 -r1.1 pkgsrc/misc/openoffice3/patches/patch-au

cvs diff -r1.29 -r1.30 pkgsrc/misc/openoffice3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/distinfo 2011/04/01 20:11:33 1.29
+++ pkgsrc/misc/openoffice3/Attic/distinfo 2011/07/22 03:03:28 1.30
@@ -1,47 +1,51 @@ @@ -1,47 +1,51 @@
1$NetBSD: distinfo,v 1.29 2011/04/01 20:11:33 bouyer Exp $ 1$NetBSD: distinfo,v 1.30 2011/07/22 03:03:28 mrg Exp $
2 2
3SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498 3SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
4RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0 4RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0
5Size (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 6500967 bytes 5Size (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 6500967 bytes
6SHA1 (openoffice-3.1.1/OOo_3.1.1_src_core.tar.bz2) = e4e68570d488061e7e2e513e33916ce192dd1348 6SHA1 (openoffice-3.1.1/OOo_3.1.1_src_core.tar.bz2) = e4e68570d488061e7e2e513e33916ce192dd1348
7RMD160 (openoffice-3.1.1/OOo_3.1.1_src_core.tar.bz2) = d1f2eef58fd9c3f436c82bd6347a40ae62e2a812 7RMD160 (openoffice-3.1.1/OOo_3.1.1_src_core.tar.bz2) = d1f2eef58fd9c3f436c82bd6347a40ae62e2a812
8Size (openoffice-3.1.1/OOo_3.1.1_src_core.tar.bz2) = 185952495 bytes 8Size (openoffice-3.1.1/OOo_3.1.1_src_core.tar.bz2) = 185952495 bytes
9SHA1 (openoffice-3.1.1/OOo_3.1.1_src_extensions.tar.bz2) = dba308a76a75320507c0d67a4cf5d2dac3dd01b0 9SHA1 (openoffice-3.1.1/OOo_3.1.1_src_extensions.tar.bz2) = dba308a76a75320507c0d67a4cf5d2dac3dd01b0
10RMD160 (openoffice-3.1.1/OOo_3.1.1_src_extensions.tar.bz2) = 9dbe9e083f0e32446593a09bb0a64b5e2a396f0a 10RMD160 (openoffice-3.1.1/OOo_3.1.1_src_extensions.tar.bz2) = 9dbe9e083f0e32446593a09bb0a64b5e2a396f0a
11Size (openoffice-3.1.1/OOo_3.1.1_src_extensions.tar.bz2) = 14820645 bytes 11Size (openoffice-3.1.1/OOo_3.1.1_src_extensions.tar.bz2) = 14820645 bytes
12SHA1 (openoffice-3.1.1/OOo_3.1.1_src_l10n.tar.bz2) = 24ceb884c9d97722a2359e5ffe6a24e118a3918d 12SHA1 (openoffice-3.1.1/OOo_3.1.1_src_l10n.tar.bz2) = 24ceb884c9d97722a2359e5ffe6a24e118a3918d
13RMD160 (openoffice-3.1.1/OOo_3.1.1_src_l10n.tar.bz2) = ee2f7cb6d4aaf3a882c7c2ba3ba237158d106eed 13RMD160 (openoffice-3.1.1/OOo_3.1.1_src_l10n.tar.bz2) = ee2f7cb6d4aaf3a882c7c2ba3ba237158d106eed
14Size (openoffice-3.1.1/OOo_3.1.1_src_l10n.tar.bz2) = 96600878 bytes 14Size (openoffice-3.1.1/OOo_3.1.1_src_l10n.tar.bz2) = 96600878 bytes
15SHA1 (openoffice-3.1.1/OOo_3.1.1_src_system.tar.bz2) = c8a6348a2259ae8df30a0bc3a72d09280a57988c 15SHA1 (openoffice-3.1.1/OOo_3.1.1_src_system.tar.bz2) = c8a6348a2259ae8df30a0bc3a72d09280a57988c
16RMD160 (openoffice-3.1.1/OOo_3.1.1_src_system.tar.bz2) = db38175ad14bf5785f3d08631d6d2d66598eb82b 16RMD160 (openoffice-3.1.1/OOo_3.1.1_src_system.tar.bz2) = db38175ad14bf5785f3d08631d6d2d66598eb82b
17Size (openoffice-3.1.1/OOo_3.1.1_src_system.tar.bz2) = 53316228 bytes 17Size (openoffice-3.1.1/OOo_3.1.1_src_system.tar.bz2) = 53316228 bytes
18SHA1 (patch-aa) = 8561c34e623a4b97d4e6840d8c2af0483f4e21f3 18SHA1 (patch-aa) = 8561c34e623a4b97d4e6840d8c2af0483f4e21f3
19SHA1 (patch-ab) = 454f3a357a8c16a027858ed5c789d29baa8eafcb 19SHA1 (patch-ab) = 454f3a357a8c16a027858ed5c789d29baa8eafcb
20SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d 20SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
21SHA1 (patch-ad) = 8f7afec29d927db694bf511ffd615fe903cc46dc 21SHA1 (patch-ad) = 8f7afec29d927db694bf511ffd615fe903cc46dc
22SHA1 (patch-ae) = 754b79eaca1dc872d61a7f8fd79d7ee8d0a17b39 22SHA1 (patch-ae) = 754b79eaca1dc872d61a7f8fd79d7ee8d0a17b39
23SHA1 (patch-af) = 553e67c7afd8506515ae40a252d4e26dce59fc51 23SHA1 (patch-af) = 553e67c7afd8506515ae40a252d4e26dce59fc51
24SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4 24SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
25SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012 25SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
26SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1 26SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
 27SHA1 (patch-aj) = 64a9c271ab473b2b358d863a85ce632f3d4894b3
27SHA1 (patch-ak) = e8d2f5c8b7ff997b2aa83452f73b59420d01eb6b 28SHA1 (patch-ak) = e8d2f5c8b7ff997b2aa83452f73b59420d01eb6b
 29SHA1 (patch-al) = 4de49711c725562e839925acfdf70b80a9035ce3
28SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5 30SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
29SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6 31SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
30SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c 32SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
31SHA1 (patch-ap) = d9445a00083b7e847bf54b948f699a89b811d2da 33SHA1 (patch-ap) = d9445a00083b7e847bf54b948f699a89b811d2da
32SHA1 (patch-aq) = 3e9a156887e108126c76f0735abb4dce177efa4b 34SHA1 (patch-aq) = 3e9a156887e108126c76f0735abb4dce177efa4b
33SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623 35SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
34SHA1 (patch-as) = b6a9760ba4260aa267df4e3fa0b767c6db2d49ac 36SHA1 (patch-as) = b6a9760ba4260aa267df4e3fa0b767c6db2d49ac
 37SHA1 (patch-at) = 1f970c9dd3b952bbc481a46f728e6988ff5bf2ec
 38SHA1 (patch-au) = 92febfce09a049e6d68139498be8a0d6990c9b3c
35SHA1 (patch-aw) = a331b0130b0b6bac0b81ee6a1aeeb7b216d5f511 39SHA1 (patch-aw) = a331b0130b0b6bac0b81ee6a1aeeb7b216d5f511
36SHA1 (patch-ba) = c759a1fca8893095d88e7f4ee30830fd01213a69 40SHA1 (patch-ba) = c759a1fca8893095d88e7f4ee30830fd01213a69
37SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053 41SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
38SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4 42SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4
39SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de 43SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
40SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a 44SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a
41SHA1 (patch-bh) = 39322769872a33293d9dad56b947ca2d6d5069df 45SHA1 (patch-bh) = 39322769872a33293d9dad56b947ca2d6d5069df
42SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464 46SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
43SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6 47SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
44SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c 48SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c
45SHA1 (patch-bl) = 28beb128f19199a1a86965d2e2b6d42a2565224c 49SHA1 (patch-bl) = 28beb128f19199a1a86965d2e2b6d42a2565224c
46SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa 50SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
47SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447 51SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447

File Added: pkgsrc/misc/openoffice3/patches/Attic/patch-aj
$NetBSD: patch-aj,v 1.1 2011/07/22 03:03:28 mrg Exp $

--- bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx.orig	2008-04-11 03:22:44.000000000 -0700
+++ bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx	2011-07-21 01:31:47.000000000 -0700
@@ -33,6 +33,7 @@
 
 #include <stdio.h>
 #include <dlfcn.h>
+#include <string.h>
 #include <cxxabi.h>
 #include <hash_map>
 #include <sys/param.h>

File Added: pkgsrc/misc/openoffice3/patches/Attic/patch-al
$NetBSD: patch-al,v 1.1 2011/07/22 03:03:28 mrg Exp $

enable GCC 4.5 support

--- cppu/inc/uno/lbnames.h.orig	2008-12-08 06:37:56.000000000 -0800
+++ cppu/inc/uno/lbnames.h	2011-07-20 20:07:27.000000000 -0700
@@ -65,12 +65,12 @@
 #error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
 #elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
 #define __CPPU_ENV gcc3
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)
+#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
 #define __CPPU_ENV gcc3
 #elif (__GNUC__ == 3)
 #error "Tested gcc 3 version is <= 3.4.  Patch uno/lbnames.h to try your gcc 3 version."
 #else
-#error "Supported gcc majors are 2 , 3 and 4 <= 4.4.  Unsupported gcc major version."
+#error "Supported gcc majors are 2 , 3 and 4 <= 4.5.  Unsupported gcc major version."
 #endif /* defined (__GNUC__) */
 #endif /* defined (_MSC_VER) */
 

File Added: pkgsrc/misc/openoffice3/patches/Attic/patch-at
$NetBSD: patch-at,v 1.1 2011/07/22 03:03:28 mrg Exp $

--- connectivity/source/parse/sqlbison.y.orig	2008-11-19 10:43:08.000000000 -0800
+++ connectivity/source/parse/sqlbison.y	2011-07-20 22:26:46.000000000 -0700
@@ -3654,7 +3654,7 @@
 }
 
 // -------------------------------------------------------------------------
-void OSQLParser::error(sal_Char *fmt)
+void OSQLParser::error(const sal_Char *fmt)
 {
 	if(!m_sErrorMessage.getLength())
 	{

File Added: pkgsrc/misc/openoffice3/patches/Attic/patch-au
$NetBSD: patch-au,v 1.1 2011/07/22 03:03:28 mrg Exp $

--- connectivity/inc/connectivity/sqlparse.hxx.orig	2008-12-30 14:32:01.000000000 +0000
+++ connectivity/inc/connectivity/sqlparse.hxx
@@ -213,7 +213,7 @@ namespace connectivity
 
 
 
-		void error(sal_Char *fmt);
+		void error(const sal_Char *fmt);
 		int SQLlex();
 #ifdef YYBISON
 		void setParseTree(OSQLParseNode * pNewParseTree);