diff options
| author | ryoon <ryoon@pkgsrc.org> | 2017-09-10 11:30:15 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2017-09-10 11:30:15 +0000 |
| commit | 8cf1daeda2c298d7601e90cae9cb0e63467e3cb1 (patch) | |
| tree | c55d28196eb0b04bb2ddbece68449b1c26785272 /misc | |
| parent | a917b8359099a7849017a527fbe8345a270afbca (diff) | |
| download | pkgsrc-8cf1daeda2c298d7601e90cae9cb0e63467e3cb1.tar.gz | |
Fix build with modular xorg under NetBSD/amd64-current
* Link static libraries, libjpeg.a instread of libjpeg from openjdk8.
Reported by wiz@
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/libreoffice/distinfo | 4 | ||||
| -rw-r--r-- | misc/libreoffice/patches/patch-configure.ac | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo index 3ee41bf5e60..26d05d2de6b 100644 --- a/misc/libreoffice/distinfo +++ b/misc/libreoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2017/09/02 10:09:06 ryoon Exp $ +$NetBSD: distinfo,v 1.40 2017/09/10 11:30:15 ryoon Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -216,7 +216,7 @@ SHA1 (patch-Makefile.in) = 5bb39185b12d57b69c72771a3afc214ac243e694 SHA1 (patch-autogen.sh) = 81d14387f32658c69a40a07f0af1373a90f70364 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) = 615ae72adc94effd8b2318bbe480096782801f30 +SHA1 (patch-configure.ac) = 64d49f455dcef62c950f581d85c4893e9c8945d5 SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075 SHA1 (patch-external_libmariadb_UnpackedTarball__mariadb.mk) = e7f156c30a33119e0268b371cea61674572fb860 SHA1 (patch-external_libmariadb_mariadb-netbsd.patch) = 032283279faf2978c7a6af3f09a3c19b5fe861c0 diff --git a/misc/libreoffice/patches/patch-configure.ac b/misc/libreoffice/patches/patch-configure.ac index 03d23fe7c80..df0dae9ab29 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.7 2017/08/01 11:57:37 ryoon Exp $ +$NetBSD: patch-configure.ac,v 1.8 2017/09/10 11:30:15 ryoon Exp $ ---- configure.ac.orig 2017-07-25 20:26:39.000000000 +0000 +--- configure.ac.orig 2017-08-24 21:39:40.000000000 +0000 +++ configure.ac @@ -6026,14 +6026,14 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG ], [AC_MSG_RESULT([no])]) @@ -20,6 +20,15 @@ $NetBSD: patch-configure.ac,v 1.7 2017/08/01 11:57:37 ryoon Exp $ AC_MSG_RESULT([yes]) ], [AC_MSG_RESULT([no])]) AC_LANG_POP([C++]) +@@ -7603,7 +7603,7 @@ else + if test "$COM" = "MSC"; then + LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.lib" + else +- LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs -ljpeg" ++ LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.a" + fi + + case "$host_cpu" in @@ -9175,11 +9175,11 @@ dnl HarfBuzz dnl =================================================================== libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3], |