CVS commit: pkgsrc/x11/libxfce4windowing

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu May  1 00:57:26 UTC 2025

Modified Files:
        pkgsrc/x11/libxfce4windowing: Makefile distinfo
Added Files:
        pkgsrc/x11/libxfce4windowing/patches:
            patch-libxfce4windowing_meson.build
            patch-libxfce4windowingui_meson.build

Log Message:
libxfce4windowing: fix issue with job dependency ordering


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/libxfce4windowing/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libxfce4windowing/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/libxfce4windowing/patches/patch-libxfce4windowing_meson.build \
    pkgsrc/x11/libxfce4windowing/patches/patch-libxfce4windowingui_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/libxfce4windowing/Makefile
diff -u pkgsrc/x11/libxfce4windowing/Makefile:1.7 pkgsrc/x11/libxfce4windowing/Makefile:1.8
--- pkgsrc/x11/libxfce4windowing/Makefile:1.7   Sun Apr 27 16:32:05 2025
+++ pkgsrc/x11/libxfce4windowing/Makefile       Thu May  1 00:57:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2025/04/27 16:32:05 gutteridge Exp $
+# $NetBSD: Makefile,v 1.8 2025/05/01 00:57:25 gutteridge Exp $
 
 PKGREVISION= 1
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -9,8 +9,6 @@ MASTER_SITES=   https://archive.xfce.org/s
 
 COMMENT=       Xfce window management library
 
-MAKE_JOBS_SAFE=        no  # https://gitlab.xfce.org/xfce/libxfce4windowing/-/issues/45
-
 USE_TOOLS+=            pkg-config
 
 MESON_ARGS+=           -Dx11=enabled

Index: pkgsrc/x11/libxfce4windowing/distinfo
diff -u pkgsrc/x11/libxfce4windowing/distinfo:1.2 pkgsrc/x11/libxfce4windowing/distinfo:1.3
--- pkgsrc/x11/libxfce4windowing/distinfo:1.2   Fri Feb 14 01:50:54 2025
+++ pkgsrc/x11/libxfce4windowing/distinfo       Thu May  1 00:57:25 2025
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2025/02/14 01:50:54 gutteridge Exp $
+$NetBSD: distinfo,v 1.3 2025/05/01 00:57:25 gutteridge Exp $
 
 BLAKE2s (libxfce4windowing-4.20.2.tar.bz2) = 5a75a0ff120c0931ad85245ba51b1740efde4b210829d755636178aa84bc5454
 SHA512 (libxfce4windowing-4.20.2.tar.bz2) = 7d8f66bcef56e238246c54d9bca62596c7699b65357d242c05a72c0c6797a3a973b9163ebc81af83e6f09985a0bbaa8e7fb787f8b9e99d2a812a6ed31ee82ebc
 Size (libxfce4windowing-4.20.2.tar.bz2) = 601778 bytes
+SHA1 (patch-libxfce4windowing_meson.build) = 83c488dfa312d1db611df05bc19509b3de9341ed
+SHA1 (patch-libxfce4windowingui_meson.build) = 1669633e6b88ba8665ef7b5fb27a74eef79fc282
 SHA1 (patch-meson.build) = 2563b1bd202b95df9bb4735e140682c8b6b7c9fd

Added files:

Index: pkgsrc/x11/libxfce4windowing/patches/patch-libxfce4windowing_meson.build
diff -u /dev/null pkgsrc/x11/libxfce4windowing/patches/patch-libxfce4windowing_meson.build:1.1
--- /dev/null   Thu May  1 00:57:26 2025
+++ pkgsrc/x11/libxfce4windowing/patches/patch-libxfce4windowing_meson.build    Thu May  1 00:57:26 2025
@@ -0,0 +1,34 @@
+$NetBSD: patch-libxfce4windowing_meson.build,v 1.1 2025/05/01 00:57:26 gutteridge Exp $
+
+Fix issue with job dependency ordering.
+https://gitlab.xfce.org/xfce/libxfce4windowing/-/issues/45
+https://gitlab.xfce.org/xfce/libxfce4windowing/-/merge_requests/77
+
+--- libxfce4windowing/meson.build.orig 2025-02-02 15:53:57.000000000 +0000
++++ libxfce4windowing/meson.build
+@@ -98,15 +98,12 @@ windowing_config_h = configure_file(
+ windowing_public_sources += windowing_config_h
+ windowing_sources += windowing_config_h
+ 
+-windowing_link_depends = []
+-windowing_link_depends += custom_target(
+-  'libxfce4windowing-visibility.h',
++windowing_sources += configure_file(
+   input: 'libxfce4windowing.symbols',
+   output: 'libxfce4windowing-visibility.h',
+   command: [xdt_gen_visibility, '--kind=header', '@INPUT@', '@OUTPUT@'],
+ )
+-windowing_link_depends += custom_target(
+-  'libxfce4windowing-visibility.c',
++windowing_sources += configure_file(
+   input: 'libxfce4windowing.symbols',
+   output: 'libxfce4windowing-visibility.c',
+   command: [xdt_gen_visibility, '--kind=source', '@INPUT@', '@OUTPUT@'],
+@@ -133,7 +130,6 @@ libxfce4windowing = library(
+   ],
+   gnu_symbol_visibility: gnu_symbol_visibility,
+   dependencies: windowing_deps,
+-  link_depends: windowing_link_depends,
+   install: true,
+ )
+ 
Index: pkgsrc/x11/libxfce4windowing/patches/patch-libxfce4windowingui_meson.build
diff -u /dev/null pkgsrc/x11/libxfce4windowing/patches/patch-libxfce4windowingui_meson.build:1.1
--- /dev/null   Thu May  1 00:57:26 2025
+++ pkgsrc/x11/libxfce4windowing/patches/patch-libxfce4windowingui_meson.build  Thu May  1 00:57:26 2025
@@ -0,0 +1,62 @@
+$NetBSD: patch-libxfce4windowingui_meson.build,v 1.1 2025/05/01 00:57:26 gutteridge Exp $
+
+Fix issue with job dependency ordering.
+https://gitlab.xfce.org/xfce/libxfce4windowing/-/issues/45
+https://gitlab.xfce.org/xfce/libxfce4windowing/-/merge_requests/77
+
+--- libxfce4windowingui/meson.build.orig       2025-01-20 10:52:51.000000000 +0000
++++ libxfce4windowingui/meson.build
+@@ -7,7 +7,7 @@ windowingui_headers = [
+   'xfw-window-list-menu.h',
+ ]
+ 
+-windowingui_sources = [
++windowingui_public_sources = [
+   'libxfce4windowingui-config.c',
+   'xfw-window-action-menu.c',
+   'xfw-window-list-menu.c',
+@@ -19,7 +19,7 @@ windowingui_config_data = configuration_
+   'LIBXFCE4WINDOWINGUI_VERSION_MICRO': version_parts[2],
+ })
+ 
+-windowingui_sources += configure_file(
++windowingui_public_sources += configure_file(
+   configuration: windowingui_config_data,
+   input: 'libxfce4windowingui-config.h.in',
+   output: 'libxfce4windowingui-config.h',
+@@ -27,15 +27,13 @@ windowingui_sources += configure_file(
+   install_dir: get_option('prefix') / get_option('includedir') / 'xfce4' / libxfce4windowing_pkgname / 'libxfce4windowingui',
+ )
+ 
+-windowingui_link_depends = []
+-windowingui_link_depends += custom_target(
+-  'libxfce4windowingui-visibility.h',
++windowingui_sources = windowingui_public_sources
++windowingui_sources += configure_file(
+   input: 'libxfce4windowingui.symbols',
+   output: 'libxfce4windowingui-visibility.h',
+   command: [xdt_gen_visibility, '--kind=header', '@INPUT@', '@OUTPUT@'],
+ )
+-windowingui_link_depends += custom_target(
+-  'libxfce4windowingui-visibility.c',
++windowingui_sources += configure_file(
+   input: 'libxfce4windowingui.symbols',
+   output: 'libxfce4windowingui-visibility.c',
+   command: [xdt_gen_visibility, '--kind=source', '@INPUT@', '@OUTPUT@'],
+@@ -61,7 +59,6 @@ libxfce4windowingui = library(
+   link_with: [
+     libxfce4windowing,
+   ],
+-  link_depends: windowingui_link_depends,
+   install: true,
+ )
+ 
+@@ -81,7 +78,7 @@ pkgconfig.generate(
+ )
+ 
+ if get_option('introspection')
+-  windowingui_gir_sources = windowingui_sources + windowingui_headers
++  windowingui_gir_sources = windowingui_public_sources + windowingui_headers
+ 
+   gnome.generate_gir(
+     libxfce4windowingui,