cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to xfdesktop 4.6.0, removes the homemade menu implementation, and

Browse Source 
use libxfce4menu instead. xfce4-menu-editor is gone, will be back in next
release.
This commit is contained in:
landry 2009-03-08 17:21:13 +00:00
parent bbd7a2589a
commit 4ccd7071d4
7 changed files with 114 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11/xfce4/xfdesktop/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2008/11/06 15:34:46 landry Exp $
# $OpenBSD: Makefile,v 1.24 2009/03/08 17:21:13 landry Exp $
COMMENT= xfce4 desktop manager
@ -17,17 +17,16 @@ CONFIGURE_ARGS= --enable-thunarx \
--enable-exo
LIB_DEPENDS= xfcegui4.>=4::x11/xfce4/libxfcegui4 \
xfce4mcs-client.>=3::x11/xfce4/libxfce4mcs \
thunar-vfs-1.>=4,thunarx-1.>=4::x11/xfce4/thunar \
RUN_DEPENDS= ::x11/xfce4/xfce-mcs-manager
xfce4menu-0.1::x11/xfce4/libxfce4menu \
xfconf-0::x11/xfce4/xfconf
WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
Xfixes Xi Xinerama Xrandr Xrender XRes atk-1.0 c cairo dbus-1 \
dbus-glib-1 exo-0.3 expat fam fontconfig freetype gdk-x11-2.0 \
gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre pixman-1 png pthread rpcsvc \
startup-notification-1 stdc++ xfce4panel xfce4util z
startup-notification-1 stdc++ wnck-1 xfce4panel xfce4util xml2 z
.include <bsd.port.mk>

10
x11/xfce4/xfdesktop/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xfce4/xfdesktop-4.4.3.tar.bz2) = PB6o0syzz7u7uoNCFK1dLg==
RMD160 (xfce4/xfdesktop-4.4.3.tar.bz2) = SQdJzFeaMOo2iatlwJnShOz//1Y=
SHA1 (xfce4/xfdesktop-4.4.3.tar.bz2) = a6YP1/j1cQQZXj4XVRMV0MPCOB4=
SHA256 (xfce4/xfdesktop-4.4.3.tar.bz2) = I4D1NH/LK1M3D3usRs4YJn5U5+Sg3e49/mwW33q45fU=
SIZE (xfce4/xfdesktop-4.4.3.tar.bz2) = 3095897
MD5 (xfce4/xfdesktop-4.6.0.tar.bz2) = UIsY+dTvJ4M1F7ujvW4vvw==
RMD160 (xfce4/xfdesktop-4.6.0.tar.bz2) = BwiOgp1HxjA1Ngsj1xieuOSptUk=
SHA1 (xfce4/xfdesktop-4.6.0.tar.bz2) = Eb1TEuE8eNsSX/7hSUwz414z0Vo=
SHA256 (xfce4/xfdesktop-4.6.0.tar.bz2) = FDL8Ms1e0u0iLE+V6esinAn3x9BjRDvm8TIrAVGPKE8=
SIZE (xfce4/xfdesktop-4.6.0.tar.bz2) = 3349853

12
x11/xfce4/xfdesktop/patches/patch-Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.4 2008/11/04 16:53:05 landry Exp $
--- Makefile.in.orig Sat Nov 17 20:52:57 2007
+++ Makefile.in Tue Nov 4 17:41:48 2008
@@ -314,7 +314,7 @@ SUBDIRS = \
modules \
pixmaps
-confdir = $(sysconfdir)/xdg/xfce4/desktop
+confdir = $(prefix)/share/examples/xfdesktop
conf_DATA = \
menu.xml \
menu.xml.be \

12
x11/xfce4/xfdesktop/patches/patch-modules_menu_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-modules_menu_Makefile_in,v 1.3 2008/11/04 16:53:05 landry Exp $
--- modules/menu/Makefile.in.orig Sat Nov 17 20:52:57 2007
+++ modules/menu/Makefile.in Tue Nov 4 17:41:48 2008
@@ -337,7 +337,7 @@ xfce4_desktop_menu_la_LIBADD = \
$(LIBX11_LIBS) \
$(LIBXFCEGUI4_LIBS)
-xfceconfdir = $(sysconfdir)/xdg/xfce4/desktop
+xfceconfdir = $(prefix)/share/examples/xfdesktop
xfceconf_DATA = \
xfce-registered-categories.xml \
xfce-registered-categories.xml.ca \

12
x11/xfce4/xfdesktop/patches/patch-modules_menu_menu-data_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-modules_menu_menu-data_Makefile_in,v 1.1 2009/03/08 17:21:13 landry Exp $
--- modules/menu/menu-data/Makefile.in.orig Mon Sep 8 21:15:09 2008
+++ modules/menu/menu-data/Makefile.in Mon Sep 8 21:15:40 2008
@@ -292,7 +292,7 @@ desktop_in_files = \
xfce4-web-browser.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-menudir = $(sysconfdir)/xdg/menus
+menudir = $(prefix)/share/examples/xfdesktop
menu_DATA = xfce-applications.menu
EXTRA_DIST = $(desktop_in_files) $(menu_DATA)
DISTCLEANFILES = $(desktop_DATA)

3
x11/xfce4/xfdesktop/pkg/PFRAG.shared
View File

@ -1,3 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2007/05/08 16:10:48 steven Exp $
lib/xfce4/mcs-plugins/backdrop_settings.so
@comment $OpenBSD: PFRAG.shared,v 1.4 2009/03/08 17:21:13 landry Exp $
lib/xfce4/modules/xfce4_desktop_menu.so

156
x11/xfce4/xfdesktop/pkg/PLIST
View File

@ -1,12 +1,9 @@
@comment $OpenBSD: PLIST,v 1.10 2008/11/06 15:34:46 landry Exp $
@comment $OpenBSD: PLIST,v 1.11 2009/03/08 17:21:13 landry Exp $
%%SHARED%%
@bin bin/xfce4-menueditor
@bin bin/xfce4-popup-menu
@bin bin/xfdesktop
@bin bin/xfdesktop-settings
lib/xfce4/
lib/xfce4/mcs-plugins/
lib/xfce4/mcs-plugins/backdrop_settings.a
lib/xfce4/mcs-plugins/backdrop_settings.la
lib/xfce4/modules/
lib/xfce4/modules/xfce4_desktop_menu.a
lib/xfce4/modules/xfce4_desktop_menu.la
@ -15,100 +12,89 @@ libexec/xfce4/panel-plugins/
@bin libexec/xfce4/panel-plugins/xfce4-menu-plugin
@man man/man1/xfdesktop.1
share/applications/xfce-backdrop-settings.desktop
share/applications/xfce-menueditor.desktop
share/applications/xfce4-about-xfce.desktop
share/applications/xfce4-file-manager.desktop
share/applications/xfce4-help.desktop
share/applications/xfce4-logout.desktop
share/applications/xfce4-run-program.desktop
share/applications/xfce4-terminal.desktop
share/applications/xfce4-web-browser.desktop
share/desktop-directories/
share/desktop-directories/xfce-accessories.directory
share/desktop-directories/xfce-development.directory
share/desktop-directories/xfce-education.directory
share/desktop-directories/xfce-games.directory
share/desktop-directories/xfce-graphics.directory
share/desktop-directories/xfce-multimedia.directory
share/desktop-directories/xfce-network.directory
share/desktop-directories/xfce-office.directory
share/desktop-directories/xfce-other.directory
share/desktop-directories/xfce-screensavers.directory
share/desktop-directories/xfce-settings.directory
share/desktop-directories/xfce-system.directory
share/examples/xfdesktop/
@sample ${SYSCONFDIR}/xdg/xfce4/desktop/
share/examples/xfdesktop/menu.xml
@sample ${SYSCONFDIR}/xdg/xfce4/desktop/menu.xml
share/examples/xfdesktop/menu.xml.be
share/examples/xfdesktop/menu.xml.ca
share/examples/xfdesktop/menu.xml.cs
share/examples/xfdesktop/menu.xml.da
share/examples/xfdesktop/menu.xml.de
share/examples/xfdesktop/menu.xml.el
share/examples/xfdesktop/menu.xml.es
share/examples/xfdesktop/menu.xml.et
share/examples/xfdesktop/menu.xml.eu
share/examples/xfdesktop/menu.xml.fi
share/examples/xfdesktop/menu.xml.fr
share/examples/xfdesktop/menu.xml.he
share/examples/xfdesktop/menu.xml.hu
share/examples/xfdesktop/menu.xml.it
share/examples/xfdesktop/menu.xml.ja
share/examples/xfdesktop/menu.xml.ko
share/examples/xfdesktop/menu.xml.nb_NO
share/examples/xfdesktop/menu.xml.nl
share/examples/xfdesktop/menu.xml.pa
share/examples/xfdesktop/menu.xml.pl
share/examples/xfdesktop/menu.xml.pt_BR
share/examples/xfdesktop/menu.xml.pt_PT
share/examples/xfdesktop/menu.xml.ro
share/examples/xfdesktop/menu.xml.ru
share/examples/xfdesktop/menu.xml.sk
share/examples/xfdesktop/menu.xml.sv
share/examples/xfdesktop/menu.xml.tr
share/examples/xfdesktop/menu.xml.uk
share/examples/xfdesktop/menu.xml.vi
share/examples/xfdesktop/menu.xml.zh_TW
share/examples/xfdesktop/xfce-registered-categories.xml
@sample ${SYSCONFDIR}/xdg/xfce4/desktop/xfce-registered-categories.xml
share/examples/xfdesktop/xfce-registered-categories.xml.ca
share/examples/xfdesktop/xfce-registered-categories.xml.cs
share/examples/xfdesktop/xfce-registered-categories.xml.de
share/examples/xfdesktop/xfce-registered-categories.xml.el
share/examples/xfdesktop/xfce-registered-categories.xml.es
share/examples/xfdesktop/xfce-registered-categories.xml.eu
share/examples/xfdesktop/xfce-registered-categories.xml.fi
share/examples/xfdesktop/xfce-registered-categories.xml.fr
share/examples/xfdesktop/xfce-registered-categories.xml.he
share/examples/xfdesktop/xfce-registered-categories.xml.hu
share/examples/xfdesktop/xfce-registered-categories.xml.it
share/examples/xfdesktop/xfce-registered-categories.xml.ja
share/examples/xfdesktop/xfce-registered-categories.xml.nb_NO
share/examples/xfdesktop/xfce-registered-categories.xml.nl
share/examples/xfdesktop/xfce-registered-categories.xml.pl
share/examples/xfdesktop/xfce-registered-categories.xml.pt_BR
share/examples/xfdesktop/xfce-registered-categories.xml.ro
share/examples/xfdesktop/xfce-registered-categories.xml.ru
share/examples/xfdesktop/xfce-registered-categories.xml.sk
share/examples/xfdesktop/xfce-registered-categories.xml.sv
share/examples/xfdesktop/xfce-registered-categories.xml.tr
share/examples/xfdesktop/xfce-registered-categories.xml.zh_CN
share/examples/xfdesktop/xfce-registered-categories.xml.zh_TW
@sample ${SYSCONFDIR}/xdg/
@sample ${SYSCONFDIR}/xdg/menus/
share/examples/xfdesktop/xfce-applications.menu
@sample ${SYSCONFDIR}/xdg/menus/xfce-applications.menu
share/icons/
share/icons/hicolor/
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/xfce4-backdrop.png
share/icons/hicolor/32x32/apps/xfce4-menueditor.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/xfce4-backdrop.png
share/icons/hicolor/48x48/apps/xfce4-menueditor.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/xfce4-backdrop.svg
share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
share/locale/am/
share/locale/am/LC_MESSAGES/
share/locale/am/LC_MESSAGES/xfdesktop.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/xfdesktop.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/xfdesktop.mo
share/locale/be/LC_MESSAGES/xfdesktop.mo
share/locale/bg/LC_MESSAGES/xfdesktop.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/xfdesktop.mo
share/locale/ca/LC_MESSAGES/xfdesktop.mo
share/locale/cs/LC_MESSAGES/xfdesktop.mo
share/locale/da/LC_MESSAGES/xfdesktop.mo
share/locale/de/LC_MESSAGES/xfdesktop.mo
share/locale/dz/
share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/xfdesktop.mo
share/locale/el/LC_MESSAGES/xfdesktop.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/xfdesktop.mo
share/locale/eo/LC_MESSAGES/xfdesktop.mo
share/locale/es/LC_MESSAGES/xfdesktop.mo
share/locale/es_MX/
share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/xfdesktop.mo
share/locale/et/LC_MESSAGES/xfdesktop.mo
share/locale/eu/LC_MESSAGES/xfdesktop.mo
share/locale/fa/
share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/xfdesktop.mo
share/locale/fi/LC_MESSAGES/xfdesktop.mo
share/locale/fr/LC_MESSAGES/xfdesktop.mo
share/locale/gl/LC_MESSAGES/xfdesktop.mo
share/locale/gu/
share/locale/gu/LC_MESSAGES/
share/locale/gu/LC_MESSAGES/xfdesktop.mo
share/locale/he/LC_MESSAGES/xfdesktop.mo
share/locale/hi/
share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/xfdesktop.mo
share/locale/hu/LC_MESSAGES/xfdesktop.mo
share/locale/hy/
@ -117,26 +103,49 @@ share/locale/hy/LC_MESSAGES/xfdesktop.mo
share/locale/id/LC_MESSAGES/xfdesktop.mo
share/locale/it/LC_MESSAGES/xfdesktop.mo
share/locale/ja/LC_MESSAGES/xfdesktop.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/xfdesktop.mo
share/locale/ko/LC_MESSAGES/xfdesktop.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/xfdesktop.mo
share/locale/lv/LC_MESSAGES/xfdesktop.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/xfdesktop.mo
share/locale/mr/
share/locale/mr/LC_MESSAGES/
share/locale/mr/LC_MESSAGES/xfdesktop.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/xfdesktop.mo
share/locale/nb_NO/
share/locale/nb_NO/LC_MESSAGES/
share/locale/nb_NO/LC_MESSAGES/xfdesktop.mo
share/locale/nl/LC_MESSAGES/xfdesktop.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/xfdesktop.mo
share/locale/pl/LC_MESSAGES/xfdesktop.mo
share/locale/pt_BR/LC_MESSAGES/xfdesktop.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/xfdesktop.mo
share/locale/ro/LC_MESSAGES/xfdesktop.mo
share/locale/ru/LC_MESSAGES/xfdesktop.mo
share/locale/sk/LC_MESSAGES/xfdesktop.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/xfdesktop.mo
share/locale/sv/LC_MESSAGES/xfdesktop.mo
share/locale/ta/
share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/xfdesktop.mo
share/locale/tr/LC_MESSAGES/xfdesktop.mo
share/locale/uk/LC_MESSAGES/xfdesktop.mo
share/locale/ur/
share/locale/ur/LC_MESSAGES/
share/locale/ur/LC_MESSAGES/xfdesktop.mo
share/locale/vi/LC_MESSAGES/xfdesktop.mo
share/locale/zh_CN/LC_MESSAGES/xfdesktop.mo
@ -152,8 +161,7 @@ share/pixmaps/xfce4_xicon3.png
share/pixmaps/xfce4_xicon4.png
share/pixmaps/xfdesktop/
share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png
share/xfce4-menueditor/
share/xfce4-menueditor/xfce4-menueditor.ui
share/xfce4/
share/xfce4/backdrops/
share/xfce4/backdrops/flower.png
share/xfce4/backdrops/xfce-in-a-grid.png
@ -164,6 +172,9 @@ share/xfce4/backdrops/xfce-stripes.png
share/xfce4/backdrops/xfce-turbulence.png
share/xfce4/backdrops/xfce4gradientcurve.png
share/xfce4/backdrops/xfce4logo.png
share/xfce4/doc/
share/xfce4/doc/C/
share/xfce4/doc/C/images/
share/xfce4/doc/C/images/root_menu.png
share/xfce4/doc/C/images/root_menu2.png
share/xfce4/doc/C/images/select_bg_color.png
@ -172,6 +183,10 @@ share/xfce4/doc/C/images/xfdesktop-behavior-tab.png
share/xfce4/doc/C/images/xfdesktop-editor.png
share/xfce4/doc/C/images/xfdesktop-list.png
share/xfce4/doc/C/xfdesktop.html
share/xfce4/doc/da/
share/xfce4/doc/da/xfdesktop.html
share/xfce4/doc/fr/
share/xfce4/doc/fr/images/
share/xfce4/doc/fr/images/root_menu.png
share/xfce4/doc/fr/images/root_menu2.png
share/xfce4/doc/fr/images/select_bg_color.png
@ -180,6 +195,15 @@ share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png
share/xfce4/doc/fr/images/xfdesktop-editor.png
share/xfce4/doc/fr/images/xfdesktop-list.png
share/xfce4/doc/fr/xfdesktop.html
share/xfce4/doc/ja/
share/xfce4/doc/ja/images/
share/xfce4/doc/ja/images/root_menu.png
share/xfce4/doc/ja/images/root_menu2.png
share/xfce4/doc/ja/images/select_bg_color.png
share/xfce4/doc/ja/images/xfdesktop-background-tab.png
share/xfce4/doc/ja/images/xfdesktop-icons-tab.png
share/xfce4/doc/ja/images/xfdesktop-menus-tab.png
share/xfce4/doc/ja/xfdesktop.html
share/xfce4/panel-plugins/
share/xfce4/panel-plugins/xfce4-menu.desktop
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true