Sun Sep 10 11:30:15 2017 UTC ()
Fix build with modular xorg under NetBSD/amd64-current

* Link static libraries, libjpeg.a instread of libjpeg from openjdk8.
  Reported by wiz@


(ryoon)
diff -r1.39 -r1.40 pkgsrc/misc/libreoffice/distinfo
diff -r1.7 -r1.8 pkgsrc/misc/libreoffice/patches/patch-configure.ac
cvs diff -r1.39 -r1.40 pkgsrc/misc/libreoffice/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/distinfo 2017/09/02 10:09:06 1.39
+++ pkgsrc/misc/libreoffice/distinfo 2017/09/10 11:30:15 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.39 2017/09/02 10:09:06 ryoon Exp $ 1$NetBSD: distinfo,v 1.40 2017/09/10 11:30:15 ryoon Exp $
2 2
3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b 4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes 6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
7SHA1 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 66ed8eac9bac2a23ba9e3a3b3d560609fa3acc25 7SHA1 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 66ed8eac9bac2a23ba9e3a3b3d560609fa3acc25
8RMD160 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 45c0fd5f41e82691dcdebdda87da78b0af529066 8RMD160 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 45c0fd5f41e82691dcdebdda87da78b0af529066
9SHA512 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 9bdc7e440809a9f6fed6dd5a8ba9bc41c029a3d59586bead442efed34a2288d23fade0aee889b4519781ef2d8283dbf0567be3dbdce51ce502f6c2c3450e4783 9SHA512 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 9bdc7e440809a9f6fed6dd5a8ba9bc41c029a3d59586bead442efed34a2288d23fade0aee889b4519781ef2d8283dbf0567be3dbdce51ce502f6c2c3450e4783
10Size (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 102916 bytes 10Size (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 102916 bytes
11SHA1 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 885cc4b6c9472d95e2515e777f6018a90657e974 11SHA1 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 885cc4b6c9472d95e2515e777f6018a90657e974
12RMD160 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = f3c180e878c68bb44fd9fc44b40c0e1ea480f266 12RMD160 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = f3c180e878c68bb44fd9fc44b40c0e1ea480f266
13SHA512 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 1107ac0ba3804ef5c9870a9359076cc48d0be4e6610287abf78b606519fc834b97dc0fff851cd680ade6327f4803e7232eaf462d9428ca20398ad397b714d8f8 13SHA512 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 1107ac0ba3804ef5c9870a9359076cc48d0be4e6610287abf78b606519fc834b97dc0fff851cd680ade6327f4803e7232eaf462d9428ca20398ad397b714d8f8
14Size (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 525299 bytes 14Size (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 525299 bytes
@@ -206,26 +206,26 @@ SHA512 (libreoffice/libreoffice-help-5.4 @@ -206,26 +206,26 @@ SHA512 (libreoffice/libreoffice-help-5.4
206Size (libreoffice/libreoffice-help-5.4.1.2.tar.xz) = 2343312 bytes 206Size (libreoffice/libreoffice-help-5.4.1.2.tar.xz) = 2343312 bytes
207SHA1 (libreoffice/libreoffice-translations-5.4.1.2.tar.xz) = 8648fd8e3186262dcdd450e7a485b16d31e9efa8 207SHA1 (libreoffice/libreoffice-translations-5.4.1.2.tar.xz) = 8648fd8e3186262dcdd450e7a485b16d31e9efa8
208RMD160 (libreoffice/libreoffice-translations-5.4.1.2.tar.xz) = 2acd6ba7ba7a0786a6d9d2d38f270c71eb46138f 208RMD160 (libreoffice/libreoffice-translations-5.4.1.2.tar.xz) = 2acd6ba7ba7a0786a6d9d2d38f270c71eb46138f
209SHA512 (libreoffice/libreoffice-translations-5.4.1.2.tar.xz) = 54a071f32d7019045404ae745376fbf8d34fcad8367f6108402068cf7ee122e09d0a7e95570fd5c7f434dc277824b30bb590ea7f1a270307d19116635f734c5b 209SHA512 (libreoffice/libreoffice-translations-5.4.1.2.tar.xz) = 54a071f32d7019045404ae745376fbf8d34fcad8367f6108402068cf7ee122e09d0a7e95570fd5c7f434dc277824b30bb590ea7f1a270307d19116635f734c5b
210Size (libreoffice/libreoffice-translations-5.4.1.2.tar.xz) = 136258296 bytes 210Size (libreoffice/libreoffice-translations-5.4.1.2.tar.xz) = 136258296 bytes
211SHA1 (libreoffice/xmlsec1-1.2.24.tar.gz) = b64a443641de3338d7d1ba17f25653a314d65d93 211SHA1 (libreoffice/xmlsec1-1.2.24.tar.gz) = b64a443641de3338d7d1ba17f25653a314d65d93
212RMD160 (libreoffice/xmlsec1-1.2.24.tar.gz) = b203056b392723364d3a0bcb151602758ada8f87 212RMD160 (libreoffice/xmlsec1-1.2.24.tar.gz) = b203056b392723364d3a0bcb151602758ada8f87
213SHA512 (libreoffice/xmlsec1-1.2.24.tar.gz) = a01feb9af8f85e77f2c5d2d7f596fba3ef58bc593cb9a7c3e883deb38f8292598ba5aa09fa59897fe303f10336a10b0bb0f27171f2b6e6251e694f37f0b9b7d4 213SHA512 (libreoffice/xmlsec1-1.2.24.tar.gz) = a01feb9af8f85e77f2c5d2d7f596fba3ef58bc593cb9a7c3e883deb38f8292598ba5aa09fa59897fe303f10336a10b0bb0f27171f2b6e6251e694f37f0b9b7d4
214Size (libreoffice/xmlsec1-1.2.24.tar.gz) = 1835762 bytes 214Size (libreoffice/xmlsec1-1.2.24.tar.gz) = 1835762 bytes
215SHA1 (patch-Makefile.in) = 5bb39185b12d57b69c72771a3afc214ac243e694 215SHA1 (patch-Makefile.in) = 5bb39185b12d57b69c72771a3afc214ac243e694
216SHA1 (patch-autogen.sh) = 81d14387f32658c69a40a07f0af1373a90f70364 216SHA1 (patch-autogen.sh) = 81d14387f32658c69a40a07f0af1373a90f70364
217SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e847dd9ecfb4e4abe78b1b5965a0b 217SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e847dd9ecfb4e4abe78b1b5965a0b
218SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4 218SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4
219SHA1 (patch-configure.ac) = 615ae72adc94effd8b2318bbe480096782801f30 219SHA1 (patch-configure.ac) = 64d49f455dcef62c950f581d85c4893e9c8945d5
220SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075 220SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075
221SHA1 (patch-external_libmariadb_UnpackedTarball__mariadb.mk) = e7f156c30a33119e0268b371cea61674572fb860 221SHA1 (patch-external_libmariadb_UnpackedTarball__mariadb.mk) = e7f156c30a33119e0268b371cea61674572fb860
222SHA1 (patch-external_libmariadb_mariadb-netbsd.patch) = 032283279faf2978c7a6af3f09a3c19b5fe861c0 222SHA1 (patch-external_libmariadb_mariadb-netbsd.patch) = 032283279faf2978c7a6af3f09a3c19b5fe861c0
223SHA1 (patch-external_mysqlcppconn_config.h) = 75929db7615da07810ac685b682628b7aca31919 223SHA1 (patch-external_mysqlcppconn_config.h) = 75929db7615da07810ac685b682628b7aca31919
224SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce 224SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce
225SHA1 (patch-mysqlc_Library__mysqlc.mk) = c75e938a59cf64cf02ce6545f05752d64d634599 225SHA1 (patch-mysqlc_Library__mysqlc.mk) = c75e938a59cf64cf02ce6545f05752d64d634599
226SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = df3a3900fc8b5542f1cc37f7bd509afdb53d9c1b 226SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = df3a3900fc8b5542f1cc37f7bd509afdb53d9c1b
227SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d 227SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
228SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58 228SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58
229SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb 229SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
230SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 51372020a640f9f1ccd8ebd8694e33c4fdedff47 230SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 51372020a640f9f1ccd8ebd8694e33c4fdedff47
231SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 50dac45907c8d0651e9fc4a0df3f74affc940931 231SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 50dac45907c8d0651e9fc4a0df3f74affc940931
cvs diff -r1.7 -r1.8 pkgsrc/misc/libreoffice/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/patches/patch-configure.ac 2017/08/01 11:57:37 1.7
+++ pkgsrc/misc/libreoffice/patches/patch-configure.ac 2017/09/10 11:30:15 1.8
@@ -1,35 +1,44 @@ @@ -1,35 +1,44 @@
1$NetBSD: patch-configure.ac,v 1.7 2017/08/01 11:57:37 ryoon Exp $ 1$NetBSD: patch-configure.ac,v 1.8 2017/09/10 11:30:15 ryoon Exp $
2 2
3--- configure.ac.orig 2017-07-25 20:26:39.000000000 +0000 3--- configure.ac.orig 2017-08-24 21:39:40.000000000 +0000
4+++ configure.ac 4+++ configure.ac
5@@ -6026,14 +6026,14 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG 5@@ -6026,14 +6026,14 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG
6 ], [AC_MSG_RESULT([no])]) 6 ], [AC_MSG_RESULT([no])])
7 AC_LANG_POP([C++]) 7 AC_LANG_POP([C++])
8  8
9- AC_MSG_CHECKING([whether $CXX defines __cxa_exceptions in cxxabi.h]) 9- AC_MSG_CHECKING([whether $CXX defines __cxa_exceptions in cxxabi.h])
10+ AC_MSG_CHECKING([whether $CXX defines __cxa_exception in cxxabi.h]) 10+ AC_MSG_CHECKING([whether $CXX defines __cxa_exception in cxxabi.h])
11 AC_LANG_PUSH([C++]) 11 AC_LANG_PUSH([C++])
12 AC_COMPILE_IFELSE([AC_LANG_SOURCE([ 12 AC_COMPILE_IFELSE([AC_LANG_SOURCE([
13 #include <cstddef> 13 #include <cstddef>
14 #include <cxxabi.h> 14 #include <cxxabi.h>
15- std::size_t f() { return sizeof(__cxxabiv1::__cxa_exceptions); } 15- std::size_t f() { return sizeof(__cxxabiv1::__cxa_exceptions); }
16+ std::size_t f() { return sizeof(__cxxabiv1::__cxa_exception); } 16+ std::size_t f() { return sizeof(__cxxabiv1::__cxa_exception); }
17 ])], [ 17 ])], [
18- AC_DEFINE([HAVE_CXXABI_H_CXA_EXCEPTIONS],[1]) 18- AC_DEFINE([HAVE_CXXABI_H_CXA_EXCEPTIONS],[1])
19+ AC_DEFINE([HAVE_CXXABI_H_CXA_EXCEPTION],[1]) 19+ AC_DEFINE([HAVE_CXXABI_H_CXA_EXCEPTION],[1])
20 AC_MSG_RESULT([yes]) 20 AC_MSG_RESULT([yes])
21 ], [AC_MSG_RESULT([no])]) 21 ], [AC_MSG_RESULT([no])])
22 AC_LANG_POP([C++]) 22 AC_LANG_POP([C++])
 23@@ -7603,7 +7603,7 @@ else
 24 if test "$COM" = "MSC"; then
 25 LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.lib"
 26 else
 27- LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs -ljpeg"
 28+ LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.a"
 29 fi
 30
 31 case "$host_cpu" in
23@@ -9175,11 +9175,11 @@ dnl HarfBuzz 32@@ -9175,11 +9175,11 @@ dnl HarfBuzz
24 dnl =================================================================== 33 dnl ===================================================================
25 libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3], 34 libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3],
26 ["-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"], 35 ["-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"],
27- ["-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"]) 36- ["-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"])
28+ ["${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a"]) 37+ ["${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a"])
29  38
30 libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42], 39 libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42],
31 ["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"], 40 ["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],
32- ["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"]) 41- ["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"])
33+ ["${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a"]) 42+ ["${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a"])
34  43
35 if test "$COM" = "MSC"; then # override the above 44 if test "$COM" = "MSC"; then # override the above