Attachment 145604 Details for Bug 192545 – patch to unbreak editors/openoffice-4 on FreeBSD 10.0 and 11.0

[patch] patch to unbreak editors/openoffice-4 on FreeBSD 10.0 and 11.0

openoffice410.patch4 (text/plain), 9.32 KB, created by Don Lewis on 2014-08-10 07:44:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Lewis

Created: 2014-08-10 07:44:24 UTC

Size: 9.32 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 364344)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	apache-openoffice
>-PORTVERSION=	4.1.0
>+PORTVERSION=	${AOOVERSION}
> CATEGORIES=	editors java
> MASTER_SITES=	${MASTER_SITE_APACHE:S@%SUBDIR%@openoffice/${PORTVERSION}/source@} \
> 		${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@}:extsrc
>@@ -13,7 +13,7 @@
> PKGNAMESUFFIX=		-${LANG_SUFFIX}
> .endif
> DISTFILES=	${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
>-EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
>+EXTRACT_ONLY=	${OOOSRC}
> 
> MAINTAINER=	office@FreeBSD.org
> #de facto maintainer is maho@FreeBSD.org
>@@ -41,38 +41,45 @@
> 		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
> 		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
> 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
>-#		mdds>=0.9.0:${PORTSDIR}/devel/mdds
> LIB_DEPENDS=								\
> 		libapr-1.so:${PORTSDIR}/devel/apr1			\
> 		libcurl.so:${PORTSDIR}/ftp/curl				\
> 		libcairo.so:${PORTSDIR}/graphics/cairo			\
>+		libjpeg.so:${PORTSDIR}/graphics/jpeg			\
>+		libpng.so:${PORTSDIR}/graphics/png			\
> 		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
>-		libgraphite.so:${PORTSDIR}/graphics/silgraphite		\
> 		libCoinMP.so:${PORTSDIR}/math/coinmp			\
> 		libfreetype.so:${PORTSDIR}/print/freetype2		\
> 		libnss3.so:${PORTSDIR}/security/nss			\
> 		libexpat.so:${PORTSDIR}/textproc/expat2			\
> 		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	\
>+		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
> 		libtextcat.so:${PORTSDIR}/textproc/libtextcat		\
>-		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
>+		libmythes-1.2.so:${PORTSDIR}/textproc/mythes		\
> 		librdf.so:${PORTSDIR}/textproc/redland			\
> 		libserf-1.so:${PORTSDIR}/www/serf
>-#		libjpeg.so:${PORTSDIR}/graphics/jpeg
>-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
>+#		libgraphite.so:${PORTSDIR}/graphics/silgraphite
>+RUN_DEPENDS=								\
>+		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
> 		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
> 		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
> 		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
> 		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
> 
>+AOOVERSION1=		4
>+AOOVERSION2=		1
>+AOOVERSION3=		0
>+AOOVERSION=		${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
>+AOOXXX=			${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
> SVNREVISION=		1589052
>-OOOSRC=			apache-openoffice-${PORTVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
>-EXTSRC=			ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}_1${EXTRACT_SUFX}
>+OOOSRC=			apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
>+EXTSRC=			ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140809.tar.gz
> 
>-OOODIR=			openoffice4
>-INSTALLATION_BASEDIR?=	openoffice-${PORTVERSION}
>-EXECBASE?=		openoffice-${PORTVERSION}
>+OOODIR=			openoffice${AOOVERSION1}
>+AOOSUFFIX=		${PORTVERSION}
>+INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
>+EXECBASE?=		openoffice-${AOOSUFFIX}
> DIST_SUBDIR=		openoffice
>-SIMPLEOSVER=		${OSREL:C/\.//g}
> 
> NO_LATEST_LINK=	yes
> 
>@@ -142,7 +149,8 @@
> 
> USE_AUTOTOOLS=	autoconf
> GNU_CONFIGURE=	yes
>-WRKSRC?=	${WRKDIR}/aoo-${PORTVERSION}/main
>+WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
>+WRKSRC?=	${WRKSUBDIR}/main
> BASH?=		${PREFIX}/bin/bash
> SUB_FILES=	pkg-message
> SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
>@@ -151,7 +159,8 @@
> MAKE_JOBS_NUMBER=	4
> .endif
> 
>-CONFIGURE_ARGS+=	--with-system-apache-commons=yes \
>+CONFIGURE_ARGS+=							\
>+			--with-system-apache-commons=yes		\
> 			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
> 			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
> 			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
>@@ -173,9 +182,9 @@
> 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
> 			--with-gperf=${LOCALBASE}/bin/gperf		\
> 			--enable-gstreamer				\
>-			--with-system-graphite				\
> 			--with-system-hunspell				\
> 			--with-system-hyphen				\
>+			--with-system-jpeg				\
> 			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
> 			--with-system-libtextcat			\
> 			--with-system-libxml				\
>@@ -184,6 +193,7 @@
> 			--with-system-lucene				\
> 			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
> 			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
>+			--with-system-mythes				\
> 			--with-system-nss				\
> 			--enable-opengl					\
> 			--with-system-openssl				\
>@@ -204,6 +214,7 @@
> 			--x-includes={LOCALBASE}/include		\
> 			--x-libraries=${LOCALBASE}lib			\
> 			--with-system-zlib
>+#			--with-system-graphite
> 
> #OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
> #OOOEXTENSIONS+=		presenter/presenter-screen.oxt
>@@ -233,6 +244,7 @@
> .endif
> 
> post-extract:
>+	@${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
> 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
> 	@${RM} -rf ${WRKSRC}/l10n
> 
>@@ -249,9 +261,9 @@
> 	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
> 
> do-build:
>-	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "[repositories]\n" > source_config
>-	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "main=active\n" >> source_config
>-	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "extras=active\n" >> source_config
>+	@cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config
>+	@cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config
>+	@cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config
> 	@cd ${WRKSRC} ; ./bootstrap
> 	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
> 
>@@ -266,14 +278,14 @@
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
> 	@cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
> 	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
>-	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc
>+	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/${AOOVERSION1}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
>-	@cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
>+	@cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
> 
> post-install:
>-	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program -type f $ -name '*.so*' -or -name '*.bin' $ -print0 | ${XARGS} -0 -n1 ${STRIP_CMD}
>+	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f $ -name '*.so*' -or -name '*.bin' $ -print0 | ${XARGS} -0 -n1 ${STRIP_CMD}
> 	@for prog in crashrep pagein uri-encode javaldx regmerge regview; do \
>-		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/$${prog}; \
>+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \
> 	done
> 	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
> 	@${ECHO_MSG} "===>  Add wrapper scripts";
>Index: distinfo
>===================================================================
>--- distinfo	(revision 364344)
>+++ distinfo	(working copy)
>@@ -1,6 +1,6 @@
> SHA256 (openoffice/apache-openoffice-4.1.0-r1589052-src.tar.bz2) = f73d01082fe52cc04dc91c4a53d9c8c27b551c0561b8e51ed14b1bfee8fa783e
> SIZE (openoffice/apache-openoffice-4.1.0-r1589052-src.tar.bz2) = 217686497
>-SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.1.0.r1589052_1.tar.bz2) = ce261cc499f54a61f3b0f06e0f86eedc6fa477deb2ada25f6ca3f0e7f05400b5
>-SIZE (openoffice/ApacheOpenOffice.ext_sources.4.1.0.r1589052_1.tar.bz2) = 128368053
>+SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140809.tar.gz) = d0b4925cbf8a32b9dfbf8ca708a485e150c85fe131cc60cff9eb8f0d0b5a710d
>+SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140809.tar.gz) = 94099621
> SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
> SIZE (openoffice/unowinreg.dll) = 6144
>Index: files/patch-jpeg
>===================================================================
>--- files/patch-jpeg	(revision 0)
>+++ files/patch-jpeg	(working copy)
>@@ -0,0 +1,12 @@
>+--- svtools/Library_svt.mk.orig	2014-02-25 00:28:36.000000000 -0800
>++++ svtools/Library_svt.mk	2014-08-04 21:40:00.000000000 -0700
>+@@ -76,6 +76,9 @@
>+ $(eval $(call gb_Library_set_ldflags,svt,\
>+ 	$$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
>+ ))
>++$(eval $(call gb_Library_set_ldflags,svt,\
>++	$$(shell echo $$(LDFLAGS) | sed 's/ -L[^ ]*\/jre\/lib\/[^ ]*//g') \
>++))
>+ ifeq ($(GUIBASE),os2)
>+ # YD FIXME above is not working... needs ldflags hack...
>+ $(eval $(call gb_Library_set_ldflags,svt,\
>
>Property changes on: files/patch-jpeg
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 192545: 145604 | 146198 | 146278