ports/168060: [UPDATE] x11-wm/xfce4-desktop to 4.10.0
Olivier Duchateau
duchateau.olivier at gmail.com
Thu May 17 20:00:14 UTC 2012
>Number: 168060
>Category: ports
>Synopsis: [UPDATE] x11-wm/xfce4-desktop to 4.10.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 17 20:00:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Olivier Duchateau
>Release: FreeBSD 8.2-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
Announce: http://mail.xfce.org/pipermail/xfce/2012-April/030377.html
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/x11-wm/xfce4-desktop/Makefile xfce4-desktop/Makefile
--- /usr/ports/x11-wm/xfce4-desktop/Makefile 2011-10-28 16:53:12.000000000 +0200
+++ xfce4-desktop/Makefile 2012-05-09 06:15:43.000000000 +0200
@@ -6,17 +6,14 @@
#
PORTNAME= xfce4-desktop
-PORTVERSION= 4.8.3
+PORTVERSION= 4.10.0
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR= src/xfce/xfdesktop/${PORTVERSION:R}
DISTNAME= xfdesktop-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= xfce at FreeBSD.org
-COMMENT= Xfce 4 desktop background manager and root menu
-
-DOCSDIR= ${PREFIX}/share/doc/xfdesktop
+COMMENT= Xfce's desktop manager
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
@@ -28,10 +25,10 @@
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack gtk20 intltool intlhack pkgconfig \
desktopfileutils
-USE_XFCE= configenv garcon libmenu libutil xfconf
+USE_XFCE= configenv garcon libmenu libutil libexo xfconf
-CONFIGURE_ARGS+= --enable-gio-unix \
- --enable-notifications
+CONFIGURE_ARGS+=--enable-gio-unix \
+ --enable-notifications
OPTIONS= THUNAR "Enable thunar support" on \
NLS "Enable Native Language Support" on
@@ -41,10 +38,10 @@
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_THUNAR)
-CONFIGURE_ARGS+=--enable-thunarx --enable-exo
-USE_XFCE+= libexo thunar
+CONFIGURE_ARGS+=--enable-thunarx --with-file-manager-fallback=Thunar
+USE_XFCE+= thunar
.else
-CONFIGURE_ARGS+=--disable-thunarx --disable-exo
+CONFIGURE_ARGS+=--disable-thunarx --without-file-manager-fallback
.endif
.if !defined(WITHOUT_NLS)
diff -urN /usr/ports/x11-wm/xfce4-desktop/distinfo xfce4-desktop/distinfo
--- /usr/ports/x11-wm/xfce4-desktop/distinfo 2011-10-28 16:53:12.000000000 +0200
+++ xfce4-desktop/distinfo 2012-05-09 06:15:43.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfdesktop-4.8.3.tar.bz2) = e58460f52ae96c389402f6db62c46db61cd51cdb550a42bd97c0ab2a5b62f424
-SIZE (xfce4/xfdesktop-4.8.3.tar.bz2) = 2693819
+SHA256 (xfce4/xfdesktop-4.10.0.tar.bz2) = 897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b
+SIZE (xfce4/xfdesktop-4.10.0.tar.bz2) = 1098862
diff -urN /usr/ports/x11-wm/xfce4-desktop/files/patch-src::xfce-desktop-menu.c xfce4-desktop/files/patch-src::xfce-desktop-menu.c
--- /usr/ports/x11-wm/xfce4-desktop/files/patch-src::xfce-desktop-menu.c 2011-03-08 13:07:01.000000000 +0100
+++ xfce4-desktop/files/patch-src::xfce-desktop-menu.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
---- src/xfce-desktop-menu.c.orig 2010-12-04 06:20:14.000000000 -0600
-+++ src/xfce-desktop-menu.c 2011-03-05 19:58:16.416523605 -0600
-@@ -99,7 +99,8 @@ xfce_desktop_menu_reload(XfceDesktopMenu
- * recursively. same deal for _something_changed(). */
- DBG("Schedule menu reload");
- if(!desktop_menu->idle_id)
-- desktop_menu->idle_id = g_idle_add(_generate_menu_idled, desktop_menu);
-+ /* just regen when idle. */
-+ _generate_menu(desktop_menu);
- }
-
- /*
diff -urN /usr/ports/x11-wm/xfce4-desktop/files/patch-src::xfdesktop-file-utils.c xfce4-desktop/files/patch-src::xfdesktop-file-utils.c
--- /usr/ports/x11-wm/xfce4-desktop/files/patch-src::xfdesktop-file-utils.c 2011-04-28 07:59:37.000000000 +0200
+++ xfce4-desktop/files/patch-src::xfdesktop-file-utils.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
---- ./src/xfdesktop-file-utils.c.orig 2011-04-22 13:21:52.000000000 -0500
-+++ ./src/xfdesktop-file-utils.c 2011-04-27 12:32:33.676427006 -0500
-@@ -49,7 +49,9 @@
-
- #include <libxfce4ui/libxfce4ui.h>
-
-+#ifdef HAVE_LIBEXO
- #include <exo/exo.h>
-+#endif
-
- #include <dbus/dbus-glib-lowlevel.h>
-
diff -urN /usr/ports/x11-wm/xfce4-desktop/pkg-descr xfce4-desktop/pkg-descr
--- /usr/ports/x11-wm/xfce4-desktop/pkg-descr 2007-01-29 07:39:17.000000000 +0100
+++ xfce4-desktop/pkg-descr 2012-05-09 06:15:43.000000000 +0200
@@ -1,8 +1,4 @@
-The desktop manager sets the background image, provides a right-click
-menu to launch applications and can optionally show files (including
-application launchers) or iconified windows. It includes gradient
-support for background color, saturation support for background image,
-real multiscreen and xinerama support, and it provides a desktop menu
-editor.
+The desktop manager sets the background image, and provides a root
+window menu, desktop icons or minimized icons and windows list.
-WWW: http://www.xfce.org/projects/xfdesktop/
+WWW: http://docs.xfce.org/xfce/xfdesktop/start
diff -urN /usr/ports/x11-wm/xfce4-desktop/pkg-plist xfce4-desktop/pkg-plist
--- /usr/ports/x11-wm/xfce4-desktop/pkg-plist 2011-10-28 16:53:12.000000000 +0200
+++ xfce4-desktop/pkg-plist 2012-05-09 06:15:43.000000000 +0200
@@ -1,52 +1,7 @@
bin/xfdesktop
bin/xfdesktop-settings
share/applications/xfce-backdrop-settings.desktop
-%%DOCSDIR%%/html/C/images/root_menu.png
-%%DOCSDIR%%/html/C/images/root_menu2.png
-%%DOCSDIR%%/html/C/images/select_bg_color.png
-%%DOCSDIR%%/html/C/images/xfdesktop-background-tab.png
-%%DOCSDIR%%/html/C/images/xfdesktop-icons-tab.png
-%%DOCSDIR%%/html/C/images/xfdesktop-menus-tab.png
-%%DOCSDIR%%/html/C/index.html
-%%DOCSDIR%%/html/bn/images
-%%DOCSDIR%%/html/bn/index.html
-%%DOCSDIR%%/html/ca/images
-%%DOCSDIR%%/html/ca/index.html
-%%DOCSDIR%%/html/da/images
-%%DOCSDIR%%/html/da/index.html
-%%DOCSDIR%%/html/el/images
-%%DOCSDIR%%/html/el/index.html
-%%DOCSDIR%%/html/fr/images/root_menu.png
-%%DOCSDIR%%/html/fr/images/root_menu2.png
-%%DOCSDIR%%/html/fr/images/select_bg_color.png
-%%DOCSDIR%%/html/fr/images/xfdesktop-background-tab.png
-%%DOCSDIR%%/html/fr/images/xfdesktop-icons-tab.png
-%%DOCSDIR%%/html/fr/images/xfdesktop-menus-tab.png
-%%DOCSDIR%%/html/fr/index.html
-%%DOCSDIR%%/html/gl/images
-%%DOCSDIR%%/html/gl/index.html
-%%DOCSDIR%%/html/id/images
-%%DOCSDIR%%/html/id/index.html
-%%DOCSDIR%%/html/it/images
-%%DOCSDIR%%/html/it/index.html
-%%DOCSDIR%%/html/ja/images/root_menu.png
-%%DOCSDIR%%/html/ja/images/root_menu2.png
-%%DOCSDIR%%/html/ja/images/select_bg_color.png
-%%DOCSDIR%%/html/ja/images/xfdesktop-background-tab.png
-%%DOCSDIR%%/html/ja/images/xfdesktop-icons-tab.png
-%%DOCSDIR%%/html/ja/images/xfdesktop-menus-tab.png
-%%DOCSDIR%%/html/ja/index.html
-%%DOCSDIR%%/html/ru/images
-%%DOCSDIR%%/html/ru/index.html
-%%DOCSDIR%%/html/sv/images
-%%DOCSDIR%%/html/sv/index.html
-%%DOCSDIR%%/html/tr/images
-%%DOCSDIR%%/html/tr/index.html
-%%DOCSDIR%%/html/ug/images
-%%DOCSDIR%%/html/ug/index.html
-%%DOCSDIR%%/html/xfdesktop.css
-%%DOCSDIR%%/html/zh_CN/images
-%%DOCSDIR%%/html/zh_CN/index.html
+share/backgrounds/xfce/xfce-blue.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
@@ -97,6 +52,7 @@
%%NLS%%share/locale/ms/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/nb/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/nl/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/pa/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/pl/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/pt/LC_MESSAGES/xfdesktop.mo
@@ -123,18 +79,8 @@
share/pixmaps/xfce4_xicon3.png
share/pixmaps/xfce4_xicon4.png
share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png
-share/xfce4/backdrops/xfce-in-a-grid.png
-share/xfce4/backdrops/xfce-in-the-moon.png
-share/xfce4/backdrops/xfce-smoke.png
-share/xfce4/backdrops/xfce-stellar-tile.png
-share/xfce4/backdrops/xfce-stripes.png
-share/xfce4/backdrops/xfce-turbulence.png
-share/xfce4/backdrops/xfce4gradientcurve.png
-share/xfce4/backdrops/xfce4logo.png
@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
- at dirrm share/xfce4/backdrops
- at dirrmtry share/xfce4
@dirrm share/pixmaps/xfdesktop
%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur_PK
@@ -158,23 +104,5 @@
%%NLS%%@dirrmtry share/locale/bn_IN
%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ast
- at dirrm %%DOCSDIR%%/html/zh_CN
- at dirrm %%DOCSDIR%%/html/ug
- at dirrm %%DOCSDIR%%/html/tr
- at dirrm %%DOCSDIR%%/html/sv
- at dirrm %%DOCSDIR%%/html/ru
- at dirrm %%DOCSDIR%%/html/ja/images
- at dirrm %%DOCSDIR%%/html/ja
- at dirrm %%DOCSDIR%%/html/it
- at dirrm %%DOCSDIR%%/html/id
- at dirrm %%DOCSDIR%%/html/gl
- at dirrm %%DOCSDIR%%/html/fr/images
- at dirrm %%DOCSDIR%%/html/fr
- at dirrm %%DOCSDIR%%/html/el
- at dirrm %%DOCSDIR%%/html/da
- at dirrm %%DOCSDIR%%/html/ca
- at dirrm %%DOCSDIR%%/html/bn
- at dirrm %%DOCSDIR%%/html/C/images
- at dirrm %%DOCSDIR%%/html/C
- at dirrm %%DOCSDIR%%/html
- at dirrm %%DOCSDIR%%
+ at dirrm share/backgrounds/xfce
+ at dirrmtry share/backgrounds
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list