diff options
author | Guido Falsi <madpilot@FreeBSD.org> | 2021-01-02 16:36:33 +0000 |
---|---|---|
committer | Guido Falsi <madpilot@FreeBSD.org> | 2021-01-02 16:36:33 +0000 |
commit | b2f2269daff8c7e224099d352e652241fbdfcb7b (patch) | |
tree | 27b902ea7af0a7d6abc54b964847536e36093b87 /x11-wm/xfce4 | |
parent | Update to upstream release 21.01. (diff) |
Welcome XFCE 4.16 to the FreeBSD ports tree!
Upstream announce: https://xfce.org/about/news/?post=1608595200
This XFCE release dropped support for GTK2 plugins and also dropped
GTK2 from all components.
WARNING: please check UPDATING before upgrading your packages. In
case of problems also read the libexo pkg-message.
Due to this some panel plugins and libraries will be removed since
they cannot compile anymore:
- print/xfce4-print
- x11/xfce4-quicklauncher-plugin
- x11/xfce4-wmdock-plugin
- x11-toolkits/libxfce4gui
These further components also fail to build or work and are being
marked BROKEN, deprecated and marked for removal:
- science/xfce4-equake-plugin
- x11/xfce4-embed-plugin
- deskutils/orage
- deskutils/xfce4-volumed [1]
deskutils/xfce4-notes-plugin will be also marked BROKEN, but there
is active development in it's upstream repository and a fixed release
is expected soon.
deskutils/xfce4-generic-slider will also be marked broken, since
it fails to compile. [2]
Thanks also to riggs, Olivier Duchateau <duchateau.olivier@gmail.com>
and the people in Approved and Reviewed lines below for help and
contributions.
Reviewed by: woodsb02
Approved by: sergey.dyatko@gmail.com (maintainer) [1],
ehaupt [2]
Differential Revision: https://reviews.freebsd.org/D27846
Notes
Notes:
svn path=/head/; revision=559953
Diffstat (limited to '')
-rw-r--r-- | x11-wm/xfce4-desktop/Makefile | 2 | ||||
-rw-r--r-- | x11-wm/xfce4-desktop/distinfo | 6 | ||||
-rw-r--r-- | x11-wm/xfce4-desktop/pkg-plist | 15 | ||||
-rw-r--r-- | x11-wm/xfce4-panel/Makefile | 12 | ||||
-rw-r--r-- | x11-wm/xfce4-panel/distinfo | 6 | ||||
-rw-r--r-- | x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c | 13 | ||||
-rw-r--r-- | x11-wm/xfce4-panel/pkg-plist | 55 | ||||
-rw-r--r-- | x11-wm/xfce4-session/Makefile | 2 | ||||
-rw-r--r-- | x11-wm/xfce4-session/distinfo | 6 | ||||
-rw-r--r-- | x11-wm/xfce4-session/pkg-plist | 21 | ||||
-rw-r--r-- | x11-wm/xfce4-wm/Makefile | 3 | ||||
-rw-r--r-- | x11-wm/xfce4-wm/distinfo | 6 | ||||
-rw-r--r-- | x11-wm/xfce4-wm/files/patch-XFixes-XError | 44 | ||||
-rw-r--r-- | x11-wm/xfce4-wm/files/patch-XKillClient-XError | 24 | ||||
-rw-r--r-- | x11-wm/xfce4-wm/files/patch-Xsync-XError | 30 | ||||
-rw-r--r-- | x11-wm/xfce4-wm/pkg-plist | 18 | ||||
-rw-r--r-- | x11-wm/xfce4/Makefile | 169 |
17 files changed, 214 insertions, 218 deletions
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index b1d2fe7150a8..452cef9c36aa 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-desktop -PORTVERSION= 4.14.3 +PORTVERSION= 4.16.0 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DISTNAME= xfdesktop-${DISTVERSIONFULL} diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo index ed668267d299..2567aea0a098 100644 --- a/x11-wm/xfce4-desktop/distinfo +++ b/x11-wm/xfce4-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1604366823 -SHA256 (xfce4/xfdesktop-4.14.3.tar.bz2) = 06d7d08f41a847f539e9aeb52ed715f960255dc1b2162a60e5f90661892a5793 -SIZE (xfce4/xfdesktop-4.14.3.tar.bz2) = 1549953 +TIMESTAMP = 1608683086 +SHA256 (xfce4/xfdesktop-4.16.0.tar.bz2) = 934ba5affecff21e62d9fac1dd50c50cd94b3a807fefa5f5bff59f3d6f155bae +SIZE (xfce4/xfdesktop-4.16.0.tar.bz2) = 2041114 diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist index 685620d2c515..280f640689c0 100644 --- a/x11-wm/xfce4-desktop/pkg-plist +++ b/x11-wm/xfce4-desktop/pkg-plist @@ -5,12 +5,13 @@ share/applications/xfce-backdrop-settings.desktop share/backgrounds/xfce/xfce-blue.jpg share/backgrounds/xfce/xfce-stripes.png share/backgrounds/xfce/xfce-teal.jpg -share/icons/hicolor/32x32/apps/xfce4-backdrop.png -share/icons/hicolor/32x32/apps/xfce4-menueditor.png -share/icons/hicolor/48x48/apps/xfce4-backdrop.png -share/icons/hicolor/48x48/apps/xfce4-menueditor.png -share/icons/hicolor/scalable/apps/xfce4-backdrop.svg -share/icons/hicolor/scalable/apps/xfce4-menueditor.svg +share/backgrounds/xfce/xfce-verticals.png +share/icons/hicolor/128x128/apps/org.xfce.xfdesktop.png +share/icons/hicolor/16x16/apps/org.xfce.xfdesktop.png +share/icons/hicolor/24x24/apps/org.xfce.xfdesktop.png +share/icons/hicolor/32x32/apps/org.xfce.xfdesktop.png +share/icons/hicolor/48x48/apps/org.xfce.xfdesktop.png +share/icons/hicolor/scalable/apps/org.xfce.xfdesktop.svg %%NLS%%share/locale/am/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/ar/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfdesktop.mo @@ -37,8 +38,8 @@ share/icons/hicolor/scalable/apps/xfce4-menueditor.svg %%NLS%%share/locale/he/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfdesktop.mo -%%NLS%%share/locale/hye/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/hy_AM/LC_MESSAGES/xfdesktop.mo +%%NLS%%share/locale/hye/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/id/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/ie/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/is/LC_MESSAGES/xfdesktop.mo diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index dd4f036e4a48..1824a36e2596 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-panel -PORTVERSION= 4.14.4 +PORTVERSION= 4.16.0 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 @@ -16,7 +16,8 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libdbusmenu-gtk3.so:devel/libdbusmenu USES= compiler:c11 desktop-file-utils gettext-tools gmake gnome \ libtool pathfix perl5 pkgconfig tar:bzip2 xfce xorg @@ -32,8 +33,8 @@ CONFIGURE_ARGS= --enable-gio-unix --without-html-dir PORTSCOUT= limitw:1,even -OPTIONS_DEFINE= GIR GTK2 NLS VAPI -OPTIONS_DEFAULT= GIR GTK2 VAPI +OPTIONS_DEFINE= GIR NLS VAPI +OPTIONS_DEFAULT= GIR VAPI OPTIONS_SUB= yes GIR_DESC= Use Gobject Introspection @@ -42,9 +43,6 @@ GIR_USE= gnome=introspection:build GIR_CONFIGURE_ON= --enable-introspection=yes GIR_CONFIGURE_OFF= --enable-introspection=no -GTK2_USE= gnome=gtk20 -GTK2_CONFIGURE_ENABLE= gtk2 - NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo index 14a52461519b..b1887efdb61c 100644 --- a/x11-wm/xfce4-panel/distinfo +++ b/x11-wm/xfce4-panel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588078825 -SHA256 (xfce4/xfce4-panel-4.14.4.tar.bz2) = 8e5ea79412ba84cfada897ff309cbe2cd4aca16b9bd4f93df060229528576fd5 -SIZE (xfce4/xfce4-panel-4.14.4.tar.bz2) = 1307938 +TIMESTAMP = 1608682746 +SHA256 (xfce4/xfce4-panel-4.16.0.tar.bz2) = 5e979aeeb37d306d72858b1bc67448222ea7a68de01409055b846cd31f3cc53d +SIZE (xfce4/xfce4-panel-4.16.0.tar.bz2) = 1382354 diff --git a/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c b/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c index 64a605c24887..60998ddca727 100644 --- a/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c +++ b/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c @@ -3,15 +3,9 @@ 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 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c -index 5637bea6..3a64496e 100644 ---- plugins/pager/pager.c +--- plugins/pager/pager.c.orig 2020-12-10 23:14:07 UTC +++ plugins/pager/pager.c -@@ -445,6 +445,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS +@@ -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); @@ -20,6 +14,3 @@ index 5637bea6..3a64496e 100644 } else { --- -2.23.0 - diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist index 34a06bcacf45..cae1ea4a06ae 100644 --- a/x11-wm/xfce4-panel/pkg-plist +++ b/x11-wm/xfce4-panel/pkg-plist @@ -3,18 +3,6 @@ bin/xfce4-popup-applicationsmenu bin/xfce4-popup-directorymenu bin/xfce4-popup-windowmenu etc/xdg/xfce4/panel/default.xml -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-config.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-enum-types.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-enums.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-arrow-button.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-hvbox.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-convenience.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-image.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros-46.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h -%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin.h include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-config.h include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enum-types.h include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enums.h @@ -22,14 +10,10 @@ include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-arrow-button.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-convenience.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-image.h -include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros-46.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin-provider.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin.h -%%GIR%%lib/girepository-1.0/libxfce4panel-2.0.typelib -%%GTK2%%lib/libxfce4panel-1.0.so -%%GTK2%%lib/libxfce4panel-1.0.so.4 -%%GTK2%%lib/libxfce4panel-1.0.so.4.0.0 +%%GIR%%lib/girepository-1.0/Libxfce4panel-2.0.typelib lib/libxfce4panel-2.0.so lib/libxfce4panel-2.0.so.4 lib/libxfce4panel-2.0.so.4.0.0 @@ -45,24 +29,31 @@ lib/xfce4/panel/plugins/libshowdesktop.so lib/xfce4/panel/plugins/libsystray.so lib/xfce4/panel/plugins/libtasklist.so lib/xfce4/panel/plugins/libwindowmenu.so -%%GTK2%%lib/xfce4/panel/wrapper-1.0 lib/xfce4/panel/wrapper-2.0 -%%GTK2%%libdata/pkgconfig/libxfce4panel-1.0.pc libdata/pkgconfig/libxfce4panel-2.0.pc share/applications/panel-desktop-handler.desktop share/applications/panel-preferences.desktop -%%GIR%%share/gir-1.0/libxfce4panel-2.0.gir -share/icons/hicolor/16x16/apps/xfce4-panel-menu.png -share/icons/hicolor/16x16/apps/xfce4-panel.png -share/icons/hicolor/22x22/apps/xfce4-panel-menu.png -share/icons/hicolor/22x22/apps/xfce4-panel.png -share/icons/hicolor/24x24/apps/xfce4-panel-menu.png -share/icons/hicolor/24x24/apps/xfce4-panel.png -share/icons/hicolor/32x32/apps/xfce4-panel-menu.png -share/icons/hicolor/32x32/apps/xfce4-panel.png -share/icons/hicolor/48x48/apps/xfce4-panel-menu.png -share/icons/hicolor/48x48/apps/xfce4-panel.png -share/icons/hicolor/scalable/apps/xfce4-panel.svg +%%GIR%%share/gir-1.0/Libxfce4panel-2.0.gir +share/icons/hicolor/128x128/apps/org.xfce.panel.png +share/icons/hicolor/16x16/apps/org.xfce.panel.applicationsmenu.png +share/icons/hicolor/16x16/apps/org.xfce.panel.png +share/icons/hicolor/24x24/apps/org.xfce.panel.applicationsmenu.png +share/icons/hicolor/24x24/apps/org.xfce.panel.png +share/icons/hicolor/32x32/apps/org.xfce.panel.actions.png +share/icons/hicolor/32x32/apps/org.xfce.panel.applicationsmenu.png +share/icons/hicolor/32x32/apps/org.xfce.panel.clock.png +share/icons/hicolor/32x32/apps/org.xfce.panel.directorymenu.png +share/icons/hicolor/32x32/apps/org.xfce.panel.launcher.png +share/icons/hicolor/32x32/apps/org.xfce.panel.pager.png +share/icons/hicolor/32x32/apps/org.xfce.panel.png +share/icons/hicolor/32x32/apps/org.xfce.panel.separator.png +share/icons/hicolor/32x32/apps/org.xfce.panel.showdesktop.png +share/icons/hicolor/32x32/apps/org.xfce.panel.statustray.png +share/icons/hicolor/32x32/apps/org.xfce.panel.tasklist.png +share/icons/hicolor/32x32/apps/org.xfce.panel.windowmenu.png +share/icons/hicolor/48x48/apps/org.xfce.panel.applicationsmenu.png +share/icons/hicolor/48x48/apps/org.xfce.panel.png +share/icons/hicolor/scalable/apps/org.xfce.panel.svg %%NLS%%share/locale/am/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-panel.mo @@ -80,7 +71,6 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg %%NLS%%share/locale/es/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/et/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/fa_IR/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-panel.mo @@ -88,6 +78,7 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/hye/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ie/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-panel.mo diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index 3084d5d12f0c..2e040f52dcb4 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-session -PORTVERSION= 4.14.2 +PORTVERSION= 4.16.0 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo index e15d234a5fdf..dbb9487151d3 100644 --- a/x11-wm/xfce4-session/distinfo +++ b/x11-wm/xfce4-session/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1585440692 -SHA256 (xfce4/xfce4-session-4.14.2.tar.bz2) = fbe3a4a60c91589a2024ce12b2d2667625a8fedcbc90ef031831f56319f597af -SIZE (xfce4/xfce4-session-4.14.2.tar.bz2) = 841878 +TIMESTAMP = 1608682710 +SHA256 (xfce4/xfce4-session-4.16.0.tar.bz2) = 22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b07d17b7 +SIZE (xfce4/xfce4-session-4.16.0.tar.bz2) = 875504 diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist index a3f230563287..a9507749271f 100644 --- a/x11-wm/xfce4-session/pkg-plist +++ b/x11-wm/xfce4-session/pkg-plist @@ -12,14 +12,26 @@ man/man1/xfce4-session-logout.1.gz man/man1/xfce4-session.1.gz share/applications/xfce-session-settings.desktop share/applications/xfce4-session-logout.desktop -share/icons/hicolor/128x128/apps/xfce4-session.png +share/icons/hicolor/128x128/apps/org.xfce.session.png +share/icons/hicolor/16x16/apps/org.xfce.session.png +share/icons/hicolor/24x24/actions/xfsm-hibernate.png +share/icons/hicolor/24x24/actions/xfsm-lock.png +share/icons/hicolor/24x24/actions/xfsm-logout.png +share/icons/hicolor/24x24/actions/xfsm-reboot.png +share/icons/hicolor/24x24/actions/xfsm-shutdown.png +share/icons/hicolor/24x24/actions/xfsm-suspend.png +share/icons/hicolor/24x24/actions/xfsm-switch-user.png +share/icons/hicolor/24x24/apps/org.xfce.session.png +share/icons/hicolor/32x32/apps/org.xfce.session.png share/icons/hicolor/48x48/actions/xfsm-hibernate.png +share/icons/hicolor/48x48/actions/xfsm-lock.png share/icons/hicolor/48x48/actions/xfsm-logout.png share/icons/hicolor/48x48/actions/xfsm-reboot.png share/icons/hicolor/48x48/actions/xfsm-shutdown.png share/icons/hicolor/48x48/actions/xfsm-suspend.png -share/icons/hicolor/48x48/apps/xfce4-session.png -share/icons/hicolor/scalable/apps/xfce4-session.svg +share/icons/hicolor/48x48/actions/xfsm-switch-user.png +share/icons/hicolor/48x48/apps/org.xfce.session.png +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 @@ -33,6 +45,7 @@ share/icons/hicolor/scalable/apps/xfce4-session.svg %%NLS%%share/locale/de/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/eo/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-session.mo @@ -42,9 +55,11 @@ share/icons/hicolor/scalable/apps/xfce4-session.svg %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/he/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/hi/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/hye/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ie/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-session.mo diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile index 7437922a6a45..32ba195c6119 100644 --- a/x11-wm/xfce4-wm/Makefile +++ b/x11-wm/xfce4-wm/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-wm -PORTVERSION= 4.14.6 -PORTREVISION= 2 +PORTVERSION= 4.16.0 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DISTNAME= xfwm4-${DISTVERSIONFULL} diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo index 22965cbf8b01..eea7e1280bc2 100644 --- a/x11-wm/xfce4-wm/distinfo +++ b/x11-wm/xfce4-wm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1604253744 -SHA256 (xfce4/xfwm4-4.14.6.tar.bz2) = ac6fa8b09d34090fb9ad81d8b7fb0455a10eccf500396b644afa2b9c2444142f -SIZE (xfce4/xfwm4-4.14.6.tar.bz2) = 1167818 +TIMESTAMP = 1608682605 +SHA256 (xfce4/xfwm4-4.16.0.tar.bz2) = 1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3 +SIZE (xfce4/xfwm4-4.16.0.tar.bz2) = 1200929 diff --git a/x11-wm/xfce4-wm/files/patch-XFixes-XError b/x11-wm/xfce4-wm/files/patch-XFixes-XError deleted file mode 100644 index 7583e5c63462..000000000000 --- a/x11-wm/xfce4-wm/files/patch-XFixes-XError +++ /dev/null @@ -1,44 +0,0 @@ -From c255a406bd353a24a9143b152f91e5eb39f69f1f Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan <fourdan@xfce.org> -Date: Sat, 28 Nov 2020 21:16:20 +0100 -Subject: [PATCH] compositor: Handle XFixes XError - -XFixesSetPictureClipRegion() with the region from the client window can -cause a RenderBadPicture error. - -Make sure to include it within the XError trap. - -Signed-off-by: Olivier Fourdan <fourdan@xfce.org> -https://gitlab.xfce.org/xfce/xfwm4/-/issues/460 ---- - src/compositor.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/compositor.c b/src/compositor.c -index 5110f29c2..25baaabe5 100644 ---- src/compositor.c -+++ src/compositor.c -@@ -781,15 +781,16 @@ border_size (CWindow *cw) - myDisplayErrorTrapPush (display_info); - border = XFixesCreateRegionFromWindow (display_info->dpy, - cw->id, WindowRegionBounding); -- if ((myDisplayErrorTrapPop (display_info) != Success) || (border == None)) -- { -- return None; -- } - XFixesSetPictureClipRegion (display_info->dpy, cw->picture, 0, 0, border); - XFixesTranslateRegion (display_info->dpy, border, - cw->attr.x + cw->attr.border_width, - cw->attr.y + cw->attr.border_width); - -+ if (myDisplayErrorTrapPop (display_info) != Success) -+ { -+ return None; -+ } -+ - return border; - } - --- -GitLab - diff --git a/x11-wm/xfce4-wm/files/patch-XKillClient-XError b/x11-wm/xfce4-wm/files/patch-XKillClient-XError deleted file mode 100644 index 2316463c484f..000000000000 --- a/x11-wm/xfce4-wm/files/patch-XKillClient-XError +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/client.c b/src/client.c -index c90c7ada710b482a847e80a1e835adf54fe97f34..13acc44f75455b1c9de70255a73cf4457dfb7531 100644 ---- src/client.c -+++ src/client.c -@@ -2705,10 +2705,18 @@ clientClose (Client *c) - void - clientKill (Client *c) - { -+ ScreenInfo *screen_info; -+ DisplayInfo *display_info; -+ - g_return_if_fail (c != NULL); - TRACE ("client \"%s\" (0x%lx)", c->name, c->window); - -- XKillClient (clientGetXDisplay (c), c->window); -+ screen_info = c->screen_info; -+ display_info = screen_info->display_info; -+ -+ myDisplayErrorTrapPush (display_info); -+ XKillClient (display_info->dpy, c->window); -+ myDisplayErrorTrapPopIgnored (display_info); - } - - void diff --git a/x11-wm/xfce4-wm/files/patch-Xsync-XError b/x11-wm/xfce4-wm/files/patch-Xsync-XError deleted file mode 100644 index 61b5aa5c6d2c..000000000000 --- a/x11-wm/xfce4-wm/files/patch-Xsync-XError +++ /dev/null @@ -1,30 +0,0 @@ -From 6b3c1ef155a01b61443b832b1922b560ef42ce24 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan <fourdan@xfce.org> -Date: Sat, 21 Nov 2020 14:05:04 +0100 -Subject: [PATCH] xsync: Handle XError - -XSync can fail, handle the XError gracefully. - -Signed-off-by: Olivier Fourdan <fourdan@xfce.org> -Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/448 ---- - src/xsync.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/xsync.c b/src/xsync.c -index 920dfdc17..e1c379f9d 100644 ---- src/xsync.c -+++ src/xsync.c -@@ -113,7 +113,9 @@ clientDestroyXSyncAlarm (Client *c) - screen_info = c->screen_info; - display_info = screen_info->display_info; - -+ myDisplayErrorTrapPush (display_info); - XSyncDestroyAlarm (display_info->dpy, c->xsync_alarm); -+ myDisplayErrorTrapPopIgnored (display_info); - c->xsync_alarm = None; - } - } --- -GitLab - diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist index 45e40680480c..0e63e3f40700 100644 --- a/x11-wm/xfce4-wm/pkg-plist +++ b/x11-wm/xfce4-wm/pkg-plist @@ -6,6 +6,12 @@ lib/xfce4/xfwm4/helper-dialog share/applications/xfce-wm-settings.desktop share/applications/xfce-wmtweaks-settings.desktop share/applications/xfce-workspaces-settings.desktop +share/icons/hicolor/128x128/apps/org.xfce.workspaces.png +share/icons/hicolor/128x128/apps/org.xfce.xfwm4-tweaks.png +share/icons/hicolor/128x128/apps/org.xfce.xfwm4.png +share/icons/hicolor/16x16/apps/org.xfce.workspaces.png +share/icons/hicolor/16x16/apps/org.xfce.xfwm4-tweaks.png +share/icons/hicolor/16x16/apps/org.xfce.xfwm4.png share/icons/hicolor/22x22/actions/xfce-wm-close.png share/icons/hicolor/22x22/actions/xfce-wm-maximize.png share/icons/hicolor/22x22/actions/xfce-wm-menu.png @@ -15,10 +21,10 @@ share/icons/hicolor/22x22/actions/xfce-wm-stick.png share/icons/hicolor/22x22/actions/xfce-wm-unmaximize.png share/icons/hicolor/22x22/actions/xfce-wm-unshade.png share/icons/hicolor/22x22/actions/xfce-wm-unstick.png -share/icons/hicolor/48x48/apps/wmtweaks.png -share/icons/hicolor/48x48/apps/xfce4-workspaces.png +share/icons/hicolor/48x48/apps/org.xfce.workspaces.png +share/icons/hicolor/48x48/apps/org.xfce.xfwm4-tweaks.png +share/icons/hicolor/48x48/apps/org.xfce.xfwm4.png share/icons/hicolor/48x48/apps/xfwm4-default.png -share/icons/hicolor/48x48/apps/xfwm4.png share/icons/hicolor/scalable/actions/xfce-wm-close.svg share/icons/hicolor/scalable/actions/xfce-wm-maximize.svg share/icons/hicolor/scalable/actions/xfce-wm-menu.svg @@ -28,10 +34,10 @@ share/icons/hicolor/scalable/actions/xfce-wm-stick.svg share/icons/hicolor/scalable/actions/xfce-wm-unmaximize.svg share/icons/hicolor/scalable/actions/xfce-wm-unshade.svg share/icons/hicolor/scalable/actions/xfce-wm-unstick.svg -share/icons/hicolor/scalable/apps/wmtweaks.svg -share/icons/hicolor/scalable/apps/xfce4-workspaces.svg +share/icons/hicolor/scalable/apps/org.xfce.workspaces.svg +share/icons/hicolor/scalable/apps/org.xfce.xfwm4-tweaks.svg +share/icons/hicolor/scalable/apps/org.xfce.xfwm4.svg share/icons/hicolor/scalable/apps/xfwm4-default.svg -share/icons/hicolor/scalable/apps/xfwm4.svg %%NLS%%share/locale/am/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ar/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfwm4.mo diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 1997d15105dd..863f1671bfb2 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -1,44 +1,137 @@ -# Created by: James Earl <jdearl@telus.net> +# Created by: Ben Woods <woodsb02@FreeBSD.org> # $FreeBSD$ -PORTNAME= xfce -PORTVERSION= 4.14 -CATEGORIES= x11-wm xfce +PORTNAME= xfce4-goodies +PORTVERSION= 4.16 +CATEGORIES= x11 MAINTAINER= xfce@FreeBSD.org -COMMENT= Meta-port for the Xfce Desktop Environment - -RUN_DEPENDS= xfwm4:x11-wm/xfce4-wm \ - xfce4-session:x11-wm/xfce4-session \ - xfce4-panel:x11-wm/xfce4-panel \ - xfdesktop:x11-wm/xfce4-desktop \ - xfsettingsd:sysutils/xfce4-settings - -USES= metaport - -OPTIONS_DEFINE= APPFINDER GREYBIRD GTK2ENGINE ICONS LIGHTDM MOUSEPAD NOTIFY ORAGE PRINT \ - TERMINAL XPM -OPTIONS_DEFAULT= APPFINDER GREYBIRD ICONS MOUSEPAD NOTIFY TERMINAL -APPFINDER_RUN_DEPENDS= xfce4-appfinder:misc/xfce4-appfinder -APPFINDER_DESC= Launcher and finder -GREYBIRD_DESC= Install Greybird theme -GREYBIRD_RUN_DEPENDS= greybird-theme>0:x11-themes/greybird-theme -GTK2ENGINE_DESC= Install old gtk2 only engine theme -GTK2ENGINE_RUN_DEPENDS= gtk-xfce-engine>0:x11-themes/gtk-xfce-engine -ICONS_RUN_DEPENDS= adwaita-icon-theme>0:x11-themes/adwaita-icon-theme -LIGHTDM_RUN_DEPENDS= lightdm-gtk-greeter:x11/lightdm-gtk-greeter -LIGHTDM_DESC= LightDM display manger -MOUSEPAD_RUN_DEPENDS= mousepad:editors/mousepad -MOUSEPAD_DESC= Text editor -NOTIFY_RUN_DEPENDS= xfce4-notifyd-config:deskutils/xfce4-notifyd -ORAGE_RUN_DEPENDS= orage:deskutils/orage -ORAGE_DESC= Calendar -PRINT_RUN_DEPENDS= xfprint4:print/xfce4-print -TERMINAL_RUN_DEPENDS= xfce4-terminal:x11/xfce4-terminal -TERMINAL_DESC= Terminal emulator -XPM_RUN_DEPENDS= xfce4-power-manager:sysutils/xfce4-power-manager -XPM_DESC= Power manager - -do-install: # empty +COMMENT= Meta-port for software and artwork from the Xfce4 Goodies Project + +USES= metaport + +OPTIONS_DEFAULT= ARCHIVE BATTERY CALCULATOR CLIPMAN CPUGRAPH DASHBOARD \ + DATETIME DICTIONARY DISKPERF FSGUARD GENMON GIGOLO \ + MAILWATCH MEDIATAGS MENULIBRE MOUNT NETLOAD PAROLE \ + POWERMANAGER RISTRETTO SCREENSAVER SCREENSHOOTER SMARTBOOKMARK \ + SYSTEMLOAD TASKMANAGER TERMINAL THEMES TIMEOUT TIMER VCS VERVE \ + WAVELAN WEATHER WHISKERMENU XFBURN XKB +# Removed from defaults due to ports being broken. +# NOTES BSDCPUFREQ + +OPTIONS_EXCLUDE_powerpc= BATTERY +OPTIONS_EXCLUDE_powerpc64= BATTERY +OPTIONS_EXCLUDE_powerpc64le= BATTERY +OPTIONS_EXCLUDE_powerpcspe= BATTERY + +OPTIONS_GROUP= APPLICATIONS PANELPLUGINS THUNARPLUGINS UNOFFICIAL + +OPTIONS_GROUP_APPLICATIONS= DASHBOARD DICTIONARY GIGOLO MIDORI PAROLE \ + POWERMANAGER RISTRETTO SCREENSHOOTER \ + TASKMANAGER TERMINAL VOLUMEDPULSE XFBURN \ + XFMPC SCREENSAVER +DASHBOARD_DESC= GNOME shell like dashboard for the Xfce desktop +DICTIONARY_DESC= Xfce4 plugin to query different dictionaries +GIGOLO_DESC= Frontend to easily manage filesystem connections +MIDORI_DESC= Lightweight web browser using WebKit engine +PAROLE_DESC= Lightweight media player based on GStreamer +POWERMANAGER_DESC= Power manager for the Xfce Desktop +RISTRETTO_DESC= Image viewer with Xfce integration +SCREENSAVER_DESC= Screen Saver for the Xfce Desktop +SCREENSHOOTER_DESC= Application and panel plugin to take screenshots +TASKMANAGER_DESC= Task manager for the Xfce desktop +TERMINAL_DESC= Terminal emulator for the X windowing system +VOLUMEDPULSE_DESC= Volume management daemon for Xfce using PulseAudio +XFBURN_DESC= CD/DVD burning tool for Xfce +XFMPC_DESC= Graphical MPD client focusing on low footprint + +DASHBOARD_RUN_DEPENDS= xfce4-dashboard>=0:x11/xfce4-dashboard +DICTIONARY_RUN_DEPENDS= xfce4-dict-plugin>=0:textproc/xfce4-dict-plugin +GIGOLO_RUN_DEPENDS= gigolo>=0:sysutils/gigolo +MIDORI_RUN_DEPENDS= midori>=0:www/midori +PAROLE_RUN_DEPENDS= parole>=0:multimedia/xfce4-parole +POWERMANAGER_RUN_DEPENDS= xfce4-power-manager>=0:sysutils/xfce4-power-manager +RISTRETTO_RUN_DEPENDS= ristretto>=0:graphics/ristretto +SCREENSAVER_RUN_DEPENDS= xfce4-screensaver>=0:x11/xfce4-screensaver +SCREENSHOOTER_RUN_DEPENDS= xfce4-screenshooter-plugin>=0:x11/xfce4-screenshooter-plugin +TASKMANAGER_RUN_DEPENDS= xfce4-taskmanager>=0:x11/xfce4-taskmanager +TERMINAL_RUN_DEPENDS= xfce4-terminal>=0:x11/xfce4-terminal +VOLUMEDPULSE_RUN_DEPENDS= xfce4-volumed-pulse>=0:deskutils/xfce4-volumed-pulse +XFBURN_RUN_DEPENDS= xfburn>=0:sysutils/xfburn +XFMPC_RUN_DEPENDS= xfmpc>=0:audio/xfmpc + +OPTIONS_GROUP_PANELPLUGINS= BATTERY CALCULATOR CLIPMAN CPUGRAPH DATETIME \ + DISKPERF FSGUARD GENERICSLIDER GENMON \ + MAILWATCH MOUNT MPC NETLOAD NOTES PULSEAUDIO \ + SMARTBOOKMARK SYSTEMLOAD TIMER \ + TIMEOUT VERVE WAVELAN WEATHER WHISKERMENU \ + XKB +BATTERY_DESC= Battery monitor panel plugin for Xfce4 +CALCULATOR_DESC= Simple calculator for the Xfce panel +CLIPMAN_DESC= Clipboard manager for the Xfce panel +CPUGRAPH_DESC= Graphical representation of the CPU load +DATETIME_DESC= Datetime panel plugin for the Xfce desktop +DISKPERF_DESC= Graphical representation of the disk IO +FSGUARD_DESC= Displays free space of mountpoint +GENERICSLIDER_DESC= Slider to adjust / monitor any numeric variable +GENMON_DESC= Generic Monitor Xfce4 panel plugin +MAILWATCH_DESC= Mail notification applet for the Xfce panel +MOUNT_DESC= Mount and umount utility for the Xfce4 panel +MPC_DESC= Musicpd client plugin for the Xfce panel +NETLOAD_DESC= Network Load plugin for Xfce4 +NOTES_DESC= Notes plugin for the Xfce panel +PULSEAUDIO_DESC= Panel plugin for controlling PulseAudio mixer +SMARTBOOKMARK_DESC= Query search engines from the Xfce panel +SYSTEMLOAD_DESC= System Load plugin for Xfce4 panel +TIMEOUT_DESC= Prompts the user to take a break every X minutes +TIMER_DESC= Set alarm at specific time or after time period +VERVE_DESC= Command line plugin for the Xfce Desktop +WAVELAN_DESC= Displays information about a WaveLAN device +WEATHER_DESC= Weather plugin for the Xfce panel +WHISKERMENU_DESC= Alternate menu for the Xfce Desktop +XKB_DESC= Keyboard layout switching plugin for Xfce panel + +BATTERY_RUN_DEPENDS= xfce4-battery-plugin>=0:sysutils/xfce4-battery-plugin +CALCULATOR_RUN_DEPENDS= xfce4-calculator-plugin>=0:math/xfce4-calculator-plugin +CLIPMAN_RUN_DEPENDS= xfce4-clipman-plugin>=0:x11/xfce4-clipman-plugin +CPUGRAPH_RUN_DEPENDS= xfce4-cpugraph-plugin>=0:sysutils/xfce4-cpugraph-plugin +DATETIME_RUN_DEPENDS= xfce4-datetime-plugin>=0:x11-clocks/xfce4-datetime-plugin +DISKPERF_RUN_DEPENDS= xfce4-diskperf-plugin>=0:sysutils/xfce4-diskperf-plugin +FSGUARD_RUN_DEPENDS= xfce4-fsguard-plugin>=0:sysutils/xfce4-fsguard-plugin +GENERICSLIDER_RUN_DEPENDS= xfce4-generic-slider>=0:deskutils/xfce4-generic-slider +GENMON_RUN_DEPENDS= xfce4-genmon-plugin>=0:sysutils/xfce4-genmon-plugin +MAILWATCH_RUN_DEPENDS= xfce4-mailwatch-plugin>=0:mail/xfce4-mailwatch-plugin +MOUNT_RUN_DEPENDS= xfce4-mount-plugin>=0:sysutils/xfce4-mount-plugin +MPC_RUN_DEPENDS= xfce4-mpc-plugin>=0:audio/xfce4-mpc-plugin +NETLOAD_RUN_DEPENDS= xfce4-netload-plugin>=0:sysutils/xfce4-netload-plugin +NOTES_RUN_DEPENDS= xfce4-notes-plugin>=0:deskutils/xfce4-notes-plugin +PULSEAUDIO_RUN_DEPENDS= xfce4-pulseaudio-plugin>=0:audio/xfce4-pulseaudio-plugin +SMARTBOOKMARK_RUN_DEPENDS= xfce4-smartbookmark-plugin>=0:www/xfce4-smartbookmark-plugin +SYSTEMLOAD_RUN_DEPENDS= xfce4-systemload-plugin>=0:sysutils/xfce4-systemload-plugin +TIMEOUT_RUN_DEPENDS= xfce4-time-out-plugin>=0:x11-clocks/xfce4-time-out-plugin +TIMER_RUN_DEPENDS= xfce4-timer-plugin>=0:x11-clocks/xfce4-timer-plugin +VERVE_RUN_DEPENDS= xfce4-verve-plugin>=0:x11/xfce4-verve-plugin +WAVELAN_RUN_DEPENDS= xfce4-wavelan-plugin>=0:sysutils/xfce4-wavelan-plugin +WEATHER_RUN_DEPENDS= xfce4-weather-plugin>=0:misc/xfce4-weather-plugin +WHISKERMENU_RUN_DEPENDS= xfce4-whiskermenu-plugin>=0:x11/xfce4-whiskermenu-plugin +XKB_RUN_DEPENDS= xfce4-xkb-plugin>=0:deskutils/xfce4-xkb-plugin + +OPTIONS_GROUP_THUNARPLUGINS= ARCHIVE MEDIATAGS VCS +ARCHIVE_DESC= Create/extract archives from file context menus +MEDIATAGS_DESC= View/edit id3/ogg tags in file properties dialog +VCS_DESC= SVN+GIT Version Control System integration + +ARCHIVE_RUN_DEPENDS= thunar-archive-plugin>=0:archivers/thunar-archive-plugin +MEDIATAGS_RUN_DEPENDS= thunar-media-tags-plugin>=0:audio/thunar-media-tags-plugin +VCS_RUN_DEPENDS= thunar-vcs-plugin>=0:devel/thunar-vcs-plugin + +OPTIONS_GROUP_UNOFFICIAL= BSDCPUFREQ MENULIBRE THEMES +BSDCPUFREQ_DESC= Display the CPU clock frequency in Xfce panel +MENULIBRE_DESC= Advanced compliant menu editor +THEMES_DESC= Additional themes for xfwm4 + +BSDCPUFREQ_RUN_DEPENDS= xfce4-bsdcpufreq-plugin>=0:sysutils/xfce4-bsdcpufreq-plugin +MENULIBRE_RUN_DEPENDS= py${PYTHON3_DEFAULT:S/.//}-menulibre>=0:x11/menulibre +THEMES_RUN_DEPENDS= xfce4-wm-themes>=0:misc/xfce4-wm-themes .include <bsd.port.mk> |