FreeBSD Bugzilla – Attachment 146278 Details for
Bug 192545
[patch] unbreak editors/openoffice-4 (4.1.0) on FreeBSD 10.0 and 11.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to unbreak editors/openoffice-4 on FreeBSD 10.0 and 11.0 with USES=python with Makefile and patch cleanups
openoffice.patch3 (text/plain), 24.99 KB, created by
Don Lewis
on 2014-08-25 22:50:32 UTC
(
hide
)
Description:
patch to unbreak editors/openoffice-4 on FreeBSD 10.0 and 11.0 with USES=python with Makefile and patch cleanups
Filename:
MIME Type:
Creator:
Don Lewis
Created:
2014-08-25 22:50:32 UTC
Size:
24.99 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 366159) >+++ 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 > >@@ -84,8 +91,7 @@ > USE_GL= gl glu > USE_GSTREAMER= yes > USE_GCC= yes >-USE_PYTHON= yes >-USES+= bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils >+USES+= bison desktop-file-utils gmake perl5 pkgconfig python tar:bzip2 > USE_PERL5= build > WITHOUT_CPU_CFLAGS= true > MAKE_JOBS_SAFE= yes >@@ -142,7 +148,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 +158,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 +181,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 +192,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 +213,9 @@ > --x-includes={LOCALBASE}/include \ > --x-libraries=${LOCALBASE}lib \ > --with-system-zlib >+# system-graphite causes breakage when compiled with clang and linked >+# with libc++ because aoo is compiled with gcc and linked with libstdc++. >+# --with-system-graphite > > #OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt > #OOOEXTENSIONS+= presenter/presenter-screen.oxt >@@ -218,106 +230,107 @@ > # really tweak, extremely useful when you build all localized language versions > # needed after when you build with ALL_LOCALIZED_LANGS. > .if defined(TWEAK_L10N) >- @${RM} -f ${WRKDIR}/.PLIST* >- @${RM} -f ${WRKDIR}/.install_done.* >- @${RM} -f ${WRKDIR}/.package_done.* >- @${RM} -f ${WRKDIR}/.extract_done.* >- @${RM} -f ${WRKDIR}/.patch_done.* >- @${RM} -f ${WRKDIR}/.configure_done.* >- @${RM} -f ${WRKDIR}/.build_done.* >- @${MKDIR} ${WRKDIR} >- @${TOUCH} ${EXTRACT_COOKIE} >- @${TOUCH} ${PATCH_COOKIE} >- @${TOUCH} ${CONFIGURE_COOKIE} >- @${TOUCH} ${BUILD_COOKIE} >+ ${RM} -f ${WRKDIR}/.PLIST* >+ ${RM} -f ${WRKDIR}/.install_done.* >+ ${RM} -f ${WRKDIR}/.package_done.* >+ ${RM} -f ${WRKDIR}/.extract_done.* >+ ${RM} -f ${WRKDIR}/.patch_done.* >+ ${RM} -f ${WRKDIR}/.configure_done.* >+ ${RM} -f ${WRKDIR}/.build_done.* >+ ${MKDIR} ${WRKDIR} >+ ${TOUCH} ${EXTRACT_COOKIE} >+ ${TOUCH} ${PATCH_COOKIE} >+ ${TOUCH} ${CONFIGURE_COOKIE} >+ ${TOUCH} ${BUILD_COOKIE} > .endif > > post-extract: >- @${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ >- @${RM} -rf ${WRKSRC}/l10n >+ ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} >+ ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ >+ ${RM} -rf ${WRKSRC}/l10n > > post-patch: > .if defined (USE_GCC) >- @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk >- @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk >+ ${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk >+ ${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk > .else >- @${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk >- @${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk >+ ${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk >+ ${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk > .endif > > pre-configure: >- @${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip >+ ${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 ${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}" >+ 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}" > > do-install: >- @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES >- @${RM} -Rf ${WRKDIR}/tmp >- @${MKDIR} ${WRKDIR}/tmp >+ cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES >+ ${RM} -Rf ${WRKDIR}/tmp >+ ${MKDIR} ${WRKDIR}/tmp > @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ > ${ECHO_CMD} "extracting $$i" ; \ > cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \ > done >- @${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 >- @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ >- @cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ >+ ${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\/${AOOVERSION1}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc >+ ${MKDIR} ${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} >- @for prog in crashrep pagein uri-encode javaldx regmerge regview; do \ >- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/$${prog}; \ >+ ${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}/${OOODIR}/program/$${prog}; \ > done >- @${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; >+ ${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; > @${ECHO_MSG} "===> Add wrapper scripts"; >- @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ >- @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ >+ ${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ >+ ${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ > -e 's#%%SVNREVISION%%#${SVNREVISION}#g' \ > -e 's#%%OOODIR%%#${OOODIR}#g' \ > -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ > ${WRKDIR}/openoffice-wrapper >- @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ >+ ${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ > ${STAGEDIR}${PREFIX}/bin/${EXECBASE} >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter >- @${ECHO_CMD} "" > ${TMPPLIST} >- @${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST} >- @${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST} >- @${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST} >- @cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST} >- @cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} >- @cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \ >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter >+ ${ECHO_CMD} "" > ${TMPPLIST} >+ ${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST} >+ ${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST} >+ ${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST} >+ cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST} >+ cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} >+ cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \ > ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} >- @for app in base calc draw impress math writer; do \ >+ for app in base calc draw impress math writer; do \ > ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \ > -e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \ > ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \ > done >- @${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \ >+ ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \ > -e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \ > ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop >- @${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \ >+ ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \ > ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop >- @${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak >- @${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} >- @${MKDIR} ${STAGEDIR}${DESKTOPDIR} >- @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \ >+ ${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak >+ ${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} >+ ${MKDIR} ${STAGEDIR}${DESKTOPDIR} >+ ${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \ > ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} >- @${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST} >- @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ >+ ${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST} >+ for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ > for app in base calc draw impress math printeradmin writer; do \ > if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \ > ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \ >@@ -333,9 +346,9 @@ > ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \ > done ; \ > done >- @${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST} >- @${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} >- @${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} >+ ${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST} >+ ${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} >+ ${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} > > .include <${FILESDIR}/Makefile.others> > >Index: distinfo >=================================================================== >--- distinfo (revision 366159) >+++ 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:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >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 >Index: files/patch-sal >=================================================================== >--- files/patch-sal (revision 366159) >+++ files/patch-sal (working copy) >@@ -11,43 +11,3 @@ > /** Returns a reference to a character of this string. */ > sal_Char& operator[]( int n ) { return pData->buffer[n]; } > /** Returns a const reference to a character of this string. */ >-build -- version: 275224 >- >- >-============= >-Building module canvas >-============= >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/inc >- >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/factory >- >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/tools >- >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/null >- >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/vcl >- >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo >- >-Compiling: canvas/source/cairo/cairo_textlayout.cxx >-g++46 -fmessage-length=0 -c -O2 -fno-strict-aliasing -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0 -I/usr/local/include/cairo -I/usr/local/include/glib-2.0 -I/usr/local/include/pixman-1 -I/usr/local/include/freetype2 -I/usr/local/include/libpng15 -D_THREAD_SAFE -I/usr/local/include -I/usr/local/include/freetype2 -I. -I../../unxfbsdx.pro/inc/cairocanvas -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxfbsdx.pro/inc -I. -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/stl -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/external -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/unxfbsdx/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/res -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc/Xp31 -I/usr/local/openjdk6/include -I/usr/local/openjdk6/include/freebsd -I/usr/local/openjdk6/include/bsd -I/usr/local/openjdk6/include/linux -I/usr/local/openjdk6/include/native_threads/include -I/usr/local/include -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/offuh -I. -I../../res -I. -pipe -Wl,-rpath=/usr/local/lib/gcc46 -fvisibility-inlines-hidden -g1 -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fpic -DFREEBSD -DUNX -DVCL -DGCC -DC341 -DX86_64 -DX86_64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_GCC_VISIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/local/lib/gcc46/include/c++ -DSUPD=410 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGUI -DSOLAR_JAVA -DVERBOSE -DSHAREDLIB -D_DLL_ -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON -o ../../unxfbsdx.pro/slo/cairo_textlayout.o /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member function 'void cairocanvas::TextLayout::useFont(cairo::Cairo*)': >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error: 'rtl::OString::operator const sal_Char*() const' is private >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:315:157: error: within this context >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member function 'bool cairocanvas::TextLayout::draw(cairo::Cairo*)': >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error: 'rtl::OString::operator const sal_Char*() const' is private >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:336:40: error: within this context >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx: In member function 'bool cairocanvas::TextLayout::draw(cairo::SurfaceSharedPtr&, OutputDevice&, const Point&, const com::sun::star::rendering::ViewState&, const com::sun::star::rendering::RenderState&) const': >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:475:51: warning: declaration of 'aIter' shadows a previous local [-Wshadow] >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:415:47: warning: shadowed declaration is here [-Wshadow] >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:476:57: warning: declaration of 'aEnd' shadows a previous local [-Wshadow] >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:416:53: warning: shadowed declaration is here [-Wshadow] >-dmake: Error code 1, while making '../../unxfbsdx.pro/slo/cairo_textlayout.obj' >-ERROR: error 65280 occurred while making /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo >- >Index: files/patch-sal-inline >=================================================================== >--- files/patch-sal-inline (revision 366159) >+++ files/patch-sal-inline (working copy) >@@ -1,16 +0,0 @@ >-Index: sal/util/makefile.mk >-=================================================================== >---- sal/util/makefile.mk (revision 1509387) >-+++ sal/util/makefile.mk (working copy) >-@@ -45,6 +45,11 @@ >- CFLAGS+= $(LFS_CFLAGS) >- CXXFLAGS+= $(LFS_CFLAGS) >- >-+# gcc can have some broken inlining optimizations >-+.IF "$(OS)"=="FREEBSD" && "$(COM)" == "GCC" >-+CFLAGS += -fkeep-inline-functions >-+.ENDIF >-+ >- .IF "$(depend)" == "" >- >- # --- Files --------------------------------------------------------
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 192545
:
145604
|
146198
| 146278