vte3: apply a Solaris and derivate build fix

NetBSD · Jun 24, 2023 · 153562e · 153562e
1 parent c19bfaa
commit 153562e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/x11/vte3/distinfo b/x11/vte3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2023/06/11 02:19:46 gutteridge Exp $
+$NetBSD: distinfo,v 1.26 2023/06/24 00:47:48 gutteridge Exp $
 
 BLAKE2s (vte-0.72.2.tar.gz) = beaa70c20e8fdc33d6321f06b4284d88d29941cecebe88473d8b25e387712436
 SHA512 (vte-0.72.2.tar.gz) = eb828833f417fb81892c50c79c4aac1c76afc6f184bdeb6d80e62ba0cfa5d7c47c1c92a6a4c2c0165ec6a812a6d026810d43522a2eaa175c14fd2c452d7e84e0
 Size (vte-0.72.2.tar.gz) = 630814 bytes
-SHA1 (patch-meson.build) = 4f914f5f79c566464d91c64953e00d55676019c4
+SHA1 (patch-meson.build) = 95cc6aea622e7f6ae991f337667b37bf0b9864bf
 SHA1 (patch-src_app_app.cc) = 2548e01629aa563595387328638a52a5616ff0bd
 SHA1 (patch-src_dumpkeys.c) = 102f24d7404d46b13194f3431d0a864d480e5da7
 SHA1 (patch-src_meson.build) = a8e159688fb36e4cfac40249e279a670c9c6cda8

diff --git a/x11/vte3/patches/patch-meson.build b/x11/vte3/patches/patch-meson.build
@@ -1,10 +1,22 @@
-$NetBSD: patch-meson.build,v 1.3 2023/06/01 21:51:27 gutteridge Exp $
+$NetBSD: patch-meson.build,v 1.4 2023/06/24 00:47:48 gutteridge Exp $
 
 Remove silly asserts that do nothing except break portability.
 
---- meson.build.orig	2022-03-27 17:52:19.000000000 +0000
+Fix Solaris derivate builds, where defining _XOPEN_SOURCE_EXTENDED can be
+harmful, avoid _XOPEN_SOURCE clashes, etc.
+
+--- meson.build.orig	2023-06-01 19:33:31.000000000 +0000
 +++ meson.build
-@@ -230,13 +230,6 @@ endforeach
+@@ -222,7 +222,7 @@ libc_feature_defines = [
+
+ system = host_machine.system()
+
+-if system == 'freebsd'
++if system == 'freebsd' or system == 'sunos'
+   # Defining _POSIX_C_SOURCE above makes freebsd not expose some functionality
+   # that's hidden behind __BSD_VISIBLE.  Not defininy any of the above however
+   # makes it expose verything.
+@@ -273,13 +273,6 @@ endforeach
 
  # Check for symbols
 
@@ -18,7 +30,7 @@ Remove silly asserts that do nothing except break portability.
 
  # Check for functions
 
-@@ -558,14 +552,10 @@ linker_flags = [
+@@ -603,14 +596,10 @@ linker_flags = [
  foreach flag: linker_flags
    if cc.has_link_argument(flag[0])
      add_project_link_arguments(flag[0], language: 'c')