Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

3 files changed, 67 insertions, 126 deletions

diff --git a/xfce/xfdesktop/.footprint b/xfce/xfdesktop/.footprint
index ec071d87d..e4de9d6e1 100644
--- a/xfce/xfdesktop/.footprint
+++ b/xfce/xfdesktop/.footprint
@@ -1,43 +1,71 @@
-drwxr-xr-x	root/root	etc/
-drwxr-xr-x	root/root	etc/xdg/
-drwxr-xr-x	root/root	etc/xdg/menus/
--rw-r--r--	root/root	etc/xdg/menus/xfce-applications.menu
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/xfce4-popup-menu
 -rwxr-xr-x	root/root	usr/bin/xfdesktop
 -rwxr-xr-x	root/root	usr/bin/xfdesktop-settings
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/xfce4/
-drwxr-xr-x	root/root	usr/lib/xfce4/modules/
--rwxr-xr-x	root/root	usr/lib/xfce4/modules/xfce4_desktop_menu.la
--rwxr-xr-x	root/root	usr/lib/xfce4/modules/xfce4_desktop_menu.so
-drwxr-xr-x	root/root	usr/lib/xfce4/xfce4/
-drwxr-xr-x	root/root	usr/lib/xfce4/xfce4/panel-plugins/
--rwxr-xr-x	root/root	usr/lib/xfce4/xfce4/panel-plugins/xfce4-menu-plugin
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/xfce-backdrop-settings.desktop
--rw-r--r--	root/root	usr/share/applications/xfce4-about-xfce.desktop
--rw-r--r--	root/root	usr/share/applications/xfce4-file-manager.desktop
--rw-r--r--	root/root	usr/share/applications/xfce4-help.desktop
--rw-r--r--	root/root	usr/share/applications/xfce4-logout.desktop
--rw-r--r--	root/root	usr/share/applications/xfce4-run-program.desktop
--rw-r--r--	root/root	usr/share/applications/xfce4-terminal.desktop
--rw-r--r--	root/root	usr/share/applications/xfce4-web-browser.desktop
-drwxr-xr-x	root/root	usr/share/desktop-directories/
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-accessories.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-development.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-education.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-games.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-graphics.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-multimedia.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-network.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-office.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-other.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-screensavers.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-settings.directory
--rw-r--r--	root/root	usr/share/desktop-directories/xfce-system.directory
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/C/
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/C/images/
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/C/images/root_menu.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/C/images/root_menu2.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/C/images/select_bg_color.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/C/images/xfdesktop-background-tab.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/C/images/xfdesktop-icons-tab.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/C/images/xfdesktop-menus-tab.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/C/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/bn/
+lrwxrwxrwx	root/root	usr/share/doc/xfdesktop/html/bn/images -> /usr/share/doc/xfdesktop/html/C/images
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/bn/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/ca/
+lrwxrwxrwx	root/root	usr/share/doc/xfdesktop/html/ca/images -> /usr/share/doc/xfdesktop/html/C/images
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/ca/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/da/
+lrwxrwxrwx	root/root	usr/share/doc/xfdesktop/html/da/images -> /usr/share/doc/xfdesktop/html/C/images
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/da/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/fr/
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/fr/images/
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/fr/images/root_menu.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/fr/images/root_menu2.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/fr/images/select_bg_color.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/fr/images/xfdesktop-background-tab.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/fr/images/xfdesktop-icons-tab.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/fr/images/xfdesktop-menus-tab.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/fr/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/gl/
+lrwxrwxrwx	root/root	usr/share/doc/xfdesktop/html/gl/images -> /usr/share/doc/xfdesktop/html/C/images
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/gl/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/id/
+lrwxrwxrwx	root/root	usr/share/doc/xfdesktop/html/id/images -> /usr/share/doc/xfdesktop/html/C/images
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/id/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/it/
+lrwxrwxrwx	root/root	usr/share/doc/xfdesktop/html/it/images -> /usr/share/doc/xfdesktop/html/C/images
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/it/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/ja/
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/ja/images/
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/ja/images/root_menu.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/ja/images/root_menu2.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/ja/images/select_bg_color.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/ja/images/xfdesktop-background-tab.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/ja/images/xfdesktop-icons-tab.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/ja/images/xfdesktop-menus-tab.png
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/ja/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/ru/
+lrwxrwxrwx	root/root	usr/share/doc/xfdesktop/html/ru/images -> /usr/share/doc/xfdesktop/html/C/images
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/ru/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/sv/
+lrwxrwxrwx	root/root	usr/share/doc/xfdesktop/html/sv/images -> /usr/share/doc/xfdesktop/html/C/images
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/sv/index.html
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/ug/
+lrwxrwxrwx	root/root	usr/share/doc/xfdesktop/html/ug/images -> /usr/share/doc/xfdesktop/html/C/images
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/ug/index.html
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/xfdesktop.css
+drwxr-xr-x	root/root	usr/share/doc/xfdesktop/html/zh_CN/
+lrwxrwxrwx	root/root	usr/share/doc/xfdesktop/html/zh_CN/images -> /usr/share/doc/xfdesktop/html/C/images
+-rw-r--r--	root/root	usr/share/doc/xfdesktop/html/zh_CN/index.html
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
@@ -61,9 +89,6 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/xfdesktop.1.gz
 drwxr-xr-x	root/root	usr/share/pixmaps/
 -rw-r--r--	root/root	usr/share/pixmaps/nutyx2009_2.png
-drwxr-xr-x	root/root	usr/share/pixmaps/xfce4/
-drwxr-xr-x	root/root	usr/share/pixmaps/xfce4/xfdesktop/
--rw-r--r--	root/root	usr/share/pixmaps/xfce4/xfdesktop/text-selection-frame.png
 -rw-r--r--	root/root	usr/share/pixmaps/xfce4_xicon.png
 -rw-r--r--	root/root	usr/share/pixmaps/xfce4_xicon1.png
 -rw-r--r--	root/root	usr/share/pixmaps/xfce4_xicon2.png
@@ -83,87 +108,3 @@ drwxr-xr-x	root/root	usr/share/xfce4/backdrops/
 -rw-r--r--	root/root	usr/share/xfce4/backdrops/xfce-turbulence.png
 -rw-r--r--	root/root	usr/share/xfce4/backdrops/xfce4gradientcurve.png
 -rw-r--r--	root/root	usr/share/xfce4/backdrops/xfce4logo.png
-drwxr-xr-x	root/root	usr/share/xfce4/doc/
-drwxr-xr-x	root/root	usr/share/xfce4/doc/C/
-drwxr-xr-x	root/root	usr/share/xfce4/doc/C/images/
--rw-r--r--	root/root	usr/share/xfce4/doc/C/images/root_menu.png
--rw-r--r--	root/root	usr/share/xfce4/doc/C/images/root_menu2.png
--rw-r--r--	root/root	usr/share/xfce4/doc/C/images/select_bg_color.png
--rw-r--r--	root/root	usr/share/xfce4/doc/C/images/xfdesktop-appearance-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/C/images/xfdesktop-behavior-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/C/images/xfdesktop-editor.png
--rw-r--r--	root/root	usr/share/xfce4/doc/C/images/xfdesktop-list.png
--rw-r--r--	root/root	usr/share/xfce4/doc/C/xfdesktop.html
-drwxr-xr-x	root/root	usr/share/xfce4/doc/am/
-drwxr-xr-x	root/root	usr/share/xfce4/doc/am/images/
--rw-r--r--	root/root	usr/share/xfce4/doc/am/images/root_menu.png
--rw-r--r--	root/root	usr/share/xfce4/doc/am/images/root_menu2.png
--rw-r--r--	root/root	usr/share/xfce4/doc/am/images/select_bg_color.png
--rw-r--r--	root/root	usr/share/xfce4/doc/am/images/xfdesktop-appearance-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/am/images/xfdesktop-behavior-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/am/images/xfdesktop-editor.png
--rw-r--r--	root/root	usr/share/xfce4/doc/am/images/xfdesktop-list.png
--rw-r--r--	root/root	usr/share/xfce4/doc/am/xfdesktop.html
-drwxr-xr-x	root/root	usr/share/xfce4/doc/ca/
-drwxr-xr-x	root/root	usr/share/xfce4/doc/ca/images/
--rw-r--r--	root/root	usr/share/xfce4/doc/ca/images/root_menu.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ca/images/root_menu2.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ca/images/select_bg_color.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ca/images/xfdesktop-appearance-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ca/images/xfdesktop-behavior-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ca/images/xfdesktop-editor.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ca/images/xfdesktop-list.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ca/xfdesktop.html
-drwxr-xr-x	root/root	usr/share/xfce4/doc/da/
--rw-r--r--	root/root	usr/share/xfce4/doc/da/xfdesktop.html
-drwxr-xr-x	root/root	usr/share/xfce4/doc/fr/
-drwxr-xr-x	root/root	usr/share/xfce4/doc/fr/images/
--rw-r--r--	root/root	usr/share/xfce4/doc/fr/images/root_menu.png
--rw-r--r--	root/root	usr/share/xfce4/doc/fr/images/root_menu2.png
--rw-r--r--	root/root	usr/share/xfce4/doc/fr/images/select_bg_color.png
--rw-r--r--	root/root	usr/share/xfce4/doc/fr/images/xfdesktop-appearance-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/fr/images/xfdesktop-editor.png
--rw-r--r--	root/root	usr/share/xfce4/doc/fr/images/xfdesktop-list.png
--rw-r--r--	root/root	usr/share/xfce4/doc/fr/xfdesktop.html
-drwxr-xr-x	root/root	usr/share/xfce4/doc/gl/
-drwxr-xr-x	root/root	usr/share/xfce4/doc/gl/images/
--rw-r--r--	root/root	usr/share/xfce4/doc/gl/images/root_menu.png
--rw-r--r--	root/root	usr/share/xfce4/doc/gl/images/root_menu2.png
--rw-r--r--	root/root	usr/share/xfce4/doc/gl/images/select_bg_color.png
--rw-r--r--	root/root	usr/share/xfce4/doc/gl/images/xfdesktop-appearance-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/gl/images/xfdesktop-behavior-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/gl/images/xfdesktop-editor.png
--rw-r--r--	root/root	usr/share/xfce4/doc/gl/images/xfdesktop-list.png
--rw-r--r--	root/root	usr/share/xfce4/doc/gl/xfdesktop.html
-drwxr-xr-x	root/root	usr/share/xfce4/doc/it/
-drwxr-xr-x	root/root	usr/share/xfce4/doc/it/images/
--rw-r--r--	root/root	usr/share/xfce4/doc/it/images/root_menu.png
--rw-r--r--	root/root	usr/share/xfce4/doc/it/images/root_menu2.png
--rw-r--r--	root/root	usr/share/xfce4/doc/it/images/select_bg_color.png
--rw-r--r--	root/root	usr/share/xfce4/doc/it/images/xfdesktop-appearance-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/it/images/xfdesktop-behavior-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/it/images/xfdesktop-editor.png
--rw-r--r--	root/root	usr/share/xfce4/doc/it/images/xfdesktop-list.png
--rw-r--r--	root/root	usr/share/xfce4/doc/it/xfdesktop.html
-drwxr-xr-x	root/root	usr/share/xfce4/doc/ja/
-drwxr-xr-x	root/root	usr/share/xfce4/doc/ja/images/
--rw-r--r--	root/root	usr/share/xfce4/doc/ja/images/root_menu.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ja/images/root_menu2.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ja/images/select_bg_color.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ja/images/xfdesktop-background-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ja/images/xfdesktop-icons-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ja/images/xfdesktop-menus-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ja/xfdesktop.html
-drwxr-xr-x	root/root	usr/share/xfce4/doc/ug/
-drwxr-xr-x	root/root	usr/share/xfce4/doc/ug/images/
--rw-r--r--	root/root	usr/share/xfce4/doc/ug/images/root_menu.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ug/images/root_menu2.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ug/images/select_bg_color.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ug/images/xfdesktop-appearance-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ug/images/xfdesktop-behavior-tab.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ug/images/xfdesktop-editor.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ug/images/xfdesktop-list.png
--rw-r--r--	root/root	usr/share/xfce4/doc/ug/xfdesktop.html
-drwxr-xr-x	root/root	usr/share/xfce4/panel-plugins/
--rw-r--r--	root/root	usr/share/xfce4/panel-plugins/xfce4-menu.desktop
diff --git a/xfce/xfdesktop/.md5sum b/xfce/xfdesktop/.md5sum
index 870aaee55..109176746 100644
--- a/xfce/xfdesktop/.md5sum
+++ b/xfce/xfdesktop/.md5sum
@@ -1,3 +1,3 @@
 edf9a0ee89fc1ad54f249abe9765e6e0  attapu.png
 41fa266e6493a17a0dee5c5103f94567  nutyx2009_2.png
-e800ea9fee7a5c5eaf2ae96e23a83e3a  xfdesktop-4.6.2.tar.bz2
+ae6c2b1d0f43a294bf409ec0332352a4  xfdesktop-4.7.5.tar.bz2
diff --git a/xfce/xfdesktop/Pkgfile b/xfce/xfdesktop/Pkgfile
index 6366d53e8..1a645ec53 100755
--- a/xfce/xfdesktop/Pkgfile
+++ b/xfce/xfdesktop/Pkgfile
@@ -5,15 +5,15 @@
 # Depends on: dbus-glib, exo, libglade, libwnck, libxfce4menu, libxfce4util, libxfcegui4, libxml2, thunar, xfce4-panel, xfconf
 
 name=xfdesktop
-version=4.6.2
-release=3
+version=4.7.5
+release=1
 source=(http://www.xfce.org/archive/xfce-$version/src/$name-$version.tar.bz2 \
 attapu.png nutyx2009_2.png)
 
 build() {
 cd $name-$version
 	sed -i "s/xfce-stripes.png/attapu.png/" common/xfdesktop-common.h
-	sed -i "s/xfce4_xicon1.png/nutyx2009_2.png/" panel-plugin/desktop-menu-plugin.c
+#	sed -i "s/xfce4_xicon1.png/nutyx2009_2.png/" panel-plugin/desktop-menu-plugin.c
 	./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/xfce4 \
@@ -25,7 +25,7 @@ cd $name-$version
 	$PKG/usr/share/xfce4/backdrops/attapu.png
 	install -D -m644 ../nutyx2009_2.png \
 	$PKG/usr/share/pixmaps/nutyx2009_2.png
-	sed -i "s/xfce4_xicon1/nutyx2009_2/" \
-	$PKG/usr/share/xfce4/panel-plugins/xfce4-menu.desktop
+#	sed -i "s/xfce4_xicon1/nutyx2009_2/" \
+#	$PKG/usr/share/xfce4/panel-plugins/xfce4-menu.desktop
 }