From nobody Sun Dec 22 14:41:27 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YGP3q4TjYz5Ynsv; Sun, 22 Dec 2024 14:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGP3q3zn7z4TrX; Sun, 22 Dec 2024 14:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734878487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7E213gpsBP9LZzkufjL7mxIQyetXDdGW6X4PIBD0wkQ=; b=uow4shmGKCIlagFBiX1TcI5alz8zfBZMY7nxgwfvziFYRzDZ10CcL2aMhgs1eJWDec0CSb vIhnq8MUCsBr+Q6059AahGdkYUvUaeH9WndxwYahglFIMBwydj7LNSItptzIdum8pog9MO RBiKWyHqlcJxcWXRUz9wbWlO3ahkQfN4HY1fz2F1c+6/Ox2GNpBIEOmBCdgCp11H54LBSE 5DWP5RVhlhFQ+63tB1ujjF/OvvqJR5oxcC5aQY+ahZTwXe9V6Ia3ZWSWu7mf3cBCGR4PRj FN6KqFX4C2bwrcFPH68c9lS3NoIFXOjo0/LvaMN+I9q2GcIIf5IN4ZTB4HIMUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734878487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7E213gpsBP9LZzkufjL7mxIQyetXDdGW6X4PIBD0wkQ=; b=yDdSwscuo4Wgue/9vtPzBw18JwIyqkKZJZ2Q/jxToWO78RUeN3zQ5ltpvJJQYoHAl5u5W2 Kt9+s6UcILmt09B0f/j4fMNSMCDl0wX9pIDMQDb5t/vGet/1G0Dz6xlPy36xzCVbVYwJl2 3FUCPh3so19S4vegohdIKhcplQzsTBB5LnlPL47jzTUsOcdwoYA6MjawvSs7C28sw7c3mO S7kI9TneR6DD07S5pmIG1dNC+KDvrNvyHV9SR+kjX9dK9OUUy3PRof5db2ZcrtfvAv5Syp 4T/i1CD/ujzArYJtqmvxgQzebj4gF2QFCRGA9h85LLfOx0iDmGTn3qvMMxFtWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734878487; a=rsa-sha256; cv=none; b=Qu4ZIm36eyoB0dIERToRsnxam6pVU513D8Tb6VOuPinN+rGhRxRpS9l5euVmnzQUCJ5Y1s aJkSLS33Y3leZr18qu5iUTcq4l+wuEy1cWoVw+KFN2WAmDVcKVVGLrZPf+BRxxQDfxsLlP 0o/jHNWwa5lZn6MoU/iAhHVOWJwynQ2q/XZWzF+/pr9VC10QUD6k11xpxijGMSWzZ1r+2A upuTJj4a/ONs32xSDzAvrr5iY5O5Id8SNLgJWxUVWAi6nWXJCDi4+NZwC6Xma/wXZKPo8P LHpz4Ot1fdTmTIFe3pU27+re7zrBxtLTrRhg4vHSG9nzWFBddSuKdgAq++gjEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YGP3q3b39z1BLK; Sun, 22 Dec 2024 14:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BMEfRLx002727; Sun, 22 Dec 2024 14:41:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BMEfRgI002724; Sun, 22 Dec 2024 14:41:27 GMT (envelope-from git) Date: Sun, 22 Dec 2024 14:41:27 GMT Message-Id: <202412221441.4BMEfRgI002724@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 5cc65db4c872 - main - sysutils/xfce4-settings: Improve build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cc65db4c8724bbf7ac32ee0a61eb128fc7781a9 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=5cc65db4c8724bbf7ac32ee0a61eb128fc7781a9 commit 5cc65db4c8724bbf7ac32ee0a61eb128fc7781a9 Author: Guido Falsi AuthorDate: 2024-12-22 14:39:36 +0000 Commit: Guido Falsi 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 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);