git: 5cc65db4c872 - main - sysutils/xfce4-settings: Improve build

The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5cc65db4c8724bbf7ac32ee0a61eb128fc7781a9

commit 5cc65db4c8724bbf7ac32ee0a61eb128fc7781a9
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2024-12-22 14:39:36 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2024-12-22 14:39:36 +0000

    sysutils/xfce4-settings: Improve build
    
    Use distribution provided include file, and avoid regenerating it
    and patching consumer.
    
    Works around upstream issue:
    
    https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/564
    
    Reported by:    Olivier Duchateau <duchateau.olivier@gmail.com>
    Obtained from:  https://codeberg.org/olivierd/freebsd-xfce4/src/branch/main/sysutils/xfce4-settings/files/patch-xfsettingsd_Makefile.in
---
 sysutils/xfce4-settings/Makefile                   |  1 +
 .../files/patch-xfsettingsd_Makefile.in            | 28 ++++++++++++++++++++++
 .../files/patch-xfsettingsd_gtk-settings.c         | 13 ----------
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 52b5b9ce2baa..4f6aced3f5ae 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xfce4-settings
 PORTVERSION=	4.20.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-settings/files/patch-xfsettingsd_Makefile.in b/sysutils/xfce4-settings/files/patch-xfsettingsd_Makefile.in
new file mode 100644
index 000000000000..bc29365d1d88
--- /dev/null
+++ b/sysutils/xfce4-settings/files/patch-xfsettingsd_Makefile.in
@@ -0,0 +1,28 @@
+--- xfsettingsd/Makefile.in.orig	2024-12-15 09:30:17 UTC
++++ xfsettingsd/Makefile.in
+@@ -1406,25 +1406,6 @@ uninstall-am: uninstall-autostartDATA uninstall-binPRO
+ %.desktop: %.desktop.in
+ 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ 
+-# Needed for XfceGtkSettingsHelper to translate GtkSettings property names into
+-# Xfconf property names
+-xsettings-properties.h: $(settings_DATA)
+-	$(AM_V_GEN) \
+-	printf '%s\n' \
+-		'#if G_GNUC_CHECK_VERSION (4, 6)' \
+-		'# pragma GCC diagnostic push' \
+-		'# pragma GCC diagnostic ignored "-Wunused-variable"' \
+-		'#endif' > $@; \
+-	for _prefix in $(shell $(XMLLINT) --xpath '//channel/property/@name' $< | $(SED) -E 's/name="(.*)"/\1/'); do \
+-		echo "static const gchar *xsettings_properties_$${_prefix}[] = {" \
+-		&& $(XMLLINT) --xpath "//channel/property[@name=\"$${_prefix}\"]/property/@name" $< | $(SED) -E 's/name=(.*)/\1,/' \
+-		&& echo '};'; \
+-	done >> $@; \
+-	printf '%s\n' \
+-		'#if G_GNUC_CHECK_VERSION (4, 6)' \
+-		'# pragma GCC diagnostic pop' \
+-		'#endif' >> $@;
+-
+ # Export on D-Bus by XfceGtkSettingsHelper of the module name xfsettingsd-gtk-settings-sync
+ # for synchronization of GtkSettings properties with the Xfconf xsettings channel on Wayland
+ gtk-settings-exported.c:
diff --git a/sysutils/xfce4-settings/files/patch-xfsettingsd_gtk-settings.c b/sysutils/xfce4-settings/files/patch-xfsettingsd_gtk-settings.c
deleted file mode 100644
index f95c843db542..000000000000
--- a/sysutils/xfce4-settings/files/patch-xfsettingsd_gtk-settings.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- xfsettingsd/gtk-settings.c.orig	2024-12-01 15:21:41 UTC
-+++ xfsettingsd/gtk-settings.c
-@@ -226,8 +226,8 @@ xfce_gtk_settings_helper_init (XfceGtkSettingsHelper *
-     }
- 
-     net_properties = g_hash_table_new (g_str_hash, g_str_equal);
--    for (guint i = 0; i < G_N_ELEMENTS (xsettings_properties_Net); i++)
--        g_hash_table_add (net_properties, (gpointer) xsettings_properties_Net[i]);
-+    /*for (guint i = 0; i < G_N_ELEMENTS (xsettings_properties_Net); i++)
-+        g_hash_table_add (net_properties, (gpointer) xsettings_properties_Net[i]);*/
- 
-     helper->gsettings_objs = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
-     helper->gsettings_data = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);