summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authoragc <agc>2003-03-02 10:50:59 +0000
committeragc <agc>2003-03-02 10:50:59 +0000
commitc977dc40355c80f9967a5b90098358da4e6cd28f (patch)
tree96e68e213d6cb6ce8db4900c50021e897f4d649a /misc
parentdcf2bf005d48aff3374d9b69b58b584e9bf466c1 (diff)
downloadpkgsrc-c977dc40355c80f9967a5b90098358da4e6cd28f.tar.gz
Pull up compilation fix from the trunk to the netbsd-1-6-1 branch.
Requested by Michael Rauch. > Module Name: pkgsrc > Committed By: mrauch > Date: Thu Feb 27 20:17:50 UTC 2003 > > Modified Files: > pkgsrc/misc/openoffice: distinfo > Added Files: > pkgsrc/misc/openoffice/patches: patch-eq > > Log Message: > Reduce optimisation for a particular file to avoid a gcc internal > compiler error.
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice/distinfo3
-rw-r--r--misc/openoffice/patches/patch-eq13
2 files changed, 15 insertions, 1 deletions
diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo
index af122a8a31e..b9eeecb7342 100644
--- a/misc/openoffice/distinfo
+++ b/misc/openoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2002/12/25 16:29:59 jdolecek Exp $
+$NetBSD: distinfo,v 1.14.2.1 2003/03/02 10:50:59 agc Exp $
SHA1 (oo_641_src.tar.bz2) = ad4c7000cf317d7e9d694a6d519336bfaf1f8edd
Size (oo_641_src.tar.bz2) = 109167758 bytes
@@ -126,3 +126,4 @@ SHA1 (patch-em) = 86a0387f4c6f42bb78cae0abe8c21e9871556786
SHA1 (patch-en) = 8b74f0bf2b5fa998624a1e5478fc0710a7a644e1
SHA1 (patch-eo) = dca9afb678c9cf87ed16e352f839a82917663d10
SHA1 (patch-ep) = ca62bf9a949519bf3d54002d350be17f0d53c463
+SHA1 (patch-eq) = 1da7be56d2b9dde0056333dc1ba2b1a64cf6b822
diff --git a/misc/openoffice/patches/patch-eq b/misc/openoffice/patches/patch-eq
new file mode 100644
index 00000000000..14752f30d18
--- /dev/null
+++ b/misc/openoffice/patches/patch-eq
@@ -0,0 +1,13 @@
+$NetBSD: patch-eq,v 1.1.2.2 2003/03/02 10:51:00 agc Exp $
+
+--- ../xmloff/source/text/makefile.mk.orig 2001-07-25 09:09:04.000000000 +0200
++++ ../xmloff/source/text/makefile.mk
+@@ -78,6 +78,8 @@ CDEFS += -DCONV_STAR_FONTS
+ # --- Files --------------------------------------------------------
+
+
++NOOPTFILES= $(SLO)$/txtimp.obj
++
+ SLOFILES = \
+ $(SLO)$/txtdrope.obj \
+ $(SLO)$/txtdropi.obj \