pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/openoffice Added a patch that allows OpenOffice t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a50b2a13452
branches:  trunk
changeset: 519038:0a50b2a13452
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Sep 27 15:28:50 2006 +0000

description:
Added a patch that allows OpenOffice to be built with gcc>=4.0.

This fixes PR 34617.

diffstat:

 misc/openoffice/distinfo         |   3 ++-
 misc/openoffice/patches/patch-ba |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r dfefcd4646aa -r 0a50b2a13452 misc/openoffice/distinfo
--- a/misc/openoffice/distinfo  Wed Sep 27 15:18:58 2006 +0000
+++ b/misc/openoffice/distinfo  Wed Sep 27 15:28:50 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2005/10/03 16:03:19 mrauch Exp $
+$NetBSD: distinfo,v 1.35 2006/09/27 15:28:50 rillig Exp $
 
 SHA1 (openoffice-1.1.5/OOo_1.1.5_src.tar.gz) = 55b316209eaabf151a59ead2abc3c621502058ea
 RMD160 (openoffice-1.1.5/OOo_1.1.5_src.tar.gz) = 4f0759d0e3951dd511487f1ed774649dcc94e0db
@@ -65,3 +65,4 @@
 SHA1 (patch-av) = fa1910700a104347bf29ba19851f47eca34c8be1
 SHA1 (patch-aw) = f0decfe7d1bac881ec83b09328a6b863a9bed7b1
 SHA1 (patch-ax) = 4679a5b3eda8dbe5927cf09de81e54557a4a0809
+SHA1 (patch-ba) = 7c156791f88b4ba99ec9a4a582242633ceef7f6b
diff -r dfefcd4646aa -r 0a50b2a13452 misc/openoffice/patches/patch-ba
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice/patches/patch-ba  Wed Sep 27 15:28:50 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ba,v 1.3 2006/09/27 15:28:50 rillig Exp $
+
+When checking for gcc>=3, the correct operator is -ge, not =.
+
+--- configure.orig     2005-07-08 09:55:43.000000000 +0200
++++ configure  2006-09-27 17:17:58.000000000 +0200
+@@ -3198,7 +3198,7 @@ echo $ECHO_N "checking the GNU gcc compi
+    _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
+    _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+ 
+-   if test "$_gcc_major" = "3"; then
++   if test "$_gcc_major" -ge "3"; then
+       USE_GCC3="TRUE"
+       if test "$_gcc_longver"  -eq "030203"; then
+                if test "$ENABLE_SYMBOLS" = "SMALL"; then



Home | Main Index | Thread Index | Old Index