diff options
| author | bapt <bapt@FreeBSD.org> | 2011-09-05 19:45:31 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2011-09-05 19:45:31 +0800 |
| commit | 531cf9a695231dee8a6bd7c67ef02ae30bcc4fea (patch) | |
| tree | 2d90a2049911091fb4b1daad1a7d4fdfe2296ebf /editors | |
| parent | 4a618757195fd2b4cdd5393e316ad092ed2a94a4 (diff) | |
| download | freebsd-ports-gnome-531cf9a695231dee8a6bd7c67ef02ae30bcc4fea.tar.gz freebsd-ports-gnome-531cf9a695231dee8a6bd7c67ef02ae30bcc4fea.tar.zst freebsd-ports-gnome-531cf9a695231dee8a6bd7c67ef02ae30bcc4fea.zip | |
- update to 3.4.3
- New options:
* SYSTRAY to activate the system try icons (quick start)
* GTK (which to be able to build a completly gtk free version of libreoffice please notice that dependencies can bring back gtk, for example libgsf if not built with the following knob: WITHOUT_GCONF)
* the GNOME option automatically activate the GTK one
* PYUNO do enable/disable the build of the python bindings for the UNO framework
- Disable system notification while building
- Remove the wiki-publisher extensions, it forces the build to have 3 apache-commons distfiles bundles and one of them the httpclient was failing with some locales activated
- Use pax instead or tar cf | tar xf, it is way faster to install
- Fix reading/writting MS Office documents
- Fix random segfaults: cell rendering options in calc, languages setting in global options
- Largely reduce built time
- Unbundle more things
- Be able to work with packaged hunspell, thesaurus and hyphenation as well as the usual extensions
- Now cups is mandatory (configure script is bugguy without cups)
- remove broken
PR: ports/157357 ports/156038 ports/158945 ports/159287 ports/160023
ports/160318
Submitted by: Hartmann, O. <ohartman@zedat.fu-berlin.de> (ports/157357),
Kuan-Chung Chiu <buganini@gmail.com> (ports/156038),
Dmitry Pryanishnikov <lynx.ripe@gmail.com> (ports/158945),
Adrien <pmn@bakarika.net> (ports/159287),
Travis Hunter <travis.hunter@gmail.com> (ports/160023),
gcooper@ (ports/160318)
With hat: office@
Diffstat (limited to 'editors')
10 files changed, 334 insertions, 160 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index c4602be484dd..0d63198123c7 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -6,30 +6,29 @@ # PORTNAME= libreoffice -PORTVERSION= 3.4.2 -PORTREVISION= 1 -LOVERSION= ${PORTVERSION}.3 +PORTVERSION= 3.4.3 +LOVERSION= ${PORTVERSION}.2 CATEGORIES= editors -MASTER_SITES= http://ftp.osuosl.org/pub/tdf/libreoffice/src/ \ - http://ftp.rediris.es/mirror/TDF/libreoffice/src/ \ - http://mirrors.supportex.net/tdf/libreoffice/src/ \ - http://mirror.netcologne.de/tdf/libreoffice/src/ \ - http://mirror.informatik.uni-mannheim.de/pub/mirrors/tdf/libreoffice/src/ \ - http://ftp.uni-muenster.de/pub/software/DocumentFoundation/libreoffice/src/ \ - http://ftp.rz.tu-bs.de/pub/mirror/tdf/tdf-pub/libreoffice/src/ \ - http://artfiles.org/documentfoundation.org/libreoffice/src/ \ - http://mirror.galpon.org/tdf/libreoffice/src/ \ - http://ftp.tu-chemnitz.de/pub/tdf/libreoffice/src/ \ - http://tdf.panu.it/libreoffice/src/ \ - http://ftp.wh2.tu-dresden.de/pub/mirrors/tdf/libreoffice/src/ \ - http://ftp.klid.dk/ftp/tdf/libreoffice/src/ \ - http://gd.tuwien.ac.at/tdf/libreoffice/src/ \ - http://archive.sunet.se/pub/Office/tdf/libreoffice/src/ \ - http://ftp.astral.ro/mirrors/tdf/libreoffice/src/ \ - http://ftp.roedu.net/mirrors/tdf/libreoffice/src/ \ - http://ftp.unicamp.br/pub/tdf/libreoffice/src/ \ - http://mirror.yongbok.net/tdf/libreoffice/src/ \ - http://mirror3.mirrors.tds.net/pub/documentfoundation.org/libreoffice/src/ \ +MASTER_SITES= http://ftp.osuosl.org/pub/tdf/libreoffice/src/${PORTVERSION}/ \ + http://ftp.rediris.es/mirror/TDF/libreoffice/src/${PORTVERSION}/ \ + http://mirrors.supportex.net/tdf/libreoffice/src/${PORTVERSION}/ \ + http://mirror.netcologne.de/tdf/libreoffice/src/${PORTVERSION}/ \ + http://mirror.informatik.uni-mannheim.de/pub/mirrors/tdf/libreoffice/src/${PORTVERSION}/ \ + http://ftp.uni-muenster.de/pub/software/DocumentFoundation/libreoffice/src/${PORTVERSION}/ \ + http://ftp.rz.tu-bs.de/pub/mirror/tdf/tdf-pub/libreoffice/src/${PORTVERSION}/ \ + http://artfiles.org/documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ + http://mirror.galpon.org/tdf/libreoffice/src/${PORTVERSION}/ \ + http://ftp.tu-chemnitz.de/pub/tdf/libreoffice/src/${PORTVERSION}/ \ + http://tdf.panu.it/libreoffice/src/${PORTVERSION}/ \ + http://ftp.wh2.tu-dresden.de/pub/mirrors/tdf/libreoffice/src/${PORTVERSION}/ \ + http://ftp.klid.dk/ftp/tdf/libreoffice/src/${PORTVERSION}/ \ + http://gd.tuwien.ac.at/tdf/libreoffice/src/${PORTVERSION}/ \ + http://archive.sunet.se/pub/Office/tdf/libreoffice/src/${PORTVERSION}/ \ + http://ftp.astral.ro/mirrors/tdf/libreoffice/src/${PORTVERSION}/ \ + http://ftp.roedu.net/mirrors/tdf/libreoffice/src/${PORTVERSION}/ \ + http://ftp.unicamp.br/pub/tdf/libreoffice/src/${PORTVERSION}/ \ + http://mirror.yongbok.net/tdf/libreoffice/src/${PORTVERSION}/ \ + http://mirror3.mirrors.tds.net/pub/documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ http://download.go-oo.org/src/:GoOOSrc \ http://download.go-oo.org/extern/:GoOOExtern \ http://www.numbertext.org/linux/:OOoDTP @@ -38,7 +37,6 @@ MAINTAINER= office@FreeBSD.org COMMENT= Full integrated office productivity suite CONFLICTS_INSTALL= libreoffice-legacy-[0-9]* -BROKEN= build is too fragile and break too often -- try libreoffice-legacy LO_COMPONENTS= artwork base calc components extensions \ extras filters help impress libs-core libs-extern \ @@ -73,6 +71,7 @@ EXTRACT_ONLY:= ${DISTFILES} #additionnal components DISTFILES+= fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz:GoOOSrc \ + 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz:GoOOSrc \ 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz:GoOOSrc \ 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2:GoOOSrc \ 37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip:GoOOSrc \ @@ -83,6 +82,7 @@ DISTFILES+= fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz:GoOOSrc \ # rely on bsdtar ability to extract .gz and .bz2 archives LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ xml2.5:${PORTSDIR}/textproc/libxml2 \ + xslt.2:${PORTSDIR}/textproc/libxslt \ expat.6:${PORTSDIR}/textproc/expat2 \ icutu.48:${PORTSDIR}/devel/icu \ jpeg.11:${PORTSDIR}/graphics/jpeg \ @@ -96,7 +96,8 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ wps-0.2.2:${PORTSDIR}/textproc/libwps \ rdf.0:${PORTSDIR}/textproc/redland \ textcat.0:${PORTSDIR}/textproc/libtextcat \ - lpsolve55:${PORTSDIR}/math/lp_solve + lpsolve55:${PORTSDIR}/math/lp_solve \ + cups.2:${PORTSDIR}/print/cups-client # dmake can't be used from ports @@ -117,25 +118,27 @@ USE_BDB= yes USE_PERL5_BUILD= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_PYTHON= yes +USE_BISON= build USE_OPENSSL= yes WANT_GNOME= yes -USE_GSTREAMER= yes -USE_XORG= xaw +USE_XORG= xaw xrandr USE_GL= gl glu MAKE_JOBS_SAFE= yes -INSTALLS_ICONS= yes +USE_AUTOTOOLS= autoconf automake:env OPTIONS= WEBDAV "Support webdav protocol" off \ - CUPS "Support cups for printing" on \ KDE4 "With Qt4/KDE4 vclplug support" off \ + GTK "With GTK vclplug support" on \ GNOME "Better integration in gnome environnement" off \ JAVA "Add Java support (XML Filters, macros)" off \ - SDK "Build with SDK" off + PYUNO "Allow to script libreoffice in python" off \ + SYSTRAY "Enable systemtry quickstarter" off \ + MMEDIA "Enable multimedia backend for impress" off \ + SDK "Build with SDK" off \ + DEBUG "Build with debug symbols and verbose output" off CONFIGURE_ENV= GPERF=${LOCALBASE}/bin/gperf \ DMAKE=${LOCALBASE}/bin/dmake \ - LDFLAGS="" \ OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" @@ -148,12 +151,12 @@ CONFIGURE_ARGS+= --with-unix-wrapper="libreoffice" \ --with-external-tar=${DISTDIR}/${DIST_SUBDIR} \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ --with-system-libxml \ + --with-system-libxslt \ --with-system-cairo --enable-cairo \ --with-system-boost \ --with-system-cppunit \ --with-system-zlib \ --with-system-icu \ - --with-system-python \ --with-system-db \ --with-system-jpeg \ --with-system-expat \ @@ -178,15 +181,18 @@ CONFIGURE_ARGS+= --with-unix-wrapper="libreoffice" \ --disable-epm \ --disable-mozilla \ --disable-build-mozilla \ + --without-system-mozilla \ --disable-kde \ --without-stlport \ --disable-nss-module \ - --without-system-mozilla \ --with-system-translate-toolkit \ --with-system-dicts \ + --disable-dependency-tracking \ --with-external-thes-dir=${LOCALBASE}/share/mythes \ --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ - --with-external-dict-dir=${LOCALBASE}/share/hunspell + --with-external-dict-dir=${LOCALBASE}/share/hunspell \ + --disable-zenity \ + --enable-cups .if defined(LOCALIZED_LANG) CONFIGURE_ARGS+= --with-lang="${LOCALIZED_LANG}" @@ -219,10 +225,31 @@ MANCOMPRESSED= yes LDFLAGS= MAKE_ENV+= USE_GMAKE=1 DESTDIR=${LODESTDIR} -CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/db${BDB_VER} -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/db${BDB_VER} -L${LOCALBASE}/lib + +.if defined(WITHOUT_SYSTRAY) +CONFIGURE_ARGS+= --disable-systray +.endif + +.if defined(WITH_MMEDIA) +USE_GSTREAMER= yes +.else +CONFIGURE_ARGS+= --disable-gstreamer +.endif + +.if defined(WITH_PYUNO) +USE_PYTHON= yes +CONFIGURE_ARGS+= --with-system-python +.else +CONFIGURE_ARGS+= --disable-python +.endif +.if defined(WITH_GTK) || defined(WITH_GNOME) USE_GNOME= gtk20 desktopfileutils -USE_AUTOTOOLS= autoconf automake:env +INSTALLS_ICONS= yes +.else +CONFIGURE_ARGS+= --disable-gtk +.endif .if defined(WITH_WEBDAV) CONFIGURE_ARGS+= --enable-neon --with-system-neon @@ -231,13 +258,6 @@ LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29 CONFIGURE_ARGS+= --disable-neon .endif -.if defined(WITH_CUPS) -CONFIGURE_ARGS+= --enable-cups -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client -.else -CONFIGURE_ARGS+= --disable-cups -.endif - .if defined(WITH_KDE4) USE_KDE4= kdelibs USE_QT_VER= 4 @@ -261,17 +281,13 @@ DISTFILES+= 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:GoOOSrc \ 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz:GoOOSrc \ 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz:GoOOSrc \ a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip:GoOOSrc \ - af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz:GoOOSrc \ - 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz:GoOOSrc \ - 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz:GoOOSrc \ - 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz:GoOOSrc \ - ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz:GoOOSrc \ ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip:GoOOSrc \ eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:GoOOSrc \ 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:GoOOSrc \ 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:GoOOSrc \ 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:GoOOSrc \ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:GoOOSrc \ + 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz:GoOOSrc \ f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:GoOOSrc \ 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:GoOOSrc \ 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:GoOOSrc \ @@ -285,27 +301,32 @@ DISTFILES+= 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:GoOOSrc \ USE_JAVA= yes JAVA_VERSION= 1.6 BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant \ - ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ - ${JAVALIBDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j \ - ${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j + ${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit \ + ${JAVAJARDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j \ + ${JAVAJARDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j \ + ${JAVAJARDIR}/bsh.jar:${PORTSDIR}/lang/bsh +RUN_DEPENDS+= ${JAVAJARDIR}/bsh.jar:${PORTSDIR}/lang/bsh CONFIGURE_ARGS+= --with-ant-home=${LOCALBASE}/share/java/apache-ant/ \ - --with-junit=${JAVALIBDIR}/junit.jar \ + --with-junit=${JAVAJARDIR}/junit.jar \ --with-jdk-home=${JAVA_HOME} \ + --with-system-beanshell \ + --with-beanshell-jar=${JAVAJARDIR}/bsh.jar \ --with-system-xerces \ - --with-xerces-jar=${JAVALIBDIR}/xercesImpl.jar \ + --with-xerces-jar=${JAVAJARDIR}/xercesImpl.jar \ --with-system-xml-apis \ - --with-xml-apis-jar=/${JAVALIBDIR}/xml-apis.jar \ + --with-xml-apis-jar=/${JAVAJARDIR}/xml-apis.jar \ --with-system-xalan \ - --with-xalan-jar=${JAVALIBDIR}/xalan.jar \ - --with-serializer-jar=${JAVALIBDIR}/serializer.jar \ - --enable-ext-wiki-publisher + --with-xalan-jar=${JAVAJARDIR}/xalan.jar \ + --with-serializer-jar=${JAVAJARDIR}/serializer.jar .else BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt CONFIGURE_ARGS+= --without-java .endif .if defined(WITH_SDK) +DISTFILES+= 185d60944ea767075d27247c3162b3bc-unowinreg.dll:GoOOExtern + CONFIGURE_ARGS+= --enable-odk .else CONFIGURE_ARGS+= --disable-odk @@ -326,6 +347,13 @@ EMPTYDIRS= libreoffice/share/uno_packages/cache \ libreoffice/basis3.4/presets/autocorr \ libreoffice/basis3.4/presets/backup +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug \ + --enable-dbgutil \ + --enable-verbose \ + --enable-crashdump +.endif + .for LANG in ${LOCALIZED_LANG} EMPTYDIRS+= libreoffice/basis3.4/share/samples/${LANG} .endfor @@ -362,6 +390,8 @@ post-patch: @${REINPLACE_CMD} -e 's#-5.1#${BDB_VER}#g' \ -e 's#5.1#${BDB_LIB_NAME:S/db//}#g' \ ${WRKSRC}/configure.in + @${REINPLACE_CMD} -e 's#/bin/bash#${LOCALBASE}/bin/bash#' \ + ${WRKSRC}/bin/distro-install-desktop-integration .if defined(WITH_KDE4) @${REINPLACE_CMD} -e 's#moc,#moc-qt4,#g' \ @@ -383,9 +413,13 @@ post-configure: post-install: @${RM} -f ${PLISTF} ${PLISTD} @${MKDIR} ${LODESTDIR}/${PREFIX}/share/applications -.for component in writer printeradmin math javafilter base calc startcenter qstart draw impress - @cd ${LODESTDIR}/${PREFIX}/share/applications; ${LN} -s ../../lib/${PORTNAME}/share/xdg/${component}.desktop ${component}.desktop +.for component in writer printeradmin math javafilter base calc startcenter draw impress + @cd ${LODESTDIR}/${PREFIX}/share/applications; ${CP} ../../lib/${PORTNAME}/share/xdg/${component}.desktop ${component}.desktop; .endfor + @cd ${WRKSRC}/sysui/desktop/; ${PAX} -rw icons/hicolor ${LODESTDIR}/${PREFIX}/share + # allow make deinstall/reinstall + @${RM} -f ${LODESTDIR}/${PREFIX}/share/icons/hicolor/*/apps/libreoffice-*.png + @for img in ${LODESTDIR}/${PREFIX}/share/icons/hicolor/*/apps/*.png; do ${MV} $$img `dirname $$img`/libreoffice-$${img##*/}; done @for dir in ${EMPTYDIRS}; do ${TOUCH} ${LODESTDIR}/${PREFIX}/lib/$$dir/.keep; done @cd ${LODESTDIR}/${PREFIX}/lib && ${FIND} -H -s * -type f -o -type l | \ @@ -393,20 +427,46 @@ post-install: @cd ${LODESTDIR}/${PREFIX}/lib && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm lib/|' >> ${PLISTD} - @cd ${LODESTDIR}/${PREFIX}/share/applications && ${FIND} -H -s * -type f -o -type l | \ - ${SED} -e 's|^|share/applications/|' >> ${PLISTF} +.for subdir in share/applications share/icons + @cd ${LODESTDIR}/${PREFIX}/${subdir} && ${FIND} -H -s * -type f -o -type l | \ + ${SED} -e 's|^|${subdir}/|' >> ${PLISTF} + @cd ${LODESTDIR}/${PREFIX}/${subdir} && ${FIND} -d * -type d | \ + ${SED} -e 's|^|@dirrm ${subdir}/|' >> ${PLISTD} + @${ECHO_CMD} "@unexec ${RMDIR} %D/${subdir} 2>/dev/null || ${TRUE}" >> ${PLISTD} +.endfor - @${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLISTD} + @cd ${LODESTDIR}/${PREFIX}/share/icons && ${FIND} -H -s * -type f -o -type l | \ + ${SED} -e 's|^|share/icons/|' >> ${PLISTF} @cd ${LODESTDIR}/${PREFIX}/bin && ${FIND} -H -s * -type f -o -type l | \ ${SED} -e 's|^|bin/|' >> ${PLISTF} +.if defined(WITHOUT_GTK) && defined(WITHOUT_GNOME) @${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${TMPPLIST} +.endif + +.if defined(WITH_SDK) +.for subdir in include share/idl share/libreoffice share/doc + @cd ${LODESTDIR}/${PREFIX}/${subdir} && ${FIND} -H -s * -type f -o -type l | \ + ${SED} -e 's|^|${subdir}/|' >> ${PLISTF} + @cd ${LODESTDIR}/${PREFIX}/${subdir} && ${FIND} -d * -type d | \ + ${SED} -e 's|^|@dirrm ${subdir}/|' >> ${PLISTD} +.endfor +.endif + @${SORT} ${WRKDIR}/plist_files >> ${TMPPLIST} @${SORT} -r ${WRKDIR}/plist_dirs >> ${TMPPLIST} - @cd ${LODESTDIR}/${PREFIX} ; ${TAR} cfp - . | ${TAR} xfp - -C ${PREFIX} +.if defined(WITH_SDK) +.for subdir in include share/idl share/libreoffice share/doc + @${ECHO_CMD} "@unexec ${RMDIR} %D/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} +.endfor +.endif + + @cd ${LODESTDIR}/${PREFIX} ; ${PAX} -rw . ${PREFIX} +.if defined(WITHOUT_GTK) && defined(WITHOUT_GNOME) @${LOCALBASE}/bin/update-desktop-database 2>/dev/null || ${TRUE} +.endif .include <bsd.port.post.mk> diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index 497ba094c6f3..298b0b9da473 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -1,45 +1,47 @@ -SHA256 (libreoffice/libreoffice-bootstrap-3.4.2.3.tar.bz2) = 577d85b6aca3b5b3cf72db6545ef79a9a53014c90ec62fd1932a1eeeb40e95be -SIZE (libreoffice/libreoffice-bootstrap-3.4.2.3.tar.bz2) = 2712799 -SHA256 (libreoffice/libreoffice-artwork-3.4.2.3.tar.bz2) = b380f286fe95bfc4168aa73f410c5fffb94baad3ea0533bb0a692e3811f6829f -SIZE (libreoffice/libreoffice-artwork-3.4.2.3.tar.bz2) = 13539965 -SHA256 (libreoffice/libreoffice-base-3.4.2.3.tar.bz2) = 2e08042babcf4cea9e75fe70eb5f41b09010282d3d8a46a4762eb84b0eec8365 -SIZE (libreoffice/libreoffice-base-3.4.2.3.tar.bz2) = 2069337 -SHA256 (libreoffice/libreoffice-calc-3.4.2.3.tar.bz2) = 401d81e1cf8588187ff5988f911c354d5aa340c237412a54097c8000317bedcf -SIZE (libreoffice/libreoffice-calc-3.4.2.3.tar.bz2) = 9522743 -SHA256 (libreoffice/libreoffice-components-3.4.2.3.tar.bz2) = 2fe9b564fe5754a2b67195d0114ded2584e6370f17e40a71e7c27eb10d920df9 -SIZE (libreoffice/libreoffice-components-3.4.2.3.tar.bz2) = 5095585 -SHA256 (libreoffice/libreoffice-extensions-3.4.2.3.tar.bz2) = 191ca347026f4f258f6fd6b8b5c40947ef7e42fc6389f8f5d85f6b53513b2496 -SIZE (libreoffice/libreoffice-extensions-3.4.2.3.tar.bz2) = 4216328 -SHA256 (libreoffice/libreoffice-extras-3.4.2.3.tar.bz2) = 7488464823ecf557ac485ee3f5655e9356730ddfc168945e7a0009319b7e9dd7 -SIZE (libreoffice/libreoffice-extras-3.4.2.3.tar.bz2) = 38644416 -SHA256 (libreoffice/libreoffice-filters-3.4.2.3.tar.bz2) = bc03c2fa71f9d06dfba1c1e3aa29a41f5e3e5096e4eb13ce7e5364f01e3dfcd5 -SIZE (libreoffice/libreoffice-filters-3.4.2.3.tar.bz2) = 11777347 -SHA256 (libreoffice/libreoffice-help-3.4.2.3.tar.bz2) = 0adcdd0080de859263e9260b2357e66c3f478cd5f510811e9d2f49dbe7185867 -SIZE (libreoffice/libreoffice-help-3.4.2.3.tar.bz2) = 1846361 -SHA256 (libreoffice/libreoffice-impress-3.4.2.3.tar.bz2) = a9c5447924e47312b6db80f36dfa1f4c5046a897416a7f7497f51b5116904ec6 -SIZE (libreoffice/libreoffice-impress-3.4.2.3.tar.bz2) = 2651052 -SHA256 (libreoffice/libreoffice-libs-core-3.4.2.3.tar.bz2) = 22f938b2f47a4c254b98fb88ba33a21943a6b7e2ca3cc9d835850448e80a0b63 -SIZE (libreoffice/libreoffice-libs-core-3.4.2.3.tar.bz2) = 15589730 -SHA256 (libreoffice/libreoffice-libs-extern-3.4.2.3.tar.bz2) = 7cc3c817cd0aca856e01c447ddfeb22803f5da187295d16e39c948ece9f6527c -SIZE (libreoffice/libreoffice-libs-extern-3.4.2.3.tar.bz2) = 637916 -SHA256 (libreoffice/libreoffice-libs-extern-sys-3.4.2.3.tar.bz2) = f90d2915645eb3d3968a6a162c9ddec9d7a4a9b892c7d80b9685eae230d273df -SIZE (libreoffice/libreoffice-libs-extern-sys-3.4.2.3.tar.bz2) = 40016513 -SHA256 (libreoffice/libreoffice-libs-gui-3.4.2.3.tar.bz2) = 93be03e42c2add347db8ccfbfe3fee065e44959e771f7b3083f64644e5d505cc -SIZE (libreoffice/libreoffice-libs-gui-3.4.2.3.tar.bz2) = 10857198 -SHA256 (libreoffice/libreoffice-postprocess-3.4.2.3.tar.bz2) = b782a00f6d3fdeb9a44e59ec9b0fdb2c59c28b1501c203fb26bb256ffd423ecc -SIZE (libreoffice/libreoffice-postprocess-3.4.2.3.tar.bz2) = 50845 -SHA256 (libreoffice/libreoffice-sdk-3.4.2.3.tar.bz2) = 173abff22599da24c32e3e03b8744dd16fa77795bc7c9c6d9b5f682a84017b1d -SIZE (libreoffice/libreoffice-sdk-3.4.2.3.tar.bz2) = 1721383 -SHA256 (libreoffice/libreoffice-testing-3.4.2.3.tar.bz2) = 4eb94d47d4d48bff41f1998c0dad96d49231301a99d8a987bebdb91f04777a42 -SIZE (libreoffice/libreoffice-testing-3.4.2.3.tar.bz2) = 50846459 -SHA256 (libreoffice/libreoffice-ure-3.4.2.3.tar.bz2) = 5ed8cf111331e1da4c205320dda16b4a63102458b12b251b71f1681860097b5f -SIZE (libreoffice/libreoffice-ure-3.4.2.3.tar.bz2) = 6213202 -SHA256 (libreoffice/libreoffice-writer-3.4.2.3.tar.bz2) = 5f80890e0493849080ea521848a521aae0964c1d8f6df1e0da6c9525721663b7 -SIZE (libreoffice/libreoffice-writer-3.4.2.3.tar.bz2) = 7294695 -SHA256 (libreoffice/libreoffice-translations-3.4.2.3.tar.bz2) = 1f21d4a1eb517653c22dabc93ae45a9d4c3ae46663d202db156ad9323e81e22f -SIZE (libreoffice/libreoffice-translations-3.4.2.3.tar.bz2) = 137568946 +SHA256 (libreoffice/libreoffice-bootstrap-3.4.3.2.tar.bz2) = 18f253da00974958059dc91ddb17d5ce5c6c41ec48b98f43451609fb2b1faa45 +SIZE (libreoffice/libreoffice-bootstrap-3.4.3.2.tar.bz2) = 2711992 +SHA256 (libreoffice/libreoffice-artwork-3.4.3.2.tar.bz2) = 6b700d41c593d2befcd85fe497d4a6e96db3b7e1639921674ae238022d1ea743 +SIZE (libreoffice/libreoffice-artwork-3.4.3.2.tar.bz2) = 13537796 +SHA256 (libreoffice/libreoffice-base-3.4.3.2.tar.bz2) = 93fc103b376a2575efe8b35d64861236e63025b9d3415cee35d845ada7589dfa +SIZE (libreoffice/libreoffice-base-3.4.3.2.tar.bz2) = 2068714 +SHA256 (libreoffice/libreoffice-calc-3.4.3.2.tar.bz2) = 05f543b5a47511f789cd30fc74ba31cdd0074a4fe7a9bc91e9dd5ab969583335 +SIZE (libreoffice/libreoffice-calc-3.4.3.2.tar.bz2) = 9521313 +SHA256 (libreoffice/libreoffice-components-3.4.3.2.tar.bz2) = 572fdbff98c1083e5066b15cbc34453cedf7f6ac5a740c07639ef2e65fd61aa7 +SIZE (libreoffice/libreoffice-components-3.4.3.2.tar.bz2) = 5094591 +SHA256 (libreoffice/libreoffice-extensions-3.4.3.2.tar.bz2) = 91ab0d29057c09026ddb380d530ef0656e48b7c558eb2be7a0c4c4f1b793029d +SIZE (libreoffice/libreoffice-extensions-3.4.3.2.tar.bz2) = 4216448 +SHA256 (libreoffice/libreoffice-extras-3.4.3.2.tar.bz2) = 3f4fe22ddf23e9e368e9145fd00cf9bc6de6e19539dfc1f818fde93426fda159 +SIZE (libreoffice/libreoffice-extras-3.4.3.2.tar.bz2) = 38643532 +SHA256 (libreoffice/libreoffice-filters-3.4.3.2.tar.bz2) = 2a12e9afa38f8d82419418c4c7443e47cc3cc39f78d5c2dc22bc61123b35dbe1 +SIZE (libreoffice/libreoffice-filters-3.4.3.2.tar.bz2) = 11779881 +SHA256 (libreoffice/libreoffice-help-3.4.3.2.tar.bz2) = 013a21f3a22e39782af784213efda43ebe4f38882932267b009ec745f32cff23 +SIZE (libreoffice/libreoffice-help-3.4.3.2.tar.bz2) = 1846706 +SHA256 (libreoffice/libreoffice-impress-3.4.3.2.tar.bz2) = 09114924804a876d41f971cfd6a2bf440df8ff79c97ebfe6698e74e7d39d87c0 +SIZE (libreoffice/libreoffice-impress-3.4.3.2.tar.bz2) = 2651830 +SHA256 (libreoffice/libreoffice-libs-core-3.4.3.2.tar.bz2) = 714001111ffacd69485676bec34d35a42e7440fe0b166cb5268e74d5ee32c858 +SIZE (libreoffice/libreoffice-libs-core-3.4.3.2.tar.bz2) = 15592792 +SHA256 (libreoffice/libreoffice-libs-extern-3.4.3.2.tar.bz2) = 681316cafbff67093ac93fa3803117219e80e3d3191c312f53129cf1a0e159c8 +SIZE (libreoffice/libreoffice-libs-extern-3.4.3.2.tar.bz2) = 637830 +SHA256 (libreoffice/libreoffice-libs-extern-sys-3.4.3.2.tar.bz2) = d6086fac838167c733e135ecde70807ade4bed21687d6740d2d7a66ca7ee84ee +SIZE (libreoffice/libreoffice-libs-extern-sys-3.4.3.2.tar.bz2) = 40030519 +SHA256 (libreoffice/libreoffice-libs-gui-3.4.3.2.tar.bz2) = 9ae7e7092f4055bab2f3285cbfc388730caa91ab38af4307482906bd6c983ab6 +SIZE (libreoffice/libreoffice-libs-gui-3.4.3.2.tar.bz2) = 10866411 +SHA256 (libreoffice/libreoffice-postprocess-3.4.3.2.tar.bz2) = 5066d9c3dc631e182f150c372a806b30f5428d39c7d7358a4beeec3f8065e6c2 +SIZE (libreoffice/libreoffice-postprocess-3.4.3.2.tar.bz2) = 50913 +SHA256 (libreoffice/libreoffice-sdk-3.4.3.2.tar.bz2) = fa540938fd9526bd242c2e46db813f679a0261914e4feed214763618f82ab34a +SIZE (libreoffice/libreoffice-sdk-3.4.3.2.tar.bz2) = 1721285 +SHA256 (libreoffice/libreoffice-testing-3.4.3.2.tar.bz2) = 89c25311bed6d9d8646bd0f8e7f37a9c227b125309cf7b49f2ab083a8b73d6c0 +SIZE (libreoffice/libreoffice-testing-3.4.3.2.tar.bz2) = 50848140 +SHA256 (libreoffice/libreoffice-ure-3.4.3.2.tar.bz2) = 9150a51fe93b803be51af02be585c8e9b2e2fce7c6a4061ed9b8c5d60183ca20 +SIZE (libreoffice/libreoffice-ure-3.4.3.2.tar.bz2) = 6214027 +SHA256 (libreoffice/libreoffice-writer-3.4.3.2.tar.bz2) = 65fdcb132a84fae9f4ec0d84501f13ada3861fbd7646947ad0cea495b637be9a +SIZE (libreoffice/libreoffice-writer-3.4.3.2.tar.bz2) = 7295462 +SHA256 (libreoffice/libreoffice-translations-3.4.3.2.tar.bz2) = 331596511967d7cc31b3a517d5887025f3bd131325830df5984c14b121acaae2 +SIZE (libreoffice/libreoffice-translations-3.4.3.2.tar.bz2) = 137012907 SHA256 (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256 SIZE (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 547217 +SHA256 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = 9d29cba4312812a26b14effda2cf56284e70226cdccc90a83844297e3b7498ee +SIZE (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = 4893724 SHA256 (libreoffice/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz) = 6e6c53064ef6f40891ad72c06fab9f3c8fdcda80e03c9d0b21244cb1d4bf030b SIZE (libreoffice/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz) = 315122 SHA256 (libreoffice/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2) = a19205ac076973b55d9c5d3c8b664735d5b89fe793629ec10c110caa98e0bc1d @@ -62,16 +64,6 @@ SHA256 (libreoffice/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz) = 5a0c SIZE (libreoffice/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz) = 4603398 SHA256 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SIZE (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 23150 -SHA256 (libreoffice/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz) = 12effcf3fea025bd34edbfec60a6216ca453fb27e781d8e5783caf75fd33d90e -SIZE (libreoffice/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz) = 80427 -SHA256 (libreoffice/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz) = 168564a57411907432c7b191f63fb581439fed57732038c5308631afe05063ac -SIZE (libreoffice/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz) = 189448 -SHA256 (libreoffice/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz) = 9775f8db678e15e9a482bbbf00b35c38da8bfc51c6dafa4531c6dd16225602fd -SIZE (libreoffice/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz) = 474681 -SHA256 (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 -SIZE (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = 1882664 -SHA256 (libreoffice/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz) = 648f10fb764d000d6a68b2d4e008117900e853c197a024d1f91dbba9b91012ca -SIZE (libreoffice/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz) = 726942 SHA256 (libreoffice/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip) = 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825 SIZE (libreoffice/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip) = 2732347 SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba @@ -84,6 +76,8 @@ SHA256 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 3d85 SIZE (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721 SHA256 (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133 SIZE (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 207563 +SHA256 (libreoffice/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz) = 168564a57411907432c7b191f63fb581439fed57732038c5308631afe05063ac +SIZE (libreoffice/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz) = 189448 SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b @@ -98,3 +92,5 @@ SHA256 (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = e1f SIZE (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = 1396007 SHA256 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd SIZE (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 743031 +SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 +SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288 diff --git a/editors/libreoffice/files/patch-clone__components__automation__source__testtool__objtest.cxx b/editors/libreoffice/files/patch-clone__components__automation__source__testtool__objtest.cxx new file mode 100644 index 000000000000..c55dfbad2a5c --- /dev/null +++ b/editors/libreoffice/files/patch-clone__components__automation__source__testtool__objtest.cxx @@ -0,0 +1,14 @@ +--- clone/components/automation/source/testtool/objtest.cxx.orig 2011-05-20 18:05:11.000000000 +0200 ++++ clone/components/automation/source/testtool/objtest.cxx 2011-08-25 22:36:33.395644903 +0200 +@@ -433,8 +433,10 @@ + abGP.Append( "04" ); + #elif defined SOLARIS && defined INTEL + abGP.Append( "05" ); // Solaris x86 +-#elif defined FREEBSD ++#elif defined FREEBSD && defined INTEL + abGP.Append( "08" ); ++#elif defined FREEBSD && defined X86_64 ++ abGP.Append( "09" ); + #elif defined MACOSX + abGP.Append( "12" ); + #elif defined LINUX && defined PPC diff --git a/editors/libreoffice/files/patch-clone__filters__oox__source__token__makefile.mk b/editors/libreoffice/files/patch-clone__filters__oox__source__token__makefile.mk index 84bd1c7c2c9d..afeb83c81bd6 100644 --- a/editors/libreoffice/files/patch-clone__filters__oox__source__token__makefile.mk +++ b/editors/libreoffice/files/patch-clone__filters__oox__source__token__makefile.mk @@ -1,6 +1,6 @@ ---- clone/filters/oox/source/token/makefile.mk.orig 2011-07-22 14:33:31.988113939 +0000 -+++ clone/filters/oox/source/token/makefile.mk 2011-07-22 14:34:30.469770138 +0000 -@@ -56,7 +56,7 @@ +--- clone/filters/oox/source/token/makefile.mk.orig 2011-05-20 16:05:36.000000000 +0000 ++++ clone/filters/oox/source/token/makefile.mk 2011-08-24 21:15:27.302581359 +0000 +@@ -56,7 +56,7 @@ $(MISC)$/tokenhash.gperf $(INCCOM)$/toke $(SLO)$/tokenmap.obj : $(INCCOM)$/tokenhash.inc $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx $(MISC)$/do_tokens $(INCCOM)$/tokenhash.inc : $(MISC)$/tokenhash.gperf $(MISC)$/do_tokens diff --git a/editors/libreoffice/files/patch-clone_libs-gui__tools__inc__solar.h b/editors/libreoffice/files/patch-clone_libs-gui__tools__inc__solar.h new file mode 100644 index 000000000000..090f17a30ac9 --- /dev/null +++ b/editors/libreoffice/files/patch-clone_libs-gui__tools__inc__solar.h @@ -0,0 +1,15 @@ +--- clone/libs-gui/tools/inc/tools/solar.h.orig 2011-08-25 22:53:01.311106000 +0200 ++++ clone/libs-gui/tools/inc/tools/solar.h 2011-08-25 22:53:36.335015661 +0200 +@@ -267,10 +267,8 @@ + #define __DLLEXTENSION "lh.so" + #elif defined LINUX && defined AXP + #define __DLLEXTENSION "ll.so" +-#elif defined FREEBSD && defined X86 +- #define __DLLEXTENSION "fi.so" +-#elif defined FREEBSD && defined X86_64 +- #define __DLLEXTENSION "fx.so" ++#elif defined FREEBSD ++ #define __DLLEXTENSION "fb.so" + #elif defined MACOSX && defined POWERPC + #define __DLLEXTENSION "mxp.dylib" + #elif defined MACOSX && defined X86 diff --git a/editors/libreoffice/files/patch-clone_ure_sal_inc_sal_main.h b/editors/libreoffice/files/patch-clone_ure_sal_inc_sal_main.h index ed7c8925b818..9ec7f904f6d0 100644 --- a/editors/libreoffice/files/patch-clone_ure_sal_inc_sal_main.h +++ b/editors/libreoffice/files/patch-clone_ure_sal_inc_sal_main.h @@ -1,5 +1,5 @@ ---- clone/ure/sal/inc/sal/main.h.orig 2011-07-29 03:42:07.000000000 +0300 -+++ clone/ure/sal/inc/sal/main.h 2011-07-29 03:50:55.000000000 +0300 +--- clone/ure/sal/inc/sal/main.h.orig 2011-05-19 11:22:58.000000000 +0000 ++++ clone/ure/sal/inc/sal/main.h 2011-08-24 21:15:27.305581455 +0000 @@ -30,8 +30,11 @@ #define _SAL_MAIN_H_ @@ -13,7 +13,7 @@ #endif #ifdef __cplusplus -@@ -41,6 +44,16 @@ +@@ -41,6 +44,16 @@ extern "C" { void SAL_CALL sal_detail_initialize(int argc, char ** argv); void SAL_CALL sal_detail_deinitialize(); @@ -30,7 +30,7 @@ #define SAL_MAIN_WITH_ARGS_IMPL \ int SAL_CALL main(int argc, char ** argv) \ { \ -@@ -48,7 +61,7 @@ +@@ -48,7 +61,7 @@ int SAL_CALL main(int argc, char ** argv sal_detail_initialize(argc, argv); \ ret = sal_main_with_args(argc, argv); \ sal_detail_deinitialize(); \ @@ -39,7 +39,7 @@ } #define SAL_MAIN_IMPL \ -@@ -58,7 +71,7 @@ +@@ -58,7 +71,7 @@ int SAL_CALL main(int argc, char ** argv sal_detail_initialize(argc, argv); \ ret = sal_main(); \ sal_detail_deinitialize(); \ diff --git a/editors/libreoffice/files/patch-configure.in b/editors/libreoffice/files/patch-configure.in index 5e3d88fdbe0b..c4be6b6bb00e 100644 --- a/editors/libreoffice/files/patch-configure.in +++ b/editors/libreoffice/files/patch-configure.in @@ -1,6 +1,82 @@ ---- configure.in.orig 2011-07-21 02:57:19.000000000 +0300 -+++ configure.in 2011-07-21 02:58:05.000000000 +0300 -@@ -8086,7 +8086,7 @@ +--- configure.in.orig 2011-07-20 10:58:45.000000000 +0000 ++++ configure.in 2011-08-25 06:28:12.256723704 +0000 +@@ -2746,15 +2746,15 @@ if test "$_os" = "SunOS"; then + else + if test "$_os_release" = "6"; then + dnl *************** +- dnl patch 105591-09 ++ dnl patch 1041-09 + dnl *************** +- AC_MSG_CHECKING([for patch 105591-09 or greater]) +- _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'` ++ AC_MSG_CHECKING([for patch 1041-09 or greater]) ++ _patch=`echo $_temp | $AWK '/1041-09/ { print "found" }'` + _patch="false" + for i in $_temp + do + _patch_major=`echo $i | $AWK -F"-" '{ print $1 }'` +- if test "$_patch_major" = "105591"; then ++ if test "$_patch_major" = "1041"; then + _patch_rev=`echo $i | $AWK -F"-" '{ print $2 }'` + if test "$_patch_rev" -ge "9"; then + _patch="found" +@@ -2764,8 +2764,8 @@ if test "$_os" = "SunOS"; then + if test "$_patch" = "found"; then + AC_MSG_RESULT([found]) + else +- AC_MSG_WARN([patch 105591-09 not found, please install compiler patch 105591-09 or greater]) +- echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn ++ AC_MSG_WARN([patch 1041-09 not found, please install compiler patch 1041-09 or greater]) ++ echo "patch 1041-09 not found, please install compiler patch 1041-09 or greater" >> warn + fi + dnl *************** + dnl patch 107733-08 +@@ -4266,7 +4266,7 @@ if test -n "$with_system_db" -o -n "$wit + test "$with_system_db" != "no"; then + SYSTEM_DB=YES + AC_MSG_RESULT([external]) +- for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do ++ for dbver in 41 41 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do + AC_MSG_CHECKING([for db$dbver/db.h]) + for inc_dir in /usr/include /usr/local/include /usr/pkg/include; do + if test -r "$inc_dir/db$dbver/db.h"; then +@@ -4293,7 +4293,7 @@ int main(int argc, char **argv) { + } + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])]) + DB_LIB= +- for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do ++ for dbver in '' 41 41 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do + AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] , + AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] + ) +@@ -4417,7 +4417,7 @@ if test -n "$with_system_mysql" -o -n "$ + if test "$MYSQL_MAJOR" -ge "5"; then + AC_MSG_RESULT([OK]) + else +- AC_MSG_ERROR([too old, use 5.0.x or 5.1.x]) ++ AC_MSG_ERROR([too old, use 5.0.x or 41.x]) + fi + AC_MSG_CHECKING([for MySQL Client library]) + MYSQL_INC=`$MYSQLCONFIG --include` +@@ -7172,7 +7172,7 @@ else + LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang" + case $lang in + "hu") LIGHTPROOF_HU_PACK="324ddcb9ef45c3bc055fcc002bc4e556-lightproof-hu_1.2.oxt";; +- "en-US") LIGHTPROOF_EN_US_PACK="942541da5f5498214518c8b459ae4524-lightproof-en-US_0.1.oxt";; ++ "en-US") LIGHTPROOF_EN_US_PACK="94241da5f5498214518c8b459ae4524-lightproof-en-US_0.1.oxt";; + esac + fi + done +@@ -7382,7 +7382,7 @@ else + case $lang in + "de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";; + "en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";; +- "es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";; ++ "es") SUNTEMPLATES_ES_PACK="4ad003e7bbda415f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";; + "fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";; + "hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";; + "it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";; +@@ -8089,7 +8089,7 @@ dnl ==================================== dnl Number of CPUs to use during the build dnl =================================================================== AC_MSG_CHECKING([for number of processors to use]) diff --git a/editors/libreoffice/files/patch-set_soenv_in b/editors/libreoffice/files/patch-set_soenv_in new file mode 100644 index 000000000000..ba5fd0af5329 --- /dev/null +++ b/editors/libreoffice/files/patch-set_soenv_in @@ -0,0 +1,26 @@ +--- set_soenv.in.orig 2011-08-25 06:07:10.245289335 +0000 ++++ set_soenv.in 2011-08-25 06:11:38.844523688 +0000 +@@ -352,13 +352,13 @@ elsif ( $platform =~ m/freebsd/ ) + $OS = "FREEBSD"; + $PATH_SEPERATOR = $ps; + $OSVERSION = '@OSVERSION@'; ++ $OUTPATH = "unxfbsd"; ++ $outfile = "FreeBSDAMDEnv.Set.sh"; + if ($platform =~ m/^amd64/) + { my ( $JAVA_OS ); + print "Setting FreeBSD AMD64 specific values... "; +- $outfile = "FreeBSDAMDEnv.Set.sh"; + $CPU = "X"; + $CPUNAME = "X86_64"; +- $OUTPATH = "unxfbsdx"; + $JAVA_OS = '@JAVA_HOME@'; + $JAVA_OS =~ s/.*\///; + if ($JAVA_OS =~ m/^linux/) +@@ -377,7 +377,6 @@ elsif ( $platform =~ m/freebsd/ ) + $outfile = "FreeBSDX86Env.Set.sh"; + $CPU = "I"; + $CPUNAME = "INTEL"; +- $OUTPATH = "unxfbsdi"; + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; diff --git a/editors/libreoffice/files/patch-solenv__inc__unx.mk b/editors/libreoffice/files/patch-solenv__inc__unx.mk deleted file mode 100644 index a39fd67012b9..000000000000 --- a/editors/libreoffice/files/patch-solenv__inc__unx.mk +++ /dev/null @@ -1,17 +0,0 @@ ---- solenv/inc/unx.mk.orig 2011-07-23 08:18:24.000000000 +0300 -+++ solenv/inc/unx.mk 2011-07-23 08:20:06.000000000 +0300 -@@ -139,8 +139,12 @@ - .INCLUDE : unxbsds.mk - .ENDIF - --.IF "$(COM)$(OS)" == "GCCFREEBSD" --.INCLUDE : unxfbsd.mk -+.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI" -+.INCLUDE : unxfbsdi.mk -+.ENDIF -+ -+.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDX" -+.INCLUDE : unxfbsdx.mk - .ENDIF - - .IF "$(COM)$(OS)" == "GCCOPENBSD" diff --git a/editors/libreoffice/files/patch-solenv__inc__unxfbsd.mk b/editors/libreoffice/files/patch-solenv__inc__unxfbsd.mk index 91a1271d39a5..bda237663ef1 100644 --- a/editors/libreoffice/files/patch-solenv__inc__unxfbsd.mk +++ b/editors/libreoffice/files/patch-solenv__inc__unxfbsd.mk @@ -1,25 +1,28 @@ ---- solenv/inc/unxfbsd.mk.orig 2011-07-23 08:03:22.000000000 +0300 -+++ solenv/inc/unxfbsd.mk 2011-07-23 08:08:39.000000000 +0300 -@@ -27,178 +27,12 @@ +--- solenv/inc/unxfbsd.mk.orig 2011-05-18 15:51:48.000000000 +0000 ++++ solenv/inc/unxfbsd.mk 2011-08-25 20:23:28.830637378 +0000 +@@ -27,178 +27,23 @@ # Makefile for FreeBSD. -ASM= -AFLAGS= -+.INCLUDE : unxgcc.mk - +- -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g -+DLLPOSTFIX=fb - +- -# Include arch specific makefile. --.IF "$(CPUNAME)" == "INTEL" ++# arch specific defines + .IF "$(CPUNAME)" == "INTEL" -.INCLUDE : unxfbsdi.mk --.ENDIF --.IF "$(CPUNAME)" == "X86_64" ++CDEFS+=-DX86 + .ENDIF ++ + .IF "$(CPUNAME)" == "X86_64" -.INCLUDE : unxfbsdx.mk --.ENDIF -- ++CDEFS+=-DX86_64 ++BUILD64=1 + .ENDIF + -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" @@ -41,7 +44,8 @@ -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF -- ++.INCLUDE : unxgcc.mk + -# name of C++ Compiler -CXX*=g++ -# name of C Compiler @@ -60,7 +64,7 @@ -CFLAGSCC= -pipe $(ARCH_FLAGS) -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs --# Flags for disabling exception handling + # Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -# -fpermissive should be removed as soon as possible @@ -108,7 +112,6 @@ -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) -+# disable exceptions in boost +CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS # default linker flags @@ -179,8 +182,9 @@ -RCLINK= -RCLINKFLAGS= -RCSETVERSION= -- --# platform specific identifier for shared libs ++LINKFLAGSDEFS:= + + # platform specific identifier for shared libs -DLLPRE=lib -DLLPOST=.so -+LINKFLAGSDEFS:= ++DLLPOSTFIX=fb |