summaryrefslogtreecommitdiff
path: root/editors/openoffice-devel
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice-devel')
-rw-r--r--editors/openoffice-devel/Makefile42
-rw-r--r--editors/openoffice-devel/distinfo8
-rw-r--r--editors/openoffice-devel/files/patch-security215
-rw-r--r--editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk17
-rw-r--r--editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk12
5 files changed, 59 insertions, 235 deletions
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 38f3065ce46f..f55d3b22f7d5 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTREVISION= 3
+PORTREVISION= 0
PORTEPOCH= 4
CATEGORIES= editors java
MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}-
PKGNAMESUFFIX= -${LANG_SUFFIX}
.endif
PKGNAMESUFFIX= -devel
-DISTFILES= ${AOOSRC}${AOODISTTAG} unowinreg.dll:unoreg ${EXTSRC}:extsrc
+DISTFILES= ${AOOSRC}${AOODISTTAG} ${EXTSRC}:extsrc
DIST_SUBDIR= openoffice
EXTRACT_ONLY= ${AOOSRC}
@@ -105,7 +105,7 @@ AOOVERSION2= 2
AOOVERSION3= 0
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
AOOTAG= AOO420m1\(Build:9800\)
-SVNREVISION= 1810071
+SVNREVISION= 1822069
#AOORC=rc3
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
@@ -150,11 +150,14 @@ WITHOUT_CPU_CFLAGS= true
CPE_PRODUCT= ${PORTNAME:S|apache-||}
CPE_VENDOR= apache
-OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA MYSQL PDFIMPORT \
- REPORT_BUILDER SDK WIKI_PUBLISHER
-OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT WIKI_PUBLISHER
+OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \
+ MYSQL PDFIMPORT REPORT_BUILDER SDK WIKI_PUBLISHER
+OPTIONS_DEFAULT= CUPS GNOME MMEDIA PDFIMPORT WIKI_PUBLISHER
+CRASHDUMP_DESC= Enable crashdumps, sets WITH_DEBUG
+DBGUTIL_DESC= Enable assertions, object counting. (non-production)
+DEBUG_DESC= Compile with -O0, sets WITH_DEBUG
GNOME_DESC= GConf + screensaver presentation control via DBUS
-GNOMEVFS_DESC= GNOME Virtual File System
+GNOMEVFS_DESC= Use GNOME Virtual File System instead of gio
MMEDIA_DESC= Multimedia backend for impress
MYSQL_DESCR= Build MySQL Connector extension
PDFIMPORT_DESC= Build and install PDF import extension
@@ -162,9 +165,16 @@ REPORT_BUILDER_DESC= Build and install Report builder extension (Broken)
SDK_DESC= Build and install software development kit
WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension
+CRASHDUMP_CONFIGURE_ENABLE= crashdump
+CRASHDUMP_VARS= WITH_DEBUG=yes
+
CUPS_CONFIGURE_ENABLE= cups
CUPS_LIB_DEPENDS= libcups.so:print/cups
+DBGUTIL_CONFIGURE_ENABLE= dbgutil
+
+DEBUG_CONFIGURE_ENABLE= debug
+
GNOME_CONFIGURE_ENABLE= dbus gconf lockdown
GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib
@@ -185,6 +195,7 @@ MYSQL_LIB_DEPENDS= libmysqlcppconn.so:databases/mysql-connector-c++
MYSQL_USES= mysql
SDK_CONFIGURE_ENABLE= odk
+SDK_DISTFILES= unowinreg.dll:unoreg
PDFIMPORT_CONFIGURE_ENABLE= pdfimport
PDFIMPORT_CONFIGURE_WITH= system-poppler
@@ -211,6 +222,10 @@ TARGET_ORDER_OVERRIDE= 710:gnome-post-icons
.include <bsd.port.pre.mk>
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+= --enable-symbols
+.endif
+
.if ${PORT_OPTIONS:MREPORT_BUILDER} || ${PORT_OPTIONS:MWIKI_PUBLISHER}
BUILD_DEPENDS+= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
RUN_DEPENDS+= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
@@ -266,7 +281,6 @@ CONFIGURE_ARGS+= \
--with-system-cairo --enable-cairo \
--with-system-coinmp \
--with-system-curl \
- --enable-crashdump \
--with-system-dicts \
--with-epm=${LOCALBASE}/bin/epm \
--with-system-expat \
@@ -331,9 +345,11 @@ pre-everything::
${TOUCH} ${BUILD_COOKIE}
.endif
+do-extract-SDK-on:
+ ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
+
post-extract:
${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
${CP} ${FILESDIR}/freebsd-aoo-intro-developer.png \
${WRKSRC}/default_images/introabout/intro.png
${CP} ${FILESDIR}/freebsd-aoo-about-developer.png \
@@ -444,7 +460,9 @@ do-build:
do-install:
@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
${STAGEDIR}${PREFIX}/share/mime/packages
- @cd ${WRKSRC}/instsetoo_native/unxfbsd*.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
+ @cd ${WRKSRC} ; \
+ . ${FREEBSD_ENV_SET} ; \
+ cd instsetoo_native/$${INPATH}/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
for i in *.tar.?z ; do \
${ECHO_CMD} "extracting $$i" ; \
${TAR} -s '|./[^/]*/||' -xz -f $$i \
@@ -468,7 +486,9 @@ do-install:
done
@${ECHO_CMD} "adding desktop support"
@${LN} -sf ${XDGREL} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
- @cd ${WRKSRC}/sysui/unxfbsd*.pro/misc/openoffice ; \
+ @cd ${WRKSRC} ; \
+ . ${FREEBSD_ENV_SET} ; \
+ cd sysui/$${INPATH}/misc/openoffice ; \
DESTDIR=${STAGEDIR} \
GNOMEDIR=${PREFIX} \
ICON_PREFIX=openoffice${AOOVERSION1} \
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 3cdb11fd58de..593696a80e00 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1506752342
-SHA256 (openoffice/apache-openoffice-r1810071-src.tar.xz) = d5ed9637367081e03433f3a8cc2d39d84a64d7068b730f5c170d282784c6dd10
-SIZE (openoffice/apache-openoffice-r1810071-src.tar.xz) = 216675892
+TIMESTAMP = 1517014366
+SHA256 (openoffice/apache-openoffice-r1822069-src.tar.xz) = af0d92d8b1a860ea2f32c75db5848d022c4d38d089d937364300bb80ce6366cc
+SIZE (openoffice/apache-openoffice-r1822069-src.tar.xz) = 216331420
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004
-SHA256 (openoffice/apache-tomcat-5.5.36-src.tar.gz) = 0f83d54e093c0a2383ba185ca928be0ee87148d5d98569470120690ac6c2008f
-SIZE (openoffice/apache-tomcat-5.5.36-src.tar.gz) = 3743113
diff --git a/editors/openoffice-devel/files/patch-security b/editors/openoffice-devel/files/patch-security
deleted file mode 100644
index d8e033e173d9..000000000000
--- a/editors/openoffice-devel/files/patch-security
+++ /dev/null
@@ -1,215 +0,0 @@
-Index: comphelper/source/container/embeddedobjectcontainer.cxx
-===================================================================
---- comphelper/source/container/embeddedobjectcontainer.cxx (revision 1813062)
-+++ comphelper/source/container/embeddedobjectcontainer.cxx (working copy)
-@@ -127,7 +127,7 @@
- pImpl = new EmbedImpl;
- pImpl->mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
- pImpl->mbOwnsStorage = true;
-- pImpl->mbUserAllowsLinkUpdate = false;
-+ pImpl->mbUserAllowsLinkUpdate = true;
- pImpl->mpTempObjectContainer = 0;
- }
-
-@@ -136,7 +136,7 @@
- pImpl = new EmbedImpl;
- pImpl->mxStorage = rStor;
- pImpl->mbOwnsStorage = false;
-- pImpl->mbUserAllowsLinkUpdate = false;
-+ pImpl->mbUserAllowsLinkUpdate = true;
- pImpl->mpTempObjectContainer = 0;
- }
-
-@@ -145,7 +145,7 @@
- pImpl = new EmbedImpl;
- pImpl->mxStorage = rStor;
- pImpl->mbOwnsStorage = false;
-- pImpl->mbUserAllowsLinkUpdate = false;
-+ pImpl->mbUserAllowsLinkUpdate = true;
- pImpl->mpTempObjectContainer = 0;
- pImpl->m_xModel = xModel;
- }
-Index: sc/source/core/data/documen2.cxx
-===================================================================
---- sc/source/core/data/documen2.cxx (revision 1813062)
-+++ sc/source/core/data/documen2.cxx (working copy)
-@@ -229,7 +229,10 @@
- if ( eMode == SCDOCMODE_DOCUMENT )
- {
- if ( pDocShell )
-- pLinkManager = new sfx2::LinkManager( pDocShell );
-+ {
-+ pLinkManager = new sfx2::LinkManager(pDocShell);
-+ pLinkManager->SetAutoAskUpdateAllLinks();
-+ }
-
- xPoolHelper = new ScPoolHelper( this );
-
-@@ -269,6 +272,7 @@
- if ( bAutoCalc && !pLinkManager && pShell)
- {
- pLinkManager = new sfx2::LinkManager( pShell );
-+ pLinkManager->SetAutoAskUpdateAllLinks();
- }
- return pLinkManager;
- }
-Index: sfx2/inc/sfx2/linkmgr.hxx
-===================================================================
---- sfx2/inc/sfx2/linkmgr.hxx (revision 1813062)
-+++ sfx2/inc/sfx2/linkmgr.hxx (working copy)
-@@ -54,6 +54,13 @@
- SvLinkSources aServerTbl;
-
- SfxObjectShell *pPersist; // LinkMgr has to be deallocated before SfxObjectShell
-+
-+ sal_Bool mAutoAskUpdateAllLinks;
-+ sal_Bool mUpdateAsked;
-+ sal_Bool mAllowUpdate;
-+
-+ sal_Bool GetUserAllowsLinkUpdate(Window *pParent);
-+ void SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows);
- protected:
- sal_Bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType,
- const String* pName = 0 );
-@@ -104,6 +111,10 @@
-
- SvLinkSourceRef CreateObj( SvBaseLink* );
-
-+
-+ // Automatically ask user about update all links, on first insert
-+ void SetAutoAskUpdateAllLinks();
-+
- void UpdateAllLinks( sal_Bool bAskUpdate = sal_True,
- sal_Bool bCallErrHdl = sal_True,
- sal_Bool bUpdateGrfLinks = sal_False,
-Index: sfx2/source/appl/linkmgr2.cxx
-===================================================================
---- sfx2/source/appl/linkmgr2.cxx (revision 1813062)
-+++ sfx2/source/appl/linkmgr2.cxx (working copy)
-@@ -65,11 +65,12 @@
- SV_IMPL_PTRARR( SvBaseLinks, SvBaseLinkRefPtr )
-
- LinkManager::LinkManager(SfxObjectShell* p)
-- : pPersist( p )
-+ : pPersist(p),
-+ mUpdateAsked(sal_False),
-+ mAutoAskUpdateAllLinks(sal_False)
- {
- }
-
--
- LinkManager::~LinkManager()
- {
- SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData();
-@@ -157,6 +158,12 @@
- SvBaseLinkRef* pTmp = new SvBaseLinkRef( pLink );
- pLink->SetLinkManager( this );
- aLinkTbl.Insert( pTmp, aLinkTbl.Count() );
-+ Window *parent = GetPersist()->GetDialogParent();
-+ if (mAutoAskUpdateAllLinks)
-+ {
-+ SetUserAllowsLinkUpdate(pLink, GetUserAllowsLinkUpdate(parent));
-+ }
-+
- return sal_True;
- }
-
-@@ -268,7 +275,36 @@
- return bRet;
- }
-
-+void LinkManager::SetAutoAskUpdateAllLinks()
-+{
-+ mAutoAskUpdateAllLinks = sal_True;
-+}
-
-+sal_Bool LinkManager::GetUserAllowsLinkUpdate(Window *pParentWin)
-+{
-+ if (!mUpdateAsked)
-+ {
-+ if (QueryBox(pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId(STR_QUERY_UPDATE_LINKS)).Execute() == RET_YES)
-+ mAllowUpdate = sal_True;
-+ else
-+ mAllowUpdate = sal_False;
-+ mUpdateAsked = sal_True;
-+ }
-+ return mAllowUpdate;
-+}
-+
-+void LinkManager::SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows)
-+{
-+ SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
-+
-+ if (pShell)
-+ {
-+ comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer();
-+ rEmbeddedObjectContainer.setUserAllowsLinkUpdate(allows);
-+ }
-+}
-+
-+
- void LinkManager::UpdateAllLinks(
- sal_Bool bAskUpdate,
- sal_Bool /*bCallErrHdl*/,
-@@ -312,26 +348,20 @@
- if( !pLink->IsVisible() ||
- ( !bUpdateGrfLinks && OBJECT_CLIENT_GRF == pLink->GetObjType() ))
- continue;
--
-- if( bAskUpdate )
-+
-+ sal_Bool allows = sal_True;
-+
-+ if (bAskUpdate)
- {
-- int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute();
-- SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
-+ allows = GetUserAllowsLinkUpdate(pParentWin);
-+ }
-
-- if(pShell)
-- {
-- comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer();
-- rEmbeddedObjectContainer.setUserAllowsLinkUpdate(RET_YES == nRet);
-- }
-+ SetUserAllowsLinkUpdate(pLink, allows);
-+ bAskUpdate = sal_False; // one time is OK
-
-- if (RET_YES != nRet)
-- {
-- return; // nothing should be updated
-- }
-- bAskUpdate = sal_False; // one time is OK
-- }
-+ if (allows)
-+ pLink->Update();
-
-- pLink->Update();
- }
- }
-
-Index: sw/source/filter/ww8/ww8scan.cxx
-===================================================================
---- sw/source/filter/ww8/ww8scan.cxx (revision 1813062)
-+++ sw/source/filter/ww8/ww8scan.cxx (working copy)
-@@ -6467,6 +6467,12 @@
-
- if( nMax )
- {
-+ // Check size consistency
-+ if(nMax > nFFn)
-+ {
-+ throw std::out_of_range("WW8 beyond end of buffer");
-+ }
-+
- // allocate Index Array
- pFontA = new WW8_FFN[ nMax ];
- p = pFontA;
-@@ -6585,6 +6591,7 @@
-
- // Zeiger auf Ursprungsarray einen Font nach hinten setzen
- pVer8 = (WW8_FFN_Ver8*)( ((sal_uInt8*)pVer8) + pVer8->cbFfnM1 + 1 );
-+
- }
- }
- }
diff --git a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk
index acee2d1a51ee..34dfe1b4a5d1 100644
--- a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk
+++ b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk
@@ -1,6 +1,6 @@
---- solenv/gbuild/platform/freebsd.mk.orig 2017-11-27 13:50:25 UTC
+--- solenv/gbuild/platform/freebsd.mk.orig 2018-01-25 18:01:47 UTC
+++ solenv/gbuild/platform/freebsd.mk
-@@ -94,6 +94,7 @@ gb_CXXFLAGS := \
+@@ -95,6 +95,7 @@ gb_CXXFLAGS := \
-fno-use-cxa-atexit \
-fvisibility-inlines-hidden \
-fvisibility=hidden \
@@ -8,3 +8,16 @@
-pipe
ifeq ($(COM),CLANG)
gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH
+@@ -143,6 +144,12 @@ gb_LinkTarget_LDFLAGS += \
+ -Wl,--dynamic-list-cpp-typeinfo \
+ -Wl,-Bsymbolic-functions \
+
++endif
++
++ifneq ($(filter $(CPUNAME),INTEL X86_64),)
++gb_CFLAGS += -fstack-protector
++gb_CXXFLAGS += -fstack-protector
++gb_LinkTarget_LDFLAGS += -fstack-protector
+ endif
+
+ ifeq ($(gb_DEBUGLEVEL),2)
diff --git a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk
index f91d88004b2d..d4229f98d886 100644
--- a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk
+++ b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk
@@ -1,6 +1,6 @@
---- solenv/inc/unxfbsd.mk.orig 2017-11-27 13:50:28 UTC
+--- solenv/inc/unxfbsd.mk.orig 2017-01-23 03:29:47 UTC
+++ solenv/inc/unxfbsd.mk
-@@ -96,7 +96,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+@@ -105,10 +105,15 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
# -fpermissive should be removed as soon as possible
@@ -9,3 +9,11 @@
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
CFLAGSCXX += -fvisibility-inlines-hidden
.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++.IF "$(CPUNAME)" == "INTEL" || "$(CPUNAME)" == "X86_64"
++CFLAGSCC += -fstack-protector
++CFLAGSCXX += -fstack-protector
++.ENDIF
+
+ # Compiler flags for compiling static object in multi threaded environment with graphical user interface
+ CFLAGSOBJGUIMT=
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-07 01:18:40 +0000