cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix 64-bit segfault in recently_used_file_handler.cxx/set_timestamp()

Browse Source 
caused by sscanf "%ld" -> time_t sized var.
- remove -fno-stack-protector since gcc/4.2 doesn't have that on by
  default yet
- depend on estdc++.>=11 (with dwarf2 exceptions)
okay robert@
This commit is contained in:
kurt 2009-06-04 18:32:17 +00:00
parent 1094d158a8
commit 64a99cd85e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editors/openoffice3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2009/05/26 23:26:32 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2009/06/04 18:32:17 kurt Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -10,7 +10,7 @@ VERSION= 3.1.0
DISTNAME= OOo_${VERSION}
WRKDIST= ${WRKDIR}/OOO310_m11
PKGNAME= openoffice-${VERSION}
PKGNAME-main= openoffice-${VERSION}p2
PKGNAME-main= openoffice-${VERSION}p3
PKGNAME-kde= openoffice-kde-${VERSION}
PKGNAME-java= openoffice-java-${VERSION}
CATEGORIES= editors productivity
@ -89,7 +89,7 @@ BUILD_DEPENDS+= :zip-*:archivers/zip \
MODULES+= lang/python
LIB_DEPENDS-main=gdk-x11-2.0.>=400.14,gdk_pixbuf-2.0.>=400.14,gtk-x11-2.0.>=400.14::x11/gtk+2 \
${MODPY_LIB_DEPENDS} \
estdc++.>=7:libstdc++->=4.2,<4.3:lang/gcc/4.2,-estdc \
estdc++.>=11:libstdc++->=4.2,<4.3:lang/gcc/4.2,-estdc \
db.>=4:db->=4,<5:databases/db/v4 \
xslt.>=3::textproc/libxslt \
curl.>=7::net/curl \

9
editors/openoffice3/patches/patch-solenv_inc_unxobsd_mk
View File

@ -1,6 +1,6 @@
--- solenv/inc/unxobsd.mk.orig.port Tue Jun 2 11:29:58 2009
+++ solenv/inc/unxobsd.mk Tue Jun 2 15:47:36 2009
@@ -0,0 +1,249 @@
--- solenv/inc/unxobsd.mk.orig.port Wed Jun 3 13:44:50 2009
+++ solenv/inc/unxobsd.mk Wed Jun 3 13:49:00 2009
@@ -0,0 +1,248 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@ -11,7 +11,7 @@
+#
+# $RCSfile: patch-solenv_inc_unxobsd_mk,v $
+#
+# $Revision: 1.5 $
+# $Revision: 1.6 $
+#
+# This file is part of OpenOffice.org.
+#
@ -89,7 +89,6 @@
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c
+CFLAGS+=-fno-stack-protector
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"