CVS commit: pkgsrc/misc/libreoffice

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Mar  6 13:00:01 UTC 2023

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
        pkgsrc/misc/libreoffice/patches: patch-configure.ac

Log Message:
libreoffice: fix broken xinerama detection


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.24 -r1.25 pkgsrc/misc/libreoffice/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.138 pkgsrc/misc/libreoffice/distinfo:1.139
--- pkgsrc/misc/libreoffice/distinfo:1.138      Sun Mar  5 18:22:41 2023
+++ pkgsrc/misc/libreoffice/distinfo    Mon Mar  6 13:00:01 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.138 2023/03/05 18:22:41 tnn Exp $
+$NetBSD: distinfo,v 1.139 2023/03/06 13:00:01 tnn Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -172,7 +172,7 @@ SHA1 (patch-Makefile.in) = c16214631f0e4
 SHA1 (patch-autogen.sh) = 0fed5f88342112bed0f573d426cc2c3d05ed45c7
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 2eed9efc4a145687f409ba87806147dac2210c68
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc
-SHA1 (patch-configure.ac) = af6b9a07b3bc309e4e8d7ce7da13614bc59ee833
+SHA1 (patch-configure.ac) = 80670f61ad0cd81c866e547fa177562003b8eab7
 SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = c8a82ce0c3d293108daa41f81d9cee376ca50a82

Index: pkgsrc/misc/libreoffice/patches/patch-configure.ac
diff -u pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.24 pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.25
--- pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.24     Sun Mar  5 18:22:41 2023
+++ pkgsrc/misc/libreoffice/patches/patch-configure.ac  Mon Mar  6 13:00:01 2023
@@ -1,10 +1,11 @@
-$NetBSD: patch-configure.ac,v 1.24 2023/03/05 18:22:41 tnn Exp $
+$NetBSD: patch-configure.ac,v 1.25 2023/03/06 13:00:01 tnn Exp $
 
 * Add NetBSD/aarch64 support.
 * Disable freetype2 and fontconfig from pkgsrc explicitly.
   to fix X11_TYPE=native build and internal pdfium's internal freetype build.
 * Fix some static links.
 * Find devel/apache-ant.
+* Fix broken xinerama detection.
 
 --- configure.ac.orig  2023-01-25 14:26:33.000000000 +0000
 +++ configure.ac
@@ -46,6 +47,17 @@ $NetBSD: patch-configure.ac,v 1.24 2023/
  libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
  
  if test "$COM" = "MSC"; then # override the above
+@@ -13467,8 +13472,8 @@ if test "$_os" = "Linux" -o "$_os" = "Fr
+         AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
+             [AC_MSG_ERROR(Xinerama header not found.)], [])
+         XEXTLIBS=`$PKG_CONFIG --variable=libs xext`
+-        if test "x$XEXTLIB" = x; then
+-           XEXTLIBS="-L$XLIB -L$XINERAMALIB -lXext"
++        if test "x$XEXTLIBS" = x; then
++           XEXTLIBS="-L$XINERAMALIB -lXext"
+         fi
+         XINERAMA_EXTRA_LIBS="$XEXTLIBS"
+         if test "$_os" = "FreeBSD"; then
 @@ -13734,8 +13739,8 @@ EOF
                      if test -f /usr/share/ant-core/lib/ant.jar; then
                          ANT_LIB=/usr/share/ant-core/lib