[pkgsrc/trunk]: pkgsrc/meta-pkgs xfce4 & xfce4-extras: move gnome-themes-stan...

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ea69581b28ab
branches:  trunk
changeset: 771181:ea69581b28ab
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Tue Dec 14 17:21:53 2021 +0000

description:
xfce4 & xfce4-extras: move gnome-themes-standard back to xfce4

gnome-themes-standard had been moved to extras to try and help 32-bit
ARM builds generate a complete base DE, because of librsvg breakage.
With Xfce 4.16 having various components that now use CSDs, we really
must have this package as part of the basic install. (And, in any case,
32-bit ARM builds have different dependent package breakages now.)

diffstat:

 meta-pkgs/xfce4-extras/Makefile |  7 ++-----
 meta-pkgs/xfce4/Makefile        |  5 +++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r 090bb4e919bd -r ea69581b28ab meta-pkgs/xfce4-extras/Makefile
--- a/meta-pkgs/xfce4-extras/Makefile   Tue Dec 14 14:54:40 2021 +0000
+++ b/meta-pkgs/xfce4-extras/Makefile   Tue Dec 14 17:21:53 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2021/12/08 16:05:36 adam Exp $
+# $NetBSD: Makefile,v 1.91 2021/12/14 17:21:53 gutteridge Exp $
 
 META_PACKAGE=  yes
 
-PKGREVISION= 1
+PKGREVISION=   2
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=      xfce4-extras-${XFCE4_VERSION}
@@ -49,9 +49,6 @@
 DEPENDS+=      xfce4-thunar-media-tags-plugin>=0.2.1:../../multimedia/xfce4-thunar-media-tags
 #DEPENDS+=     xfce4-thunar-vcs-plugin>=0.1.4:../../sysutils/xfce4-thunar-vcs
 
-# Extra Themes
-DEPENDS+=      gnome-themes-standard>=3.20.2:../../graphics/gnome-themes-standard
-
 # Broken
 # 0.2.0 fails because our thunar is too new. Fixed upstream already.
 #DEPENDS+=     xfce4-thunar-shares>=0.2.0:../../sysutils/xfce4-thunar-shares
diff -r 090bb4e919bd -r ea69581b28ab meta-pkgs/xfce4/Makefile
--- a/meta-pkgs/xfce4/Makefile  Tue Dec 14 14:54:40 2021 +0000
+++ b/meta-pkgs/xfce4/Makefile  Tue Dec 14 17:21:53 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.106 2021/12/08 16:05:36 adam Exp $
+# $NetBSD: Makefile,v 1.107 2021/12/14 17:21:53 gutteridge Exp $
 
 META_PACKAGE=  yes
 
-PKGREVISION= 1
+PKGREVISION=   2
 .include "Makefile.common"
 
 DISTNAME=      xfce4-${XFCE4_VERSION}
@@ -22,6 +22,7 @@
 DEPENDS+=      xfce4-wm>=4.16.1:../../wm/xfce4-wm
 DEPENDS+=      xfce4-wm-themes>=4.10.0:../../wm/xfce4-wm-themes
 DEPENDS+=      elementary-xfce-icon-theme>=0.11:../../graphics/elementary-xfce-icon-theme
+DEPENDS+=      gnome-themes-standard>=3.20.2:../../graphics/gnome-themes-standard
 DEPENDS+=      xdg-utils-[0-9]*:../../misc/xdg-utils
 
 pre-extract: