diff options
7 files changed, 88 insertions, 55 deletions
diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile index 1fdccc4200d..0a874eb5905 100644 --- a/misc/libreoffice/Makefile +++ b/misc/libreoffice/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.141 2018/02/03 00:39:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.142 2018/02/13 13:03:06 ryoon Exp $ -VERREL= 6.0.0 -VERRC= 3 +VERREL= 6.0.1 +VERRC= 1 VER= ${VERREL}.${VERRC} DISTNAME= libreoffice-${VER} CATEGORIES= misc @@ -244,6 +244,13 @@ post-extract: mkdir ${WRKSRC}/tmp # mkdir ${WRKSRC}/${OBJDIR} +pre-configure: provide-python3 + +.PHONY: provide-python3 +provide-python3: + # install phase uses python3 command + ${LN} -s ${PYTHONBIN} "${BUILDLINK_DIR}/bin/python3" + do-install: cd ${WRKSRC} && make DESTDIR="${DESTDIR}" PREFIXDIR="${PREFIX}" distro-pack-install # make install cleans ${DESTDIR}${PREFIX}/*, so bin etc. are removed. diff --git a/misc/libreoffice/PLIST b/misc/libreoffice/PLIST index 1bd4017f3d5..ad7ad690b97 100644 --- a/misc/libreoffice/PLIST +++ b/misc/libreoffice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2018/02/03 05:28:49 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.27 2018/02/13 13:03:06 ryoon Exp $ bin/libreoffice bin/lobase bin/localc @@ -8999,6 +8999,7 @@ ${PKGNAME}/lib/libreoffice/share/wizards/resources_zh_TW.properties ${PKGNAME}/lib/libreoffice/share/wizards/resources_zu.properties ${PKGNAME}/lib/libreoffice/share/wordbook/en-GB.dic ${PKGNAME}/lib/libreoffice/share/wordbook/en-US.dic +${PKGNAME}/lib/libreoffice/share/wordbook/hu_AkH11.dic ${PKGNAME}/lib/libreoffice/share/wordbook/sl.dic ${PKGNAME}/lib/libreoffice/share/wordbook/technical.dic ${PKGNAME}/lib/libreoffice/share/xdg/base.desktop diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo index 037d410fca5..b8bdc36a66c 100644 --- a/misc/libreoffice/distinfo +++ b/misc/libreoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2018/02/03 00:39:50 ryoon Exp $ +$NetBSD: distinfo,v 1.48 2018/02/13 13:03:06 ryoon Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -176,22 +176,22 @@ SHA1 (libreoffice/libre-hebrew-1.0.tar.gz) = 88bc96881b7f5dc161ef8994cb499f13f6f RMD160 (libreoffice/libre-hebrew-1.0.tar.gz) = e44c35266105eb06023bd75d16f8f297c63e886d SHA512 (libreoffice/libre-hebrew-1.0.tar.gz) = 609c8ef29a1eab9b027ea04abf14949e9a204cf826fb0a792dadd8a83fc49ac9610a0b3a2bd4b8988e615688c63d0ec08a89436134980b2a9667e8966a75a795 Size (libreoffice/libre-hebrew-1.0.tar.gz) = 531276 bytes -SHA1 (libreoffice/libreoffice-6.0.0.3.tar.xz) = 98656b1889ef577c05e75734692dfc59152bca91 -RMD160 (libreoffice/libreoffice-6.0.0.3.tar.xz) = b6cb7ecc395c9e494643bd6989f6c6f1397f3161 -SHA512 (libreoffice/libreoffice-6.0.0.3.tar.xz) = 2b2c0fafec5db23317a2c3236b482b0cef9c0edfabab94495a0fd3007b271eaa1dbfa97711819b3b8fb2e2375fbdfb4c662df4ffc8c519255ac84357b4c45e62 -Size (libreoffice/libreoffice-6.0.0.3.tar.xz) = 203284136 bytes -SHA1 (libreoffice/libreoffice-dictionaries-6.0.0.3.tar.xz) = 12310f8b7387e968fc5195330d259459e9851e42 -RMD160 (libreoffice/libreoffice-dictionaries-6.0.0.3.tar.xz) = 8455879a11354cab2e6c7c06369b5f95ca578190 -SHA512 (libreoffice/libreoffice-dictionaries-6.0.0.3.tar.xz) = 34821f0e0d5d4bbdf7824dd1ac064acfab9b61c63cb46304997a0cba0f066dd6c260785510d11b7629e08e8a9fcd45db324e2c0b5e5e5040497452645926d45e -Size (libreoffice/libreoffice-dictionaries-6.0.0.3.tar.xz) = 41642772 bytes -SHA1 (libreoffice/libreoffice-help-6.0.0.3.tar.xz) = 94fd8fb94ef8e14d55c03cdc73def1f5e80c4926 -RMD160 (libreoffice/libreoffice-help-6.0.0.3.tar.xz) = aeef78c9cabbb4250d62d753521cddaa9fa340f2 -SHA512 (libreoffice/libreoffice-help-6.0.0.3.tar.xz) = 9058edf71e34e55e23f5559af94d12d5f12c38385b30d75919283f435eac07dfc790d116b556aca0d0aa30f5119aea39f07a123a1f1e5ad172f5b19b3f7dc4b0 -Size (libreoffice/libreoffice-help-6.0.0.3.tar.xz) = 2972556 bytes -SHA1 (libreoffice/libreoffice-translations-6.0.0.3.tar.xz) = 170536d7fb073aca4923f3f81151f6f42448f107 -RMD160 (libreoffice/libreoffice-translations-6.0.0.3.tar.xz) = 872f5adc57b5c3c2a1804288d0c85a061c301255 -SHA512 (libreoffice/libreoffice-translations-6.0.0.3.tar.xz) = d334d2da1b0af6a098ce97d051f9f8d84469668995038dd642d9584c977f72612e363c6eca32c1b007b4f656510ec46b62e0cce9904f19b1e6b47a8cd10a4f67 -Size (libreoffice/libreoffice-translations-6.0.0.3.tar.xz) = 139020268 bytes +SHA1 (libreoffice/libreoffice-6.0.1.1.tar.xz) = e304efe9fe2df66028e3417a30a7b8773321c1f1 +RMD160 (libreoffice/libreoffice-6.0.1.1.tar.xz) = 39faf5f99381acee8f173f51a31ba3c5d7df9ce5 +SHA512 (libreoffice/libreoffice-6.0.1.1.tar.xz) = dc9dbef56a5c1df0ac0a4418a42e9200fe1a2e52d3708ad9d86ad1b35171c258fa9a88a4427992aeae83f5e0f22613cf885f068c99e76e5fe376888f4edf7855 +Size (libreoffice/libreoffice-6.0.1.1.tar.xz) = 203420780 bytes +SHA1 (libreoffice/libreoffice-dictionaries-6.0.1.1.tar.xz) = 453078220f03bc4d7d7748c40afced40cef6c9c7 +RMD160 (libreoffice/libreoffice-dictionaries-6.0.1.1.tar.xz) = 4096fcd21991c6e0ed1c6eb61f3fc58f78678141 +SHA512 (libreoffice/libreoffice-dictionaries-6.0.1.1.tar.xz) = 7d30933cbc7650c0ba317c91784c726c7806cb126d209974a5a34a7a90354dfcbf1c02184d77640cbfa904279e467e5c7c82e601508aa5c518816d005c0961c9 +Size (libreoffice/libreoffice-dictionaries-6.0.1.1.tar.xz) = 41640700 bytes +SHA1 (libreoffice/libreoffice-help-6.0.1.1.tar.xz) = 37841d2231bae8138c663c05ac2ba6ac6c92cfd4 +RMD160 (libreoffice/libreoffice-help-6.0.1.1.tar.xz) = 3d11e907a6741a7fe3f0dd29670e574a11d8348b +SHA512 (libreoffice/libreoffice-help-6.0.1.1.tar.xz) = bbebc878b25f80642c6ebd961e8531cf4f1379cc409a63391ca731e83e71e4e83e2a7ef6ae00b56812a8a4ae2c5de5ea5465aba70b357850b7b9c5f672521336 +Size (libreoffice/libreoffice-help-6.0.1.1.tar.xz) = 2972872 bytes +SHA1 (libreoffice/libreoffice-translations-6.0.1.1.tar.xz) = ea4a8466a5f484e99a5665e0747d8c66380a10dd +RMD160 (libreoffice/libreoffice-translations-6.0.1.1.tar.xz) = d5261c22d81a312f44827d4e3f232171b35d6350 +SHA512 (libreoffice/libreoffice-translations-6.0.1.1.tar.xz) = 4f03cac5329baf8b8b10e8365c81b5691efda74a18a19274fad543f38a46ac50089505fee513857bf6e2ee91ff7fc310379de33babca1fd2910a1bc4c4f64585 +Size (libreoffice/libreoffice-translations-6.0.1.1.tar.xz) = 139061168 bytes SHA1 (libreoffice/noto-fonts-20171024.tar.gz) = e775f61b4ed544198e9497b27b3460623d5560ca RMD160 (libreoffice/noto-fonts-20171024.tar.gz) = 02f8d0e2615032daf36dc375d00a2b4575d858a3 SHA512 (libreoffice/noto-fonts-20171024.tar.gz) = 3888c5f19d85f9ae25413a064a27f01b87e09ba07b40f721b20e563bad3289a5c435686744dc3b52980625a24f82fa0b4b38046b4db971afc50a0cb3a757c179 @@ -208,7 +208,7 @@ SHA1 (patch-Makefile.in) = 5bb39185b12d57b69c72771a3afc214ac243e694 SHA1 (patch-autogen.sh) = eedd0091745cf6a32ee9b33227502baaa661270e SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e847dd9ecfb4e4abe78b1b5965a0b SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4 -SHA1 (patch-configure.ac) = 59790f5f4e48b20876907e8e725a5e2f7df980f1 +SHA1 (patch-configure.ac) = 13024963b8d5ee21b2b8268bf6e1d442e5838454 SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075 SHA1 (patch-download.lst) = c18fe0a65f75a8c8318c9b01f6ad16685f81ae27 SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = ffe2b8ff9e9ff6b5faf4eea1d51a8983908d0602 @@ -216,6 +216,8 @@ SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d SHA1 (patch-external_mysql-connector-cpp_patches_netbsd.patch) = d0981757856f5b28082ee468b385dc2fdf027dd0 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce +SHA1 (patch-external_postgresql_UnpackedTarball__postgresql.mk) = d0b94e20d9e1aa89adac0f4a91c7b684850c78bc +SHA1 (patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch) = de2b5d8e657e9721867f9c72a402cc30fd093218 SHA1 (patch-mysqlc_Library__mysqlc.mk) = b040cfdb25f41896c77df3acafd4c31dc41dd590 SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = f21567d7ba021acb697a7fe6b650d41980b6cc54 SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d diff --git a/misc/libreoffice/patches/patch-configure.ac b/misc/libreoffice/patches/patch-configure.ac index 528a1aeedfa..1f4ec85ff35 100644 --- a/misc/libreoffice/patches/patch-configure.ac +++ b/misc/libreoffice/patches/patch-configure.ac @@ -1,6 +1,6 @@ -$NetBSD: patch-configure.ac,v 1.9 2018/02/03 00:39:50 ryoon Exp $ +$NetBSD: patch-configure.ac,v 1.10 2018/02/13 13:03:07 ryoon Exp $ ---- configure.ac.orig 2018-01-24 20:31:03.000000000 +0000 +--- configure.ac.orig 2018-02-08 14:35:19.000000000 +0000 +++ configure.ac @@ -5852,14 +5852,14 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG ], [AC_MSG_RESULT([no])]) @@ -43,16 +43,16 @@ $NetBSD: patch-configure.ac,v 1.9 2018/02/03 00:39:50 ryoon Exp $ if test "$COM" = "MSC"; then # override the above GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib" -@@ -10120,7 +10120,7 @@ fi - AC_SUBST(ENABLE_PDFIUM) - +@@ -10122,7 +10122,7 @@ AC_SUBST(ENABLE_PDFIUM) SYSTEM_GPGMEPP= --if test "$_os" = "Linux" -o "$_os" = "Darwin" \ -+if test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "NetBSD" \ + if test "$enable_mpl_subset" = "yes" ; then + : +-elif test "$_os" = "Linux" -o "$_os" = "Darwin" \ ++elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "NetBSD" \ -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" \) \ -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x86" \) ; then dnl =================================================================== -@@ -10132,7 +10132,7 @@ if test "$_os" = "Linux" -o "$_os" = "Da +@@ -10134,7 +10134,7 @@ elif test "$_os" = "Linux" -o "$_os" = " SYSTEM_GPGMEPP=TRUE # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way @@ -61,7 +61,7 @@ $NetBSD: patch-configure.ac,v 1.9 2018/02/03 00:39:50 ryoon Exp $ [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp development package])], []) # progress_callback is the only func with plain C linkage # checking for it also filters out older, KDE-dependent libgpgmepp versions -@@ -11518,8 +11518,8 @@ EOF +@@ -11520,8 +11520,8 @@ EOF dnl Checking for ant.jar if test "$ANT_HOME" != "NO_ANT_HOME"; then AC_MSG_CHECKING([Ant lib directory]) diff --git a/misc/libreoffice/patches/patch-external_postgresql_UnpackedTarball__postgresql.mk b/misc/libreoffice/patches/patch-external_postgresql_UnpackedTarball__postgresql.mk new file mode 100644 index 00000000000..b5637947ced --- /dev/null +++ b/misc/libreoffice/patches/patch-external_postgresql_UnpackedTarball__postgresql.mk @@ -0,0 +1,12 @@ +$NetBSD: patch-external_postgresql_UnpackedTarball__postgresql.mk,v 1.1 2018/02/13 13:03:07 ryoon Exp $ + +--- external/postgresql/UnpackedTarball_postgresql.mk.orig 2018-02-08 14:35:19.000000000 +0000 ++++ external/postgresql/UnpackedTarball_postgresql.mk +@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_pat + external/postgresql/postgresql-libs-leak.patch \ + external/postgresql/postgresql-9.2.1-autoreconf.patch \ + external/postgresql/postgresql-9.2.1-libreoffice.patch \ ++ external/postgresql/postgresql-9.2.1-openssl-1.1.patch \ + )) + + ifeq ($(SYSTEM_ZLIB),) diff --git a/misc/libreoffice/patches/patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch b/misc/libreoffice/patches/patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch new file mode 100644 index 00000000000..039f36f0f21 --- /dev/null +++ b/misc/libreoffice/patches/patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch @@ -0,0 +1,35 @@ +$NetBSD: patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch,v 1.1 2018/02/13 13:03:07 ryoon Exp $ + +--- external/postgresql/postgresql-9.2.1-openssl-1.1.patch.orig 2018-02-12 23:06:25.715483454 +0000 ++++ external/postgresql/postgresql-9.2.1-openssl-1.1.patch +@@ -0,0 +1,30 @@ ++--- misc/build/postgresql-9.2.1/configure.orig 2012-09-19 21:47:58.000000000 +0000 +++++ misc/build/postgresql-9.2.1/configure ++@@ -9106,11 +9144,11 @@ cat >>conftest.$ac_ext <<_ACEOF ++ #ifdef __cplusplus ++ extern "C" ++ #endif ++-char SSL_library_init (); +++char SSL_CTX_new (); ++ int ++ main () ++ { ++-return SSL_library_init (); +++return SSL_CTX_new (); ++ ; ++ return 0; ++ } ++@@ -9275,11 +9313,11 @@ cat >>conftest.$ac_ext <<_ACEOF ++ #ifdef __cplusplus ++ extern "C" ++ #endif ++-char SSL_library_init (); +++char SSL_CTX_new (); ++ int ++ main () ++ { ++-return SSL_library_init (); +++return SSL_CTX_new (); ++ ; ++ return 0; ++ } diff --git a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx deleted file mode 100644 index 88ac72c7339..00000000000 --- a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.2 2018/02/03 00:39:50 ryoon Exp $ - -* Fix build with poppler-0.62.0 - ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-01-24 20:31:03.000000000 +0000 -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -36,7 +36,7 @@ - // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) - // because the internal poppler does not provide poppler-version.h and the macro always returns 0 - #if POPPLER_CHECK_VERSION(0, 21, 1) --#include <UTF8.h> -+#include <UnicodeMapFuncs.h> - #elif POPPLER_CHECK_VERSION(0, 21, 0) - #include "UTF.h" - #else -@@ -913,7 +913,7 @@ void PDFOutDev::drawChar(GfxState *state - ); - - // silence spurious warning -- (void)&mapUCS2; -+ (void)&mapUTF16; - - char buf[9]; - for( int i=0; i<uLen; ++i ) |