CVS commit: [pkgsrc-2025Q3] pkgsrc

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Sep 25 01:40:58 UTC 2025

Modified Files:
        pkgsrc/meta-pkgs/xfce4 [pkgsrc-2025Q3]: Makefile
        pkgsrc/x11/xfce4-desktop [pkgsrc-2025Q3]: Makefile

Log Message:
Pullup ticket #7005 - requested by gutteridge
x11/xfce4-desktop: Functionality fix
meta-pkgs/xfce4: Functionality fix

Revisions pulled up:
- meta-pkgs/xfce4/Makefile                                      1.161
- x11/xfce4-desktop/Makefile                                    1.115

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Mon Sep 22 20:02:34 UTC 2025

   Modified Files:
           pkgsrc/x11/xfce4-desktop: Makefile

   Log Message:
   xfce4-desktop: restore support for file/launcher icons

   When this package was updated to 4.20.0 (Makefile r. 1.108), it wasn't
   noticed that some of the file/launcher icon support now required
   libyaml as a dependency, otherwise, it simply is disabled at build
   time (without any differences in build artifacts that would cause
   notice at that stage). Addresses PR pkg/59660 from Ramiro Aceves.

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Mon Sep 22 20:05:33 UTC 2025

   Modified Files:
           pkgsrc/meta-pkgs/xfce4: Makefile

   Log Message:
   xfce4: bump for xfce4-desktop-4.20.1nb5


To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.160.2.1 pkgsrc/meta-pkgs/xfce4/Makefile
cvs rdiff -u -r1.114 -r1.114.2.1 pkgsrc/x11/xfce4-desktop/Makefile

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

Modified files:

Index: pkgsrc/meta-pkgs/xfce4/Makefile
diff -u pkgsrc/meta-pkgs/xfce4/Makefile:1.160 pkgsrc/meta-pkgs/xfce4/Makefile:1.160.2.1
--- pkgsrc/meta-pkgs/xfce4/Makefile:1.160       Sat Aug 30 22:45:52 2025
+++ pkgsrc/meta-pkgs/xfce4/Makefile     Thu Sep 25 01:40:58 2025
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.160 2025/08/30 22:45:52 wiz Exp $
+# $NetBSD: Makefile,v 1.160.2.1 2025/09/25 01:40:58 maya Exp $
 
 META_PACKAGE=  yes
 
 .include "Makefile.common"
 
 DISTNAME=      xfce4-${XFCE4_VERSION}
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    meta-pkgs
 COMMENT=       Meta-package for the Xfce desktop environment
 
 DEPENDS+=      xfce4-tumbler>=4.20.0:../../x11/xfce4-tumbler
 DEPENDS+=      xfce4-appfinder>=4.20.0:../../sysutils/xfce4-appfinder
-DEPENDS+=      xfce4-desktop>=4.20.1nb2:../../x11/xfce4-desktop
+DEPENDS+=      xfce4-desktop>=4.20.1nb5:../../x11/xfce4-desktop
 DEPENDS+=      xfce4-mousepad>=0.6.5:../../editors/xfce4-mousepad
 DEPENDS+=      xfce4-panel>=4.20.4:../../x11/xfce4-panel
 DEPENDS+=      xfce4-power-manager>=4.20.0nb4:../../sysutils/xfce4-power-manager

Index: pkgsrc/x11/xfce4-desktop/Makefile
diff -u pkgsrc/x11/xfce4-desktop/Makefile:1.114 pkgsrc/x11/xfce4-desktop/Makefile:1.114.2.1
--- pkgsrc/x11/xfce4-desktop/Makefile:1.114     Sat Aug 30 22:46:48 2025
+++ pkgsrc/x11/xfce4-desktop/Makefile   Thu Sep 25 01:40:58 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.114 2025/08/30 22:46:48 wiz Exp $
+# $NetBSD: Makefile,v 1.114.2.1 2025/09/25 01:40:58 maya Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 VERSION=       4.20.1
-PKGREVISION=   4
+PKGREVISION=   5
 DISTNAME=      xfdesktop-${VERSION}
 PKGNAME=       xfce4-desktop-${VERSION}
 CATEGORIES=    x11
@@ -24,6 +24,8 @@ CONFIGURE_ARGS+=      --sysconfdir=${PKG_SYSC
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../sysutils/xfce4-thunar/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libyaml+=        libyaml>=0.2.5
+.include "../../textproc/libyaml/buildlink3.mk"
 .include "../../x11/libxfce4windowing/buildlink3.mk"
 .include "../../x11/xfce4-garcon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"