summaryrefslogtreecommitdiff
path: root/meta-pkgs
diff options
context:
space:
mode:
authorgutteridge <gutteridge@pkgsrc.org>2021-12-14 17:21:53 +0000
committergutteridge <gutteridge@pkgsrc.org>2021-12-14 17:21:53 +0000
commite3bfb4976af0802ba26fe71c4f424cd74d98096b (patch)
tree2f1f5ffaa3000253e1fb37b5611092ecd9acc1e8 /meta-pkgs
parentb3cbbdbc57143266a647039734a758f81185afee (diff)
downloadpkgsrc-e3bfb4976af0802ba26fe71c4f424cd74d98096b.tar.gz
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 (limited to 'meta-pkgs')
-rw-r--r--meta-pkgs/xfce4-extras/Makefile7
-rw-r--r--meta-pkgs/xfce4/Makefile5
2 files changed, 5 insertions, 7 deletions
diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index ad700c6688a..54e29357f15 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -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-archive-plugin>=0.4.0:../../archivers/xfce4-thunar-archiv
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 --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 01c6bf1744e..5762519ba52 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -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-thunar>=4.16.10:../../sysutils/xfce4-thunar
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: