CVS commit: pkgsrc/misc/libreoffice

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Jan 11 14:06:28 UTC 2025

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
        pkgsrc/misc/libreoffice/patches:
            patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk
Added Files:
        pkgsrc/misc/libreoffice/patches:
            patch-external_mariadb-connector-c_fix-debug-i386.patch.0

Log Message:
misc/libreoffice: Fix build for NetBSD/i386


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/misc/libreoffice/patches/patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-external_mariadb-connector-c_fix-debug-i386.patch.0

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.161 pkgsrc/misc/libreoffice/distinfo:1.162
--- pkgsrc/misc/libreoffice/distinfo:1.161      Sat Dec 28 00:00:07 2024
+++ pkgsrc/misc/libreoffice/distinfo    Sat Jan 11 14:06:28 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.161 2024/12/28 00:00:07 ryoon Exp $
+$NetBSD: distinfo,v 1.162 2025/01/11 14:06:28 ryoon Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -212,7 +212,8 @@ SHA1 (patch-configure.ac) = c19a8201ddc9
 SHA1 (patch-desktop_scripts_soffice.sh) = 443bbfde1056521901f5f599726053883a98a67d
 SHA1 (patch-external_libcmis_UnpackedTarball__libcmis.mk) = b376a15875d031e7b44195716201958caf95a3cd
 SHA1 (patch-external_libcmis_boost186.patch.1) = e31062a779f724289f732cac9422d4eeb86216dc
-SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087
+SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = cae46efa5033422affa5386591d160fa9d1dca13
+SHA1 (patch-external_mariadb-connector-c_fix-debug-i386.patch.0) = 1d9bf372ee41827fed206abdb027fde8d2ec2dda
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = c8a82ce0c3d293108daa41f81d9cee376ca50a82
 SHA1 (patch-external_pdfium_Library__pdfium.mk) = 8dc7315e8a09234cbb3994443ac8f0b14e549770
 SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = c7a4430cae56fa52e46eef9a525d9996aac61f83

Index: pkgsrc/misc/libreoffice/patches/patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk
diff -u pkgsrc/misc/libreoffice/patches/patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk:1.3 
pkgsrc/misc/libreoffice/patches/patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk:1.4
--- pkgsrc/misc/libreoffice/patches/patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk:1.3      Tue Aug 11 16:07:39 2020
+++ pkgsrc/misc/libreoffice/patches/patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk  Sat Jan 11 14:06:28 2025
@@ -1,12 +1,13 @@
-$NetBSD: patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk,v 1.3 2020/08/11 16:07:39 ryoon Exp $
+$NetBSD: patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk,v 1.4 2025/01/11 14:06:28 ryoon Exp $
 
---- external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk.orig   2020-07-29 19:29:17.000000000 +0000
+--- external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk.orig   2024-12-12 21:46:45.000000000 +0000
 +++ external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
-@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_set_pat
+@@ -27,6 +27,8 @@ $(eval $(call gb_UnpackedTarball_set_pat
  
  $(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\
      external/mariadb-connector-c/clang-cl.patch.0 \
 +    external/mariadb-connector-c/netbsd.patch \
++    external/mariadb-connector-c/fix-debug-i386.patch.0 \
  ))
  
  # TODO are any "plugins" needed?

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-external_mariadb-connector-c_fix-debug-i386.patch.0
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-external_mariadb-connector-c_fix-debug-i386.patch.0:1.1
--- /dev/null   Sat Jan 11 14:06:28 2025
+++ pkgsrc/misc/libreoffice/patches/patch-external_mariadb-connector-c_fix-debug-i386.patch.0   Sat Jan 11 14:06:28 2025
@@ -0,0 +1,43 @@
+$NetBSD: patch-external_mariadb-connector-c_fix-debug-i386.patch.0,v 1.1 2025/01/11 14:06:28 ryoon Exp $
+
+* Fix build under NetBSD/i386 9.
+
+--- external/mariadb-connector-c/fix-debug-i386.patch.0.orig   2025-01-10 15:59:40.433414620 +0000
++++ external/mariadb-connector-c/fix-debug-i386.patch.0
+@@ -0,0 +1,36 @@
++diff -urN mariadb-connector-c-3.3.13-src.orig/CMakeLists.txt mariadb-connector-c-3.3.13-src/CMakeLists.txt
++diff -urN mariadb-connector-c-3.3.13-src.orig/libmariadb/ma_context.c mariadb-connector-c-3.3.13-src/libmariadb/ma_context.c
++--- libmariadb/ma_context.c   2024-11-08 14:58:54.000000000 +0900
+++++ libmariadb/ma_context.c   2025-01-11 00:57:37.065684221 +0900
++@@ -438,6 +438,7 @@
++   */
++   __asm__ __volatile__
++     (
+++     ".cfi_startproc\n\t"
++      "movl %%esp, (%[save])\n\t"
++      "movl %[stack], %%esp\n\t"
++ #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __clang__) && !defined(__INTEL_COMPILER)
++@@ -478,6 +479,7 @@
++      "3:\n\t"
++      "movl $1, %[ret]\n"
++      "4:\n"
+++     ".cfi_endproc\n\t"
++      : [ret] "=a" (ret),
++        [f] "+c" (f),
++        [d] "+d" (d)
++@@ -673,6 +675,7 @@
++   */
++   __asm__ __volatile__
++     (
+++     ".cfi_startproc\n\t"
++      "mov x10, sp\n\t"
++      "mov sp, %[stack]\n\t"
++ #if !defined(__INTEL_COMPILER)
++@@ -718,6 +721,7 @@
++      "2:\n\t"
++      "mov %w[ret], #1\n"
++      "3:\n"
+++     ".cfi_endproc\n\t"
++      : [ret] "=r" (ret),
++        [f] "+r" (f_reg),
++        [d] "+r" (d_reg),