CVS commit: pkgsrc/x11/xfce4-settings

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jan  6 18:42:51 UTC 2025

Modified Files:
        pkgsrc/x11/xfce4-settings: Makefile PLIST distinfo
        pkgsrc/x11/xfce4-settings/patches: patch-xfsettingsd_Makefile.in
Removed Files:
        pkgsrc/x11/xfce4-settings/patches: patch-xfsettingsd_xsettings.xml

Log Message:
xfce4-settings: update to 4.20.0

Part of the XFCE 4.20 update.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/x11/xfce4-settings/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/xfce4-settings/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/xfce4-settings/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml

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

Modified files:

Index: pkgsrc/x11/xfce4-settings/Makefile
diff -u pkgsrc/x11/xfce4-settings/Makefile:1.96 pkgsrc/x11/xfce4-settings/Makefile:1.97
--- pkgsrc/x11/xfce4-settings/Makefile:1.96     Fri Dec 27 08:21:07 2024
+++ pkgsrc/x11/xfce4-settings/Makefile  Mon Jan  6 18:42:51 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2024/12/27 08:21:07 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2025/01/06 18:42:51 bsiegert Exp $
 
-PKGREVISION= 6
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=      xfce4-settings-4.18.6
+DISTNAME=      xfce4-settings-4.20.0
 CATEGORIES=    x11
 MASTER_SITES=  https://archive.xfce.org/src/xfce/xfce4-settings/${PKGVERSION_NOREV:R}/
 
@@ -18,6 +17,8 @@ CONFIGURE_ARGS+=      --enable-pluggable-dial
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_TOOLS+=    gdbus-codegen
+
 REPLACE_PYTHON=        dialogs/mime-settings/helpers/xfce4-compose-mail
 
 PKG_SYSCONFSUBDIR=     xdg
@@ -37,6 +38,7 @@ MAKE_DIRS+=   ${PKG_SYSCONFDIR}/menus \
                ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml
 
 .include "../../audio/libcanberra/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/libwnck3/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/x11/xfce4-settings/PLIST
diff -u pkgsrc/x11/xfce4-settings/PLIST:1.13 pkgsrc/x11/xfce4-settings/PLIST:1.14
--- pkgsrc/x11/xfce4-settings/PLIST:1.13        Sun Feb 12 03:07:08 2023
+++ pkgsrc/x11/xfce4-settings/PLIST     Mon Jan  6 18:42:51 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2023/02/12 03:07:08 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.14 2025/01/06 18:42:51 bsiegert Exp $
 bin/xfce4-accessibility-settings
 bin/xfce4-appearance-settings
 bin/xfce4-display-settings
@@ -10,6 +10,7 @@ bin/xfce4-mouse-settings
 bin/xfce4-settings-editor
 bin/xfce4-settings-manager
 bin/xfsettingsd
+lib/gtk-3.0/modules/libxfsettingsd-gtk-settings-sync.la
 lib/xfce4/settings/appearance-install-theme
 lib/xfce4/xfce4-compose-mail
 share/applications/xfce-display-settings.desktop
@@ -41,11 +42,14 @@ share/icons/hicolor/128x128/apps/org.xfc
 share/icons/hicolor/128x128/apps/org.xfce.settings.mouse.png
 share/icons/hicolor/128x128/apps/org.xfce.terminalemulator.png
 share/icons/hicolor/128x128/apps/org.xfce.webbrowser.png
-share/icons/hicolor/128x128/devices/xfce-display-extend.png
-share/icons/hicolor/128x128/devices/xfce-display-external.png
-share/icons/hicolor/128x128/devices/xfce-display-internal.png
+share/icons/hicolor/128x128/devices/xfce-display-extend-down.png
+share/icons/hicolor/128x128/devices/xfce-display-extend-left.png
+share/icons/hicolor/128x128/devices/xfce-display-extend-right.png
+share/icons/hicolor/128x128/devices/xfce-display-extend-up.png
+share/icons/hicolor/128x128/devices/xfce-display-left.png
 share/icons/hicolor/128x128/devices/xfce-display-mirror.png
 share/icons/hicolor/128x128/devices/xfce-display-profile.png
+share/icons/hicolor/128x128/devices/xfce-display-right.png
 share/icons/hicolor/16x16/apps/org.xfce.filemanager.png
 share/icons/hicolor/16x16/apps/org.xfce.mailreader.png
 share/icons/hicolor/16x16/apps/org.xfce.settings.accessibility.png
@@ -111,14 +115,18 @@ share/icons/hicolor/scalable/apps/org.xf
 share/icons/hicolor/scalable/apps/org.xfce.settings.mouse.svg
 share/icons/hicolor/scalable/apps/org.xfce.terminalemulator.svg
 share/icons/hicolor/scalable/apps/org.xfce.webbrowser.svg
-share/icons/hicolor/scalable/devices/xfce-display-extend.svg
-share/icons/hicolor/scalable/devices/xfce-display-external.svg
-share/icons/hicolor/scalable/devices/xfce-display-internal.svg
+share/icons/hicolor/scalable/devices/xfce-display-extend-down.svg
+share/icons/hicolor/scalable/devices/xfce-display-extend-left.svg
+share/icons/hicolor/scalable/devices/xfce-display-extend-right.svg
+share/icons/hicolor/scalable/devices/xfce-display-extend-up.svg
+share/icons/hicolor/scalable/devices/xfce-display-left.svg
 share/icons/hicolor/scalable/devices/xfce-display-mirror.svg
 share/icons/hicolor/scalable/devices/xfce-display-profile.svg
+share/icons/hicolor/scalable/devices/xfce-display-right.svg
 share/locale/am/LC_MESSAGES/xfce4-settings.mo
 share/locale/ar/LC_MESSAGES/xfce4-settings.mo
 share/locale/ast/LC_MESSAGES/xfce4-settings.mo
+share/locale/az/LC_MESSAGES/xfce4-settings.mo
 share/locale/be/LC_MESSAGES/xfce4-settings.mo
 share/locale/be@tarask/LC_MESSAGES/xfce4-settings.mo
 share/locale/bg/LC_MESSAGES/xfce4-settings.mo
@@ -173,6 +181,7 @@ share/locale/sv/LC_MESSAGES/xfce4-settin
 share/locale/te/LC_MESSAGES/xfce4-settings.mo
 share/locale/th/LC_MESSAGES/xfce4-settings.mo
 share/locale/tr/LC_MESSAGES/xfce4-settings.mo
+share/locale/tt/LC_MESSAGES/xfce4-settings.mo
 share/locale/ug/LC_MESSAGES/xfce4-settings.mo
 share/locale/uk/LC_MESSAGES/xfce4-settings.mo
 share/locale/ur/LC_MESSAGES/xfce4-settings.mo

Index: pkgsrc/x11/xfce4-settings/distinfo
diff -u pkgsrc/x11/xfce4-settings/distinfo:1.29 pkgsrc/x11/xfce4-settings/distinfo:1.30
--- pkgsrc/x11/xfce4-settings/distinfo:1.29     Fri Jun 28 20:02:14 2024
+++ pkgsrc/x11/xfce4-settings/distinfo  Mon Jan  6 18:42:51 2025
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.29 2024/06/28 20:02:14 gutteridge Exp $
+$NetBSD: distinfo,v 1.30 2025/01/06 18:42:51 bsiegert Exp $
 
-BLAKE2s (xfce4-settings-4.18.6.tar.bz2) = eaf0250223b35e185df204aff1d3960eb9fa85a1793b0bff5015d6069620bc57
-SHA512 (xfce4-settings-4.18.6.tar.bz2) = e9615e8409f597b53bf118908c0a8c5f893b335915dd009c5b7da9ba8403a0de74b751dec7482f3076cd880f2bd3cffc1f45a13a1e88196fb7f0c87c996794b7
-Size (xfce4-settings-4.18.6.tar.bz2) = 1560269 bytes
+BLAKE2s (xfce4-settings-4.20.0.tar.bz2) = 6738938803b71647fe0516c62693762a1f415715ffbd94fb662bdcb1bca4a2dd
+SHA512 (xfce4-settings-4.20.0.tar.bz2) = ab728bfce9aefe14c59dce0f93a84d395826ffc37d3a7bafc40fce61055ce4b7d9265c65460bf7ee69e4c8f4efd7e0b88b3670d859d48d4602c17acc20556528
+Size (xfce4-settings-4.20.0.tar.bz2) = 2495778 bytes
 SHA1 (patch-dialogs_mime-settings_helpers_Makefile.in) = 680c241d9076db92fbb77481146a08c39a14cb0a
 SHA1 (patch-xfce4-settings-manager_Makefile.in) = c02cd0ccede9cea56c5d123eb1b5146039712f39
-SHA1 (patch-xfsettingsd_Makefile.in) = 4436cd90a4bdbdce731248735a38898afdd367d9
-SHA1 (patch-xfsettingsd_xsettings.xml) = 30fb16a0039d1a539ef27fb74682ae05872de7d1
+SHA1 (patch-xfsettingsd_Makefile.in) = 2cf0c45fa2db5d899173893667d6867ab9a31b0f

Index: pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in
diff -u pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in:1.3 pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in:1.4
--- pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in:1.3 Sat Jun 23 22:08:54 2018
+++ pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in     Mon Jan  6 18:42:51 2025
@@ -1,13 +1,13 @@
-$NetBSD: patch-xfsettingsd_Makefile.in,v 1.3 2018/06/23 22:08:54 youri Exp $
+$NetBSD: patch-xfsettingsd_Makefile.in,v 1.4 2025/01/06 18:42:51 bsiegert Exp $
 
 Adjust install paths.
 
---- xfsettingsd/Makefile.in.orig       2018-06-23 20:33:39.000000000 +0000
+--- xfsettingsd/Makefile.in.orig       2024-12-15 09:30:17.000000000 +0000
 +++ xfsettingsd/Makefile.in
-@@ -547,9 +547,9 @@ xfsettingsd_LDADD = $(GTK_LIBS) $(GLIB_L
-       $(LIBXKLAVIER_LIBS) $(XI_LIBS) $(LIBX11_LIBS) \
-       $(LIBNOTIFY_LIBS) $(FONTCONFIG_LIBS) $(LIBINPUT_LIBS) -lm \
-       $(am__append_3) $(am__append_6)
+@@ -693,9 +693,9 @@ libxfsettingsd_gtk_settings_sync_la_LIBA
+       $(GTK_LIBS) \
+       $(XFCONF_LIBS)
+ 
 -settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
 +settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml
  settings_DATA = xsettings.xml
@@ -15,4 +15,4 @@ Adjust install paths.
 +autostartdir = $(datadir)/examples/xfce4/autostart
  autostart_in_files = xfsettingsd.desktop.in
  autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
- EXTRA_DIST = \
+ BUILT_SOURCES = \