diff options
| author | Olivier Duchateau <olivierd@FreeBSD.org> | 2015-03-05 22:52:30 +0000 |
|---|---|---|
| committer | Olivier Duchateau <olivierd@FreeBSD.org> | 2015-03-05 22:52:30 +0000 |
| commit | 86e4cb7cb047c17951de23b2ebea9c14d0f76af2 (patch) | |
| tree | 0f1a4d58acfbb6944387e341f218a018154dc4ad /x11-wm | |
| parent | Update the mesa ports to 10.4.5. (diff) | |
The FreeBSD Xfce team proudly presents Xfce 4.12.
Announce: http://www.xfce.org/about/news/?post=1425081600
Global changes:
- Switch to USES= xfce (D677)
- Reorganize options helper
- Fix USES= gettext-* when NLS option is not set [1], [2]
- Add LICENSE (when missing)
Update:
- to 4.12 (core components)
- audio/xfce4-mpc-plugin to 0.4.5
- deskutils/xfce4-tumbler to 0.1.31
- deskutils/xfce4-xkb-plugin to 0.7.1
- editors/mousepad to 0.4.0
- graphics/ristretto to 0.8.0
- multimedia/xfce4-parole to 0.8.0
- sysutils/garcon to 0.4.0
- sysutils/xfce4-diskperf-plugin to 2.5.5 [3]
- sysutils/xfce4-fsguard-plugin to 1.0.2
- sysutils/xfce4-power-manager to 1.4.3
- sysutils/xfce4-wavelan-plugin to 0.5.12
- x11/libexo to 0.10.3
- x11-fm/thunar to 1.6.6
- x11-themes/gtk-xfce-engine to 3.2.0
PR: 196003 [1], 197251 [2], 198132
Differential Revision: https://reviews.freebsd.org/D677
Submitted by: Kamil Szczesny [1], amdmi3@ [2], myself
Exp-run by: antoine@
Approved by: danilo@ (maintainer) [3]
Tested by: Ivan <enitarzi@gmail.com>
Notes
Notes:
svn path=/head/; revision=380565
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xfce4-desktop/Makefile | 41 | ||||
| -rw-r--r-- | x11-wm/xfce4-desktop/distinfo | 4 | ||||
| -rw-r--r-- | x11-wm/xfce4-desktop/files/patch-src__xfdesktop-app-menu-item.c | 22 | ||||
| -rw-r--r-- | x11-wm/xfce4-desktop/pkg-descr | 2 | ||||
| -rw-r--r-- | x11-wm/xfce4-desktop/pkg-plist | 2 | ||||
| -rw-r--r-- | x11-wm/xfce4-panel/Makefile | 46 | ||||
| -rw-r--r-- | x11-wm/xfce4-panel/distinfo | 4 | ||||
| -rw-r--r-- | x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c | 23 | ||||
| -rw-r--r-- | x11-wm/xfce4-panel/pkg-plist | 75 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/Makefile | 31 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/distinfo | 4 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c | 12 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/pkg-descr | 7 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/pkg-plist | 27 | ||||
| -rw-r--r-- | x11-wm/xfce4-wm/Makefile | 60 | ||||
| -rw-r--r-- | x11-wm/xfce4-wm/distinfo | 4 | ||||
| -rw-r--r-- | x11-wm/xfce4-wm/files/extrapatch-src__events.c | 16 | ||||
| -rw-r--r-- | x11-wm/xfce4-wm/files/patch-src__client.c | 47 | ||||
| -rw-r--r-- | x11-wm/xfce4-wm/pkg-descr | 2 | ||||
| -rw-r--r-- | x11-wm/xfce4-wm/pkg-plist | 262 | ||||
| -rw-r--r-- | x11-wm/xfce4/Makefile | 5 |
21 files changed, 361 insertions, 335 deletions
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index 7ff176d8c1c4..1e7bb44a75e1 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= xfce4-desktop -PORTVERSION= 4.10.3 -PORTREVISION= 2 +PORTVERSION= 4.12.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/xfdesktop/${PORTVERSION:R} DISTNAME= xfdesktop-${PORTVERSION} DIST_SUBDIR= xfce4 @@ -22,41 +20,24 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_GNOME= glib20 gtk20 intltool intlhack libwnck -USE_XFCE= configenv garcon libmenu libutil libexo xfconf -USES= pkgconfig gmake tar:bzip2 +USE_XFCE= garcon thunar +USES= pkgconfig gmake gettext-tools xfce tar:bzip2 USE_XORG= x11 sm -# Prevent build error, with macro 'g_return_val_if_fail ()' -CFLAGS+= -Wno-return-type - CONFIGURE_ARGS+=--enable-gio-unix \ - --enable-notifications - -OPTIONS_DEFINE= THUNAR NLS -OPTIONS_DEFAULT= THUNAR NLS -THUNAR_DESC= Enable thunar support + --enable-notifications \ + --with-file-manager-fallback=Thunar -.include <bsd.port.options.mk> +OPTIONS_DEFINE= NLS +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MTHUNAR} -CONFIGURE_ARGS+=--enable-thunarx --with-file-manager-fallback=Thunar -USE_XFCE+= thunar -.else -CONFIGURE_ARGS+=--disable-thunarx --without-file-manager-fallback -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +.include <bsd.port.pre.mk> post-patch: .if !${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo index caafbe6fbc09..f13937682248 100644 --- a/x11-wm/xfce4-desktop/distinfo +++ b/x11-wm/xfce4-desktop/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfdesktop-4.10.3.tar.bz2) = 09ca2ba554d8b724b4bbb34b6fb3523de36b556efa4f28ecd802c9c5ba3272ce -SIZE (xfce4/xfdesktop-4.10.3.tar.bz2) = 1054828 +SHA256 (xfce4/xfdesktop-4.12.0.tar.bz2) = 6e7a8b87317762214b6407576f6e2c1efcc176c136b4c7b869d18a74c87b7fc7 +SIZE (xfce4/xfdesktop-4.12.0.tar.bz2) = 1408116 diff --git a/x11-wm/xfce4-desktop/files/patch-src__xfdesktop-app-menu-item.c b/x11-wm/xfce4-desktop/files/patch-src__xfdesktop-app-menu-item.c deleted file mode 100644 index c7ac70238e64..000000000000 --- a/x11-wm/xfce4-desktop/files/patch-src__xfdesktop-app-menu-item.c +++ /dev/null @@ -1,22 +0,0 @@ ---- ./src/xfdesktop-app-menu-item.c.orig 2013-09-16 07:17:42.000000000 +0000 -+++ ./src/xfdesktop-app-menu-item.c 2013-12-17 20:23:34.000000000 +0000 -@@ -31,6 +31,7 @@ - - #include <libxfce4util/libxfce4util.h> - #include <libxfce4ui/libxfce4ui.h> -+#include <exo/exo.h> - - #include "xfdesktop-app-menu-item.h" - -@@ -212,6 +213,11 @@ - - /* Turn the pixbuf into a gtk_image */ - if(G_LIKELY(pixbuf)) { -+ /* scale the pixbuf down if it needs it */ -+ GdkPixbuf *tmp = exo_gdk_pixbuf_scale_down(pixbuf, TRUE, w, h); -+ g_object_unref(pixbuf); -+ pixbuf = tmp; -+ - image = gtk_image_new_from_pixbuf(pixbuf); - g_object_unref(G_OBJECT(pixbuf)); - } diff --git a/x11-wm/xfce4-desktop/pkg-descr b/x11-wm/xfce4-desktop/pkg-descr index f22117d413d5..b7b0115f5a6f 100644 --- a/x11-wm/xfce4-desktop/pkg-descr +++ b/x11-wm/xfce4-desktop/pkg-descr @@ -1,4 +1,4 @@ The desktop manager sets the background image, and provides a root window menu, desktop icons or minimized icons and windows list. -WWW: http://docs.xfce.org/xfce/xfdesktop/start +WWW: http://www.xfce.org/ diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist index de9240f7d343..c20a0a32efe3 100644 --- a/x11-wm/xfce4-desktop/pkg-plist +++ b/x11-wm/xfce4-desktop/pkg-plist @@ -3,6 +3,7 @@ bin/xfdesktop-settings man/man1/xfdesktop.1.gz share/applications/xfce-backdrop-settings.desktop share/backgrounds/xfce/xfce-blue.jpg +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 @@ -26,6 +27,7 @@ share/icons/hicolor/scalable/apps/xfce4-menueditor.svg %%NLS%%share/locale/es/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/et/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfdesktop.mo +%%NLS%%share/locale/fa_IR/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfdesktop.mo diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index 45b186244e70..b04b9d89f99c 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= xfce4-panel -PORTVERSION= 4.10.1 -PORTREVISION= 3 +PORTVERSION= 4.12.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org @@ -17,39 +15,27 @@ LICENSE_COMB= multi LICENSE_DISTFILES= ${WRKSRC}/COPYING \ ${WRKSRC}/COPYING.LIB -LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ - libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -USES= desktop-file-utils gmake libtool:keepla pathfix perl5 \ +USES= desktop-file-utils gmake libtool pathfix gettext-tools perl5 \ pkgconfig tar:bzip2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_GNOME= glib20 gtk20 intltool intlhack libwnck +USE_GNOME= glib20 gtk20 intltool intlhack libwnck cairo USE_LDCONFIG= yes -USE_XFCE= configenv garcon libexo libmenu libutil xfconf +USE_XFCE= garcon libexo USE_XORG= x11 sm -CONFIGURE_ARGS+=--enable-gio-unix - -OPTIONS_DEFINE= NLS DOCS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html -PLIST_SUB+= APIDOCS="" -.else -CONFIGURE_ARGS+=--without-html-dir -PLIST_SUB+= APIDOCS="@comment " -.endif +CONFIGURE_ARGS+=--enable-gio-unix --without-html-dir + +OPTIONS_DEFINE= GTK3 NLS +OPTIONS_DEFAULT= GTK3 NLS +GTK3_USES= xfce:gtk3 +GTK3_USE= gnome=gtk30 +GTK3_CONFIGURE_ENABLE= gtk3 +GTK3_USES_OFF= xfce +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes .include <bsd.port.mk> diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo index 89f2375f58ab..0080c07a106e 100644 --- a/x11-wm/xfce4-panel/distinfo +++ b/x11-wm/xfce4-panel/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-panel-4.10.1.tar.bz2) = 573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6 -SIZE (xfce4/xfce4-panel-4.10.1.tar.bz2) = 1061090 +SHA256 (xfce4/xfce4-panel-4.12.0.tar.bz2) = 30920fc2e2fc26279a82b5261a155c2cc15ab2aa1ced2275684a6ff8261b97b0 +SIZE (xfce4/xfce4-panel-4.12.0.tar.bz2) = 1107470 diff --git a/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c b/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c deleted file mode 100644 index 58384b8c5593..000000000000 --- a/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c +++ /dev/null @@ -1,23 +0,0 @@ -'system-hibernate' and 'system-suspend' icons don't exist when Gnome or -Adwaita are default icons theme. - ---- plugins/actions/actions.c.orig 2013-05-05 15:47:07 UTC -+++ plugins/actions/actions.c -@@ -181,7 +181,7 @@ static ActionEntry action_entries[] = - N_("_Hibernate"), - N_("Do you want to suspend to disk?"), - N_("Hibernating computer in %d seconds."), -- "system-hibernate" -+ "xfsm-hibernate" - }, - { ACTION_TYPE_SUSPEND, - "suspend", -@@ -189,7 +189,7 @@ static ActionEntry action_entries[] = - N_("Sus_pend"), - N_("Do you want to suspend to RAM?"), - N_("Suspending computer in %d seconds."), -- "system-suspend" -+ "xfsm-suspend" - }, - { ACTION_TYPE_RESTART, - "restart", diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist index aab1dcb54c24..b0d981fdffb4 100644 --- a/x11-wm/xfce4-panel/pkg-plist +++ b/x11-wm/xfce4-panel/pkg-plist @@ -15,64 +15,41 @@ include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros-46.h include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros.h include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin.h -lib/libxfce4panel-1.0.la +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-config.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enum-types.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enums.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-arrow-button.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-convenience.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-image.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros-46.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin-provider.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin.h lib/libxfce4panel-1.0.so lib/libxfce4panel-1.0.so.4 lib/libxfce4panel-1.0.so.4.0.0 +%%GTK3%%lib/libxfce4panel-2.0.so +%%GTK3%%lib/libxfce4panel-2.0.so.4 +%%GTK3%%lib/libxfce4panel-2.0.so.4.0.0 lib/xfce4/panel/migrate -lib/xfce4/panel/plugins/libactions.la lib/xfce4/panel/plugins/libactions.so -lib/xfce4/panel/plugins/libapplicationsmenu.la lib/xfce4/panel/plugins/libapplicationsmenu.so -lib/xfce4/panel/plugins/libclock.la lib/xfce4/panel/plugins/libclock.so -lib/xfce4/panel/plugins/libdirectorymenu.la lib/xfce4/panel/plugins/libdirectorymenu.so -lib/xfce4/panel/plugins/liblauncher.la lib/xfce4/panel/plugins/liblauncher.so -lib/xfce4/panel/plugins/libpager.la lib/xfce4/panel/plugins/libpager.so -lib/xfce4/panel/plugins/libseparator.la lib/xfce4/panel/plugins/libseparator.so -lib/xfce4/panel/plugins/libshowdesktop.la lib/xfce4/panel/plugins/libshowdesktop.so -lib/xfce4/panel/plugins/libsystray.la lib/xfce4/panel/plugins/libsystray.so -lib/xfce4/panel/plugins/libtasklist.la lib/xfce4/panel/plugins/libtasklist.so -lib/xfce4/panel/plugins/libwindowmenu.la lib/xfce4/panel/plugins/libwindowmenu.so -lib/xfce4/panel/wrapper +lib/xfce4/panel/wrapper-1.0 +%%GTK3%%lib/xfce4/panel/wrapper-2.0 libdata/pkgconfig/libxfce4panel-1.0.pc +%%GTK3%%libdata/pkgconfig/libxfce4panel-2.0.pc share/applications/panel-desktop-handler.desktop share/applications/panel-preferences.desktop -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfceArrowButton.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfceHVBox.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfcePanelImage.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfcePanelPlugin.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-4-6.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-4-8.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-deprecated.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-full.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/home.png -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/index.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/index.sgml -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/left.png -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp2 -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Commonly-used-plugin-macros.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Convenience-Functions.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-GObject-Oriented-Panel-Plugin-Registers-Macros.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros-(4.6-Style).html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Standard-Enumerations.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Version-Information.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-fundamentals.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-miscelleanous.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-plugins.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-widgets.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/right.png -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/style.css -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/up.png 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 @@ -87,49 +64,39 @@ share/icons/hicolor/scalable/apps/xfce4-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 -%%NLS%%share/locale/az/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/be/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/bn/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/da/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/dz/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/eo/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/es_MX/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/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 -%%NLS%%share/locale/gu/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/he/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/hi/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/hy/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/ku/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ms/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-panel.mo @@ -138,11 +105,12 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/si/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/ta/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/te/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-panel.mo @@ -150,6 +118,7 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo share/xfce4/panel/plugins/actions.desktop share/xfce4/panel/plugins/applicationsmenu.desktop diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index f068fff948f6..681b89568ef2 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -2,52 +2,41 @@ # $FreeBSD$ PORTNAME= xfce4-session -PORTVERSION= 4.10.1 -PORTREVISION= 3 +PORTVERSION= 4.12.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce's session manager +LICENSE= GPLv2 + BUILD_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth RUN_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth \ console-kit-daemon:${PORTSDIR}/sysutils/consolekit -LIB_DEPENDS= libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \ - libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libupower-glib.so:${PORTSDIR}/sysutils/upower \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_GNOME= gtk20 glib20 intltool intlhack -USES= pathfix pkgconfig gmake tar:bzip2 libtool +USE_GNOME= gtk20 glib20 intltool intlhack libwnck +USES= pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2 USE_LDCONFIG= yes -USE_XFCE= configenv libmenu libutil xfconf +USE_XFCE= libmenu USE_XORG= x11 sm ice CONFIGURE_ARGS+=--enable-legacy-sm \ - --disable-systemd \ --with-xsession-prefix=${PREFIX} SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS_DEFINE= NLS +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes PLIST_SUB= VERSION="4.6" -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+= --enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - .include <bsd.port.mk> diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo index f8466cf8fccb..4b47d550f556 100644 --- a/x11-wm/xfce4-session/distinfo +++ b/x11-wm/xfce4-session/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-session-4.10.1.tar.bz2) = 0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83 -SIZE (xfce4/xfce4-session-4.10.1.tar.bz2) = 1273015 +SHA256 (xfce4/xfce4-session-4.12.0.tar.bz2) = 68c85453b097d3ada573dcb7e72acd06e0fc34531996122c10d20096405b7b06 +SIZE (xfce4/xfce4-session-4.12.0.tar.bz2) = 1247710 diff --git a/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c b/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c deleted file mode 100644 index f806b768bb81..000000000000 --- a/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c +++ /dev/null @@ -1,12 +0,0 @@ ---- xfce4-session/xfsm-shutdown.c.orig 2012-04-28 22:43:27.000000000 +0200 -+++ xfce4-session/xfsm-shutdown.c 2012-05-17 20:32:41.000000000 +0200 -@@ -52,6 +52,9 @@ - #include <signal.h> - #endif - -+#include <sys/param.h> -+#include <sys/user.h> -+#include <sys/sysctl.h> - - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> diff --git a/x11-wm/xfce4-session/pkg-descr b/x11-wm/xfce4-session/pkg-descr index 65af86da5a5d..e38b77ededea 100644 --- a/x11-wm/xfce4-session/pkg-descr +++ b/x11-wm/xfce4-session/pkg-descr @@ -1,4 +1,5 @@ -The session manager controls all aspects of the startup and the -shutdown of the user session. +The Xfce session manager controls the loading of applications when +Xfce is started. It also handles logging out, shutting down, and +rebooting. -WWW: http://docs.xfce.org/xfce/xfce4-session/start +WWW: http://www.xfce.org/ diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist index a788af1d6bff..98be06bb06ce 100644 --- a/x11-wm/xfce4-session/pkg-plist +++ b/x11-wm/xfce4-session/pkg-plist @@ -4,8 +4,8 @@ bin/xfce4-session-logout bin/xfce4-session-settings bin/xflock4 etc/xdg/autostart/xscreensaver.desktop -etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml etc/xdg/xfce4/Xft.xrdb +etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml etc/xdg/xfce4/xinitrc include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-engine.h include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-rc.h @@ -23,8 +23,12 @@ 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/xsessions/xfce.desktop share/icons/hicolor/128x128/apps/xfce4-session.png +share/icons/hicolor/48x48/apps/system-hibernate.png +share/icons/hicolor/48x48/apps/system-log-out.png +share/icons/hicolor/48x48/apps/system-reboot.png +share/icons/hicolor/48x48/apps/system-shutdown.png +share/icons/hicolor/48x48/apps/system-suspend.png share/icons/hicolor/48x48/apps/xfce4-session.png share/icons/hicolor/48x48/apps/xfce4-splash.png share/icons/hicolor/48x48/apps/xfsm-hibernate.png @@ -32,52 +36,45 @@ share/icons/hicolor/48x48/apps/xfsm-logout.png share/icons/hicolor/48x48/apps/xfsm-reboot.png share/icons/hicolor/48x48/apps/xfsm-shutdown.png share/icons/hicolor/48x48/apps/xfsm-suspend.png +share/icons/hicolor/scalable/apps/system-shutdown.svg share/icons/hicolor/scalable/apps/xfce4-session.svg share/icons/hicolor/scalable/apps/xfsm-shutdown.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/bg/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/bn/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/da/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/dz/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_GB/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/eo/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/es_MX/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/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 -%%NLS%%share/locale/gu/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/id/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ms/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-session.mo @@ -86,11 +83,12 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/si/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/ta/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/te/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-session.mo @@ -98,6 +96,9 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo +share/polkit-1/actions/org.xfce.session.policy share/themes/Default/balou/logo.png share/themes/Default/balou/themerc +share/xsessions/xfce.desktop diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile index 170e65c00d9e..6853e569258e 100644 --- a/x11-wm/xfce4-wm/Makefile +++ b/x11-wm/xfce4-wm/Makefile @@ -2,63 +2,43 @@ # $FreeBSD$ PORTNAME= xfce4-wm -PORTVERSION= 4.10.1 -PORTREVISION= 1 +PORTVERSION= 4.12.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/xfwm4/${PORTVERSION:R} DISTNAME= xfwm4-${PORTVERSION} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce's window manager -LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ - libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck +LICENSE= GPLv2 + +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib CONFIGURE_ARGS= --enable-xsync \ --enable-render \ --enable-randr \ + --enable-compositor \ --disable-kde-systray GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= pathfix pkgconfig gmake tar:bzip2 -USE_GNOME= gtk20 intltool intlhack +USES= pkgconfig gmake gettext-tools xfce tar:bzip2 +USE_GNOME= gtk20 intltool intlhack libwnck USE_LDCONFIG= yes -USE_XFCE= configenv libmenu libutil xfconf -USE_XORG= x11 sm xext xrandr xrender +USE_XFCE= libmenu +USE_XORG= x11 sm xcomposite xdamage xext xfixes xrandr xrender DATADIR= ${PREFIX}/share/xfwm4 -OPTIONS_DEFINE= COMPOSITE NLS NOTIFY REVMOUSE -OPTIONS_DEFAULT= COMPOSITE NOTIFY -REVMOUSE_DESC= Reverse mouse workspace changing direction - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MCOMPOSITE} -CONFIGURE_ARGS+=--enable-compositor -.else -CONFIGURE_ARGS+=--disable-compositor -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification -CONFIGURE_ARGS+=--enable-startup-notification -.else -CONFIGURE_ARGS+=--disable-startup-notification -.endif - -.if ${PORT_OPTIONS:MREVMOUSE} -EXTRA_PATCHES= ${FILESDIR}/extrapatch-src__events.c -.endif +OPTIONS_DEFINE= DRM NLS STARTUP +OPTIONS_DEFAULT= NLS STARTUP +DRM_DESC= Direct Rendering Module service +STARTUP_DESC= Startup notification +DRM_LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm +DRM_CONFIGURE_ENABLE= libdrm +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +STARTUP_LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification +STARTUP_CONFIGURE_ENABLE= startup-notification +OPTIONS_SUB= yes .include <bsd.port.mk> diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo index 20ec30cec004..bdb5d91a6e11 100644 --- a/x11-wm/xfce4-wm/distinfo +++ b/x11-wm/xfce4-wm/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfwm4-4.10.1.tar.bz2) = 380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740 -SIZE (xfce4/xfwm4-4.10.1.tar.bz2) = 1093825 +SHA256 (xfce4/xfwm4-4.12.0.tar.bz2) = 29f4cbe2869ae32a6775877ed6bfc4ded7000f013ff7eb70b2639c49f415cc3a +SIZE (xfce4/xfwm4-4.12.0.tar.bz2) = 1200700 diff --git a/x11-wm/xfce4-wm/files/extrapatch-src__events.c b/x11-wm/xfce4-wm/files/extrapatch-src__events.c deleted file mode 100644 index af5798ac41e4..000000000000 --- a/x11-wm/xfce4-wm/files/extrapatch-src__events.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/events.c.orig Mon Apr 2 21:48:20 2007 -+++ src/events.c Tue Jun 19 06:49:58 2007 -@@ -860,11 +860,11 @@ - - if (ev->button == Button4) - { -- workspaceSwitch (screen_info, screen_info->current_ws - 1, NULL, TRUE, ev->time); -+ workspaceSwitch (screen_info, screen_info->current_ws + 1, NULL, TRUE, ev->time); - } - else if (ev->button == Button5) - { -- workspaceSwitch (screen_info, screen_info->current_ws + 1, NULL, TRUE, ev->time); -+ workspaceSwitch (screen_info, screen_info->current_ws - 1, NULL, TRUE, ev->time); - } - } - diff --git a/x11-wm/xfce4-wm/files/patch-src__client.c b/x11-wm/xfce4-wm/files/patch-src__client.c deleted file mode 100644 index 9a8fa2c9cbfa..000000000000 --- a/x11-wm/xfce4-wm/files/patch-src__client.c +++ /dev/null @@ -1,47 +0,0 @@ -Obtained from: -- Fullscreen mode doesn't work correctly for Chromium (bug #8563) -- Panels don't hide when full screening VLC, which is maximized (bug #10622) - ---- src/client.c.orig 2013-05-05 15:58:42 UTC -+++ src/client.c -@@ -981,8 +981,13 @@ - wc.width = c->width; - wc.height = c->height; - -+ if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) -+ { -+ clientUpdateFullscreenSize (c); -+ } -+ - /* If client is maximized, we need to update its coordonates and size as well */ -- if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)) -+ else if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)) - { - GdkRectangle rect; - myScreenFindMonitorAtPoint (screen_info, -@@ -3538,8 +3543,13 @@ - continue; - } - -+ if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) -+ { -+ clientUpdateFullscreenSize (c); -+ } -+ - /* Recompute size and position of maximized windows */ -- if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)) -+ else if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)) - { - maximization_flags = c->flags & CLIENT_FLAG_MAXIMIZED; - -@@ -3553,10 +3563,6 @@ - wc.height = c->height; - clientConfigure (c, &wc, CWX | CWY | CWWidth | CWHeight, CFG_NOTIFY); - } -- else if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) -- { -- clientUpdateFullscreenSize (c); -- } - else - { - configure_flags = CFG_CONSTRAINED | CFG_REQUEST; diff --git a/x11-wm/xfce4-wm/pkg-descr b/x11-wm/xfce4-wm/pkg-descr index 199bf2bc037d..f121986b050b 100644 --- a/x11-wm/xfce4-wm/pkg-descr +++ b/x11-wm/xfce4-wm/pkg-descr @@ -2,4 +2,4 @@ The Xfce 4 window manager manages the placement of application windows on the screen, provides window decorations, and manages work- spaces or virtual desktops. -WWW: http://docs.xfce.org/xfce/xfwm4/start +WWW: http://www.xfce.org/ diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist index 988447569596..a24eb617632a 100644 --- a/x11-wm/xfce4-wm/pkg-plist +++ b/x11-wm/xfce4-wm/pkg-plist @@ -27,53 +27,45 @@ 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/xfce4-workspaces.svg share/icons/hicolor/scalable/apps/wmtweaks.svg +share/icons/hicolor/scalable/apps/xfce4-workspaces.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 -%%NLS%%share/locale/az/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/be/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/bn/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/da/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/de/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/dz/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/el/LC_MESSAGES/xfwm4.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/eo/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/es/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/es_MX/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/et/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/fa/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/gu/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/he/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/hi/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/id/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/is/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/it/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/ka/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/kk/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/mk/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/mr/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ms/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfwm4.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfwm4.mo @@ -82,11 +74,12 @@ share/icons/hicolor/scalable/apps/xfwm4.svg %%NLS%%share/locale/ru/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/si/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfwm4.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/ta/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/te/LC_MESSAGES/xfwm4.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfwm4.mo @@ -94,6 +87,7 @@ share/icons/hicolor/scalable/apps/xfwm4.svg %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/vi/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfwm4.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfwm4.mo share/themes/Daloa/xfwm4/README share/themes/Daloa/xfwm4/bottom-active.png @@ -217,6 +211,250 @@ share/themes/Daloa/xfwm4/top-right-active.png share/themes/Daloa/xfwm4/top-right-active.xpm share/themes/Daloa/xfwm4/top-right-inactive.png share/themes/Daloa/xfwm4/top-right-inactive.xpm +share/themes/Default-hdpi/xfwm4/README +share/themes/Default-hdpi/xfwm4/bottom-active.png +share/themes/Default-hdpi/xfwm4/bottom-active.xpm +share/themes/Default-hdpi/xfwm4/bottom-inactive.png +share/themes/Default-hdpi/xfwm4/bottom-inactive.xpm +share/themes/Default-hdpi/xfwm4/bottom-left-active.png +share/themes/Default-hdpi/xfwm4/bottom-left-active.xpm +share/themes/Default-hdpi/xfwm4/bottom-left-inactive.png +share/themes/Default-hdpi/xfwm4/bottom-left-inactive.xpm +share/themes/Default-hdpi/xfwm4/bottom-right-active.png +share/themes/Default-hdpi/xfwm4/bottom-right-active.xpm +share/themes/Default-hdpi/xfwm4/bottom-right-inactive.png +share/themes/Default-hdpi/xfwm4/bottom-right-inactive.xpm +share/themes/Default-hdpi/xfwm4/close-active.png +share/themes/Default-hdpi/xfwm4/close-active.xpm +share/themes/Default-hdpi/xfwm4/close-inactive.png +share/themes/Default-hdpi/xfwm4/close-inactive.xpm +share/themes/Default-hdpi/xfwm4/close-prelight.png +share/themes/Default-hdpi/xfwm4/close-prelight.xpm +share/themes/Default-hdpi/xfwm4/close-pressed.png +share/themes/Default-hdpi/xfwm4/close-pressed.xpm +share/themes/Default-hdpi/xfwm4/hide-active.png +share/themes/Default-hdpi/xfwm4/hide-active.xpm +share/themes/Default-hdpi/xfwm4/hide-inactive.png +share/themes/Default-hdpi/xfwm4/hide-inactive.xpm +share/themes/Default-hdpi/xfwm4/hide-prelight.png +share/themes/Default-hdpi/xfwm4/hide-prelight.xpm +share/themes/Default-hdpi/xfwm4/hide-pressed.png +share/themes/Default-hdpi/xfwm4/hide-pressed.xpm +share/themes/Default-hdpi/xfwm4/left-active.png +share/themes/Default-hdpi/xfwm4/left-active.xpm +share/themes/Default-hdpi/xfwm4/left-inactive.png +share/themes/Default-hdpi/xfwm4/left-inactive.xpm +share/themes/Default-hdpi/xfwm4/maximize-active.png +share/themes/Default-hdpi/xfwm4/maximize-active.xpm +share/themes/Default-hdpi/xfwm4/maximize-inactive.png +share/themes/Default-hdpi/xfwm4/maximize-inactive.xpm +share/themes/Default-hdpi/xfwm4/maximize-prelight.png +share/themes/Default-hdpi/xfwm4/maximize-prelight.xpm +share/themes/Default-hdpi/xfwm4/maximize-pressed.png +share/themes/Default-hdpi/xfwm4/maximize-pressed.xpm +share/themes/Default-hdpi/xfwm4/maximize-toggled-active.png +share/themes/Default-hdpi/xfwm4/maximize-toggled-active.xpm +share/themes/Default-hdpi/xfwm4/maximize-toggled-inactive.png +share/themes/Default-hdpi/xfwm4/maximize-toggled-inactive.xpm +share/themes/Default-hdpi/xfwm4/maximize-toggled-prelight.png +share/themes/Default-hdpi/xfwm4/maximize-toggled-prelight.xpm +share/themes/Default-hdpi/xfwm4/maximize-toggled-pressed.png +share/themes/Default-hdpi/xfwm4/maximize-toggled-pressed.xpm +share/themes/Default-hdpi/xfwm4/menu-active.png +share/themes/Default-hdpi/xfwm4/menu-active.xpm +share/themes/Default-hdpi/xfwm4/menu-inactive.png +share/themes/Default-hdpi/xfwm4/menu-inactive.xpm +share/themes/Default-hdpi/xfwm4/menu-prelight.png +share/themes/Default-hdpi/xfwm4/menu-prelight.xpm +share/themes/Default-hdpi/xfwm4/menu-pressed.png +share/themes/Default-hdpi/xfwm4/menu-pressed.xpm +share/themes/Default-hdpi/xfwm4/right-active.png +share/themes/Default-hdpi/xfwm4/right-active.xpm +share/themes/Default-hdpi/xfwm4/right-inactive.png +share/themes/Default-hdpi/xfwm4/right-inactive.xpm +share/themes/Default-hdpi/xfwm4/shade-active.png +share/themes/Default-hdpi/xfwm4/shade-active.xpm +share/themes/Default-hdpi/xfwm4/shade-inactive.png +share/themes/Default-hdpi/xfwm4/shade-inactive.xpm +share/themes/Default-hdpi/xfwm4/shade-prelight.png +share/themes/Default-hdpi/xfwm4/shade-prelight.xpm +share/themes/Default-hdpi/xfwm4/shade-pressed.png +share/themes/Default-hdpi/xfwm4/shade-pressed.xpm +share/themes/Default-hdpi/xfwm4/shade-toggled-active.png +share/themes/Default-hdpi/xfwm4/shade-toggled-active.xpm +share/themes/Default-hdpi/xfwm4/shade-toggled-inactive.png +share/themes/Default-hdpi/xfwm4/shade-toggled-inactive.xpm +share/themes/Default-hdpi/xfwm4/shade-toggled-prelight.png +share/themes/Default-hdpi/xfwm4/shade-toggled-prelight.xpm +share/themes/Default-hdpi/xfwm4/shade-toggled-pressed.png +share/themes/Default-hdpi/xfwm4/shade-toggled-pressed.xpm +share/themes/Default-hdpi/xfwm4/stick-active.png +share/themes/Default-hdpi/xfwm4/stick-active.xpm +share/themes/Default-hdpi/xfwm4/stick-inactive.png +share/themes/Default-hdpi/xfwm4/stick-inactive.xpm +share/themes/Default-hdpi/xfwm4/stick-prelight.png +share/themes/Default-hdpi/xfwm4/stick-prelight.xpm +share/themes/Default-hdpi/xfwm4/stick-pressed.png +share/themes/Default-hdpi/xfwm4/stick-pressed.xpm +share/themes/Default-hdpi/xfwm4/stick-toggled-active.png +share/themes/Default-hdpi/xfwm4/stick-toggled-active.xpm +share/themes/Default-hdpi/xfwm4/stick-toggled-inactive.png +share/themes/Default-hdpi/xfwm4/stick-toggled-inactive.xpm +share/themes/Default-hdpi/xfwm4/stick-toggled-prelight.png +share/themes/Default-hdpi/xfwm4/stick-toggled-prelight.xpm +share/themes/Default-hdpi/xfwm4/stick-toggled-pressed.png +share/themes/Default-hdpi/xfwm4/stick-toggled-pressed.xpm +share/themes/Default-hdpi/xfwm4/themerc +share/themes/Default-hdpi/xfwm4/title-1-active.png +share/themes/Default-hdpi/xfwm4/title-1-active.xpm +share/themes/Default-hdpi/xfwm4/title-1-inactive.png +share/themes/Default-hdpi/xfwm4/title-1-inactive.xpm +share/themes/Default-hdpi/xfwm4/title-2-active.png +share/themes/Default-hdpi/xfwm4/title-2-active.xpm +share/themes/Default-hdpi/xfwm4/title-2-inactive.png +share/themes/Default-hdpi/xfwm4/title-2-inactive.xpm +share/themes/Default-hdpi/xfwm4/title-3-active.png +share/themes/Default-hdpi/xfwm4/title-3-active.xpm +share/themes/Default-hdpi/xfwm4/title-3-inactive.png +share/themes/Default-hdpi/xfwm4/title-3-inactive.xpm +share/themes/Default-hdpi/xfwm4/title-4-active.png +share/themes/Default-hdpi/xfwm4/title-4-active.xpm +share/themes/Default-hdpi/xfwm4/title-4-inactive.png +share/themes/Default-hdpi/xfwm4/title-4-inactive.xpm +share/themes/Default-hdpi/xfwm4/title-5-active.png +share/themes/Default-hdpi/xfwm4/title-5-active.xpm +share/themes/Default-hdpi/xfwm4/title-5-inactive.png +share/themes/Default-hdpi/xfwm4/title-5-inactive.xpm +share/themes/Default-hdpi/xfwm4/top-left-active.png +share/themes/Default-hdpi/xfwm4/top-left-active.xpm +share/themes/Default-hdpi/xfwm4/top-left-inactive.png +share/themes/Default-hdpi/xfwm4/top-left-inactive.xpm +share/themes/Default-hdpi/xfwm4/top-right-active.png +share/themes/Default-hdpi/xfwm4/top-right-active.xpm +share/themes/Default-hdpi/xfwm4/top-right-inactive.png +share/themes/Default-hdpi/xfwm4/top-right-inactive.xpm +share/themes/Default-xhdpi/xfwm4/README +share/themes/Default-xhdpi/xfwm4/bottom-active.png +share/themes/Default-xhdpi/xfwm4/bottom-active.xpm +share/themes/Default-xhdpi/xfwm4/bottom-inactive.png +share/themes/Default-xhdpi/xfwm4/bottom-inactive.xpm +share/themes/Default-xhdpi/xfwm4/bottom-left-active.png +share/themes/Default-xhdpi/xfwm4/bottom-left-active.xpm +share/themes/Default-xhdpi/xfwm4/bottom-left-inactive.png +share/themes/Default-xhdpi/xfwm4/bottom-left-inactive.xpm +share/themes/Default-xhdpi/xfwm4/bottom-right-active.png +share/themes/Default-xhdpi/xfwm4/bottom-right-active.xpm +share/themes/Default-xhdpi/xfwm4/bottom-right-inactive.png +share/themes/Default-xhdpi/xfwm4/bottom-right-inactive.xpm +share/themes/Default-xhdpi/xfwm4/close-active.png +share/themes/Default-xhdpi/xfwm4/close-active.xpm +share/themes/Default-xhdpi/xfwm4/close-inactive.png +share/themes/Default-xhdpi/xfwm4/close-inactive.xpm +share/themes/Default-xhdpi/xfwm4/close-prelight.png +share/themes/Default-xhdpi/xfwm4/close-prelight.xpm +share/themes/Default-xhdpi/xfwm4/close-pressed.png +share/themes/Default-xhdpi/xfwm4/close-pressed.xpm +share/themes/Default-xhdpi/xfwm4/hide-active.png +share/themes/Default-xhdpi/xfwm4/hide-active.xpm +share/themes/Default-xhdpi/xfwm4/hide-inactive.png +share/themes/Default-xhdpi/xfwm4/hide-inactive.xpm +share/themes/Default-xhdpi/xfwm4/hide-prelight.png +share/themes/Default-xhdpi/xfwm4/hide-prelight.xpm +share/themes/Default-xhdpi/xfwm4/hide-pressed.png +share/themes/Default-xhdpi/xfwm4/hide-pressed.xpm +share/themes/Default-xhdpi/xfwm4/left-active.png +share/themes/Default-xhdpi/xfwm4/left-active.xpm +share/themes/Default-xhdpi/xfwm4/left-inactive.png +share/themes/Default-xhdpi/xfwm4/left-inactive.xpm +share/themes/Default-xhdpi/xfwm4/maximize-active.png +share/themes/Default-xhdpi/xfwm4/maximize-active.xpm +share/themes/Default-xhdpi/xfwm4/maximize-inactive.png +share/themes/Default-xhdpi/xfwm4/maximize-inactive.xpm +share/themes/Default-xhdpi/xfwm4/maximize-prelight.png +share/themes/Default-xhdpi/xfwm4/maximize-prelight.xpm +share/themes/Default-xhdpi/xfwm4/maximize-pressed.png +share/themes/Default-xhdpi/xfwm4/maximize-pressed.xpm +share/themes/Default-xhdpi/xfwm4/maximize-toggled-active.png +share/themes/Default-xhdpi/xfwm4/maximize-toggled-active.xpm +share/themes/Default-xhdpi/xfwm4/maximize-toggled-inactive.png +share/themes/Default-xhdpi/xfwm4/maximize-toggled-inactive.xpm +share/themes/Default-xhdpi/xfwm4/maximize-toggled-prelight.png +share/themes/Default-xhdpi/xfwm4/maximize-toggled-prelight.xpm +share/themes/Default-xhdpi/xfwm4/maximize-toggled-pressed.png +share/themes/Default-xhdpi/xfwm4/maximize-toggled-pressed.xpm +share/themes/Default-xhdpi/xfwm4/menu-active.png +share/themes/Default-xhdpi/xfwm4/menu-active.xpm +share/themes/Default-xhdpi/xfwm4/menu-inactive.png +share/themes/Default-xhdpi/xfwm4/menu-inactive.xpm +share/themes/Default-xhdpi/xfwm4/menu-prelight.png +share/themes/Default-xhdpi/xfwm4/menu-prelight.xpm +share/themes/Default-xhdpi/xfwm4/menu-pressed.png +share/themes/Default-xhdpi/xfwm4/menu-pressed.xpm +share/themes/Default-xhdpi/xfwm4/right-active.png +share/themes/Default-xhdpi/xfwm4/right-active.xpm +share/themes/Default-xhdpi/xfwm4/right-inactive.png +share/themes/Default-xhdpi/xfwm4/right-inactive.xpm +share/themes/Default-xhdpi/xfwm4/shade-active.png +share/themes/Default-xhdpi/xfwm4/shade-active.xpm +share/themes/Default-xhdpi/xfwm4/shade-inactive.png +share/themes/Default-xhdpi/xfwm4/shade-inactive.xpm +share/themes/Default-xhdpi/xfwm4/shade-prelight.png +share/themes/Default-xhdpi/xfwm4/shade-prelight.xpm +share/themes/Default-xhdpi/xfwm4/shade-pressed.png +share/themes/Default-xhdpi/xfwm4/shade-pressed.xpm +share/themes/Default-xhdpi/xfwm4/shade-toggled-active.png +share/themes/Default-xhdpi/xfwm4/shade-toggled-active.xpm +share/themes/Default-xhdpi/xfwm4/shade-toggled-inactive.png +share/themes/Default-xhdpi/xfwm4/shade-toggled-inactive.xpm +share/themes/Default-xhdpi/xfwm4/shade-toggled-prelight.png +share/themes/Default-xhdpi/xfwm4/shade-toggled-prelight.xpm +share/themes/Default-xhdpi/xfwm4/shade-toggled-pressed.png +share/themes/Default-xhdpi/xfwm4/shade-toggled-pressed.xpm +share/themes/Default-xhdpi/xfwm4/stick-active.png +share/themes/Default-xhdpi/xfwm4/stick-active.xpm +share/themes/Default-xhdpi/xfwm4/stick-inactive.png +share/themes/Default-xhdpi/xfwm4/stick-inactive.xpm +share/themes/Default-xhdpi/xfwm4/stick-prelight.png +share/themes/Default-xhdpi/xfwm4/stick-prelight.xpm +share/themes/Default-xhdpi/xfwm4/stick-pressed.png +share/themes/Default-xhdpi/xfwm4/stick-pressed.xpm +share/themes/Default-xhdpi/xfwm4/stick-toggled-active.png +share/themes/Default-xhdpi/xfwm4/stick-toggled-active.xpm +share/themes/Default-xhdpi/xfwm4/stick-toggled-inactive.png +share/themes/Default-xhdpi/xfwm4/stick-toggled-inactive.xpm +share/themes/Default-xhdpi/xfwm4/stick-toggled-prelight.png +share/themes/Default-xhdpi/xfwm4/stick-toggled-prelight.xpm +share/themes/Default-xhdpi/xfwm4/stick-toggled-pressed.png +share/themes/Default-xhdpi/xfwm4/stick-toggled-pressed.xpm +share/themes/Default-xhdpi/xfwm4/themerc +share/themes/Default-xhdpi/xfwm4/title-1-active.png +share/themes/Default-xhdpi/xfwm4/title-1-active.xpm +share/themes/Default-xhdpi/xfwm4/title-1-inactive.png +share/themes/Default-xhdpi/xfwm4/title-1-inactive.xpm +share/themes/Default-xhdpi/xfwm4/title-2-active.png +share/themes/Default-xhdpi/xfwm4/title-2-active.xpm +share/themes/Default-xhdpi/xfwm4/title-2-inactive.png +share/themes/Default-xhdpi/xfwm4/title-2-inactive.xpm +share/themes/Default-xhdpi/xfwm4/title-3-active.png +share/themes/Default-xhdpi/xfwm4/title-3-active.xpm +share/themes/Default-xhdpi/xfwm4/title-3-inactive.png +share/themes/Default-xhdpi/xfwm4/title-3-inactive.xpm +share/themes/Default-xhdpi/xfwm4/title-4-active.png +share/themes/Default-xhdpi/xfwm4/title-4-active.xpm +share/themes/Default-xhdpi/xfwm4/title-4-inactive.png +share/themes/Default-xhdpi/xfwm4/title-4-inactive.xpm +share/themes/Default-xhdpi/xfwm4/title-5-active.png +share/themes/Default-xhdpi/xfwm4/title-5-active.xpm +share/themes/Default-xhdpi/xfwm4/title-5-inactive.png +share/themes/Default-xhdpi/xfwm4/title-5-inactive.xpm +share/themes/Default-xhdpi/xfwm4/top-left-active.png +share/themes/Default-xhdpi/xfwm4/top-left-active.xpm +share/themes/Default-xhdpi/xfwm4/top-left-inactive.png +share/themes/Default-xhdpi/xfwm4/top-left-inactive.xpm +share/themes/Default-xhdpi/xfwm4/top-right-active.png +share/themes/Default-xhdpi/xfwm4/top-right-active.xpm +share/themes/Default-xhdpi/xfwm4/top-right-inactive.png +share/themes/Default-xhdpi/xfwm4/top-right-inactive.xpm share/themes/Default/xfwm4/README share/themes/Default/xfwm4/bottom-active.png share/themes/Default/xfwm4/bottom-active.xpm diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index c1d30ec0cb29..b305a68324b8 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce -PORTVERSION= 4.10 -PORTREVISION= 9 +PORTVERSION= 4.12 CATEGORIES= x11-wm xfce MASTER_SITES= # empty DISTFILES= # empty @@ -36,7 +35,7 @@ NO_MTREE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MICONS} -RUN_DEPENDS+= gnome-icon-theme>=3.12.0:${PORTSDIR}/misc/gnome-icon-theme +RUN_DEPENDS+= adwaita-icon-theme>=3.14.0:${PORTSDIR}/x11-themes/adwaita-icon-theme .endif .if ${PORT_OPTIONS:MORAGE} |