git: aac41c1d6719 - main - Welcome XFCE 4.18 to the FreeBSD ports tree!
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 16 Dec 2022 14:58:45 UTC
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=aac41c1d6719790f71e5a3123ad9afdcbfb46e8e
commit aac41c1d6719790f71e5a3123ad9afdcbfb46e8e
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2022-12-16 14:55:57 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2022-12-16 14:55:57 +0000
Welcome XFCE 4.18 to the FreeBSD ports tree!
Upstream announce: https://xfce.org/about/news/?post=1671062400
Some notes:
- Updated pkg-descr for various packages
- Added some missing dependencies (reported by poudriere Q/A tests)
- Removed patches now included upstream
---
deskutils/xfce4-tumbler/Makefile | 4 +-
deskutils/xfce4-tumbler/distinfo | 6 +-
.../xfce4-tumbler/files/patch-tumblerd_Makefile.in | 11 +
.../xfce4-tumbler/files/patch-tumblerd__tumbler.rc | 20 -
.../xfce4-tumbler/files/patch-tumblerd_tumbler.rc | 20 +
deskutils/xfce4-tumbler/pkg-descr | 5 +-
deskutils/xfce4-tumbler/pkg-plist | 2 +-
devel/xfce4-dev-tools/Makefile | 2 +-
devel/xfce4-dev-tools/distinfo | 6 +-
devel/xfce4-dev-tools/pkg-descr | 4 +-
misc/xfce4-appfinder/Makefile | 2 +-
misc/xfce4-appfinder/distinfo | 6 +-
misc/xfce4-appfinder/pkg-descr | 5 +-
sysutils/garcon/Makefile | 5 +-
sysutils/garcon/distinfo | 6 +-
sysutils/garcon/pkg-descr | 5 +-
sysutils/garcon/pkg-plist | 1 +
sysutils/xfce4-cpugraph-plugin/Makefile | 2 +-
sysutils/xfce4-cpugraph-plugin/distinfo | 6 +-
sysutils/xfce4-power-manager/Makefile | 7 +-
sysutils/xfce4-power-manager/distinfo | 6 +-
sysutils/xfce4-settings/Makefile | 2 +-
sysutils/xfce4-settings/distinfo | 6 +-
...gs_appearance-settings_appearance-install-theme | 10 -
sysutils/xfce4-settings/pkg-descr | 4 +-
sysutils/xfce4-settings/pkg-plist | 5 +-
sysutils/xfce4-systemload-plugin/Makefile | 2 +-
sysutils/xfce4-systemload-plugin/distinfo | 6 +-
x11-fm/thunar/Makefile | 5 +-
x11-fm/thunar/distinfo | 6 +-
x11-fm/thunar/pkg-descr | 7 +-
x11-fm/thunar/pkg-plist | 114 ++
x11-wm/xfce4-desktop/Makefile | 7 +-
x11-wm/xfce4-desktop/distinfo | 6 +-
x11-wm/xfce4-desktop/pkg-descr | 2 +-
x11-wm/xfce4-desktop/pkg-plist | 3 +
x11-wm/xfce4-panel/Makefile | 2 +-
x11-wm/xfce4-panel/distinfo | 6 +-
.../xfce4-panel/files/patch-plugins_pager_pager.c | 16 -
x11-wm/xfce4-panel/pkg-descr | 2 +-
x11-wm/xfce4-session/Makefile | 5 +-
x11-wm/xfce4-session/distinfo | 6 +-
x11-wm/xfce4-session/files/patch-scripts_xflock4 | 18 -
x11-wm/xfce4-session/pkg-plist | 2 +
x11-wm/xfce4-wm/Makefile | 8 +-
x11-wm/xfce4-wm/distinfo | 6 +-
x11-wm/xfce4-wm/files/patch-src_icons.c | 46 -
x11-wm/xfce4-wm/pkg-descr | 6 +-
x11-wm/xfce4/Makefile | 2 +-
x11/libexo/Makefile | 2 +-
x11/libexo/distinfo | 6 +-
x11/libexo/pkg-descr | 8 +-
x11/libexo/pkg-plist | 136 +-
x11/libxfce4menu/Makefile | 7 +-
x11/libxfce4menu/distinfo | 6 +-
.../files/patch-shortcuts-grabber-fix-PR27 | 1324 --------------------
x11/libxfce4menu/pkg-plist | 3 +
x11/libxfce4util/Makefile | 2 +-
x11/libxfce4util/distinfo | 6 +-
x11/libxfce4util/pkg-descr | 3 +-
x11/libxfce4util/pkg-plist | 4 +
x11/xfce4-conf/Makefile | 2 +-
x11/xfce4-conf/distinfo | 6 +-
x11/xfce4-conf/pkg-descr | 3 +-
x11/xfce4-conf/pkg-plist | 2 +
x11/xfce4-goodies/Makefile | 3 +-
66 files changed, 354 insertions(+), 1610 deletions(-)
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 2b725d749e8d..09cdbdb417a4 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -1,6 +1,5 @@
PORTNAME= tumbler
-PORTVERSION= 4.16.1
-PORTREVISION= 4
+PORTVERSION= 4.18.0
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE
PKGNAMEPREFIX= xfce4-
@@ -19,6 +18,7 @@ LIB_DEPENDS= libpng.so:graphics/png
USES= compiler:c11 gettext-tools gmake gnome libtool \
localbase:ldflags pathfix pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 glib20 intltool libgsf librsvg2
+USE_XFCE= libutil
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/xfce4-tumbler/distinfo b/deskutils/xfce4-tumbler/distinfo
index cbe54428bf9e..8e5546b59f02 100644
--- a/deskutils/xfce4-tumbler/distinfo
+++ b/deskutils/xfce4-tumbler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660252887
-SHA256 (xfce4/tumbler-4.16.1.tar.bz2) = 852bbffa13f35b48ce92e243a03a118e32037c03e68297335c2bc4578e39273e
-SIZE (xfce4/tumbler-4.16.1.tar.bz2) = 593122
+TIMESTAMP = 1671097562
+SHA256 (xfce4/tumbler-4.18.0.tar.bz2) = 4087f3af4ef31271d3f315421a2f1fe67e4fda7ad60bbab1f073627914dfcf00
+SIZE (xfce4/tumbler-4.18.0.tar.bz2) = 609664
diff --git a/deskutils/xfce4-tumbler/files/patch-tumblerd_Makefile.in b/deskutils/xfce4-tumbler/files/patch-tumblerd_Makefile.in
new file mode 100644
index 000000000000..0996dfd37445
--- /dev/null
+++ b/deskutils/xfce4-tumbler/files/patch-tumblerd_Makefile.in
@@ -0,0 +1,11 @@
+--- tumblerd/Makefile.in.orig 2022-06-19 06:51:39 UTC
++++ tumblerd/Makefile.in
+@@ -1123,7 +1123,7 @@ install-data-am: install-confDATA install-serviceDATA
+ info-am:
+
+ install-data-am: install-confDATA install-serviceDATA \
+- install-systemd_userDATA install-tumblerdPROGRAMS
++ install-tumblerdPROGRAMS
+
+ install-dvi: install-dvi-am
+
diff --git a/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc b/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc
deleted file mode 100644
index 783d00df99ea..000000000000
--- a/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc
+++ /dev/null
@@ -1,20 +0,0 @@
---- tumblerd/tumbler.rc.orig 2017-05-28 10:17:58 UTC
-+++ tumblerd/tumbler.rc
-@@ -37,7 +37,7 @@ MaxFileSize=0
-
- # RAW image files using libopenraw
- [RawThumbnailer]
--Disabled=false
-+Disabled=true
- Priority=1
- Locations=
- MaxFileSize=0
-@@ -58,7 +58,7 @@ MaxFileSize=0
-
- # ffmpegthumbnailer plugin
- [FfmpegThumbnailer]
--Disabled=false
-+Disabled=true
- Priority=2
- Locations=
- MaxFileSize=0
diff --git a/deskutils/xfce4-tumbler/files/patch-tumblerd_tumbler.rc b/deskutils/xfce4-tumbler/files/patch-tumblerd_tumbler.rc
new file mode 100644
index 000000000000..48f55a83b9de
--- /dev/null
+++ b/deskutils/xfce4-tumbler/files/patch-tumblerd_tumbler.rc
@@ -0,0 +1,20 @@
+--- tumblerd/tumbler.rc.orig 2022-03-29 08:54:49 UTC
++++ tumblerd/tumbler.rc
+@@ -36,7 +36,7 @@ MaxFileSize=0
+ # RAW image files using libopenraw (the libopenraw pixbuf loader is kind of
+ # broken, hence the priority)
+ [RawThumbnailer]
+-Disabled=false
++Disabled=true
+ Priority=3
+ Locations=
+ Excludes=
+@@ -67,7 +67,7 @@ MaxFileSize=0
+
+ # ffmpegthumbnailer plugin
+ [FfmpegThumbnailer]
+-Disabled=false
++Disabled=true
+ Priority=2
+ Locations=
+ Excludes=
diff --git a/deskutils/xfce4-tumbler/pkg-descr b/deskutils/xfce4-tumbler/pkg-descr
index 8f476a66a2f8..e7cf43c973d5 100644
--- a/deskutils/xfce4-tumbler/pkg-descr
+++ b/deskutils/xfce4-tumbler/pkg-descr
@@ -1,2 +1,3 @@
-Tumbler, is thumbnail service implementing the thumbnail management D-BUS
-specification.
+Tumbler is a D-Bus service for applications to request thumbnails
+for various URI schemes and MIME types. It is an implementation of
+the thumbnail management D-Bus specification.
diff --git a/deskutils/xfce4-tumbler/pkg-plist b/deskutils/xfce4-tumbler/pkg-plist
index b461c7479f01..93a768ce3df8 100644
--- a/deskutils/xfce4-tumbler/pkg-plist
+++ b/deskutils/xfce4-tumbler/pkg-plist
@@ -6,7 +6,6 @@ include/tumbler-1/tumbler/tumbler-config.h
include/tumbler-1/tumbler/tumbler-enum-types.h
include/tumbler-1/tumbler/tumbler-error.h
include/tumbler-1/tumbler/tumbler-file-info.h
-include/tumbler-1/tumbler/tumbler-glib-extensions.h
include/tumbler-1/tumbler/tumbler-marshal.h
include/tumbler-1/tumbler/tumbler-provider-factory.h
include/tumbler-1/tumbler/tumbler-provider-plugin.h
@@ -65,6 +64,7 @@ share/icons/hicolor/32x32/apps/org.xfce.tumbler.png
%%NLS%%share/locale/is/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/it/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/ja/LC_MESSAGES/tumbler.mo
+%%NLS%%share/locale/kab/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/kk/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/ko/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/lt/LC_MESSAGES/tumbler.mo
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index 0833d132f07d..d941e590ebde 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xfce4-dev-tools
-PORTVERSION= 4.16.0
+PORTVERSION= 4.18.0
CATEGORIES= devel xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
diff --git a/devel/xfce4-dev-tools/distinfo b/devel/xfce4-dev-tools/distinfo
index 34156e8dc7fd..5ea679c20d3f 100644
--- a/devel/xfce4-dev-tools/distinfo
+++ b/devel/xfce4-dev-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608682203
-SHA256 (xfce4/xfce4-dev-tools-4.16.0.tar.bz2) = f50b3070e66f3ebdf331744dd1ec5e1af5de333965d491e15ce05545e8eb4f04
-SIZE (xfce4/xfce4-dev-tools-4.16.0.tar.bz2) = 340107
+TIMESTAMP = 1671102951
+SHA256 (xfce4/xfce4-dev-tools-4.18.0.tar.bz2) = eedb4fc955f0e3459c46864ff98579295db2b900743e0ff69cad5970ba76be37
+SIZE (xfce4/xfce4-dev-tools-4.18.0.tar.bz2) = 349125
diff --git a/devel/xfce4-dev-tools/pkg-descr b/devel/xfce4-dev-tools/pkg-descr
index 9e2a527001c8..ea47abf11f96 100644
--- a/devel/xfce4-dev-tools/pkg-descr
+++ b/devel/xfce4-dev-tools/pkg-descr
@@ -1,2 +1,2 @@
-The Xfce development tools are a collection of tools and macros for
-Xfce developers and people that want to build Xfce from Git.
+The Xfce Development Tools are a set of scripts and m4/autoconf
+macros that ease build system maintenance.
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index bff431565205..a3bed28bb4b8 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xfce4-appfinder
-PORTVERSION= 4.16.1
+PORTVERSION= 4.18.0
CATEGORIES= misc xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
diff --git a/misc/xfce4-appfinder/distinfo b/misc/xfce4-appfinder/distinfo
index d658612b6f73..7c86814afb1f 100644
--- a/misc/xfce4-appfinder/distinfo
+++ b/misc/xfce4-appfinder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610956327
-SHA256 (xfce4/xfce4-appfinder-4.16.1.tar.bz2) = bfe3e9bd92695014ee74a2fbb7f5fd1b4c29cf043c4a11598b8958324c81e7ec
-SIZE (xfce4/xfce4-appfinder-4.16.1.tar.bz2) = 579984
+TIMESTAMP = 1671101646
+SHA256 (xfce4/xfce4-appfinder-4.18.0.tar.bz2) = 962a98d7b327d2073ed4cd0f78bce7945ed51b97d52fd60196e8b02ef819c18c
+SIZE (xfce4/xfce4-appfinder-4.18.0.tar.bz2) = 562219
diff --git a/misc/xfce4-appfinder/pkg-descr b/misc/xfce4-appfinder/pkg-descr
index 6b61e7bd42fe..36b309ab4bc6 100644
--- a/misc/xfce4-appfinder/pkg-descr
+++ b/misc/xfce4-appfinder/pkg-descr
@@ -1,2 +1,3 @@
-This application allows you to search, launch and find information about
-applications installed on your system.
+The Xfce application finder is a program that searches your file
+system for .desktop files, and displays a categorized list of all
+the GUI applications on your system.
diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index 86e7b6c1b450..93db9989d3a0 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -1,5 +1,5 @@
PORTNAME= garcon
-PORTVERSION= 4.16.1
+PORTVERSION= 4.18.0
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -13,7 +13,8 @@ WWW= https://www.xfce.org/
LICENSE= GPLv2
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+ libfreetype.so:print/freetype2 \
+ libharfbuzz.so:print/harfbuzz
USES= compiler:c11 gettext-tools gmake gnome libtool pathfix \
pkgconfig tar:bzip2 xfce
diff --git a/sysutils/garcon/distinfo b/sysutils/garcon/distinfo
index ae2f8e3e7200..7b810e9212c7 100644
--- a/sysutils/garcon/distinfo
+++ b/sysutils/garcon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610727771
-SHA256 (xfce4/garcon-4.16.1.tar.bz2) = 84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d
-SIZE (xfce4/garcon-4.16.1.tar.bz2) = 520220
+TIMESTAMP = 1671096826
+SHA256 (xfce4/garcon-4.18.0.tar.bz2) = 54633487566a8b8502b71c11a7f719efe27c069bd5773cc95f11ff4ea8f11a14
+SIZE (xfce4/garcon-4.18.0.tar.bz2) = 550674
diff --git a/sysutils/garcon/pkg-descr b/sysutils/garcon/pkg-descr
index 2102f39096e4..3341c102e607 100644
--- a/sysutils/garcon/pkg-descr
+++ b/sysutils/garcon/pkg-descr
@@ -1,3 +1,4 @@
Garcon is an implementation of the freedesktop.org menu specification
-replacing the former Xfce menu library libxfce4menu. It is based on
-GLib/GIO only and aims at covering the entire specification.
+replacing the former Xfce menu library libxfce4menu. It is based
+on GLib/GIO only and aims at covering the entire specification
+except for legacy menus.
diff --git a/sysutils/garcon/pkg-plist b/sysutils/garcon/pkg-plist
index 7b8801cbc6ca..e83e082b54db 100644
--- a/sysutils/garcon/pkg-plist
+++ b/sysutils/garcon/pkg-plist
@@ -38,6 +38,7 @@ share/desktop-directories/xfce-network.directory
share/desktop-directories/xfce-office.directory
share/desktop-directories/xfce-other.directory
share/desktop-directories/xfce-personal.directory
+share/desktop-directories/xfce-science.directory
share/desktop-directories/xfce-screensavers.directory
share/desktop-directories/xfce-settings.directory
share/desktop-directories/xfce-system.directory
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 2b6d6b76cbc8..fd906be0aa45 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xfce4-cpugraph-plugin
-PORTVERSION= 1.2.6
+PORTVERSION= 1.2.7
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-cpugraph-plugin/distinfo b/sysutils/xfce4-cpugraph-plugin/distinfo
index 7ad4050beb9b..89e8decd895c 100644
--- a/sysutils/xfce4-cpugraph-plugin/distinfo
+++ b/sysutils/xfce4-cpugraph-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643788330
-SHA256 (xfce4/xfce4-cpugraph-plugin-1.2.6.tar.bz2) = 773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99
-SIZE (xfce4/xfce4-cpugraph-plugin-1.2.6.tar.bz2) = 458058
+TIMESTAMP = 1667553246
+SHA256 (xfce4/xfce4-cpugraph-plugin-1.2.7.tar.bz2) = 68a651e278ed7186964e455b69b15da77f8d56257e5c3d6adf783b3ee9337405
+SIZE (xfce4/xfce4-cpugraph-plugin-1.2.7.tar.bz2) = 438674
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index 4594e2ce8fb4..d6bce6f210d3 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xfce4-power-manager
-PORTVERSION= 4.16.0
+PORTVERSION= 4.18.0
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -11,11 +11,12 @@ WWW= https://goodies.xfce.org/projects/applications/xfce4-power-manager
LICENSE= GPLv2
LIB_DEPENDS= libnotify.so:devel/libnotify \
- libupower-glib.so:sysutils/upower
+ libupower-glib.so:sysutils/upower \
+ libharfbuzz.so:print/harfbuzz
USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
tar:bzip2 xfce xorg
-USE_GNOME= cairo glib20 gtk30 intltool
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
USE_XFCE= panel
USE_XORG= ice sm xrandr x11 xext xtst xscrnsaver
diff --git a/sysutils/xfce4-power-manager/distinfo b/sysutils/xfce4-power-manager/distinfo
index a994126e5352..1cb2a456741f 100644
--- a/sysutils/xfce4-power-manager/distinfo
+++ b/sysutils/xfce4-power-manager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608682877
-SHA256 (xfce4/xfce4-power-manager-4.16.0.tar.bz2) = eb9c587c01b502fa45a32e7fc2aba98fa6d8391475133883654f77e562c43bf3
-SIZE (xfce4/xfce4-power-manager-4.16.0.tar.bz2) = 1234968
+TIMESTAMP = 1671101831
+SHA256 (xfce4/xfce4-power-manager-4.18.0.tar.bz2) = 2eee467886252f9fa704c978ec67dafad5274ede93e59b092a688faa7e72c39a
+SIZE (xfce4/xfce4-power-manager-4.18.0.tar.bz2) = 1239515
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index ec50c3c6b821..d298c481b932 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xfce4-settings
-PORTVERSION= 4.16.5
+PORTVERSION= 4.18.0
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index 2f7bdb7d0c42..43159a36aa8b 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668331180
-SHA256 (xfce4/xfce4-settings-4.16.5.tar.bz2) = 7a4f74802486d7e77a1c9fa4fda19b13fc8a8dec3e5074f367e34fa82b40d28e
-SIZE (xfce4/xfce4-settings-4.16.5.tar.bz2) = 1498988
+TIMESTAMP = 1671101537
+SHA256 (xfce4/xfce4-settings-4.18.0.tar.bz2) = ed3f75837cb33cd694610fc87cd569c4782b7ac4e099143a3dbe8fff1f1c6a9d
+SIZE (xfce4/xfce4-settings-4.18.0.tar.bz2) = 1517874
diff --git a/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_appearance-install-theme b/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_appearance-install-theme
deleted file mode 100644
index 2bac50f627ad..000000000000
--- a/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_appearance-install-theme
+++ /dev/null
@@ -1,10 +0,0 @@
---- dialogs/appearance-settings/appearance-install-theme.orig 2015-08-01 08:43:16 UTC
-+++ dialogs/appearance-settings/appearance-install-theme
-@@ -104,6 +104,7 @@ fi
- # we try $XDG_CACHE_HOME because it is more likely this is on the
- # same partition, so moving the theme after extract is faster
- if test x"`which mktemp 2>/dev/null`" != x""; then
-+ TMPDIR="${TMPDIR:-/tmp}"
- tmpdir=`TMPDIR="${XDG_CACHE_HOME:-$TMPDIR}" mktemp -d`
- else
- tmpdir="/tmp/tmp.$$.$RANDOM"
diff --git a/sysutils/xfce4-settings/pkg-descr b/sysutils/xfce4-settings/pkg-descr
index 51cd18880cd2..62995f945c07 100644
--- a/sysutils/xfce4-settings/pkg-descr
+++ b/sysutils/xfce4-settings/pkg-descr
@@ -1,2 +1,2 @@
-The settings manager allows you to configure every detail of your desktop
-environment.
+Xfce settings manager allows you to configure every detail of your
+desktop environment.
diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist
index 5ba1ba6d8583..9ec29e11c4f7 100644
--- a/sysutils/xfce4-settings/pkg-plist
+++ b/sysutils/xfce4-settings/pkg-plist
@@ -112,7 +112,7 @@ share/icons/hicolor/scalable/apps/org.xfce.settings.manager.svg
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/xfce4/helpers/thunar.desktop
+share/xfce4/helpers/alacritty.desktop
share/xfce4/helpers/aterm.desktop
share/xfce4/helpers/balsa.desktop
share/xfce4/helpers/brave.desktop
@@ -134,6 +134,7 @@ share/xfce4/helpers/icecat.desktop
share/xfce4/helpers/icedove.desktop
share/xfce4/helpers/iceweasel.desktop
share/xfce4/helpers/jumanji.desktop
+share/xfce4/helpers/kitty.desktop
share/xfce4/helpers/kmail.desktop
share/xfce4/helpers/konqueror.desktop
share/xfce4/helpers/links.desktop
@@ -158,6 +159,7 @@ share/xfce4/helpers/surf.desktop
share/xfce4/helpers/sylpheed-claws.desktop
share/xfce4/helpers/sylpheed.desktop
share/xfce4/helpers/terminator.desktop
+share/xfce4/helpers/thunar.desktop
share/xfce4/helpers/thunderbird.desktop
share/xfce4/helpers/urxvt.desktop
share/xfce4/helpers/vimprobable2.desktop
@@ -196,6 +198,7 @@ share/xfce4/helpers/xterm.desktop
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/kab/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-settings.mo
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index ab14a337d565..c6ec96b7312f 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xfce4-systemload-plugin
-PORTVERSION= 1.3.1
+PORTVERSION= 1.3.2
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-systemload-plugin/distinfo b/sysutils/xfce4-systemload-plugin/distinfo
index a363e3de653b..822a54ffd926 100644
--- a/sysutils/xfce4-systemload-plugin/distinfo
+++ b/sysutils/xfce4-systemload-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616488989
-SHA256 (xfce4/xfce4-systemload-plugin-1.3.1.tar.bz2) = 56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
-SIZE (xfce4/xfce4-systemload-plugin-1.3.1.tar.bz2) = 417959
+TIMESTAMP = 1667553309
+SHA256 (xfce4/xfce4-systemload-plugin-1.3.2.tar.bz2) = bb303fc3020e053ad1fa0b8fcbf0d7681c5563bb8f649357d6a95a577802b072
+SIZE (xfce4/xfce4-systemload-plugin-1.3.2.tar.bz2) = 409767
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 266e3a6bedf6..bb41edeb429e 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -1,5 +1,5 @@
PORTNAME= thunar
-DISTVERSION= 4.16.11
+DISTVERSION= 4.18.0
CATEGORIES= x11-fm xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -14,7 +14,8 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libtumbler-1.so:deskutils/xfce4-tumbler \
- libharfbuzz.so:print/harfbuzz
+ libharfbuzz.so:print/harfbuzz \
+ libpcre2-8.so:devel/pcre2
RUN_DEPENDS= pkexec:sysutils/polkit
USES= compiler:c11 cpe desktop-file-utils gettext-tools gmake gnome \
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
index c480d0e9508c..1b5284e75d1e 100644
--- a/x11-fm/thunar/distinfo
+++ b/x11-fm/thunar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648939402
-SHA256 (xfce4/thunar-4.16.11.tar.bz2) = f47dde90b2e5e3e31920a4f57ddd3670282d0a90870a45e89148fce41b2a8a1b
-SIZE (xfce4/thunar-4.16.11.tar.bz2) = 2326592
+TIMESTAMP = 1671101927
+SHA256 (xfce4/thunar-4.18.0.tar.bz2) = d1f4b080c97b9e390eff199aaaac7562fb20f031686f8d5ee5207e953bfc2feb
+SIZE (xfce4/thunar-4.18.0.tar.bz2) = 2802858
diff --git a/x11-fm/thunar/pkg-descr b/x11-fm/thunar/pkg-descr
index b7ab20bf5539..a860a702f38a 100644
--- a/x11-fm/thunar/pkg-descr
+++ b/x11-fm/thunar/pkg-descr
@@ -1 +1,6 @@
-Thunar is a new modern file manager for the Xfce Desktop Environment.
+Thunar is a modern file manager for the Xfce Desktop Environment.
+It has been designed from the ground up to be fast and easy-to-use.
+Its user interface is clean and intuitive, and does not include any
+confusing or useless options. Thunar is fast and responsive with a
+good start up time and directory load time. Thunar is accessible
+using Assistive Technologies and is fully standards compliant.
diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist
index 8da6916aefec..cf11d558b0c0 100644
--- a/x11-fm/thunar/pkg-plist
+++ b/x11-fm/thunar/pkg-plist
@@ -37,6 +37,120 @@ share/dbus-1/services/org.xfce.FileManager.service
share/dbus-1/services/org.xfce.Thunar.service
%%DOCSDIR%%/README.gtkrc
%%GIR%%share/gir-1.0/Thunarx-3.0.gir
+share/gtk-doc/html/thunar/ThunarAbstractDialog.html
+share/gtk-doc/html/thunar/ThunarAbstractIconView.html
+share/gtk-doc/html/thunar/ThunarActionManager.html
+share/gtk-doc/html/thunar/ThunarApplication.html
+share/gtk-doc/html/thunar/ThunarBrowser.html
+share/gtk-doc/html/thunar/ThunarChooserButton.html
+share/gtk-doc/html/thunar/ThunarChooserDialog.html
+share/gtk-doc/html/thunar/ThunarChooserModel.html
+share/gtk-doc/html/thunar/ThunarClipboardManager.html
+share/gtk-doc/html/thunar/ThunarColumnEditor.html
+share/gtk-doc/html/thunar/ThunarColumnModel.html
+share/gtk-doc/html/thunar/ThunarCompactView.html
+share/gtk-doc/html/thunar/ThunarComponent.html
+share/gtk-doc/html/thunar/ThunarDBusService.html
+share/gtk-doc/html/thunar/ThunarDeepCountJob.html
+share/gtk-doc/html/thunar/ThunarDetailsView.html
+share/gtk-doc/html/thunar/ThunarDevice.html
+share/gtk-doc/html/thunar/ThunarDeviceMonitor.html
+share/gtk-doc/html/thunar/ThunarEmblemChooser.html
+share/gtk-doc/html/thunar/ThunarFile.html
+share/gtk-doc/html/thunar/ThunarFileMonitor.html
+share/gtk-doc/html/thunar/ThunarFolder.html
+share/gtk-doc/html/thunar/ThunarHistory.html
+share/gtk-doc/html/thunar/ThunarIconFactory.html
+share/gtk-doc/html/thunar/ThunarIconRenderer.html
+share/gtk-doc/html/thunar/ThunarIconView.html
+share/gtk-doc/html/thunar/ThunarImage.html
+share/gtk-doc/html/thunar/ThunarJob.html
+share/gtk-doc/html/thunar/ThunarJobOperation.html
+share/gtk-doc/html/thunar/ThunarJobOperationHistory.html
+share/gtk-doc/html/thunar/ThunarListModel.html
+share/gtk-doc/html/thunar/ThunarLocationBar.html
+share/gtk-doc/html/thunar/ThunarLocationButton.html
+share/gtk-doc/html/thunar/ThunarLocationButtons.html
+share/gtk-doc/html/thunar/ThunarLocationEntry.html
+share/gtk-doc/html/thunar/ThunarMenu.html
+share/gtk-doc/html/thunar/ThunarNavigator.html
+share/gtk-doc/html/thunar/ThunarPathEntry.html
+share/gtk-doc/html/thunar/ThunarPermissionsChooser.html
+share/gtk-doc/html/thunar/ThunarPreferences.html
+share/gtk-doc/html/thunar/ThunarPreferencesDialog.html
+share/gtk-doc/html/thunar/ThunarProgressDialog.html
+share/gtk-doc/html/thunar/ThunarProgressView.html
+share/gtk-doc/html/thunar/ThunarPropertiesDialog.html
+share/gtk-doc/html/thunar/ThunarRenamerDialog.html
+share/gtk-doc/html/thunar/ThunarRenamerModel.html
+share/gtk-doc/html/thunar/ThunarRenamerProgress.html
+share/gtk-doc/html/thunar/ThunarSendtoModel.html
+share/gtk-doc/html/thunar/ThunarSessionClient.html
+share/gtk-doc/html/thunar/ThunarShortcutsIconRenderer.html
+share/gtk-doc/html/thunar/ThunarShortcutsModel.html
+share/gtk-doc/html/thunar/ThunarShortcutsPane.html
+share/gtk-doc/html/thunar/ThunarShortcutsView.html
+share/gtk-doc/html/thunar/ThunarSidePane.html
+share/gtk-doc/html/thunar/ThunarSimpleJob.html
+share/gtk-doc/html/thunar/ThunarSizeLabel.html
+share/gtk-doc/html/thunar/ThunarStandardView.html
+share/gtk-doc/html/thunar/ThunarStatusbar.html
+share/gtk-doc/html/thunar/ThunarTransferJob.html
+share/gtk-doc/html/thunar/ThunarTreeModel.html
+share/gtk-doc/html/thunar/ThunarTreePane.html
+share/gtk-doc/html/thunar/ThunarTreeView.html
+share/gtk-doc/html/thunar/ThunarUserManager.html
+share/gtk-doc/html/thunar/ThunarView.html
+share/gtk-doc/html/thunar/ThunarWindow.html
+share/gtk-doc/html/thunar/annotation-glossary.html
+share/gtk-doc/html/thunar/ch01.html
+share/gtk-doc/html/thunar/ch02.html
+share/gtk-doc/html/thunar/ch03.html
+share/gtk-doc/html/thunar/ch04.html
+share/gtk-doc/html/thunar/ch05.html
+share/gtk-doc/html/thunar/ch06.html
+share/gtk-doc/html/thunar/ch07.html
+share/gtk-doc/html/thunar/ch08.html
+share/gtk-doc/html/thunar/ch09.html
+share/gtk-doc/html/thunar/ch10.html
+share/gtk-doc/html/thunar/ch11.html
+share/gtk-doc/html/thunar/ch12.html
+share/gtk-doc/html/thunar/ch13.html
+share/gtk-doc/html/thunar/ch14.html
+share/gtk-doc/html/thunar/ch15.html
+share/gtk-doc/html/thunar/ch16.html
+share/gtk-doc/html/thunar/ch17.html
+share/gtk-doc/html/thunar/ch18.html
+share/gtk-doc/html/thunar/ch19.html
+share/gtk-doc/html/thunar/glib-gtk-extensions.html
+share/gtk-doc/html/thunar/home.png
+share/gtk-doc/html/thunar/index.html
+share/gtk-doc/html/thunar/left-insensitive.png
+share/gtk-doc/html/thunar/left.png
+share/gtk-doc/html/thunar/right-insensitive.png
+share/gtk-doc/html/thunar/right.png
+share/gtk-doc/html/thunar/style.css
+share/gtk-doc/html/thunar/thunar-objects.html
+share/gtk-doc/html/thunar/thunar-thunar-dialogs.html
+share/gtk-doc/html/thunar/thunar-thunar-dnd.html
+share/gtk-doc/html/thunar/thunar-thunar-enum-types.html
+share/gtk-doc/html/thunar/thunar-thunar-gdk-extensions.html
+share/gtk-doc/html/thunar/thunar-thunar-gio-extensions.html
+share/gtk-doc/html/thunar/thunar-thunar-gobject-extensions.html
+share/gtk-doc/html/thunar/thunar-thunar-gtk-extensions.html
+share/gtk-doc/html/thunar/thunar-thunar-ice.html
+share/gtk-doc/html/thunar/thunar-thunar-io-jobs-util.html
+share/gtk-doc/html/thunar/thunar-thunar-io-jobs.html
+share/gtk-doc/html/thunar/thunar-thunar-io-scan-directory.html
+share/gtk-doc/html/thunar/thunar-thunar-notify.html
+share/gtk-doc/html/thunar/thunar-thunar-pango-extensions.html
+share/gtk-doc/html/thunar/thunar-thunar-renamer-pair.html
+share/gtk-doc/html/thunar/thunar-thunar-util.html
+share/gtk-doc/html/thunar/thunar-view.html
+share/gtk-doc/html/thunar/thunar-widgets.html
+share/gtk-doc/html/thunar/thunar.devhelp2
+share/gtk-doc/html/thunar/up-insensitive.png
+share/gtk-doc/html/thunar/up.png
share/gtk-doc/html/thunarx/ThunarxFileInfo.html
share/gtk-doc/html/thunarx/ThunarxMenu.html
share/gtk-doc/html/thunarx/ThunarxMenuItem.html
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index ccfa29a6c37c..430917a22e84 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xfce4-desktop
-PORTVERSION= 4.16.1
+PORTVERSION= 4.18.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DISTNAME= xfdesktop-${DISTVERSIONFULL}
@@ -12,11 +12,12 @@ WWW= https://www.xfce.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libnotify.so:devel/libnotify
+LIB_DEPENDS= libnotify.so:devel/libnotify \
+ libharfbuzz.so:print/harfbuzz
USES= compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 \
xfce xorg
-USE_GNOME= cairo glib20 gtk30 intltool libwnck3
+USE_GNOME= cairo glib20 gdkpixbuf2 gtk30 intltool libwnck3
USE_XFCE= garcon libexo
USE_XORG= ice sm x11
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index 51d5353f33f2..69c443a80e6e 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661013041
-SHA256 (xfce4/xfdesktop-4.16.1.tar.bz2) = e31dcb0008ae55e99e42128a4694002203305287434a8ee0f9937e7298a4bd11
-SIZE (xfce4/xfdesktop-4.16.1.tar.bz2) = 1942859
+TIMESTAMP = 1671101408
+SHA256 (xfce4/xfdesktop-4.18.0.tar.bz2) = 661783e7e6605459926d80bca46d25ce2197c221456457a863ea9d0252120d14
+SIZE (xfce4/xfdesktop-4.18.0.tar.bz2) = 2136039
diff --git a/x11-wm/xfce4-desktop/pkg-descr b/x11-wm/xfce4-desktop/pkg-descr
index 800e836b5aeb..04d26547dec8 100644
--- a/x11-wm/xfce4-desktop/pkg-descr
+++ b/x11-wm/xfce4-desktop/pkg-descr
@@ -1,2 +1,2 @@
-The desktop manager sets the background image, and provides a root
+Xfce desktop manager sets the background image, and provides a root
window menu, desktop icons or minimized icons and windows list.
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index cf37b60c60d1..9eaafdb05d25 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -3,6 +3,9 @@ bin/xfdesktop-settings
man/man1/xfdesktop.1.gz
share/applications/xfce-backdrop-settings.desktop
share/backgrounds/xfce/xfce-blue.jpg
+share/backgrounds/xfce/xfce-flower.svg
+share/backgrounds/xfce/xfce-leaves.svg
+share/backgrounds/xfce/xfce-shapes.svg
share/backgrounds/xfce/xfce-stripes.png
share/backgrounds/xfce/xfce-teal.jpg
share/backgrounds/xfce/xfce-verticals.png
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 1245310b1796..504c5645dc6c 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xfce4-panel
-PORTVERSION= 4.16.5
+PORTVERSION= 4.18.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index e8e457ebbb7e..c1c324d8fdc5 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661013254
-SHA256 (xfce4/xfce4-panel-4.16.5.tar.bz2) = 096693e2bc76cf760cfe00dc76ec121c4d23f9166aa29945ae41616e8ec78230
-SIZE (xfce4/xfce4-panel-4.16.5.tar.bz2) = 1386556
+TIMESTAMP = 1671097747
+SHA256 (xfce4/xfce4-panel-4.18.0.tar.bz2) = be80023fd546587831bab25ded15ae4c9e346289a75744b6ba4cf4ee53794710
+SIZE (xfce4/xfce4-panel-4.18.0.tar.bz2) = 1451719
diff --git a/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c b/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c
deleted file mode 100644
index 60998ddca727..000000000000
--- a/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c
+++ /dev/null
@@ -1,16 +0,0 @@
-From 88d469cb47e58865370b26e6a4d6a7f8891d2949 Mon Sep 17 00:00:00 2001
-From: Andre Miranda <andreldm@xfce.org>
-Date: Sun, 25 Aug 2019 19:16:03 -0300
-Subject: [PATCH] pager: Override WnckPager scroll-event handler (Bug #15886)
-
---- plugins/pager/pager.c.orig 2020-12-10 23:14:07 UTC
-+++ plugins/pager/pager.c
-@@ -482,6 +482,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
- G_CALLBACK (pager_plugin_drag_begin_event), plugin);
- g_signal_connect_after (G_OBJECT (plugin->pager), "drag-end",
- G_CALLBACK (pager_plugin_drag_end_event), plugin);
-+ g_signal_connect_swapped (G_OBJECT (plugin->pager), "scroll-event",
-+ G_CALLBACK (pager_plugin_scroll_event), plugin);
- }
- else
- {
diff --git a/x11-wm/xfce4-panel/pkg-descr b/x11-wm/xfce4-panel/pkg-descr
index d70a7b32c617..730bc7d02039 100644
--- a/x11-wm/xfce4-panel/pkg-descr
+++ b/x11-wm/xfce4-panel/pkg-descr
@@ -1,2 +1,2 @@
-The panel supports multiple panels, with many options for their
+Xfce panel supports multiple panels, with many options for their
position, appearance, transparency and behavior.
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 379da3f79537..b6dc9292f5e9 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -1,6 +1,5 @@
PORTNAME= xfce4-session
-PORTVERSION= 4.16.0
-PORTREVISION= 1
+PORTVERSION= 4.18.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -20,7 +19,7 @@ LIB_DEPENDS= libupower-glib.so:sysutils/upower \
USES= compiler:c11 gettext-tools gmake gnome libtool pathfix \
pkgconfig tar:bzip2 xfce xorg
-USE_GNOME= cairo gtk30 glib20 intltool libwnck3
+USE_GNOME= cairo gdkpixbuf2 gtk30 glib20 intltool libwnck3
USE_XFCE= libexo xfconf
USE_XORG= ice sm x11
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index dbb9487151d3..e7f5f2b0745b 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608682710
-SHA256 (xfce4/xfce4-session-4.16.0.tar.bz2) = 22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b07d17b7
-SIZE (xfce4/xfce4-session-4.16.0.tar.bz2) = 875504
+TIMESTAMP = 1671101736
+SHA256 (xfce4/xfce4-session-4.18.0.tar.bz2) = 38badb500b272012f494543a60a9c0563c381647cc95bed73b68aec0b0b89a7f
+SIZE (xfce4/xfce4-session-4.18.0.tar.bz2) = 853627
diff --git a/x11-wm/xfce4-session/files/patch-scripts_xflock4 b/x11-wm/xfce4-session/files/patch-scripts_xflock4
deleted file mode 100644
index 32cedb702b8a..000000000000
--- a/x11-wm/xfce4-session/files/patch-scripts_xflock4
+++ /dev/null
@@ -1,18 +0,0 @@
---- scripts/xflock4.orig 2019-05-10 20:05:58 UTC
-+++ scripts/xflock4
-@@ -39,12 +39,14 @@ done
- # else run another access locking utility, if installed
- for lock_cmd in \
- "xlock -mode blank" \
-- "slock"
-+ "slock" \
-+ "i3lock -c 000000"
- do
- set -- $lock_cmd
- if command -v -- $1 >/dev/null 2>&1; then
- $lock_cmd >/dev/null 2>&1 &
- # turn off display backlight:
-+ sleep 1
- xset dpms force off
- exit
- fi
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index a9507749271f..0e7a9b38b819 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -35,6 +35,7 @@ share/icons/hicolor/scalable/apps/org.xfce.session.svg
%%NLS%%share/locale/am/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/az/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/be/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/be@tarask/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-session.mo
@@ -51,6 +52,7 @@ share/icons/hicolor/scalable/apps/org.xfce.session.svg
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/et/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/fa_IR/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-session.mo
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index bb09f4fa0247..e4296b7e3115 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -1,6 +1,5 @@
PORTNAME= xfce4-wm
-PORTVERSION= 4.16.1
-PORTREVISION= 1
+PORTVERSION= 4.18.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DISTNAME= xfwm4-${DISTVERSIONFULL}
@@ -12,11 +11,12 @@ WWW= https://xfce.org/
LICENSE= GPLv2
-LIB_DEPENDS= libepoxy.so:graphics/libepoxy
+LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
+ libharfbuzz.so:print/harfbuzz
USES= compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 \
xfce xorg
-USE_GNOME= cairo gtk30 intltool libwnck3
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libwnck3
USE_XFCE= libmenu xfconf
USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xi xinerama \
xorgproto xpresent xrandr xrender xres
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index d29af699a51b..cf3a0c882343 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610219439
-SHA256 (xfce4/xfwm4-4.16.1.tar.bz2) = b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c
-SIZE (xfce4/xfwm4-4.16.1.tar.bz2) = 1201722
+TIMESTAMP = 1671100717
+SHA256 (xfce4/xfwm4-4.18.0.tar.bz2) = 92cd1b889bb25cb4bc06c1c6736c238d96e79c1e706b9f77fad0a89d6e5fc13f
+SIZE (xfce4/xfwm4-4.18.0.tar.bz2) = 1220901
diff --git a/x11-wm/xfce4-wm/files/patch-src_icons.c b/x11-wm/xfce4-wm/files/patch-src_icons.c
deleted file mode 100644
index 564d90fd25fd..000000000000
--- a/x11-wm/xfce4-wm/files/patch-src_icons.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/icons.c.orig 2021-01-05 08:18:20 UTC
-+++ src/icons.c
-@@ -295,16 +295,26 @@ static void
- }
-
- static void
--get_pixmap_geometry (Display *dpy, Pixmap pixmap, guint *out_width, guint *out_height, guint *out_depth)
-+get_pixmap_geometry (ScreenInfo *screen_info, Pixmap pixmap, guint *out_width, guint *out_height, guint *out_depth)
- {
- Window root;
- guint border_width;
- gint x, y;
- guint width, height;
- guint depth;
-+ Status rc;
-+ int result;
-
-- XGetGeometry (dpy, pixmap, &root, &x, &y, &width, &height, &border_width, &depth);
-+ myDisplayErrorTrapPush (screen_info->display_info);
-+ rc = XGetGeometry (myScreenGetXDisplay(screen_info), pixmap, &root,
-+ &x, &y, &width, &height, &border_width, &depth);
-+ result = myDisplayErrorTrapPop (screen_info->display_info);
-
-+ if ((rc != Success) || (result != Success))
-+ {
-+ return;
-+ }
-+
- if (out_width != NULL)
- {
- *out_width = width;
-@@ -371,12 +381,12 @@ try_pixmap_and_mask (ScreenInfo *screen_info, Pixmap s
- return NULL;
- }
-
-- get_pixmap_geometry (myScreenGetXDisplay(screen_info), src_pixmap, &w, &h, &depth);
-+ get_pixmap_geometry (screen_info, src_pixmap, &w, &h, &depth);
- surface = get_surface_from_pixmap (screen_info, src_pixmap, w, h, depth);
-
- if (surface && src_mask != None)
- {
-- get_pixmap_geometry (myScreenGetXDisplay(screen_info), src_mask, &w, &h, &depth);
-+ get_pixmap_geometry (screen_info, src_mask, &w, &h, &depth);
- mask_surface = get_surface_from_pixmap (screen_info, src_mask, w, h, depth);
- }
- else
diff --git a/x11-wm/xfce4-wm/pkg-descr b/x11-wm/xfce4-wm/pkg-descr
index 0f8a3c7132e7..0f31d682df72 100644
--- a/x11-wm/xfce4-wm/pkg-descr
+++ b/x11-wm/xfce4-wm/pkg-descr
@@ -1,3 +1,3 @@
-The Xfce 4 window manager manages the placement of application windows
-on the screen, provides window decorations, and manages work-
-spaces or virtual desktops.
+The Xfce 4 window manager manages the placement of application
+windows on the screen, provides window decorations, and manages
+workspaces or virtual desktops.
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index bcdd0d855fc9..4ee604b7eebc 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xfce
-PORTVERSION= 4.16
+PORTVERSION= 4.18
CATEGORIES= x11-wm xfce
MAINTAINER= xfce@FreeBSD.org
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index c0eebc4bf54c..5d0872a53091 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -1,5 +1,5 @@
PORTNAME= libexo
-PORTVERSION= 4.16.4
+PORTVERSION= 4.18.0
CATEGORIES= x11 xfce
MASTER_SITES= XFCE
DISTNAME= exo-${DISTVERSIONFULL}
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index fcac81df4508..dad12aa01c93 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1654934890
-SHA256 (xfce4/exo-4.16.4.tar.bz2) = 82a50c67e78f1e5c420b7615515bcca759b86eeab99224ab8eca4306b89d2eca
*** 1678 LINES SKIPPED ***