xfe, maj 1.32.2-1

5 files changed, 22 insertions, 49 deletions

diff --git a/extra/xfe/.footprint b/extra/xfe/.footprint
index d974c415d..2c409c9f8 100644
--- a/extra/xfe/.footprint
+++ b/extra/xfe/.footprint
@@ -259,6 +259,8 @@ lrwxrwxrwx	root/root	usr/share/xfe/icons/blue-theme/shell_32x32.png -> ../gnome-
 lrwxrwxrwx	root/root	usr/share/xfe/icons/blue-theme/showhidden.png -> ../gnome-theme/showhidden.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/blue-theme/shownumbers.png -> ../gnome-theme/shownumbers.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/blue-theme/showthumb.png -> ../gnome-theme/showthumb.png
+lrwxrwxrwx	root/root	usr/share/xfe/icons/blue-theme/sla_16x16.png -> ../gnome-theme/sla_16x16.png
+lrwxrwxrwx	root/root	usr/share/xfe/icons/blue-theme/sla_32x32.png -> ../gnome-theme/sla_32x32.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/blue-theme/smallicons.png -> ../gnome-theme/smallicons.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/blue-theme/so_16x16.png -> ../gnome-theme/so_16x16.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/blue-theme/so_32x32.png -> ../gnome-theme/so_32x32.png
@@ -562,6 +564,8 @@ lrwxrwxrwx	root/root	usr/share/xfe/icons/brown-theme/shell_32x32.png -> ../gnome
 lrwxrwxrwx	root/root	usr/share/xfe/icons/brown-theme/showhidden.png -> ../gnome-theme/showhidden.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/brown-theme/shownumbers.png -> ../gnome-theme/shownumbers.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/brown-theme/showthumb.png -> ../gnome-theme/showthumb.png
+lrwxrwxrwx	root/root	usr/share/xfe/icons/brown-theme/sla_16x16.png -> ../gnome-theme/sla_16x16.png
+lrwxrwxrwx	root/root	usr/share/xfe/icons/brown-theme/sla_32x32.png -> ../gnome-theme/sla_32x32.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/brown-theme/smallicons.png -> ../gnome-theme/smallicons.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/brown-theme/so_16x16.png -> ../gnome-theme/so_16x16.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/brown-theme/so_32x32.png -> ../gnome-theme/so_32x32.png
@@ -865,6 +869,8 @@ drwxr-xr-x	root/root	usr/share/xfe/icons/gnome-theme/
 -rw-r--r--	root/root	usr/share/xfe/icons/gnome-theme/showhidden.png
 -rw-r--r--	root/root	usr/share/xfe/icons/gnome-theme/shownumbers.png
 -rw-r--r--	root/root	usr/share/xfe/icons/gnome-theme/showthumb.png
+-rw-r--r--	root/root	usr/share/xfe/icons/gnome-theme/sla_16x16.png
+-rw-r--r--	root/root	usr/share/xfe/icons/gnome-theme/sla_32x32.png
 -rw-r--r--	root/root	usr/share/xfe/icons/gnome-theme/smallicons.png
 -rw-r--r--	root/root	usr/share/xfe/icons/gnome-theme/so_16x16.png
 -rw-r--r--	root/root	usr/share/xfe/icons/gnome-theme/so_32x32.png
@@ -1168,6 +1174,8 @@ lrwxrwxrwx	root/root	usr/share/xfe/icons/gnomeblue-theme/shell_32x32.png -> ../g
 lrwxrwxrwx	root/root	usr/share/xfe/icons/gnomeblue-theme/showhidden.png -> ../gnome-theme/showhidden.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/gnomeblue-theme/shownumbers.png -> ../gnome-theme/shownumbers.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/gnomeblue-theme/showthumb.png -> ../gnome-theme/showthumb.png
+lrwxrwxrwx	root/root	usr/share/xfe/icons/gnomeblue-theme/sla_16x16.png -> ../gnome-theme/sla_16x16.png
+lrwxrwxrwx	root/root	usr/share/xfe/icons/gnomeblue-theme/sla_32x32.png -> ../gnome-theme/sla_32x32.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/gnomeblue-theme/smallicons.png -> ../gnome-theme/smallicons.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/gnomeblue-theme/so_16x16.png -> ../gnome-theme/so_16x16.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/gnomeblue-theme/so_32x32.png -> ../gnome-theme/so_32x32.png
@@ -1471,6 +1479,8 @@ drwxr-xr-x	root/root	usr/share/xfe/icons/kde-theme/
 -rw-r--r--	root/root	usr/share/xfe/icons/kde-theme/showhidden.png
 -rw-r--r--	root/root	usr/share/xfe/icons/kde-theme/shownumbers.png
 -rw-r--r--	root/root	usr/share/xfe/icons/kde-theme/showthumb.png
+-rw-r--r--	root/root	usr/share/xfe/icons/kde-theme/sla_16x16.png
+-rw-r--r--	root/root	usr/share/xfe/icons/kde-theme/sla_32x32.png
 -rw-r--r--	root/root	usr/share/xfe/icons/kde-theme/smallicons.png
 -rw-r--r--	root/root	usr/share/xfe/icons/kde-theme/so_16x16.png
 -rw-r--r--	root/root	usr/share/xfe/icons/kde-theme/so_32x32.png
@@ -1774,6 +1784,8 @@ lrwxrwxrwx	root/root	usr/share/xfe/icons/tango-theme/shell_32x32.png -> ../gnome
 lrwxrwxrwx	root/root	usr/share/xfe/icons/tango-theme/showhidden.png -> ../gnome-theme/showhidden.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/tango-theme/shownumbers.png -> ../gnome-theme/shownumbers.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/tango-theme/showthumb.png -> ../gnome-theme/showthumb.png
+-rw-r--r--	root/root	usr/share/xfe/icons/tango-theme/sla_16x16.png
+-rw-r--r--	root/root	usr/share/xfe/icons/tango-theme/sla_32x32.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/tango-theme/smallicons.png -> ../gnome-theme/smallicons.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/tango-theme/so_16x16.png -> ../gnome-theme/so_16x16.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/tango-theme/so_32x32.png -> ../gnome-theme/so_32x32.png
@@ -2077,6 +2089,8 @@ lrwxrwxrwx	root/root	usr/share/xfe/icons/windows-theme/shell_32x32.png -> ../xfe
 lrwxrwxrwx	root/root	usr/share/xfe/icons/windows-theme/showhidden.png -> ../xfe-theme/showhidden.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/windows-theme/shownumbers.png -> ../xfe-theme/shownumbers.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/windows-theme/showthumb.png -> ../xfe-theme/showthumb.png
+lrwxrwxrwx	root/root	usr/share/xfe/icons/windows-theme/sla_16x16.png -> ../xfe-theme/sla_16x16.png
+lrwxrwxrwx	root/root	usr/share/xfe/icons/windows-theme/sla_32x32.png -> ../xfe-theme/sla_32x32.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/windows-theme/smallicons.png -> ../xfe-theme/smallicons.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/windows-theme/so_16x16.png -> ../xfe-theme/so_16x16.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/windows-theme/so_32x32.png -> ../xfe-theme/so_32x32.png
@@ -2380,6 +2394,8 @@ lrwxrwxrwx	root/root	usr/share/xfe/icons/xfce-theme/shell_32x32.png -> ../gnome-
 lrwxrwxrwx	root/root	usr/share/xfe/icons/xfce-theme/showhidden.png -> ../gnome-theme/showhidden.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/xfce-theme/shownumbers.png -> ../gnome-theme/shownumbers.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/xfce-theme/showthumb.png -> ../gnome-theme/showthumb.png
+lrwxrwxrwx	root/root	usr/share/xfe/icons/xfce-theme/sla_16x16.png -> ../gnome-theme/sla_16x16.png
+lrwxrwxrwx	root/root	usr/share/xfe/icons/xfce-theme/sla_32x32.png -> ../gnome-theme/sla_32x32.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/xfce-theme/smallicons.png -> ../gnome-theme/smallicons.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/xfce-theme/so_16x16.png -> ../gnome-theme/so_16x16.png
 lrwxrwxrwx	root/root	usr/share/xfe/icons/xfce-theme/so_32x32.png -> ../gnome-theme/so_32x32.png
@@ -2683,6 +2699,8 @@ drwxr-xr-x	root/root	usr/share/xfe/icons/xfe-theme/
 -rw-r--r--	root/root	usr/share/xfe/icons/xfe-theme/showhidden.png
 -rw-r--r--	root/root	usr/share/xfe/icons/xfe-theme/shownumbers.png
 -rw-r--r--	root/root	usr/share/xfe/icons/xfe-theme/showthumb.png
+-rw-r--r--	root/root	usr/share/xfe/icons/xfe-theme/sla_16x16.png
+-rw-r--r--	root/root	usr/share/xfe/icons/xfe-theme/sla_32x32.png
 -rw-r--r--	root/root	usr/share/xfe/icons/xfe-theme/smallicons.png
 -rw-r--r--	root/root	usr/share/xfe/icons/xfe-theme/so_16x16.png
 -rw-r--r--	root/root	usr/share/xfe/icons/xfe-theme/so_32x32.png
diff --git a/extra/xfe/.md5sum b/extra/xfe/.md5sum
index e56993b9a..80615fc8a 100644
--- a/extra/xfe/.md5sum
+++ b/extra/xfe/.md5sum
@@ -1,3 +1 @@
-bd83b4bb5ebbb736315c5ce31b547d28  gcc4.5.patch
-be09eee1dd65d3de31830b9b31c4b823  xfe-1.32.1-pos-01.patch
-7ccbc35fc92cf72d2e405d32bfd741bc  xfe-1.32.1.tar.gz
+df88a7a3c643d5cea1eb9e1009eb6f20  xfe-1.32.2.tar.gz
diff --git a/extra/xfe/Pkgfile b/extra/xfe/Pkgfile
index fbe282d1a..918d6b52a 100644
--- a/extra/xfe/Pkgfile
+++ b/extra/xfe/Pkgfile
@@ -5,16 +5,13 @@
 # Depends on: fox, libpng, libjpeg, libtiff, expat, intltool
 
 name=xfe
-version=1.32.1
-release=2
-source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz\
-	$name-$version-pos-01.patch gcc4.5.patch)
+version=1.32.2
+release=1
+source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz)
 
 
 build() {
 	cd $name-$version
-	patch -Np1 -i ../$name-$version-pos-01.patch
-	patch -Np0 -i ../gcc4.5.patch
 	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
diff --git a/extra/xfe/gcc4.5.patch b/extra/xfe/gcc4.5.patch
deleted file mode 100644
index 6e26c7110..000000000
--- a/extra/xfe/gcc4.5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/xfeutils.cpporig	2010-04-29 20:31:23.000000000 +0200
-+++ src/xfeutils.cpp	2010-04-29 20:32:44.000000000 +0200
-@@ -512,7 +512,7 @@
- 
- 
- // Replacement of the stat function
--inline FXint statrep(const FXchar* filename, struct stat* buf)
-+FXint statrep(const FXchar* filename, struct stat* buf)
- {
- #if defined(linux)
- 
-@@ -546,7 +546,7 @@
- 
- 
- // Replacement of the lstat function
--inline FXint lstatrep(const FXchar* filename, struct stat* buf)
-+FXint lstatrep(const FXchar* filename, struct stat* buf)
- {
- #if defined(linux)
- 
diff --git a/extra/xfe/xfe-1.32.1-pos-01.patch b/extra/xfe/xfe-1.32.1-pos-01.patch
deleted file mode 100644
index 39140843a..000000000
--- a/extra/xfe/xfe-1.32.1-pos-01.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xfe-1.32.1/xferc.in.original	2010-01-08 22:04:48.000000000 +0000
-+++ xfe-1.32.1/xferc.in	2010-01-08 22:05:30.000000000 +0000
-@@ -4,13 +4,16 @@
- #
- # These settings are overridden in ~/.xfe/xferc
- #
-+[OPTIONS]
-+xpos=50
-+ypos=50
- 
- [SETTINGS]
- #
- # Where to search for icons
- #
- iconpath = @prefix@/share/xfe/icons/gnomeblue-theme
--
-+save_win_pos=1
- 
- [KEYBINDINGS]
- #