pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/libreoffice Update to 5.2.3.3



details:   https://anonhg.NetBSD.org/pkgsrc/rev/82c3606ec8f4
branches:  trunk
changeset: 355615:82c3606ec8f4
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Tue Dec 06 15:21:00 2016 +0000

description:
Update to 5.2.3.3

* Drop external PostgreSQL dependency. Use internal one to reduce conflict
* Add cups option, from mrg@. Thank you.

* Calc does not work properly in some case. I will revisit later.
* i386 build will fails. I will revisit later.

Changelog:
New features and bugfixes including:

diffstat:

 misc/libreoffice/Makefile                                                            |   51 +-
 misc/libreoffice/PLIST                                                               |  461 +++++++++-
 misc/libreoffice/PLIST.java                                                          |    2 +-
 misc/libreoffice/distinfo                                                            |  100 +-
 misc/libreoffice/options.mk                                                          |   15 +-
 misc/libreoffice/patches/patch-Makefile.in                                           |   15 +
 misc/libreoffice/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx |   71 +-
 misc/libreoffice/patches/patch-configure.ac                                          |   32 +-
 misc/libreoffice/patches/patch-external_libmariadb_UnpackedTarball__mariadb.mk       |   12 +
 misc/libreoffice/patches/patch-external_libmariadb_mariadb-netbsd.patch              |   16 +
 misc/libreoffice/patches/patch-external_postgresql_ExternalProject__postgresql.mk    |   15 +
 misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx                   |   37 +
 misc/libreoffice/patches/patch-include_svx_ucsubset.hrc                              |   22 +
 misc/libreoffice/patches/patch-mysqlc_Library__mysqlc.mk                             |   13 +
 misc/libreoffice/patches/patch-svx_source_dialog_charmap.cxx                         |   46 +
 misc/libreoffice/patches/patch-svx_source_dialog_ucsubset.src                        |   55 +
 misc/libreoffice/patches/patch-ucb_source_ucp_ftp_ftploaderthread.cxx                |   15 -
 17 files changed, 820 insertions(+), 158 deletions(-)

diffs (truncated from 1614 to 300 lines):

diff -r c91b593c4368 -r 82c3606ec8f4 misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Tue Dec 06 15:13:50 2016 +0000
+++ b/misc/libreoffice/Makefile Tue Dec 06 15:21:00 2016 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.93 2016/12/04 05:17:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2016/12/06 15:21:00 ryoon Exp $
 
-VERREL=                5.1.5
-VERRC=         2
+VERREL=                5.2.3
+VERRC=         3
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
-PKGREVISION=   5
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
@@ -14,11 +13,7 @@
 COMMENT=       Office productivity suite from The Document Foundation
 LICENSE=       gnu-lgpl-v3
 
-# With -O2, when preference window is opened, soffice.bin crashes with SIGFPE.
 .include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
-BUILDLINK_TRANSFORM+=  opt:-O2:-O
-.endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD*)
 pre-build:
@@ -48,12 +43,13 @@
 .endfor
 
 MORE_DISTFILES= \
+       breakpad.zip \
        0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz \
        0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz \
        134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz \
        5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz \
-       edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz \
-       1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \
+       907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz \
+       ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz \
        8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz \
        2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz \
        3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip \
@@ -73,8 +69,8 @@
        c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz \
        db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip \
        d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip \
+       beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip \
        e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip \
-       ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip \
        eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip \
        d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip \
        f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip \
@@ -85,16 +81,18 @@
        c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz \
        OpenCOLLADA-master-6509aa13af.tar.bz2 \
        798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \
-       368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
+       368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz \
+       5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2 \
+       language-subtag-registry-2016-02-10.tar.bz2 \
+       libeot-0.01.tar.bz2 \
+       7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz \
+       c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 
 .for md in ${MORE_DISTFILES}
 DISTFILES+=            ${md}
 SITES.${md}=           http://dev-www.libreoffice.org/src/
 .endfor
 
-DISTFILES+=e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
-SITES.e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip=http://www.numbertext.org/linux/
-
 DISTFILES+=185d60944ea767075d27247c3162b3bc-unowinreg.dll
 SITES.185d60944ea767075d27247c3162b3bc-unowinreg.dll=http://download.go-oo.org/extern/
 
@@ -151,7 +149,6 @@
 CONFIGURE_ARGS+=       --disable-fetch-external
 CONFIGURE_ARGS+=       --disable-firebird-sdbc
 CONFIGURE_ARGS+=       --disable-odk
-CONFIGURE_ARGS+=       --disable-randr-link
 CONFIGURE_ARGS+=       --disable-systray
 # Enabling crashrep causes error. Non-official build does not need it.
 CONFIGURE_ARGS+=       --disable-crashdump
@@ -162,6 +159,10 @@
 #CONFIGURE_ARGS+=      --enable-release-build
 CONFIGURE_ARGS+=       --enable-ext-wiki-publisher
 CONFIGURE_ARGS+=       --enable-ext-nlpsolver
+CONFIGURE_ARGS+=       --enable-ext-mariadb-connector
+CONFIGURE_ARGS+=       --without-system-mysql-cppconn
+CONFIGURE_ARGS+=       --without-system-postgresql
+CONFIGURE_ARGS+=       --without-system-mariadb
 CONFIGURE_ARGS+=       --with-alloc=system
 CONFIGURE_ARGS+=       --with-compat-oowrappers
 CONFIGURE_ARGS+=       --with-external-tar=${DISTDIR}/${DIST_SUBDIR}
@@ -171,8 +172,6 @@
 CONFIGURE_ARGS+=       --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib
 CONFIGURE_ARGS+=       --with-system-libs
 CONFIGURE_ARGS+=       --with-system-dicts
-# internal vigra should be used because only header files are used.
-CONFIGURE_ARGS+=       --without-system-vigra
 CONFIGURE_ARGS+=       --with-vendor="pkgsrc"
 CONFIGURE_ARGS+=       --without-doxygen
 CONFIGURE_ARGS+=       --without-junit
@@ -181,7 +180,8 @@
 CONFIGURE_ARGS+=       --without-system-apache-commons
 CONFIGURE_ARGS+=       --with-system-cppunit
 CONFIGURE_ARGS+=       --with-system-libgltf
-CONFIGURE_ARGS+=       --without-system-npapi-headers
+# gengal.bin segfault, in runtime same problem causes application error.
+#CONFIGURE_ARGS+=      --without-galleries
 # internal sane should be used because only header files are used.
 CONFIGURE_ARGS+=       --without-system-sane
 # sbin might not be in PATH
@@ -247,6 +247,7 @@
 #      cd ${DESTDIR}${PREFIX}/share/applications && ${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/share/xdg/${f}
 #.endfor
 
+.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libabw/buildlink3.mk"
 .include "../../converters/libcdr/buildlink3.mk"
 .include "../../converters/libe-book/buildlink3.mk"
@@ -266,12 +267,13 @@
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../databases/unixodbc/buildlink3.mk"
+.include "../../devel/apr-util/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/cppunit/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/liblangtag/buildlink3.mk"
-.include "../../devel/mdds/buildlink3.mk"
+.include "../../devel/mdds1.2/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
@@ -297,9 +299,13 @@
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../net/libcmis/buildlink3.mk"
+.include "../../net/mDNSResponder/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mcups)
 .include "../../print/cups/buildlink3.mk"
+.endif
 .include "../../print/poppler-cpp/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
@@ -315,8 +321,11 @@
 .include "../../textproc/redland/buildlink3.mk"
 .include "../../textproc/libexttextcat/buildlink3.mk"
 .include "../../textproc/mythes/buildlink3.mk"
+.include "../../textproc/raptor2/buildlink3.mk"
+.include "../../textproc/rasqal/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../www/neon/buildlink3.mk"
+.include "../../www/serf/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
@@ -327,8 +336,8 @@
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff -r c91b593c4368 -r 82c3606ec8f4 misc/libreoffice/PLIST
--- a/misc/libreoffice/PLIST    Tue Dec 06 15:13:50 2016 +0000
+++ b/misc/libreoffice/PLIST    Tue Dec 06 15:21:00 2016 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2016/08/15 19:15:25 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.14 2016/12/06 15:21:00 ryoon Exp $
 bin/libreoffice
 bin/lobase
 bin/localc
@@ -47,10 +47,8 @@
 ${PKGNAME}/lib/libreoffice/program/gdbtrace
 ${PKGNAME}/lib/libreoffice/program/gengal
 ${PKGNAME}/lib/libreoffice/program/gengal.bin
-${PKGNAME}/lib/libreoffice/program/gnome-open-url
 ${PKGNAME}/lib/libreoffice/program/intro.png
 ${PKGNAME}/lib/libreoffice/program/java-set-classpath
-${PLIST.kde4}${PKGNAME}/lib/libreoffice/program/kde4-open-url
 ${PKGNAME}/lib/libreoffice/program/libOGLTranslo.so
 ${PKGNAME}/lib/libreoffice/program/libPresentationMinimizerlo.so
 ${PKGNAME}/lib/libreoffice/program/libPresenterScreenlo.so
@@ -63,7 +61,6 @@
 ${PKGNAME}/lib/libreoffice/program/libavmedialo.so
 ${PKGNAME}/lib/libreoffice/program/libavmediaogl.so
 ${PKGNAME}/lib/libreoffice/program/libbasctllo.so
-${PKGNAME}/lib/libreoffice/program/libbasebmplo.so
 ${PKGNAME}/lib/libreoffice/program/libbasegfxlo.so
 ${PKGNAME}/lib/libreoffice/program/libbasprovlo.so
 ${PKGNAME}/lib/libreoffice/program/libbiblo.so
@@ -139,11 +136,9 @@
 ${PKGNAME}/lib/libreoffice/program/libinvocadaptlo.so
 ${PKGNAME}/lib/libreoffice/program/libinvocationlo.so
 ${PKGNAME}/lib/libreoffice/program/libiolo.so
-${PLIST.kde4}${PKGNAME}/lib/libreoffice/program/libkde4be1lo.so
 ${PKGNAME}/lib/libreoffice/program/libldapbe2lo.so
 ${PKGNAME}/lib/libreoffice/program/liblnglo.so
 ${PKGNAME}/lib/libreoffice/program/liblnthlo.so
-${PLIST.gtk3}${PKGNAME}/lib/libreoffice/program/liblibreofficekitgtk.so
 ${PKGNAME}/lib/libreoffice/program/liblocalebe1lo.so
 ${PKGNAME}/lib/libreoffice/program/liblocaledata_en.so
 ${PKGNAME}/lib/libreoffice/program/liblocaledata_es.so
@@ -175,7 +170,6 @@
 ${PKGNAME}/lib/libreoffice/program/libpdffilterlo.so
 ${PKGNAME}/lib/libreoffice/program/libpdfimportlo.so
 ${PKGNAME}/lib/libreoffice/program/libplacewarelo.so
-${PKGNAME}/lib/libreoffice/program/libpllo.so
 ${PKGNAME}/lib/libreoffice/program/libpostgresql-sdbc-impllo.so
 ${PKGNAME}/lib/libreoffice/program/libpostgresql-sdbclo.so
 ${PKGNAME}/lib/libreoffice/program/libpricinglo.so
@@ -268,8 +262,6 @@
 ${PKGNAME}/lib/libreoffice/program/libvcllo.so
 ${PKGNAME}/lib/libreoffice/program/libvclplug_genlo.so
 ${PKGNAME}/lib/libreoffice/program/libvclplug_gtklo.so
-${PLIST.gtk3}${PKGNAME}/lib/libreoffice/program/libvclplug_gtk3lo.so
-${PLIST.kde4}${PKGNAME}/lib/libreoffice/program/libvclplug_kde4lo.so
 ${PKGNAME}/lib/libreoffice/program/libwpftcalclo.so
 ${PKGNAME}/lib/libreoffice/program/libwpftdrawlo.so
 ${PKGNAME}/lib/libreoffice/program/libwpftimpresslo.so
@@ -293,7 +285,6 @@
 ${PKGNAME}/lib/libreoffice/program/msgbox.py
 ${PKGNAME}/lib/libreoffice/program/officehelper.py
 ${PKGNAME}/lib/libreoffice/program/oosplash
-${PKGNAME}/lib/libreoffice/program/open-url
 ${PKGNAME}/lib/libreoffice/program/opencl/cl-test.ods
 ${PKGNAME}/lib/libreoffice/program/opengl/areaHashCRC64TFragmentShader.glsl
 ${PKGNAME}/lib/libreoffice/program/opengl/areaScaleFastFragmentShader.glsl
@@ -376,7 +367,6 @@
 ${PKGNAME}/lib/libreoffice/program/pagein-draw
 ${PKGNAME}/lib/libreoffice/program/pagein-impress
 ${PKGNAME}/lib/libreoffice/program/pagein-writer
-${PKGNAME}/lib/libreoffice/program/pluginapp.bin
 ${PKGNAME}/lib/libreoffice/program/postgresql-sdbc.ini
 ${PKGNAME}/lib/libreoffice/program/pythonloader.py
 ${PKGNAME}/lib/libreoffice/program/pythonloader.unorc
@@ -6268,6 +6258,117 @@
 ${PKGNAME}/lib/libreoffice/program/resource/vclzh-CN.res
 ${PKGNAME}/lib/libreoffice/program/resource/vclzh-TW.res
 ${PKGNAME}/lib/libreoffice/program/resource/vclzu.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectaf.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectam.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectar.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectas.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectast.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectbe.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectbg.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectbn-IN.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectbn.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectbo.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectbr.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectbrx.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectbs.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectca-valencia.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectca.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectcs.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectcy.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectda.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectde.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectdgo.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectdz.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectel.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfecten-GB.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfecten-US.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfecten-ZA.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfecteo.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectes.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectet.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfecteu.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectfa.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectfi.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectfr.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectga.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectgd.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectgl.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectgu.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectgug.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfecthe.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfecthi.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfecthr.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfecthu.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectid.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectis.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectit.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectja.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectka.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectkk.res
+${PKGNAME}/lib/libreoffice/program/resource/writerperfectkm.res



Home | Main Index | Thread Index | Old Index