CVS commit: pkgsrc/x11/gtk4

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Tue Jan 16 10:00:16 UTC 2024

Modified Files:
        pkgsrc/x11/gtk4: Makefile distinfo
Added Files:
        pkgsrc/x11/gtk4/patches: patch-meson.build

Log Message:
gtk4: build workaround for NetBSD with gcc 12

NetBSD ld.elf_so dumps core with a shlib built with gcc 12 and
both -z,relro and -z,now. c.f., PR lib/57792

gtk4 adds both of these flags by default, and fails on either a
system with a base HAVE_GCC=12, or with GCC_REQD=12.

With the patch, it can be caused to fail again by setting
PKGSRC_USE_RELRO=full

Thank you to RVP for the analysis


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/gtk4/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/gtk4/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/x11/gtk4/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/x11/gtk4/Makefile
diff -u pkgsrc/x11/gtk4/Makefile:1.39 pkgsrc/x11/gtk4/Makefile:1.40
--- pkgsrc/x11/gtk4/Makefile:1.39       Thu Nov 30 06:22:27 2023
+++ pkgsrc/x11/gtk4/Makefile    Tue Jan 16 10:00:16 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2023/11/30 06:22:27 adam Exp $
+# $NetBSD: Makefile,v 1.40 2024/01/16 10:00:16 prlw1 Exp $
 
 DISTNAME=      gtk-4.12.4
 PKGNAME=       ${DISTNAME:S/gtk/gtk4/}
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -28,6 +29,7 @@ MESON_ARGS+=          -Dintrospection=enabled
 # needs gstreamer-gl
 MESON_ARGS+=           -Dmedia-gstreamer=disabled
 # ffmpeg backend is disabled by default
+# https://gitlab.gnome.org/GNOME/gtk/-/issues/5581
 MESON_ARGS+=           -Dmedia-ffmpeg=enabled
 
 PKGCONFIG_OVERRIDE+=   output/meson-private/gtk4.pc

Index: pkgsrc/x11/gtk4/distinfo
diff -u pkgsrc/x11/gtk4/distinfo:1.17 pkgsrc/x11/gtk4/distinfo:1.18
--- pkgsrc/x11/gtk4/distinfo:1.17       Thu Nov 30 06:22:27 2023
+++ pkgsrc/x11/gtk4/distinfo    Tue Jan 16 10:00:16 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.17 2023/11/30 06:22:27 adam Exp $
+$NetBSD: distinfo,v 1.18 2024/01/16 10:00:16 prlw1 Exp $
 
 BLAKE2s (gtk-4.12.4.tar.xz) = 6ba005f44379aad917ce3527a85ce51a428db073aacae139080639f871d1c968
 SHA512 (gtk-4.12.4.tar.xz) = 354c686c160c7996ec7c69b31204786245c2a92615e4799b6248776f10f4393c167e73caf8d2fb949539c978358ffa2151092a515be94ec7eeb8951b773ae6d0
 Size (gtk-4.12.4.tar.xz) = 16951736 bytes
+SHA1 (patch-meson.build) = a9db17787c70631896315fb2c825e62977cfbb9b

Added files:

Index: pkgsrc/x11/gtk4/patches/patch-meson.build
diff -u /dev/null pkgsrc/x11/gtk4/patches/patch-meson.build:1.5
--- /dev/null   Tue Jan 16 10:00:16 2024
+++ pkgsrc/x11/gtk4/patches/patch-meson.build   Tue Jan 16 10:00:16 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-meson.build,v 1.5 2024/01/16 10:00:16 prlw1 Exp $
+
+Build fix for gcc 12 on NetBSD.
+It is the equivalent of the default PKGSRC_USE_RELRO=partial
+c.f., PR lib/57792
+
+--- meson.build.orig   2023-11-17 20:29:11.000000000 +0000
++++ meson.build
+@@ -362,7 +362,6 @@ common_cflags = cc.get_supported_argumen
+ common_ldflags = cc.get_supported_link_arguments([
+   '-Wl,-Bsymbolic',
+   '-Wl,-z,relro',
+-  '-Wl,-z,now',
+ ])
+ 
+ confinc = include_directories('.')