summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortyrry <tyrry@nutyx.(none)>2010-03-23 16:04:43 +0100
committertyrry <tyrry@nutyx.(none)>2010-03-23 16:04:43 +0100
commitee43c5b4c9ed6a6ba37eadc7b7cec8d7e4f247c7 (patch)
tree8f701239d5794ba5b76a98df1d2014feebd9a73e
parent4e88d3b98b8e640f7d95ed1527d56581e541739b (diff)
parent082114ded7501433dd31becbae522873f18c072e (diff)
downloadnutyx-pakxe-ee43c5b4c9ed6a6ba37eadc7b7cec8d7e4f247c7.tar.gz
nutyx-pakxe-ee43c5b4c9ed6a6ba37eadc7b7cec8d7e4f247c7.tar.bz2
nutyx-pakxe-ee43c5b4c9ed6a6ba37eadc7b7cec8d7e4f247c7.tar.xz
nutyx-pakxe-ee43c5b4c9ed6a6ba37eadc7b7cec8d7e4f247c7.zip
Merge remote branch 'nutyx-2009/master'
-rw-r--r--base/initrd/Pkgfile2
-rw-r--r--base/kernel-pae/.footprint8
-rw-r--r--base/kernel-pae/.md5sum1
-rw-r--r--base/kernel-pae/Pkgfile9
-rw-r--r--base/kernel-pae/post-install1
-rw-r--r--base/kernel/.footprint8
-rw-r--r--base/kernel/.md5sum1
-rw-r--r--base/kernel/Pkgfile9
-rw-r--r--base/kernel/post-install1
-rw-r--r--base/libevent/.footprint31
-rw-r--r--base/libevent/.md5sum1
-rw-r--r--base/libevent/Pkgfile19
-rw-r--r--base/units/.footprint (renamed from test/units/.footprint)0
-rw-r--r--base/units/.md5sum1
-rw-r--r--base/units/Pkgfile (renamed from test/units/Pkgfile)2
-rwxr-xr-xextra/exiv2/.footprint7
-rwxr-xr-xextra/exiv2/.md5sum2
-rwxr-xr-xextra/exiv2/Pkgfile4
-rw-r--r--extra/firefox/.footprint14
-rw-r--r--extra/firefox/.md5sum2
-rw-r--r--extra/firefox/Pkgfile4
-rw-r--r--extra/gkrellm/.footprint27
-rw-r--r--extra/gkrellm/.md5sum3
-rw-r--r--extra/gkrellm/Pkgfile24
-rw-r--r--extra/gkrellm/gkrellm.desktop10
-rw-r--r--extra/gkrellm/gkrellm.pngbin0 -> 2084 bytes
-rw-r--r--extra/google-chrome/.footprint470
-rw-r--r--extra/google-chrome/.md5sum7
-rw-r--r--extra/google-chrome/Pkgfile130
-rw-r--r--extra/google-chrome/chromium.desktop114
-rw-r--r--extra/google-chrome/chromium.install11
-rw-r--r--extra/google-chrome/chromium.sh4
-rw-r--r--extra/google-chrome/createSource.htm54
-rw-r--r--extra/google-chrome/drop_sse2.patch18
-rw-r--r--extra/google-chrome/ffmpeg_branding_mime.patch29
-rw-r--r--extra/google-chrome/libpng-1.4.patch58
-rw-r--r--extra/gtkimageview/.footprint25
-rw-r--r--extra/gtkimageview/.md5sum1
-rwxr-xr-xextra/gtkimageview/Pkgfile22
-rw-r--r--extra/imule/.footprint61
-rw-r--r--extra/imule/.md5sum1
-rw-r--r--extra/imule/Pkgfile23
-rw-r--r--extra/nvidia-96xx/Pkgfile2
-rw-r--r--extra/nvidia/.footprint30
-rw-r--r--extra/nvidia/.md5sum2
-rwxr-xr-xextra/nvidia/Pkgfile2
-rw-r--r--extra/pygtk/.footprint3
-rw-r--r--extra/pygtk/.md5sum2
-rw-r--r--extra/pygtk/Pkgfile6
-rw-r--r--extra/rxvt-unicode/.footprint (renamed from test/rxvt-unicode/.footprint)0
-rw-r--r--extra/rxvt-unicode/.md5sum (renamed from test/rxvt-unicode/.md5sum)3
-rw-r--r--extra/rxvt-unicode/Pkgfile (renamed from test/rxvt-unicode/Pkgfile)14
-rw-r--r--extra/rxvt-unicode/font-width-fix.patch (renamed from test/rxvt-unicode/font-width-fix.patch)0
-rw-r--r--extra/rxvt-unicode/rxvt-unicode.desktop (renamed from test/rxvt-unicode/rxvt-unicode.desktop)0
-rw-r--r--extra/rxvt-unicode/rxvt-unicode.png (renamed from test/rxvt-unicode/rxvt-unicode.png)bin1513 -> 1513 bytes
-rw-r--r--extra/sylpheed/.footprint12
-rw-r--r--extra/sylpheed/.md5sum2
-rw-r--r--extra/sylpheed/Pkgfile2
-rw-r--r--extra/transmission/.footprint1
-rwxr-xr-xextra/transmission/.md5sum2
-rwxr-xr-xextra/transmission/Pkgfile2
-rwxr-xr-xextra/ufraw/.md5sum3
-rwxr-xr-xextra/ufraw/Pkgfile11
-rw-r--r--extra/ufraw/gcc44.patch11
-rw-r--r--extra/ufraw/ufraw-0.15-glibc-2.10.patch12
-rw-r--r--kde/amarok/.footprint4
-rw-r--r--kde/amarok/.md5sum2
-rwxr-xr-xkde/amarok/Pkgfile4
-rwxr-xr-xkde/gtk-qt-engine/.footprint32
-rw-r--r--kde/gtk-qt-engine/.gtkrc-2.0-kde414
-rw-r--r--kde/gtk-qt-engine/.md5sum3
-rwxr-xr-xkde/gtk-qt-engine/Pkgfile20
-rwxr-xr-xkde/gtk-qt-engine/gtk-qt-engine.rc.sh4
-rw-r--r--kde/kdebase-runtime/.footprint45
-rwxr-xr-xkde/kdebase-runtime/Pkgfile2
-rw-r--r--kde/kdebase-workspace/.footprint33
-rw-r--r--kde/kdebase-workspace/.md5sum9
-rwxr-xr-xkde/kdegraphics/Pkgfile2
-rwxr-xr-xkde/strigi/Pkgfile2
-rw-r--r--test/rxvt-unicode/gcc4.4.patch23
-rw-r--r--test/units/.md5sum1
-rw-r--r--xfce/midori/.footprint8
-rw-r--r--xfce/midori/.md5sum2
-rwxr-xr-xxfce/midori/Pkgfile2
-rw-r--r--xorg/xorg-xf86-input-aiptek/.footprint (renamed from test/xorg-xf86-input-aiptek/.footprint)0
-rw-r--r--xorg/xorg-xf86-input-aiptek/.md5sum (renamed from test/xorg-xf86-input-aiptek/.md5sum)0
-rw-r--r--xorg/xorg-xf86-input-aiptek/Pkgfile (renamed from test/xorg-xf86-input-aiptek/Pkgfile)2
-rw-r--r--xorg/xorg-xf86-input-fpit/.footprint (renamed from test/xorg-xf86-input-fpit/.footprint)0
-rw-r--r--xorg/xorg-xf86-input-fpit/.md5sum (renamed from test/xorg-xf86-input-fpit/.md5sum)1
-rw-r--r--xorg/xorg-xf86-input-fpit/Pkgfile (renamed from test/xorg-xf86-input-fpit/Pkgfile)7
-rw-r--r--xorg/xorg-xf86-input-fpit/fpit-1.3.0-abi.patch95
-rw-r--r--xorg/xorg-xf86-input-hyperpen/.footprint (renamed from test/xorg-xf86-input-hyperpen/.footprint)0
-rw-r--r--xorg/xorg-xf86-input-hyperpen/.md5sum (renamed from test/xorg-xf86-input-hyperpen/.md5sum)1
-rw-r--r--xorg/xorg-xf86-input-hyperpen/Pkgfile (renamed from test/xorg-xf86-input-hyperpen/Pkgfile)5
-rw-r--r--xorg/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch89
-rw-r--r--xorg/xorg-xf86-input-mutouch/.footprint (renamed from test/xorg-xf86-input-mutouch/.footprint)0
-rw-r--r--xorg/xorg-xf86-input-mutouch/.md5sum (renamed from test/xorg-xf86-input-mutouch/.md5sum)1
-rw-r--r--xorg/xorg-xf86-input-mutouch/Pkgfile (renamed from test/xorg-xf86-input-mutouch/Pkgfile)6
-rw-r--r--xorg/xorg-xf86-input-mutouch/mutouch-1.2.1-abi.patch73
99 files changed, 1407 insertions, 426 deletions
diff --git a/base/initrd/Pkgfile b/base/initrd/Pkgfile
index 662cf88dd..0dc815c9e 100644
--- a/base/initrd/Pkgfile
+++ b/base/initrd/Pkgfile
@@ -4,7 +4,7 @@
# Packager: thierryn1 at hispeed dot ch
name=initrd
-version=2.6.33
+version=2.6.33.1
release=1
_tools=06032010
_baseversion=2.6.33
diff --git a/base/kernel-pae/.footprint b/base/kernel-pae/.footprint
index 3338d00b8..3b380c572 100644
--- a/base/kernel-pae/.footprint
+++ b/base/kernel-pae/.footprint
@@ -1,8 +1,8 @@
drwxr-xr-x root/root boot/
--rw-r--r-- root/root boot/System.map-2.6.33
--rw-r--r-- root/root boot/config-2.6.33
-lrwxrwxrwx root/root boot/kernel -> kernel-2.6.33
--rw-r--r-- root/root boot/kernel-2.6.33
+-rw-r--r-- root/root boot/System.map-2.6.33.1
+-rw-r--r-- root/root boot/config-2.6.33.1
+lrwxrwxrwx root/root boot/kernel -> kernel-2.6.33.1
+-rw-r--r-- root/root boot/kernel-2.6.33.1
drwxr-xr-x root/root lib/
drwxr-xr-x root/root lib/firmware/
drwxr-xr-x root/root lib/firmware/3com/
diff --git a/base/kernel-pae/.md5sum b/base/kernel-pae/.md5sum
index cb77ec393..bc95528fe 100644
--- a/base/kernel-pae/.md5sum
+++ b/base/kernel-pae/.md5sum
@@ -1,3 +1,4 @@
0e09cea5ee38d4457a3af832d67c924d config
38550ec26e5368286e2fde8fb03fa744 config_64
c3883760b18d50e8d78819c54d579b00 linux-2.6.33.tar.bz2
+745fd1355c630e163e40c40d4c9b79f9 patch-2.6.33.1.bz2
diff --git a/base/kernel-pae/Pkgfile b/base/kernel-pae/Pkgfile
index 27b19e10d..b4f40b04a 100644
--- a/base/kernel-pae/Pkgfile
+++ b/base/kernel-pae/Pkgfile
@@ -4,15 +4,14 @@
# Packager: thierryn1 at hispeed dot ch
name=kernel-pae
-version=2.6.33
+version=2.6.33.1
_BaseVersion=2.6.33
release=1
source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config \
- )
-# http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2)
+ http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2)
build(){
-# bzip2 -d patch-$version.bz2
+bzip2 -d patch-$version.bz2
cd linux-${_BaseVersion}
make mrproper
case `uname -m` in
@@ -21,7 +20,7 @@ case `uname -m` in
i?86)
mv $SRC/config ./.config;;
esac
-# patch -Np1 -i ../patch-$version
+patch -Np1 -i ../patch-$version
sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
make -j3
make INSTALL_MOD_PATH=$PKG modules_install
diff --git a/base/kernel-pae/post-install b/base/kernel-pae/post-install
new file mode 100644
index 000000000..f35bba3b5
--- /dev/null
+++ b/base/kernel-pae/post-install
@@ -0,0 +1 @@
+depmod
diff --git a/base/kernel/.footprint b/base/kernel/.footprint
index 4f574dee4..a92c0dc40 100644
--- a/base/kernel/.footprint
+++ b/base/kernel/.footprint
@@ -1,8 +1,8 @@
drwxr-xr-x root/root boot/
--rw-r--r-- root/root boot/System.map-2.6.33
--rw-r--r-- root/root boot/config-2.6.33
-lrwxrwxrwx root/root boot/kernel -> kernel-2.6.33
--rw-r--r-- root/root boot/kernel-2.6.33
+-rw-r--r-- root/root boot/System.map-2.6.33.1
+-rw-r--r-- root/root boot/config-2.6.33.1
+lrwxrwxrwx root/root boot/kernel -> kernel-2.6.33.1
+-rw-r--r-- root/root boot/kernel-2.6.33.1
drwxr-xr-x root/root lib/
drwxr-xr-x root/root lib/firmware/
drwxr-xr-x root/root lib/firmware/3com/
diff --git a/base/kernel/.md5sum b/base/kernel/.md5sum
index f649d9a4d..823eb4a29 100644
--- a/base/kernel/.md5sum
+++ b/base/kernel/.md5sum
@@ -1,3 +1,4 @@
5f2f2ca21b45dd9585ae7590a65e2cf8 config
38550ec26e5368286e2fde8fb03fa744 config_64
c3883760b18d50e8d78819c54d579b00 linux-2.6.33.tar.bz2
+745fd1355c630e163e40c40d4c9b79f9 patch-2.6.33.1.bz2
diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile
index 27ba19b22..6329942c2 100644
--- a/base/kernel/Pkgfile
+++ b/base/kernel/Pkgfile
@@ -4,15 +4,14 @@
# Packager: thierryn1 at hispeed dot ch
name=kernel
-version=2.6.33
+version=2.6.33.1
_BaseVersion=2.6.33
release=1
source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config \
- )
-# http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2)
+ http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2)
build(){
-# bzip2 -d patch-$version.bz2
+ bzip2 -d patch-$version.bz2
cd linux-${_BaseVersion}
make mrproper
case `uname -m` in
@@ -21,7 +20,7 @@ case `uname -m` in
i?86)
mv $SRC/config ./.config;;
esac
-# patch -Np1 -i ../patch-$version
+patch -Np1 -i ../patch-$version
sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
make -j3
make INSTALL_MOD_PATH=$PKG modules_install
diff --git a/base/kernel/post-install b/base/kernel/post-install
new file mode 100644
index 000000000..f35bba3b5
--- /dev/null
+++ b/base/kernel/post-install
@@ -0,0 +1 @@
+depmod
diff --git a/base/libevent/.footprint b/base/libevent/.footprint
new file mode 100644
index 000000000..8dbc7877d
--- /dev/null
+++ b/base/libevent/.footprint
@@ -0,0 +1,31 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/event_rpcgen.py
+drwxr-xr-x root/root usr/include/
+-rw-r--r-- root/root usr/include/evdns.h
+-rw-r--r-- root/root usr/include/event-config.h
+-rw-r--r-- root/root usr/include/event.h
+-rw-r--r-- root/root usr/include/evhttp.h
+-rw-r--r-- root/root usr/include/evrpc.h
+-rw-r--r-- root/root usr/include/evutil.h
+drwxr-xr-x root/root usr/lib/
+lrwxrwxrwx root/root usr/lib/libevent-1.4.so.2 -> libevent-1.4.so.2.1.3
+-rwxr-xr-x root/root usr/lib/libevent-1.4.so.2.1.3
+-rw-r--r-- root/root usr/lib/libevent.a
+-rwxr-xr-x root/root usr/lib/libevent.la
+lrwxrwxrwx root/root usr/lib/libevent.so -> libevent-1.4.so.2.1.3
+lrwxrwxrwx root/root usr/lib/libevent_core-1.4.so.2 -> libevent_core-1.4.so.2.1.3
+-rwxr-xr-x root/root usr/lib/libevent_core-1.4.so.2.1.3
+-rw-r--r-- root/root usr/lib/libevent_core.a
+-rwxr-xr-x root/root usr/lib/libevent_core.la
+lrwxrwxrwx root/root usr/lib/libevent_core.so -> libevent_core-1.4.so.2.1.3
+lrwxrwxrwx root/root usr/lib/libevent_extra-1.4.so.2 -> libevent_extra-1.4.so.2.1.3
+-rwxr-xr-x root/root usr/lib/libevent_extra-1.4.so.2.1.3
+-rw-r--r-- root/root usr/lib/libevent_extra.a
+-rwxr-xr-x root/root usr/lib/libevent_extra.la
+lrwxrwxrwx root/root usr/lib/libevent_extra.so -> libevent_extra-1.4.so.2.1.3
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/man/
+drwxr-xr-x root/root usr/share/man/man3/
+-rw-r--r-- root/root usr/share/man/man3/evdns.3.gz
+-rw-r--r-- root/root usr/share/man/man3/event.3.gz
diff --git a/base/libevent/.md5sum b/base/libevent/.md5sum
new file mode 100644
index 000000000..503566453
--- /dev/null
+++ b/base/libevent/.md5sum
@@ -0,0 +1 @@
+0b3ea18c634072d12b3c1ee734263664 libevent-1.4.13-stable.tar.gz
diff --git a/base/libevent/Pkgfile b/base/libevent/Pkgfile
new file mode 100644
index 000000000..03993f47f
--- /dev/null
+++ b/base/libevent/Pkgfile
@@ -0,0 +1,19 @@
+# Decription: Bibliothèque de notification d'événements
+# URL: http://www.monkey.org/~provos/libevent/
+# Maintainer: NuTyX core team
+# Packager: lesibel at free dot fr
+
+name=libevent
+version=1.4.13
+release=1
+
+source=( http://www.monkey.org/~provos/$name-$version-stable.tar.gz )
+
+build() {
+ cd $name-$version-stable
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc
+ make
+ make DESTDIR=$PKG install
+}
+
diff --git a/test/units/.footprint b/base/units/.footprint
index 028dd182b..028dd182b 100644
--- a/test/units/.footprint
+++ b/base/units/.footprint
diff --git a/base/units/.md5sum b/base/units/.md5sum
new file mode 100644
index 000000000..26ea2583d
--- /dev/null
+++ b/base/units/.md5sum
@@ -0,0 +1 @@
+8cf47adf29e38a9aa744e8d5246d1bec units_1.87.orig.tar.gz
diff --git a/test/units/Pkgfile b/base/units/Pkgfile
index bf1f1bd92..3977ce143 100644
--- a/test/units/Pkgfile
+++ b/base/units/Pkgfile
@@ -5,7 +5,7 @@
name=units
version=1.87
release=1
-source=(http://ftp.de.debian.org/debian/pool/main/u/$name/$name.$version.tar.gz)
+source=(http://ftp.de.debian.org/debian/pool/main/u/$name/${name}_1.87.orig.tar.gz)
build() {
cd $name-$version
diff --git a/extra/exiv2/.footprint b/extra/exiv2/.footprint
index 7f7a96767..d9348b18e 100755
--- a/extra/exiv2/.footprint
+++ b/extra/exiv2/.footprint
@@ -30,6 +30,7 @@ drwxr-xr-x root/root usr/include/exiv2/
-rw-r--r-- root/root usr/include/exiv2/orfimage.hpp
-rw-r--r-- root/root usr/include/exiv2/panasonicmn.hpp
-rw-r--r-- root/root usr/include/exiv2/pentaxmn.hpp
+-rw-r--r-- root/root usr/include/exiv2/pgfimage.hpp
-rw-r--r-- root/root usr/include/exiv2/pngimage.hpp
-rw-r--r-- root/root usr/include/exiv2/preview.hpp
-rw-r--r-- root/root usr/include/exiv2/properties.hpp
@@ -50,9 +51,9 @@ drwxr-xr-x root/root usr/include/exiv2/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libexiv2.a
-rw-r--r-- root/root usr/lib/libexiv2.la
-lrwxrwxrwx root/root usr/lib/libexiv2.so -> libexiv2.so.5.3.0
-lrwxrwxrwx root/root usr/lib/libexiv2.so.5 -> libexiv2.so.5.3.0
--rw-r--r-- root/root usr/lib/libexiv2.so.5.3.0
+lrwxrwxrwx root/root usr/lib/libexiv2.so -> libexiv2.so.6.0.0
+lrwxrwxrwx root/root usr/lib/libexiv2.so.6 -> libexiv2.so.6.0.0
+-rw-r--r-- root/root usr/lib/libexiv2.so.6.0.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/exiv2.pc
drwxr-xr-x root/root usr/share/
diff --git a/extra/exiv2/.md5sum b/extra/exiv2/.md5sum
index 6e546c31d..bc0d50c7c 100755
--- a/extra/exiv2/.md5sum
+++ b/extra/exiv2/.md5sum
@@ -1 +1 @@
-744f06b3a2beeb2341f30b157cbd8e7e exiv2-0.18.1.tar.gz
+f52fb75a2cb7512f1484deab76473e13 exiv2-0.19.tar.gz
diff --git a/extra/exiv2/Pkgfile b/extra/exiv2/Pkgfile
index 3cd2a1050..39eb2bc13 100755
--- a/extra/exiv2/Pkgfile
+++ b/extra/exiv2/Pkgfile
@@ -1,11 +1,11 @@
# Description: Librairie C++ et utilitaires pour manipuler des donnees d'images
# URL: http://www.exiv2.org/index.html
# Maintainer: NuTyX core team
-# Packager: fred.galusik at gmail dot com
+# Packager: thierryn1 at hispeed dot ch
# Depends on: expat
name=exiv2
-version=0.18.1
+version=0.19
release=1
source=(http://www.exiv2.org/$name-$version.tar.gz)
diff --git a/extra/firefox/.footprint b/extra/firefox/.footprint
index fa775c3e4..71b685df4 100644
--- a/extra/firefox/.footprint
+++ b/extra/firefox/.footprint
@@ -7,6 +7,7 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/js.msg
-rw-r--r-- root/root usr/include/firefox/jsopcode.tbl
-rw-r--r-- root/root usr/include/firefox/jsproto.tbl
+-rw-r--r-- root/root usr/include/firefox/nssck.api
-rw-r--r-- root/root usr/include/firefox/xptcstubsdecl.inc
-rw-r--r-- root/root usr/include/firefox/xptcstubsdef.inc
drwxr-xr-x root/root usr/lib/
@@ -268,9 +269,21 @@ drwxr-xr-x root/root usr/lib/firefox/icons/
-rw-r--r-- root/root usr/lib/firefox/icons/mozicon128.png
-rwxr-xr-x root/root usr/lib/firefox/install.rdf
-rwxr-xr-x root/root usr/lib/firefox/js
+-rw-r--r-- root/root usr/lib/firefox/libfreebl3.chk
+-rwxr-xr-x root/root usr/lib/firefox/libfreebl3.so
-rwxr-xr-x root/root usr/lib/firefox/libmozjs.so
+-rwxr-xr-x root/root usr/lib/firefox/libnss3.so
+-rwxr-xr-x root/root usr/lib/firefox/libnssckbi.so
+-rw-r--r-- root/root usr/lib/firefox/libnssdbm3.chk
+-rwxr-xr-x root/root usr/lib/firefox/libnssdbm3.so
+-rwxr-xr-x root/root usr/lib/firefox/libnssutil3.so
+-rwxr-xr-x root/root usr/lib/firefox/libsmime3.so
+-rw-r--r-- root/root usr/lib/firefox/libsoftokn3.chk
+-rwxr-xr-x root/root usr/lib/firefox/libsoftokn3.so
+-rwxr-xr-x root/root usr/lib/firefox/libssl3.so
-rwxr-xr-x root/root usr/lib/firefox/libxpcom.so
-rwxr-xr-x root/root usr/lib/firefox/libxul.so
+-rwxr-xr-x root/root usr/lib/firefox/mangle
drwxr-xr-x root/root usr/lib/firefox/modules/
-rw-r--r-- root/root usr/lib/firefox/modules/CertUtils.jsm
-rw-r--r-- root/root usr/lib/firefox/modules/DownloadLastDir.jsm
@@ -366,6 +379,7 @@ drwxr-xr-x root/root usr/lib/firefox/searchplugins/
-rw-r--r-- root/root usr/lib/firefox/searchplugins/google.xml
-rw-r--r-- root/root usr/lib/firefox/searchplugins/wikipedia.xml
-rw-r--r-- root/root usr/lib/firefox/searchplugins/yahoo.xml
+-rwxr-xr-x root/root usr/lib/firefox/shlibsign
-rwxr-xr-x root/root usr/lib/firefox/xpcshell
-rwxr-xr-x root/root usr/lib/firefox/xpidl
-rwxr-xr-x root/root usr/lib/firefox/xpt_dump
diff --git a/extra/firefox/.md5sum b/extra/firefox/.md5sum
index c37e75311..6e1c54dcb 100644
--- a/extra/firefox/.md5sum
+++ b/extra/firefox/.md5sum
@@ -1,4 +1,4 @@
-458051557ff49e6a352c1d56eee5782a firefox-3.6.source.tar.bz2
+a1972a2216ac7139b92b7378a328ec93 firefox-3.6.2.source.tar.bz2
68cf02788491c6e846729b2f2913bf79 firefox.desktop
658183e3e94959582c3bd382644692ea fr.xpi
f73df4409b6bba6e2a4787b9b09ee3ef mozconfig
diff --git a/extra/firefox/Pkgfile b/extra/firefox/Pkgfile
index 7994553b3..b5bdd8bab 100644
--- a/extra/firefox/Pkgfile
+++ b/extra/firefox/Pkgfile
@@ -5,8 +5,8 @@
# Depends on: alsa-lib, gtk, libidl, pango, python, curl, nss, libnotify, sqlite3, dbus-glib
name=firefox
-version=3.6
-release=2
+version=3.6.2
+release=1
source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version.source.tar.bz2\
http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/linux-i686/xpi/fr.xpi\
mozconfig firefox.desktop)
diff --git a/extra/gkrellm/.footprint b/extra/gkrellm/.footprint
new file mode 100644
index 000000000..cbc254e6e
--- /dev/null
+++ b/extra/gkrellm/.footprint
@@ -0,0 +1,27 @@
+drwxr-xr-x root/root bin/
+-rwxr-xr-x root/root bin/gkrellm
+-rwxr-xr-x root/root bin/gkrellmd
+drwxr-xr-x root/root include/
+drwxr-xr-x root/root include/gkrellm2/
+-rw-r--r-- root/root include/gkrellm2/gkrellm-public-proto.h
+-rw-r--r-- root/root include/gkrellm2/gkrellm.h
+-rw-r--r-- root/root include/gkrellm2/gkrellmd.h
+-rw-r--r-- root/root include/gkrellm2/log.h
+drwxr-xr-x root/root lib/
+drwxr-xr-x root/root lib/pkgconfig/
+-rw-r--r-- root/root lib/pkgconfig/gkrellm.pc
+drwxr-xr-x root/root share/
+drwxr-xr-x root/root share/locale/
+drwxr-xr-x root/root share/locale/fr/
+drwxr-xr-x root/root share/locale/fr/LC_MESSAGES/
+-rw-r--r-- root/root share/locale/fr/LC_MESSAGES/gkrellm.mo
+drwxr-xr-x root/root share/man/
+drwxr-xr-x root/root share/man/man1/
+-rw-r--r-- root/root share/man/man1/gkrellm.1.gz
+-rw-r--r-- root/root share/man/man1/gkrellmd.1.gz
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/applications/
+-rw-r--r-- root/root usr/share/applications/gkrellm.desktop
+drwxr-xr-x root/root usr/share/pixmaps/
+-rw-r--r-- root/root usr/share/pixmaps/gkrellm.png
diff --git a/extra/gkrellm/.md5sum b/extra/gkrellm/.md5sum
new file mode 100644
index 000000000..e5e6d6e8a
--- /dev/null
+++ b/extra/gkrellm/.md5sum
@@ -0,0 +1,3 @@
+600f4daa395112ed19a3633deb0829ff gkrellm-2.3.4.tar.gz
+a103b64d6d6c76d192b408f9338a8583 gkrellm.desktop
+aa641ec848562d54860a439a4a368b03 gkrellm.png
diff --git a/extra/gkrellm/Pkgfile b/extra/gkrellm/Pkgfile
new file mode 100644
index 000000000..889e2860c
--- /dev/null
+++ b/extra/gkrellm/Pkgfile
@@ -0,0 +1,24 @@
+# Description: Surveillance systeme graphique
+# URL: http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html
+# Maintainer: geantbrun at gmail dot com
+# Packager: geantbrun
+# Depends on: gtk lm_sensors
+
+name=gkrellm
+version=2.3.4
+release=1
+source=(http://members.dslextreme.com/users/billw/gkrellm/gkrellm-2.3.4.tar.gz\
+ $name.desktop $name.png)
+
+build() {
+ cd $name-$version
+
+
+
+ make
+ make DESTDIR=$PKG install
+ install -D -m 644 ../$name.desktop $PKG/usr/share/applications/$name.desktop
+ install -D -m 644 ../$name.png $PKG/usr/share/pixmaps/$name.png
+}
+
+
diff --git a/extra/gkrellm/gkrellm.desktop b/extra/gkrellm/gkrellm.desktop
new file mode 100644
index 000000000..33973a65f
--- /dev/null
+++ b/extra/gkrellm/gkrellm.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=gkrellm
+Comment=Manage devices
+Exec=gkrellm
+Icon=/usr/share/pixmaps/gkrellm.png
+Terminal=false
+Type=Application
+Categories=GTK;System;
+
diff --git a/extra/gkrellm/gkrellm.png b/extra/gkrellm/gkrellm.png
new file mode 100644
index 000000000..52c35562e
--- /dev/null
+++ b/extra/gkrellm/gkrellm.png
Binary files differ
diff --git a/extra/google-chrome/.footprint b/extra/google-chrome/.footprint
index f1aad85c3..9df79e0bd 100644
--- a/extra/google-chrome/.footprint
+++ b/extra/google-chrome/.footprint
@@ -1,239 +1,241 @@
-drwxr-xr-x root/root opt/
-drwxr-xr-x root/root opt/google/
-drwxr-xr-x root/root opt/google/chrome/
--rwxr-xr-x root/root opt/google/chrome/chrome
--rwsr-xr-x root/root opt/google/chrome/chrome-sandbox
--rw-r--r-- root/root opt/google/chrome/chrome.pak
--rw-r--r-- root/root opt/google/chrome/default-app-block
--rwxr-xr-x root/root opt/google/chrome/google-chrome
--rw-r--r-- root/root opt/google/chrome/google-chrome.desktop
--rw-r--r-- root/root opt/google/chrome/libffmpegsumo.so
-drwxr-xr-x root/root opt/google/chrome/locales/
--rw-r--r-- root/root opt/google/chrome/locales/am.pak
--rw-r--r-- root/root opt/google/chrome/locales/ar.pak
--rw-r--r-- root/root opt/google/chrome/locales/bg.pak
--rw-r--r-- root/root opt/google/chrome/locales/bn.pak
--rw-r--r-- root/root opt/google/chrome/locales/ca.pak
--rw-r--r-- root/root opt/google/chrome/locales/cs.pak
--rw-r--r-- root/root opt/google/chrome/locales/da.pak
--rw-r--r-- root/root opt/google/chrome/locales/de.pak
--rw-r--r-- root/root opt/google/chrome/locales/el.pak
--rw-r--r-- root/root opt/google/chrome/locales/en-GB.pak
--rw-r--r-- root/root opt/google/chrome/locales/en-US.pak
--rw-r--r-- root/root opt/google/chrome/locales/es-419.pak
--rw-r--r-- root/root opt/google/chrome/locales/es.pak
--rw-r--r-- root/root opt/google/chrome/locales/et.pak
--rw-r--r-- root/root opt/google/chrome/locales/fi.pak
--rw-r--r-- root/root opt/google/chrome/locales/fil.pak
--rw-r--r-- root/root opt/google/chrome/locales/fr.pak
--rw-r--r-- root/root opt/google/chrome/locales/gu.pak
--rw-r--r-- root/root opt/google/chrome/locales/he.pak
--rw-r--r-- root/root opt/google/chrome/locales/hi.pak
--rw-r--r-- root/root opt/google/chrome/locales/hr.pak
--rw-r--r-- root/root opt/google/chrome/locales/hu.pak
--rw-r--r-- root/root opt/google/chrome/locales/id.pak
--rw-r--r-- root/root opt/google/chrome/locales/it.pak
--rw-r--r-- root/root opt/google/chrome/locales/ja.pak
--rw-r--r-- root/root opt/google/chrome/locales/kn.pak
--rw-r--r-- root/root opt/google/chrome/locales/ko.pak
--rw-r--r-- root/root opt/google/chrome/locales/lt.pak
--rw-r--r-- root/root opt/google/chrome/locales/lv.pak
--rw-r--r-- root/root opt/google/chrome/locales/ml.pak
--rw-r--r-- root/root opt/google/chrome/locales/mr.pak
--rw-r--r-- root/root opt/google/chrome/locales/nb.pak
--rw-r--r-- root/root opt/google/chrome/locales/nl.pak
--rw-r--r-- root/root opt/google/chrome/locales/or.pak
--rw-r--r-- root/root opt/google/chrome/locales/pl.pak
--rw-r--r-- root/root opt/google/chrome/locales/pt-BR.pak
--rw-r--r-- root/root opt/google/chrome/locales/pt-PT.pak
--rw-r--r-- root/root opt/google/chrome/locales/ro.pak
--rw-r--r-- root/root opt/google/chrome/locales/ru.pak
--rw-r--r-- root/root opt/google/chrome/locales/sk.pak
--rw-r--r-- root/root opt/google/chrome/locales/sl.pak
--rw-r--r-- root/root opt/google/chrome/locales/sr.pak
--rw-r--r-- root/root opt/google/chrome/locales/sv.pak
--rw-r--r-- root/root opt/google/chrome/locales/sw.pak
--rw-r--r-- root/root opt/google/chrome/locales/ta.pak
--rw-r--r-- root/root opt/google/chrome/locales/te.pak
--rw-r--r-- root/root opt/google/chrome/locales/th.pak
--rw-r--r-- root/root opt/google/chrome/locales/tr.pak
--rw-r--r-- root/root opt/google/chrome/locales/uk.pak
--rw-r--r-- root/root opt/google/chrome/locales/vi.pak
--rw-r--r-- root/root opt/google/chrome/locales/zh-CN.pak
--rw-r--r-- root/root opt/google/chrome/locales/zh-TW.pak
-lrwxrwxrwx root/root opt/google/chrome/plugins -> ../../../usr/lib/firefox/plugins
--rw-r--r-- root/root opt/google/chrome/product_logo_16.png
--rw-r--r-- root/root opt/google/chrome/product_logo_256.png
--rw-r--r-- root/root opt/google/chrome/product_logo_32.png
--rw-r--r-- root/root opt/google/chrome/product_logo_32.xpm
--rw-r--r-- root/root opt/google/chrome/product_logo_48.png
-drwxr-xr-x root/root opt/google/chrome/resources/
-drwxr-xr-x root/root opt/google/chrome/resources/inspector/
-drwxr-xr-x root/root opt/google/chrome/resources/inspector/Images/
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/back.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/checker.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/clearConsoleButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/closeButtons.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/consoleButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/cookie.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/database.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/databaseTable.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/debuggerContinue.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/debuggerPause.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/debuggerStepInto.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/debuggerStepOut.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/debuggerStepOver.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/disclosureTriangleSmallDown.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/disclosureTriangleSmallDownBlack.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/disclosureTriangleSmallDownWhite.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/disclosureTriangleSmallRight.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/disclosureTriangleSmallRightBlack.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/disclosureTriangleSmallRightDown.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/disclosureTriangleSmallRightDownBlack.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/disclosureTriangleSmallRightDownWhite.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/disclosureTriangleSmallRightWhite.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/dockButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/elementsIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/enableOutlineButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/enableSolidButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/errorIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/errorMediumIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/errorRedDot.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/excludeButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/focusButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/forward.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/glossyHeader.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/glossyHeaderPressed.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/glossyHeaderSelected.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/glossyHeaderSelectedPressed.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/goArrow.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/graphLabelCalloutLeft.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/graphLabelCalloutRight.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/grayConnectorPoint.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/largerResourcesButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/localStorage.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/nodeSearchButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/paneBottomGrow.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/paneBottomGrowActive.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/paneGrowHandleLine.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/paneSettingsButtons.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/pauseOnExceptionButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/percentButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/profileGroupIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/profileIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/profileSmallIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/profilesIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/profilesSilhouette.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/radioDot.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/recordButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/recordToggledButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/reloadButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/resourceCSSIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/resourceDocumentIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/resourceDocumentIconSmall.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/resourceJSIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/resourcePlainIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/resourcePlainIconSmall.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/resourcesIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/resourcesSilhouette.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/resourcesSizeGraphIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/resourcesTimeGraphIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/scriptsIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/scriptsSilhouette.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/searchSmallBlue.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/searchSmallBrightBlue.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/searchSmallGray.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/searchSmallWhite.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segment.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segmentChromium.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segmentEnd.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segmentHover.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segmentHoverChromium.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segmentHoverEnd.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segmentHoverEndChromium.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segmentSelected.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segmentSelectedChromium.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segmentSelectedEnd.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/segmentSelectedEndChromium.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/sessionStorage.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/splitviewDimple.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/splitviewDividerBackground.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarBackground.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarBackgroundChromium.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarBottomBackground.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarBottomBackgroundChromium.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarButtons.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarButtonsChromium.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarMenuButton.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarMenuButtonChromium.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarMenuButtonSelected.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarResizerHorizontal.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/statusbarResizerVertical.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/storageIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/successGreenDot.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineBarBlue.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineBarGray.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineBarGreen.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineBarOrange.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineBarPurple.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineBarRed.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineBarYellow.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineCheckmarks.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineDots.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineHollowPillBlue.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineHollowPillGray.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineHollowPillGreen.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineHollowPillOrange.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineHollowPillPurple.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineHollowPillRed.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineHollowPillYellow.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelineIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelinePillBlue.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelinePillGray.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelinePillGreen.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelinePillOrange.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelinePillPurple.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelinePillRed.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/timelinePillYellow.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/tipBalloon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/tipBalloonBottom.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/tipIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/tipIconPressed.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/toolbarItemSelected.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/treeDownTriangleBlack.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/treeDownTriangleWhite.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/treeRightTriangleBlack.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/treeRightTriangleWhite.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/treeUpTriangleBlack.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/treeUpTriangleWhite.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/undockButtonGlyph.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/userInputIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/userInputPreviousIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/userInputResultIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/warningIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/warningMediumIcon.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/warningOrangeDot.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/warningsErrors.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/Images/whiteConnectorPoint.png
--rw-r--r-- root/root opt/google/chrome/resources/inspector/devtools.css
--rw-r--r-- root/root opt/google/chrome/resources/inspector/devtools.html
--rw-r--r-- root/root opt/google/chrome/resources/inspector/devtools.js
--rw-r--r-- root/root opt/google/chrome/resources/inspector/inspector.css
--rw-r--r-- root/root opt/google/chrome/resources/inspector/inspector.html
--rw-r--r-- root/root opt/google/chrome/resources/inspector/inspectorSyntaxHighlight.css
--rwxr-xr-x root/root opt/google/chrome/xdg-settings
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-lrwxrwxrwx root/root usr/bin/google-chrome -> ../../opt/google/chrome/google-chrome
+-rwxr-xr-x root/root usr/bin/chromium
drwxr-xr-x root/root usr/lib/
-lrwxrwxrwx root/root usr/lib/libnspr4.so.0d -> libnspr4.so
-lrwxrwxrwx root/root usr/lib/libnss3.so.1d -> libnss3.so
-lrwxrwxrwx root/root usr/lib/libnssutil3.so.1d -> libnssutil3.so
-lrwxrwxrwx root/root usr/lib/libplc4.so.0d -> libplc4.so
-lrwxrwxrwx root/root usr/lib/libplds4.so.0d -> libplds4.so
-lrwxrwxrwx root/root usr/lib/libsmime3.so.1d -> libsmime3.so
-lrwxrwxrwx root/root usr/lib/libssl3.so.1d -> libssl3.so
+drwxr-xr-x root/root usr/lib/chromium/
+-rw-r--r-- root/root usr/lib/chromium/chrome.pak
+-rwxr-xr-x root/root usr/lib/chromium/chromium
+-r-sr-xr-x root/root usr/lib/chromium/chromium-sandbox
+lrwxrwxrwx root/root usr/lib/chromium/libavcodec.so.52 -> /usr/lib/libavcodec.so.52
+lrwxrwxrwx root/root usr/lib/chromium/libavformat.so.52 -> /usr/lib/libavformat.so.52
+lrwxrwxrwx root/root usr/lib/chromium/libavutil.so.50 -> /usr/lib/libavutil.so.50
+drwxr-xr-x root/root usr/lib/chromium/locales/
+-rw-r--r-- root/root usr/lib/chromium/locales/am.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/ar.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/bg.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/bn.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/ca.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/cs.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/da.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/de.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/el.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/en-GB.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/en-US.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/es-419.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/es.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/et.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/fi.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/fil.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/fr.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/gu.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/he.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/hi.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/hr.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/hu.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/id.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/it.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/ja.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/kn.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/ko.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/lt.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/lv.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/ml.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/mr.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/nb.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/nl.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/or.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/pl.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/pt-BR.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/pt-PT.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/ro.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/ru.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/sk.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/sl.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/sr.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/sv.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/sw.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/ta.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/te.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/th.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/tr.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/uk.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/vi.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/zh-CN.pak
+-rw-r--r-- root/root usr/lib/chromium/locales/zh-TW.pak
+drwxr-xr-x root/root usr/lib/chromium/resources/
+drwxr-xr-x root/root usr/lib/chromium/resources/inspector/
+drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/back.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/checker.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/clearConsoleButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/closeButtons.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/consoleButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/consoleIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/cookie.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/database.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/databaseTable.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/debuggerContinue.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/debuggerPause.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/debuggerStepInto.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/debuggerStepOut.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/debuggerStepOver.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallDown.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallDownBlack.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallDownWhite.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRight.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRightBlack.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRightDown.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRightDownBlack.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRightDownWhite.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/disclosureTriangleSmallRightWhite.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/dockButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/elementsIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/enableOutlineButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/enableSolidButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/errorIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/errorMediumIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/errorRedDot.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/excludeButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/focusButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/forward.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/glossyHeader.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/glossyHeaderPressed.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/glossyHeaderSelected.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/glossyHeaderSelectedPressed.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/goArrow.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/graphLabelCalloutLeft.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/graphLabelCalloutRight.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/grayConnectorPoint.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/largerResourcesButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/localStorage.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/nodeSearchButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/paneBottomGrow.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/paneBottomGrowActive.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/paneGrowHandleLine.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/paneSettingsButtons.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/pauseOnExceptionButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/percentButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/profileGroupIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/profileIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/profileSmallIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/profilesIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/profilesSilhouette.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/radioDot.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/recordButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/recordToggledButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/reloadButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/resourceCSSIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/resourceDocumentIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/resourceDocumentIconSmall.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/resourceJSIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/resourcePlainIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/resourcePlainIconSmall.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/resourcesIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/resourcesSilhouette.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/resourcesSizeGraphIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/resourcesTimeGraphIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/scriptsIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/scriptsSilhouette.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/searchSmallBlue.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/searchSmallBrightBlue.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/searchSmallGray.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/searchSmallWhite.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segment.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segmentChromium.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segmentEnd.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segmentHover.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segmentHoverChromium.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segmentHoverEnd.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segmentHoverEndChromium.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segmentSelected.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segmentSelectedChromium.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segmentSelectedEnd.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/segmentSelectedEndChromium.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/sessionStorage.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/splitviewDimple.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/splitviewDividerBackground.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarBackground.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarBackgroundChromium.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarBottomBackground.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarBottomBackgroundChromium.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarButtons.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarButtonsChromium.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarMenuButton.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarMenuButtonChromium.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarMenuButtonSelected.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarResizerHorizontal.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/statusbarResizerVertical.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/storageIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/successGreenDot.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineBarBlue.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineBarGray.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineBarGreen.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineBarOrange.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineBarPurple.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineBarRed.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineBarYellow.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineCheckmarks.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineDots.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineHollowPillBlue.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineHollowPillGray.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineHollowPillGreen.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineHollowPillOrange.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineHollowPillPurple.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineHollowPillRed.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineHollowPillYellow.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelineIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelinePillBlue.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelinePillGray.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelinePillGreen.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelinePillOrange.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelinePillPurple.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelinePillRed.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/timelinePillYellow.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/toolbarItemSelected.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/treeDownTriangleBlack.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/treeDownTriangleWhite.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/treeRightTriangleBlack.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/treeRightTriangleWhite.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/treeUpTriangleBlack.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/treeUpTriangleWhite.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/undockButtonGlyph.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/userInputIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/userInputPreviousIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/userInputResultIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/warningIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/warningMediumIcon.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/warningOrangeDot.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/warningsErrors.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/Images/whiteConnectorPoint.png
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/audits.css
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/devtools.css
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools.html
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools.js
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/inspector.css
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/inspector.html
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/inspectorSyntaxHighlight.css
+-rw-r--r-- 1000/1000 usr/lib/chromium/resources/inspector/textEditor.css
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
-lrwxrwxrwx root/root usr/share/applications/google-chrome.desktop -> ../../../opt/google/chrome/google-chrome.desktop
+-rw-r--r-- root/root usr/share/applications/chromium.desktop
+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/16x16/
+drwxr-xr-x root/root usr/share/icons/hicolor/16x16/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/chromium.png
+drwxr-xr-x root/root usr/share/icons/hicolor/256x256/
+drwxr-xr-x root/root usr/share/icons/hicolor/256x256/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/256x256/apps/chromium.png
+drwxr-xr-x root/root usr/share/icons/hicolor/32x32/
+drwxr-xr-x root/root usr/share/icons/hicolor/32x32/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/chromium.png
+drwxr-xr-x root/root usr/share/icons/hicolor/48x48/
+drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/
+-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/chromium.png
+drwxr-xr-x root/root usr/share/licenses/
+drwxr-xr-x root/root usr/share/licenses/chromium/
+-rw-r--r-- root/root usr/share/licenses/chromium/LICENSE
+drwxr-xr-x root/root usr/share/man/
+drwxr-xr-x root/root usr/share/man/man1/
+-rw-r--r-- root/root usr/share/man/man1/chromium.1.gz
diff --git a/extra/google-chrome/.md5sum b/extra/google-chrome/.md5sum
index 95f3f4771..63277ff8d 100644
--- a/extra/google-chrome/.md5sum
+++ b/extra/google-chrome/.md5sum
@@ -1 +1,6 @@
-7dfceaf0822c029159327f78c3242147 google-chrome-beta_current_i386.deb
+897de25e9c25a01f8b1b67abe554a6b7 chromium.desktop
+93cd6f5f53b15546dc9d3de49118534c chromium.sh
+dfbc18bb26dffa2dc6d4d3a857730902 drop_sse2.patch
+ae9e26e6c2d164e6af0e513dae2273a3 ffmpeg_branding_mime.patch
+6f244ca8f006519427301b2e015f55cc google-chrome-5.0.307.11.tar.gz
+e3b482665b179e06ff852c58463706a8 libpng-1.4.patch
diff --git a/extra/google-chrome/Pkgfile b/extra/google-chrome/Pkgfile
index 692cf2b11..59830fd84 100644
--- a/extra/google-chrome/Pkgfile
+++ b/extra/google-chrome/Pkgfile
@@ -1,42 +1,108 @@
# Description: Navigateur de chez Google
-# URL: http://www.google.com
+# URL: htt:p//www.google.com
# Maintainer: NuTyX core team
# Packager: geantbrun
-# Depends on: xz-utils
+# Depends on: xz-utils, libjpeg, nss, gconf, alsa-lib, xdg-utils, hicolor-icon-theme, bzip2, libxslt, ffmpeg, p5-event, libevent
name=google-chrome
-version=4.0.249.43
+version=5.0.307.11
release=1
-if [ "`uname -m`" = 'x86_64' ]; then
- ARCH='amd64'
- else
- ARCH='i386'
-fi
-source=(http://dl.google.com/dl/linux/direct/google-chrome-beta_current_${ARCH}.deb )
+
+#source=(http://dl.google.com/dl/linux/direct/google-chrome-beta_current_${ARCH}.deb
+
+source=( http://sibelle.dyndns.org/sources/google-chrome-5.0.307.11.tar.gz
+ chromium.desktop chromium.sh drop_sse2.patch ffmpeg_branding_mime.patch libpng-1.4.patch)
build() {
- ar -x google-chrome-beta_current_$ARCH.deb
- unlzma data.tar.lzma
- tar xf data.tar
- mkdir -p $PKG/opt $PKG/usr/bin $PKG/usr/share/applications $PKG/usr/lib
+
+# ar -x google-chrome-beta_current_$ARCH.deb
+# unlzma data.tar.lzma
+# tar xf data.tar
+# mkdir -p $PKG/opt $PKG/usr/bin $PKG/usr/share/applications $PKG/usr/lib
+#
+# mv opt/google $PKG/opt
+# cd $PKG/opt/google/chrome
+#
+# cd $PKG/usr/bin/
+# ln -s ../../opt/google/chrome/google-chrome
+#
+# cd $PKG/opt/google/chrome
+# ln -s ../../../usr/lib/firefox/plugins
+#
+# cd $PKG/usr/share/applications
+# ln -s ../../../opt/google/chrome/google-chrome.desktop
+# cd $PKG/usr/lib
+# ln -s libnss3.so libnss3.so.1d
+# ln -s libnssutil3.so libnssutil3.so.1d
+# ln -s libsmime3.so libsmime3.so.1d
+# ln -s libssl3.so libssl3.so.1d
+# ln -s libplds4.so libplds4.so.0d
+# ln -s libplc4.so libplc4.so.0d
+# ln -s libnspr4.so libnspr4.so.0d
+# ln -s libjpeg.so libjpeg.so.62
- mv opt/google $PKG/opt
- cd $PKG/opt/google/chrome
-
- cd $PKG/usr/bin/
- ln -s ../../opt/google/chrome/google-chrome
-
- cd $PKG/opt/google/chrome
- ln -s ../../../usr/lib/firefox/plugins
-
- cd $PKG/usr/share/applications
- ln -s ../../../opt/google/chrome/google-chrome.desktop
- cd $PKG/usr/lib
- ln -s libnss3.so libnss3.so.1d
- ln -s libnssutil3.so libnssutil3.so.1d
- ln -s libsmime3.so libsmime3.so.1d
- ln -s libssl3.so libssl3.so.1d
- ln -s libplds4.so libplds4.so.0d
- ln -s libplc4.so libplc4.so.0d
- ln -s libnspr4.so libnspr4.so.0d
+ cd $SRC/$name-$version
+
+ export GYP_GENERATORS='make'
+ export BUILDTYPE='Release'
+ export GYP_DEFINES="gcc_version=44 \
+ no_strict_aliasing=1 \
+ linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+ linux_strip_binary=1 \
+ release_extra_cflags='${CFLAGS}' \
+ ffmpeg_branding=Chrome \
+ use_system_libjpeg=1 \
+ use_system_libxslt=1 \
+ use_system_bzip2=1 \
+ use_system_libpng=1 \
+ use_system_ffmpeg=1 \
+ use_system_yasm=1 \
+ use_system_libevent=1 \
+ use_system_ssl=1"
+
+ patch -p0 -i $SRC/ffmpeg_branding_mime.patch
+ # i686 does not include SSE2
+ # see http://code.google.com/p/chromium/issues/detail?id=9007
+ patch -p0 -i $SRC/drop_sse2.patch
+ # see http://codereview.chromium.org/569009/show
+ patch -p0 -i $SRC/libpng-1.4.patch
+
+ export PATH=./depot_tools/:$PATH
+ gclient.py runhooks --force
+
+ cd src
+ make chrome chrome_sandbox
+
+ cd $SRC/$name-$version
+
+ install -m 0755 -D src/out/Release/chrome \
+ $PKG/usr/lib/chromium/chromium
+ install -m 4555 -o root -g root -D src/out/Release/chrome_sandbox \
+ $PKG/usr/lib/chromium/chromium-sandbox
+ install -m 0644 -D src/out/Release/chrome.pak \
+ $PKG/usr/lib/chromium/chrome.pak
+ ln -s /usr/lib/libavcodec.so.52 $PKG/usr/lib/chromium/libavcodec.so.52
+ ln -s /usr/lib/libavformat.so.52 $PKG/usr/lib/chromium/libavformat.so.52
+ ln -s /usr/lib/libavutil.so.50 $PKG/usr/lib/chromium/libavutil.so.50
+ cp -a src/out/Release/locales src/out/Release/resources \
+ $PKG/usr/lib/chromium/
+ find $PKG/usr/lib/chromium/ -name '*.d' -type f -delete
+ install -m 0644 -D src/out/Release/chrome.1 \
+ $PKG/usr/share/man/man1/chromium.1
+
+ install -m 0644 -D $SRC/chromium.desktop \
+ $PKG/usr/share/applications/chromium.desktop
+ for size in 16 32 48 256; do
+ install -m 0644 -D \
+ src/chrome/app/theme/chromium/product_logo_${size}.png \
+ $PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
+ done
+ install -m 0755 -D $SRC/chromium.sh \
+ $PKG/usr/bin/chromium
+
+ install -m 0644 -D src/LICENSE \
+ $PKG/usr/share/licenses/chromium/LICENSE
+
+
+
}
diff --git a/extra/google-chrome/chromium.desktop b/extra/google-chrome/chromium.desktop
new file mode 100644
index 000000000..f04c819ce
--- /dev/null
+++ b/extra/google-chrome/chromium.desktop
@@ -0,0 +1,114 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Chromium
+# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
+# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
+GenericName=Web Browser
+GenericName[ar]=متصفح الشبكة
+GenericName[bg]=Уеб браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=WWW prohlížeč
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής ιστού
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebibrauser
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[gu]=વેબ બ્રાઉઝર
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
+GenericName[ko]=웹 브라우저
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Tīmekļa pārlūks
+GenericName[ml]=വെബ് ബ്രൌസര്‍
+GenericName[mr]=वेब ब्राऊजर
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador da Internet
+GenericName[ro]=Navigator de Internet
+GenericName[ru]=Веб-браузер
+GenericName[sl]=Spletni brskalnik
+GenericName[sv]=Webbläsare
+GenericName[ta]=இணைய உலாவி
+GenericName[th]=เว็บเบราว์เซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_HK]=網頁瀏覽器
+GenericName[zh_TW]=網頁瀏覽器
+# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[fil]=Web Browser
+GenericName[hr]=Web preglednik
+GenericName[id]=Browser Web
+GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
+GenericName[sk]=WWW prehliadač
+GenericName[sr]=Интернет прегледник
+GenericName[te]=మహాతల అన్వేషి
+GenericName[vi]=Bộ duyệt Web
+# Gnome and KDE 3 uses Comment.
+Comment=Access the Internet
+Comment[ar]=الدخول إلى الإنترنت
+Comment[bg]=Достъп до интернет
+Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
+Comment[ca]=Accedeix a Internet
+Comment[cs]=Přístup k internetu
+Comment[da]=Få adgang til internettet
+Comment[de]=Internetzugriff
+Comment[el]=Πρόσβαση στο Διαδίκτυο
+Comment[en_GB]=Access the Internet
+Comment[es]=Accede a Internet.
+Comment[et]=Pääs Internetti
+Comment[fi]=Käytä internetiä
+Comment[fil]=I-access ang Internet
+Comment[fr]=Accéder à Internet
+Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
+Comment[he]=גישה אל האינטרנט
+Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
+Comment[hr]=Pristup Internetu
+Comment[hu]=Internetelérés
+Comment[id]=Akses Internet
+Comment[it]=Accesso a Internet
+Comment[ja]=インターネットにアクセス
+Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
+Comment[ko]=인터넷 연결
+Comment[lt]=Interneto prieiga
+Comment[lv]=Piekļūt internetam
+Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
+Comment[mr]=इंटरनेटमध्ये प्रवेश करा
+Comment[nb]=Gå til Internett
+Comment[nl]=Verbinding maken met internet
+Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
+Comment[pl]=Skorzystaj z internetu
+Comment[pt]=Aceder à Internet
+Comment[pt_BR]=Acessar a internet
+Comment[ro]=Accesaţi Internetul
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prístup do siete Internet
+Comment[sl]=Dostop do interneta
+Comment[sr]=Приступите Интернету
+Comment[sv]=Gå ut på Internet
+Comment[ta]=இணையத்தை அணுகுதல்
+Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
+Comment[th]=เข้าถึงอินเทอร์เน็ต
+Comment[tr]=İnternet'e erişin
+Comment[uk]=Доступ до Інтернету
+Comment[vi]=Truy cập Internet
+Comment[zh_CN]=访问互联网
+Comment[zh_HK]=連線到網際網路
+Comment[zh_TW]=連線到網際網路
+Exec=chromium %U
+Terminal=false
+Icon=chromium
+Type=Application
+Categories=Application;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml_xml;
diff --git a/extra/google-chrome/chromium.install b/extra/google-chrome/chromium.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/google-chrome/chromium.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/google-chrome/chromium.sh b/extra/google-chrome/chromium.sh
new file mode 100644
index 000000000..989bd3476
--- /dev/null
+++ b/extra/google-chrome/chromium.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+export CHROME_WRAPPER=/usr/lib/chromium/chromium
+export CHROME_DESKTOP=chromium.desktop
+exec /usr/lib/chromium/chromium $@
diff --git a/extra/google-chrome/createSource.htm b/extra/google-chrome/createSource.htm
new file mode 100644
index 000000000..3df70baab
--- /dev/null
+++ b/extra/google-chrome/createSource.htm
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+. PKGBUILD
+
+# see http://src.chromium.org/svn/trunk/src/tools/export_tarball/export_tarball.py
+nonessential_dirs=(
+ 'src/chrome/test/data'
+ 'src/chrome/tools/test/reference_build'
+ 'src/gears/binaries'
+ 'src/net/data/cache_tests'
+ 'src/o3d/documentation'
+ 'src/o3d/samples'
+ 'src/third_party/lighttpd'
+ 'src/third_party/WebKit/LayoutTests'
+ 'src/webkit/data/layout_tests'
+ 'src/webkit/tools/test/reference_build'
+)
+
+current=$(pwd)
+tmp=$(mktemp -d)
+mkdir -p $tmp/chromium-$pkgver
+cd $tmp/chromium-$pkgver
+
+# this should be updated to a more recent revision on major updates
+svn co -r38382 -q http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools
+
+export PATH=./depot_tools/:$PATH
+gclient.py config http://src.chromium.org/svn/releases/$pkgver
+sed -e '15i\ "src/third_party/WebKit/LayoutTests": None,' \
+ -e '15i\ "src/chrome/tools/test/reference_build": None,' \
+ -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/ia32": None,' \
+ -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": None,' \
+ -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/x64": None,' \
+ -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg": None,' \
+ -i .gclient
+gclient.py sync --force --nohooks
+
+svnversion src > src/build/LASTCHANGE.in
+
+for i in ${nonessential_dirs[@]}; do
+ rm -rf $i
+done
+
+find . -name '.svn' -type d -exec rm -rf {} \;
+find . -iname '*.dll' -delete
+find . -iname '*.exe' -delete
+find . -iname '*.o' -delete
+find . -iname '*.nexe' -delete
+
+cd ..
+bsdtar cJf $current/chromium-$pkgver.tar.xz chromium-$pkgver
+cd $current
+
+rm -rf $tmp
diff --git a/extra/google-chrome/drop_sse2.patch b/extra/google-chrome/drop_sse2.patch
new file mode 100644
index 000000000..66051ff27
--- /dev/null
+++ b/extra/google-chrome/drop_sse2.patch
@@ -0,0 +1,18 @@
+--- src/build/common.gypi 2010-02-11 19:30:43.000000000 +0100
++++ src/build/common.gypi 2010-02-11 21:07:58.505011143 +0100
+@@ -759,15 +759,6 @@
+ # used during computation does not change depending on how the
+ # compiler optimized the code, since the value is always kept
+ # in its specified precision.
+- 'conditions': [
+- ['branding=="Chromium"', {
+- 'cflags': [
+- '-march=pentium4',
+- '-msse2',
+- '-mfpmath=sse',
+- ],
+- }],
+- ],
+ 'cflags': [
+ '-m32',
+ ],
diff --git a/extra/google-chrome/ffmpeg_branding_mime.patch b/extra/google-chrome/ffmpeg_branding_mime.patch
new file mode 100644
index 000000000..083026e76
--- /dev/null
+++ b/extra/google-chrome/ffmpeg_branding_mime.patch
@@ -0,0 +1,29 @@
+--- src/net/base/mime_util.cc 2010-02-11 20:07:33.939537145 +0100
++++ src/net/base/mime_util.cc 2010-02-11 20:07:33.955373468 +0100
+@@ -188,7 +188,6 @@
+ "audio/ogg",
+ "application/ogg",
+
+-#if defined(GOOGLE_CHROME_BUILD)
+ // MPEG-4.
+ "video/mp4",
+ "video/x-m4v",
+@@ -199,7 +198,6 @@
+ "audio/mp3",
+ "audio/x-mp3",
+ "audio/mpeg",
+-#endif
+ };
+
+ // List of supported codecs when passed in with <source type="...">.
+@@ -207,10 +205,8 @@
+ // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
+ // for more information.
+ static const char* const supported_media_codecs[] = {
+-#if defined(GOOGLE_CHROME_BUILD)
+ "avc1",
+ "mp4a",
+-#endif
+ "theora",
+ "vorbis",
+ };
diff --git a/extra/google-chrome/libpng-1.4.patch b/extra/google-chrome/libpng-1.4.patch
new file mode 100644
index 000000000..a3c4baf28
--- /dev/null
+++ b/extra/google-chrome/libpng-1.4.patch
@@ -0,0 +1,58 @@
+--- src/app/gfx/codec/png_codec.cc
++++ src/app/gfx/codec/png_codec.cc
+@@ -190,7 +190,7 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) {
+ unsigned long long total_size =
+ static_cast<unsigned long long>(w) * static_cast<unsigned long long>(h);
+ if (total_size > ((1 << 29) - 1))
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ state->width = static_cast<int>(w);
+ state->height = static_cast<int>(h);
+
+@@ -279,7 +279,7 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) {
+ }
+ } else {
+ NOTREACHED() << "Unknown input channels";
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ if (state->bitmap) {
+@@ -349,10 +349,7 @@ bool BuildPNGStruct(const unsigned char* input, size_t input_size,
+ if (png_sig_cmp(const_cast<unsigned char*>(input), 0, 8) != 0)
+ return false;
+
+- *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
+- png_error_ptr_NULL,
+- png_error_ptr_NULL);
++ *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ if (!*png_ptr)
+ return false;
+
+@@ -574,9 +571,7 @@ bool PNGCodec::Encode(const unsigned char* input, ColorFormat format,
+ DCHECK(input_color_components * w <= row_byte_width);
+
+ png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
+- png_error_ptr_NULL,
+- png_error_ptr_NULL);
++ NULL, NULL, NULL);
+ if (!png_ptr)
+ return false;
+ png_info* info_ptr = png_create_info_struct(png_ptr);
+--- src/third_party/WebKit/WebCore/platform/image-encoders/skia/orig/PNGImageEncoder.cpp 2009-11-19 13:39:07.000000000 -0800
++++ src/third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp 2009-11-19 13:39:25.000000000 -0800
+@@ -130,9 +130,9 @@
+ }
+
+ png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
+- png_error_ptr_NULL,
+- png_error_ptr_NULL);
++ NULL,
++ NULL,
++ NULL);
+ if (!pngPtr)
+ return false;
+
diff --git a/extra/gtkimageview/.footprint b/extra/gtkimageview/.footprint
new file mode 100644
index 000000000..2ea0b5c7d
--- /dev/null
+++ b/extra/gtkimageview/.footprint
@@ -0,0 +1,25 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/include/
+drwxr-xr-x root/root usr/include/gtkimageview/
+-rw-r--r-- root/root usr/include/gtkimageview/cursors.h
+-rw-r--r-- root/root usr/include/gtkimageview/gdkpixbufdrawcache.h
+-rw-r--r-- root/root usr/include/gtkimageview/gtkanimview.h
+-rw-r--r-- root/root usr/include/gtkimageview/gtkiimagetool.h
+-rw-r--r-- root/root usr/include/gtkimageview/gtkimagenav.h
+-rw-r--r-- root/root usr/include/gtkimageview/gtkimagescrollwin.h
+-rw-r--r-- root/root usr/include/gtkimageview/gtkimagetooldragger.h
+-rw-r--r-- root/root usr/include/gtkimageview/gtkimagetoolpainter.h
+-rw-r--r-- root/root usr/include/gtkimageview/gtkimagetoolselector.h
+-rw-r--r-- root/root usr/include/gtkimageview/gtkimageview-typebuiltins.h
+-rw-r--r-- root/root usr/include/gtkimageview/gtkimageview.h
+-rw-r--r-- root/root usr/include/gtkimageview/gtkzooms.h
+-rw-r--r-- root/root usr/include/gtkimageview/mouse_handler.h
+-rw-r--r-- root/root usr/include/gtkimageview/utils.h
+drwxr-xr-x root/root usr/lib/
+-rw-r--r-- root/root usr/lib/libgtkimageview.a
+-rwxr-xr-x root/root usr/lib/libgtkimageview.la
+lrwxrwxrwx root/root usr/lib/libgtkimageview.so -> libgtkimageview.so.0.0.0
+lrwxrwxrwx root/root usr/lib/libgtkimageview.so.0 -> libgtkimageview.so.0.0.0
+-rwxr-xr-x root/root usr/lib/libgtkimageview.so.0.0.0
+drwxr-xr-x root/root usr/lib/pkgconfig/
+-rw-r--r-- root/root usr/lib/pkgconfig/gtkimageview.pc
diff --git a/extra/gtkimageview/.md5sum b/extra/gtkimageview/.md5sum
new file mode 100644
index 000000000..42940ec66
--- /dev/null
+++ b/extra/gtkimageview/.md5sum
@@ -0,0 +1 @@
+501367b3f50e69a12208dc9c6ad00b18 gtkimageview-1.6.4.tar.gz
diff --git a/extra/gtkimageview/Pkgfile b/extra/gtkimageview/Pkgfile
new file mode 100755
index 000000000..6f9505b43
--- /dev/null
+++ b/extra/gtkimageview/Pkgfile
@@ -0,0 +1,22 @@
+# Description: Visionneur d'image pour GTK
+# URL: http://www.gnome.org
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: gtk
+
+name=gtkimageview
+version=1.6.4
+release=1
+source=(http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/$name-$version.tar.gz)
+
+
+build() {
+ cd $name-$version
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --disable-accessibility
+ make
+ make DESTDIR=$PKG install
+ rm -r $PKG/usr/share
+}
diff --git a/extra/imule/.footprint b/extra/imule/.footprint
new file mode 100644
index 000000000..2d039c6a1
--- /dev/null
+++ b/extra/imule/.footprint
@@ -0,0 +1,61 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/ed2k
+-rwxr-xr-x root/root usr/bin/imule
+drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/xchat/
+drwxr-xr-x root/root usr/lib/xchat/plugins/
+-rw-r--r-- root/root usr/lib/xchat/plugins/xas.pl
+drwxr-xr-x root/root usr/libexec/
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/applications/
+-rw-r--r-- root/root usr/share/applications/imule.desktop
+drwxr-xr-x root/root usr/share/doc/
+drwxr-xr-x root/root usr/share/doc/imule/
+-rw-r--r-- root/root usr/share/doc/imule/ABOUT-NLS
+-rw-r--r-- root/root usr/share/doc/imule/Changelog
+-rw-r--r-- root/root usr/share/doc/imule/Doxyfile
+-rw-r--r-- root/root usr/share/doc/imule/EC_Protocol.txt
+-rw-r--r-- root/root usr/share/doc/imule/ED2K-Links.HOWTO
+-rw-r--r-- root/root usr/share/doc/imule/INSTALL
+-rw-r--r-- root/root usr/share/doc/imule/README
+-rw-r--r-- root/root usr/share/doc/imule/TODO
+-rw-r--r-- root/root usr/share/doc/imule/imule-win32.HOWTO.txt
+-rw-r--r-- root/root usr/share/doc/imule/imule.texi
+-rw-r--r-- root/root usr/share/doc/imule/imulesig.txt
+-rw-r--r-- root/root usr/share/doc/imule/license.txt
+-rw-r--r-- root/root usr/share/doc/imule/nodes.dat
+-rw-r--r-- root/root usr/share/doc/imule/socks4.protocol
+-rw-r--r-- root/root usr/share/doc/imule/thisIsImuleConfigDir (EMPTY)
+drwxr-xr-x root/root usr/share/info/
+-rw-r--r-- root/root usr/share/info/dir.gz
+drwxr-xr-x root/root usr/share/locale/
+drwxr-xr-x root/root usr/share/locale/fr/
+drwxr-xr-x root/root usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r-- root/root usr/share/locale/fr/LC_MESSAGES/imule.mo
+drwxr-xr-x root/root usr/share/man/
+drwxr-xr-x root/root usr/share/man/de/
+drwxr-xr-x root/root usr/share/man/de/man1/
+-rw-r--r-- root/root usr/share/man/de/man1/ed2k.1.gz
+-rw-r--r-- root/root usr/share/man/de/man1/imule.1.gz
+-rw-r--r-- root/root usr/share/man/de/man1/xas.1.gz
+drwxr-xr-x root/root usr/share/man/es/
+drwxr-xr-x root/root usr/share/man/es/man1/
+-rw-r--r-- root/root usr/share/man/es/man1/ed2k.1.gz
+-rw-r--r-- root/root usr/share/man/es/man1/imule.1.gz
+-rw-r--r-- root/root usr/share/man/es/man1/xas.1.gz
+drwxr-xr-x root/root usr/share/man/fr/
+drwxr-xr-x root/root usr/share/man/fr/man1/
+-rw-r--r-- root/root usr/share/man/fr/man1/ed2k.1.gz
+-rw-r--r-- root/root usr/share/man/fr/man1/imule.1.gz
+drwxr-xr-x root/root usr/share/man/hu/
+drwxr-xr-x root/root usr/share/man/hu/man1/
+-rw-r--r-- root/root usr/share/man/hu/man1/ed2k.1.gz
+-rw-r--r-- root/root usr/share/man/hu/man1/imule.1.gz
+-rw-r--r-- root/root usr/share/man/hu/man1/xas.1.gz
+drwxr-xr-x root/root usr/share/man/man1/
+-rw-r--r-- root/root usr/share/man/man1/ed2k.1.gz
+-rw-r--r-- root/root usr/share/man/man1/imule.1.gz
+-rw-r--r-- root/root usr/share/man/man1/xas.1.gz
+drwxr-xr-x root/root usr/share/pixmaps/
+-rw-r--r-- root/root usr/share/pixmaps/imule.xpm
diff --git a/extra/imule/.md5sum b/extra/imule/.md5sum
new file mode 100644
index 000000000..b7c97d4ed
--- /dev/null
+++ b/extra/imule/.md5sum
@@ -0,0 +1 @@
+79f9de766f4481f2ce169888201c5427 iMule_1.4.6_src.tbz
diff --git a/extra/imule/Pkgfile b/extra/imule/Pkgfile
new file mode 100644
index 000000000..2f057af1b
--- /dev/null
+++ b/extra/imule/Pkgfile
@@ -0,0 +1,23 @@
+# Description: Logiciel de partage de fichiers P2P anonymes
+# URL: http://www.imule.i2p.tin0.de
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: wxgtk
+
+name=imule
+version=1.4.6
+release=1
+source=(http://aceini.no-ip.info/$name/$version/iMule_${version}_src.tbz)
+
+build() {
+ tar xf iMule_${version}_src.tbz
+ cd iMule-$version-src
+ ./configure --enable-debug=no \
+ --enable-optimize=yes \
+ --prefix=/usr \
+ --disable-profile
+ make
+ make DESTDIR=$PKG install
+
+}
+
diff --git a/extra/nvidia-96xx/Pkgfile b/extra/nvidia-96xx/Pkgfile
index 4915605b0..e9aa98663 100644
--- a/extra/nvidia-96xx/Pkgfile
+++ b/extra/nvidia-96xx/Pkgfile
@@ -6,7 +6,7 @@
name=nvidia-96xx
version=96.43.16
-release=1
+release=2
kernel=`uname -r|sed "s/-NuTyX//"`
source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg1.run\
)
diff --git a/extra/nvidia/.footprint b/extra/nvidia/.footprint
index d9c396cd7..eca29005e 100644
--- a/extra/nvidia/.footprint
+++ b/extra/nvidia/.footprint
@@ -16,30 +16,30 @@ drwxr-xr-x root/root usr/include/nvidia/GL/
-r--r--r-- root/root usr/include/nvidia/GL/glxext.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libGL.la
--rwxr-xr-x root/root usr/lib/libGL.so.195.36.08
-lrwxrwxrwx root/root usr/lib/libGLcore.so -> libGLcore.so.195.36.08
--rwxr-xr-x root/root usr/lib/libGLcore.so.195.36.08
+-rwxr-xr-x root/root usr/lib/libGL.so.195.36.15
+lrwxrwxrwx root/root usr/lib/libGLcore.so -> libGLcore.so.195.36.15
+-rwxr-xr-x root/root usr/lib/libGLcore.so.195.36.15
-rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0
--rwxr-xr-x root/root usr/lib/libcuda.so.195.36.08
--rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.195.36.08
--rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.195.36.08
--rwxr-xr-x root/root usr/lib/libnvidia-tls.so.195.36.08
--rwxr-xr-x root/root usr/lib/libvdpau.so.195.36.08
+-rwxr-xr-x root/root usr/lib/libcuda.so.195.36.15
+-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.195.36.15
+-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.195.36.15
+-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.195.36.15
+-rwxr-xr-x root/root usr/lib/libvdpau.so.195.36.15
drwxr-xr-x root/root usr/lib/tls/
--rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.195.36.08
+-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.195.36.15
drwxr-xr-x root/root usr/lib/vdpau/
--rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.195.36.08
--rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.195.36.08
+-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.195.36.15
+-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.195.36.15
drwxr-xr-x root/root usr/lib/xorg/
-r--r--r-- root/root usr/lib/xorg/libXvMCNVIDIA.a
--rwxr-xr-x root/root usr/lib/xorg/libXvMCNVIDIA.so.195.36.08
+-rwxr-xr-x root/root usr/lib/xorg/libXvMCNVIDIA.so.195.36.15
drwxr-xr-x root/root usr/lib/xorg/modules/
drwxr-xr-x root/root usr/lib/xorg/modules/drivers/
-rwxr-xr-x root/root usr/lib/xorg/modules/drivers/nvidia_drv.so
drwxr-xr-x root/root usr/lib/xorg/modules/extensions/
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libGLcore.so -> /usr/lib/libGLcore.so
-lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx.so -> /usr/lib/xorg/modules/extensions/libglx.so.195.36.08
--rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.195.36.08
--rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.195.36.08
+lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx.so -> /usr/lib/xorg/modules/extensions/libglx.so.195.36.15
+-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.195.36.15
+-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.195.36.15
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
diff --git a/extra/nvidia/.md5sum b/extra/nvidia/.md5sum
index c4e04306e..77fe35ddf 100644
--- a/extra/nvidia/.md5sum
+++ b/extra/nvidia/.md5sum
@@ -1,2 +1,2 @@
-7b78eed78b5f345af6dd1b2a83f5d44b NVIDIA-Linux-x86-195.36.08-pkg0.run
+b09b45113585524b08b3b2acfdf4a290 NVIDIA-Linux-x86-195.36.15-pkg0.run
8921f37eaad3576532f0023d291b9e51 nvidia-makefile.patch
diff --git a/extra/nvidia/Pkgfile b/extra/nvidia/Pkgfile
index 3ef40fa15..051fa3921 100755
--- a/extra/nvidia/Pkgfile
+++ b/extra/nvidia/Pkgfile
@@ -6,7 +6,7 @@
name=nvidia
#version=190.53
-version=195.36.08
+version=195.36.15
release=1
[ "`uname -m`" == "i686" ] && _ARCH=x86
[ "`uname -m`" == "x86_64" ] && _ARCH=x86_64
diff --git a/extra/pygtk/.footprint b/extra/pygtk/.footprint
index e2e614afc..fabc47b61 100644
--- a/extra/pygtk/.footprint
+++ b/extra/pygtk/.footprint
@@ -150,6 +150,7 @@ drwxr-xr-x root/root usr/share/pygtk/2.0/defs/
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-2.12.defs
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-2.14.defs
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-2.16.defs
+-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-2.18.defs
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-base-types.defs
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-base.defs
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-types.defs
@@ -162,6 +163,8 @@ drwxr-xr-x root/root usr/share/pygtk/2.0/defs/
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.14.defs
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.16-types.defs
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.16.defs
+-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.18-types.defs
+-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.18.defs
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-base-types.defs
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-base.defs
-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-extrafuncs.defs
diff --git a/extra/pygtk/.md5sum b/extra/pygtk/.md5sum
index f823a88d5..a93f041ad 100644
--- a/extra/pygtk/.md5sum
+++ b/extra/pygtk/.md5sum
@@ -1 +1 @@
-bd0d437fefd6d5390f5d770a495cd50c pygtk-2.16.0.tar.bz2
+43d704343d7ca04a6e4ddd4fa73a3c55 pygtk-2.17.0.tar.bz2
diff --git a/extra/pygtk/Pkgfile b/extra/pygtk/Pkgfile
index 302e3408d..ab764fd77 100644
--- a/extra/pygtk/Pkgfile
+++ b/extra/pygtk/Pkgfile
@@ -1,18 +1,18 @@
# Description: Permet l'implémentation de code python dans des applications utilisant gtk
# URL: http://www.pygtk.org/
# Maintainer: NuTyX core team
-# Packager: thierryn1 at hispeed dot ch
+# Packager: skingrapher at legtux dot org
# Depends on: gtk, pygobject, pycairo, libglade
name=pygtk
-version=2.16.0
+version=2.17.0
release=1
source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2)
build() {
cd $name-$version
sed -i -e 's/SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs/SUBDIRS = codegen . $(GTK_SUBDIR) examples tests/' Makefile.in
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --enable-numpy
make
make DESTDIR=$PKG install
install -m644 gtk/gtk-extrafuncs.defs $PKG/usr/share/pygtk/2.0/defs/
diff --git a/test/rxvt-unicode/.footprint b/extra/rxvt-unicode/.footprint
index f4c14ca0f..f4c14ca0f 100644
--- a/test/rxvt-unicode/.footprint
+++ b/extra/rxvt-unicode/.footprint
diff --git a/test/rxvt-unicode/.md5sum b/extra/rxvt-unicode/.md5sum
index 5c84aa833..224e2225e 100644
--- a/test/rxvt-unicode/.md5sum
+++ b/extra/rxvt-unicode/.md5sum
@@ -1,5 +1,4 @@
df0c3a8b6bb0578d1b91e4081c47881c font-width-fix.patch
-9ef634386594969e106f0858a2e6df8c gcc4.4.patch
-4cb9330e99fc0b0b05cebf3581557dd8 rxvt-unicode-9.06.tar.bz2
+49bb52c99e002bf85eb41d8385d903b5 rxvt-unicode-9.07.tar.bz2
ef2dfa44a86cae36a60f45559d8ad783 rxvt-unicode.desktop
84328cada91751df07324d95f8be4d1b rxvt-unicode.png
diff --git a/test/rxvt-unicode/Pkgfile b/extra/rxvt-unicode/Pkgfile
index 811717734..b0674f7f3 100644
--- a/test/rxvt-unicode/Pkgfile
+++ b/extra/rxvt-unicode/Pkgfile
@@ -2,16 +2,15 @@
# URL:http://software.schmorp.de/pkg/rxvt-unicode.html
# Maintainer: NuTyX packager team
# Packager: lesibel at free dot fr
-# Depends on: xorg-libxft
+# Depends on: xorg-libxft, p5-xml-parser
name=rxvt-unicode
-version=9.06
+version=9.07
release=1
source=(http://dist.schmorp.de/$name/$name-$version.tar.bz2 \
rxvt-unicode.desktop \
rxvt-unicode.png \
- font-width-fix.patch \
- gcc4.4.patch)
+ font-width-fix.patch )
build() {
cd $name-$version
@@ -21,9 +20,6 @@ build() {
# Fix font width bug fix
patch -p0 -i ../font-width-fix.patch || return 1
- # Port to compile with GCC4.4
- patch -p0 -i ../gcc4.4.patch
-
./configure --prefix=/usr \
--with-terminfo=/usr/share/terminfo \
--with-term=rxvt-256color \
@@ -41,10 +37,6 @@ build() {
make
make DESTDIR=$PKG install
-# install -d $PKG/usr/share/terminfo
-# export TERMINFO=$PKG/usr/share/terminfo
-# make DESTDIR=$PKG install
-
# install the tabbing wrapper
sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
install -D -m755 doc/rxvt-tabbed $PKG/usr/bin/urxvt-tabbed
diff --git a/test/rxvt-unicode/font-width-fix.patch b/extra/rxvt-unicode/font-width-fix.patch
index 811d9e615..811d9e615 100644
--- a/test/rxvt-unicode/font-width-fix.patch
+++ b/extra/rxvt-unicode/font-width-fix.patch
diff --git a/test/rxvt-unicode/rxvt-unicode.desktop b/extra/rxvt-unicode/rxvt-unicode.desktop
index c6169949f..c6169949f 100644
--- a/test/rxvt-unicode/rxvt-unicode.desktop
+++ b/extra/rxvt-unicode/rxvt-unicode.desktop
diff --git a/test/rxvt-unicode/rxvt-unicode.png b/extra/rxvt-unicode/rxvt-unicode.png
index 0738a7840..0738a7840 100644
--- a/test/rxvt-unicode/rxvt-unicode.png
+++ b/extra/rxvt-unicode/rxvt-unicode.png
Binary files differ
diff --git a/extra/sylpheed/.footprint b/extra/sylpheed/.footprint
index 519b570ac..dd5a93174 100644
--- a/extra/sylpheed/.footprint
+++ b/extra/sylpheed/.footprint
@@ -45,13 +45,13 @@ drwxr-xr-x root/root usr/include/sylpheed/sylph/
-rw-r--r-- root/root usr/include/sylpheed/sylph/xml.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libsylph-0.la
-lrwxrwxrwx root/root usr/lib/libsylph-0.so -> libsylph-0.so.1.0.0
-lrwxrwxrwx root/root usr/lib/libsylph-0.so.1 -> libsylph-0.so.1.0.0
--rwxr-xr-x root/root usr/lib/libsylph-0.so.1.0.0
+lrwxrwxrwx root/root usr/lib/libsylph-0.so -> libsylph-0.so.1.0.1
+lrwxrwxrwx root/root usr/lib/libsylph-0.so.1 -> libsylph-0.so.1.0.1
+-rwxr-xr-x root/root usr/lib/libsylph-0.so.1.0.1
-rwxr-xr-x root/root usr/lib/libsylpheed-plugin-0.la
-lrwxrwxrwx root/root usr/lib/libsylpheed-plugin-0.so -> libsylpheed-plugin-0.so.1.0.0
-lrwxrwxrwx root/root usr/lib/libsylpheed-plugin-0.so.1 -> libsylpheed-plugin-0.so.1.0.0
--rwxr-xr-x root/root usr/lib/libsylpheed-plugin-0.so.1.0.0
+lrwxrwxrwx root/root usr/lib/libsylpheed-plugin-0.so -> libsylpheed-plugin-0.so.1.0.1
+lrwxrwxrwx root/root usr/lib/libsylpheed-plugin-0.so.1 -> libsylpheed-plugin-0.so.1.0.1
+-rwxr-xr-x root/root usr/lib/libsylpheed-plugin-0.so.1.0.1
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/sylpheed.desktop
diff --git a/extra/sylpheed/.md5sum b/extra/sylpheed/.md5sum
index f4fb65bcd..5106634a1 100644
--- a/extra/sylpheed/.md5sum
+++ b/extra/sylpheed/.md5sum
@@ -1,2 +1,2 @@
-bb2cf4adfa9577746f54a516e9471bfd sylpheed-3.0.0.tar.bz2
+0d349e04ffc50ca43e24e9fb5794692e sylpheed-3.0.1.tar.bz2
827f5b9a2c9399b71196ec9e2ab41460 sylpheed.desktop
diff --git a/extra/sylpheed/Pkgfile b/extra/sylpheed/Pkgfile
index 7aa800512..e844d9dad 100644
--- a/extra/sylpheed/Pkgfile
+++ b/extra/sylpheed/Pkgfile
@@ -5,7 +5,7 @@
# Depends on: gtk, gpgme, gnupg, gnupg1
name=sylpheed
-version=3.0.0
+version=3.0.1
release=1
source=(http://sylpheed.sraoss.jp/sylpheed/v3.0/$name-$version.tar.bz2 \
sylpheed.desktop)
diff --git a/extra/transmission/.footprint b/extra/transmission/.footprint
index 706aff7fc..dfbb18c88 100644
--- a/extra/transmission/.footprint
+++ b/extra/transmission/.footprint
@@ -49,6 +49,7 @@ drwxr-xr-x root/root usr/share/transmission/web/images/buttons/
-rw-r--r-- root/root usr/share/transmission/web/images/buttons/info_activity.png
-rw-r--r-- root/root usr/share/transmission/web/images/buttons/info_files.png
-rw-r--r-- root/root usr/share/transmission/web/images/buttons/info_general.png
+-rw-r--r-- root/root usr/share/transmission/web/images/buttons/info_trackers.png
-rw-r--r-- root/root usr/share/transmission/web/images/buttons/tab_backgrounds.png
-rw-r--r-- root/root usr/share/transmission/web/images/buttons/toolbar_buttons.png
-rw-r--r-- root/root usr/share/transmission/web/images/buttons/torrent_buttons.png
diff --git a/extra/transmission/.md5sum b/extra/transmission/.md5sum
index 7ac7fd773..c694e84ab 100755
--- a/extra/transmission/.md5sum
+++ b/extra/transmission/.md5sum
@@ -1,2 +1,2 @@
-fbdc151040ec64f55c3f28be60a21060 transmission-1.83.tar.bz2
+561357621331f294c87f78e22783a283 transmission-1.92.tar.bz2
840aa42645d60e243b4e1193df22aed0 transmission.desktop
diff --git a/extra/transmission/Pkgfile b/extra/transmission/Pkgfile
index bc83aa867..a530174e8 100755
--- a/extra/transmission/Pkgfile
+++ b/extra/transmission/Pkgfile
@@ -5,7 +5,7 @@
# Depends on: gtk, openssl, curl, xorg-xcb-util
name=transmission
-version=1.83
+version=1.92
release=1
source=( http://download.m0k.org/$name/files/$name-$version.tar.bz2 \
$name.desktop)
diff --git a/extra/ufraw/.md5sum b/extra/ufraw/.md5sum
index 54fb5a4bf..3259f4f1e 100755
--- a/extra/ufraw/.md5sum
+++ b/extra/ufraw/.md5sum
@@ -1,2 +1 @@
-18774fd178266f18c398b22f99783860 ufraw-0.15-glibc-2.10.patch
-6d8f6c98a388c438784cd909dd82d540 ufraw-0.15.tar.gz
+61e100e42f17e3a7fcfae64506eebd14 ufraw-0.16.tar.gz
diff --git a/extra/ufraw/Pkgfile b/extra/ufraw/Pkgfile
index 37f2b1cac..825d11fd3 100755
--- a/extra/ufraw/Pkgfile
+++ b/extra/ufraw/Pkgfile
@@ -1,22 +1,19 @@
# Description: outil seul ou plugin pour Gimp de conversion de fichier raw (inclu dcraw)
# URL: http://ufraw.sourceforge.net/
# Maintainer: NuTyX core team
-# Packager: fred.galusik at gmail dot com
-# Depends on: gimp, exiv2, lcms, libexif, libjpeg, libpng, libtiff
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: gimp, exiv2, lcms, libexif, libjpeg, libpng, libtiff, gtkimageview
name=ufraw
-version=0.15
+version=0.16
release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz\
- ufraw-0.15-glibc-2.10.patch)
+source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
build() {
cd ufraw-$version
-patch -Np1 -i ../ufraw-0.15-glibc-2.10.patch
./configure --prefix=/usr \
--enable-extras \
--enable-mime \
--enable-openmp \
- --with-libexif \
--with-exiv2
sed -i 's@-ffast-math -fomit-frame-pointer -W -Wall -O3@$CFLAGS@g' Makefile
make
diff --git a/extra/ufraw/gcc44.patch b/extra/ufraw/gcc44.patch
deleted file mode 100644
index 51444674b..000000000
--- a/extra/ufraw/gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ufraw-0.15/dcraw.cc 2008-12-23 08:19:41.000000000 +0100
-+++ ufraw-0.15/dcraw.cc.new 2009-07-30 21:19:53.000000000 +0200
-@@ -8401,7 +8401,7 @@
- argv[argc] = "";
- for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) {
- opt = argv[arg++][1];
-- if ((cp = strchr (sp="nbrkStqmHAC", opt)))
-+ if ((cp = strchr (const sp="nbrkStqmHAC", opt)))
- for (i=0; i < "11411111142"[cp-sp]-'0'; i++)
- if (!isdigit(argv[arg+i][0])) {
- dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"), opt);
diff --git a/extra/ufraw/ufraw-0.15-glibc-2.10.patch b/extra/ufraw/ufraw-0.15-glibc-2.10.patch
deleted file mode 100644
index 5c29b3159..000000000
--- a/extra/ufraw/ufraw-0.15-glibc-2.10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ufraw-0.15.old/dcraw.cc 2008-12-23 07:19:41.000000000 +0000
-+++ ufraw-0.15/dcraw.cc 2009-05-28 15:25:51.000000000 +0100
-@@ -8401,7 +8401,7 @@
- argv[argc] = "";
- for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) {
- opt = argv[arg++][1];
-- if ((cp = strchr (sp="nbrkStqmHAC", opt)))
-+ if ((cp = (char*) strchr (sp="nbrkStqmHAC", opt)))
- for (i=0; i < "11411111142"[cp-sp]-'0'; i++)
- if (!isdigit(argv[arg+i][0])) {
- dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"), opt);
-
diff --git a/kde/amarok/.footprint b/kde/amarok/.footprint
index 0e384e111..fe11a4ee7 100644
--- a/kde/amarok/.footprint
+++ b/kde/amarok/.footprint
@@ -42,6 +42,9 @@ drwxr-xr-x root/root opt/kde/lib/kde4/
-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_amarok_service_lastfm.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_amarok_service_magnatunestore.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_amarok_service_mp3tunes.so
+lrwxrwxrwx root/root opt/kde/lib/libamarok-sqlcollection.so -> libamarok-sqlcollection.so.1
+lrwxrwxrwx root/root opt/kde/lib/libamarok-sqlcollection.so.1 -> libamarok-sqlcollection.so.1.0.0
+-rwxr-xr-x root/root opt/kde/lib/libamarok-sqlcollection.so.1.0.0
lrwxrwxrwx root/root opt/kde/lib/libamaroklib.so -> libamaroklib.so.1
lrwxrwxrwx root/root opt/kde/lib/libamaroklib.so.1 -> libamaroklib.so.1.0.0
-rwxr-xr-x root/root opt/kde/lib/libamaroklib.so.1.0.0
@@ -548,6 +551,7 @@ drwxr-xr-x root/root opt/kde/share/kde4/services/ServiceMenus/
-rw-r--r-- root/root opt/kde/share/kde4/services/amarok_service_mp3tunes.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/amarok_service_mp3tunes_config.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/amarok_service_opmldirectory.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/amarokitpc.protocol
-rw-r--r-- root/root opt/kde/share/kde4/services/amaroklastfm.protocol
drwxr-xr-x root/root opt/kde/share/kde4/servicetypes/
-rw-r--r-- root/root opt/kde/share/kde4/servicetypes/amarok_codecinstall.desktop
diff --git a/kde/amarok/.md5sum b/kde/amarok/.md5sum
index 48a516ffa..19d9d0e49 100644
--- a/kde/amarok/.md5sum
+++ b/kde/amarok/.md5sum
@@ -1,2 +1,2 @@
-c2c4ae2f2ff7154a064b554cdee557a9 amarok-2.2.2.tar.bz2
+fc672a2848e36b3b44eb81dd1466e4f4 amarok-2.3.0.tar.bz2
5595074ec080ede76f366496f4fc0ff7 splash_screen.jpg
diff --git a/kde/amarok/Pkgfile b/kde/amarok/Pkgfile
index 564321eb6..5c9cb2abc 100755
--- a/kde/amarok/Pkgfile
+++ b/kde/amarok/Pkgfile
@@ -5,8 +5,8 @@
# Depends on: kdelibs, kdemultimedia, qtscriptgenerator, taglib-extras, libgpod, libmtp, liblastfm, loudmouth
name=amarok
-version=2.2.2
-release=3
+version=2.3.0
+release=1
source=(http://download.kde.org/download.php?url=stable/$name/$version/src/$name-$version.tar.bz2\
splash_screen.jpg)
diff --git a/kde/gtk-qt-engine/.footprint b/kde/gtk-qt-engine/.footprint
new file mode 100755
index 000000000..95cef935e
--- /dev/null
+++ b/kde/gtk-qt-engine/.footprint
@@ -0,0 +1,32 @@
+drwxr-xr-x root/root etc/
+drwxr-xr-x root/root etc/skel/
+-rw-r--r-- root/root etc/skel/.gtkrc-2.0-kde4
+drwxr-xr-x root/root etc/skel/.kde/
+drwxr-xr-x root/root etc/skel/.kde/env/
+-rwxr-xr-x root/root etc/skel/.kde/env/gtk-qt-engine.rc.sh
+drwxr-xr-x root/root opt/
+drwxr-xr-x root/root opt/kde/
+drwxr-xr-x root/root opt/kde/lib/
+drwxr-xr-x root/root opt/kde/lib/kde4/
+-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_gtk4.so
+drwxr-xr-x root/root opt/kde/share/
+drwxr-xr-x root/root opt/kde/share/applications/
+drwxr-xr-x root/root opt/kde/share/applications/kde4/
+-rw-r--r-- root/root opt/kde/share/applications/kde4/kcmgtk4.desktop
+drwxr-xr-x root/root opt/kde/share/icons/
+-rw-r--r-- root/root opt/kde/share/icons/kcmgtk.png
+drwxr-xr-x root/root opt/kde/share/locale/
+drwxr-xr-x root/root opt/kde/share/locale/fr/
+drwxr-xr-x root/root opt/kde/share/locale/fr/LC_MESSAGES/
+-rw-r--r-- root/root opt/kde/share/locale/fr/LC_MESSAGES/gtkqtengine.mo
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/gtk-2.0/
+drwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/
+drwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/engines/
+-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/engines/libqt4engine.so
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/themes/
+drwxr-xr-x root/root usr/share/themes/Qt4/
+drwxr-xr-x root/root usr/share/themes/Qt4/gtk-2.0/
+-rw-r--r-- root/root usr/share/themes/Qt4/gtk-2.0/gtkrc
diff --git a/kde/gtk-qt-engine/.gtkrc-2.0-kde4 b/kde/gtk-qt-engine/.gtkrc-2.0-kde4
new file mode 100644
index 000000000..763963377
--- /dev/null
+++ b/kde/gtk-qt-engine/.gtkrc-2.0-kde4
@@ -0,0 +1,14 @@
+# This file was written by KDE
+# You can edit it in the KDE control center, under "GTK Styles and Fonts"
+
+include "/usr/share/themes/Qt4/gtk-2.0/gtkrc"
+include "/etc/gtk-2.0/gtkrc"
+
+style "user-font"
+{
+ font_name="Sans Serif"
+}
+widget_class "*" style "user-font"
+
+gtk-theme-name="Qt4"
+gtk-font-name="Sans Serif 10"
diff --git a/kde/gtk-qt-engine/.md5sum b/kde/gtk-qt-engine/.md5sum
new file mode 100644
index 000000000..8c0a46be4
--- /dev/null
+++ b/kde/gtk-qt-engine/.md5sum
@@ -0,0 +1,3 @@
+74ccff566bedeb50210b49c269279ac9 .gtkrc-2.0-kde4
+de8048baef7dfe6c97cd97c463d66152 gtk-qt-engine-1.1.tar.bz2
+1b8af9dc4e5179181b11e4f993a2e721 gtk-qt-engine.rc.sh
diff --git a/kde/gtk-qt-engine/Pkgfile b/kde/gtk-qt-engine/Pkgfile
new file mode 100755
index 000000000..01993b192
--- /dev/null
+++ b/kde/gtk-qt-engine/Pkgfile
@@ -0,0 +1,20 @@
+# Description: Moteur GTK pour pouvoir utiliser les thèmes Qt
+# URL: http://gtk-qt.ecs.soton.ac.uk/
+# Maintainer: NuTyX packager team
+# Packager: lesibel at free dot fr
+# Depends on: kdebase, qt, libbonoboui, kdelibs
+
+name=gtk-qt-engine
+version=1.1
+release=1
+source=(http://gtk-qt-engine.googlecode.com/files/$name-$version.tar.bz2 \
+ gtk-qt-engine.rc.sh .gtkrc-2.0-kde4 )
+build() {
+ cd $name
+ cmake . -DCMAKE_INSTALL_PREFIX=$KDE_PREFIX
+ make
+ make DESTDIR=$PKG install
+ mkdir -p $PKG/etc/skel/.kde/env
+ cp $SRC/gtk-qt-engine.rc.sh $PKG/etc/skel/.kde/env/
+ cp $SRC/.gtkrc-2.0-kde4 $PKG/etc/skel
+}
diff --git a/kde/gtk-qt-engine/gtk-qt-engine.rc.sh b/kde/gtk-qt-engine/gtk-qt-engine.rc.sh
new file mode 100755
index 000000000..b477f5ce2
--- /dev/null
+++ b/kde/gtk-qt-engine/gtk-qt-engine.rc.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Make sure our customised gtkrc file is loaded.
+export GTK2_RC_FILES=$HOME/.gtkrc-2.0-kde4
diff --git a/kde/kdebase-runtime/.footprint b/kde/kdebase-runtime/.footprint
index 239de9c4d..b2c62f094 100644
--- a/kde/kdebase-runtime/.footprint
+++ b/kde/kdebase-runtime/.footprint
@@ -27,6 +27,8 @@ drwxr-xr-x root/root opt/kde/bin/
-rwxr-xr-x root/root opt/kde/bin/kuiserver
-rwxr-xr-x root/root opt/kde/bin/kwalletd
-rwxr-xr-x root/root opt/kde/bin/kwriteconfig
+-rwxr-xr-x root/root opt/kde/bin/nepomukserver
+-rwxr-xr-x root/root opt/kde/bin/nepomukservicestub
-rwxr-xr-x root/root opt/kde/bin/plasmapkg
-rwxr-xr-x root/root opt/kde/bin/solid-hardware
drwxr-xr-x root/root opt/kde/etc/
@@ -58,6 +60,7 @@ drwxr-xr-x root/root opt/kde/lib/kde4/
-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_kdnssd.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_knotify.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_locale.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_nepomuk.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_phonon.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_phononxine.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kcm_trash.so
@@ -66,6 +69,7 @@ drwxr-xr-x root/root opt/kde/lib/kde4/
-rwxr-xr-x root/root opt/kde/lib/kde4/kded_device_automounter.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kded_kpasswdserver.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kded_ktimezoned.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/kded_nepomuksearchmodule.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kded_networkwatcher.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kded_phononserver.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kded_remotedirnotify.so
@@ -83,6 +87,8 @@ drwxr-xr-x root/root opt/kde/lib/kde4/
-rwxr-xr-x root/root opt/kde/lib/kde4/kio_floppy.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kio_info.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kio_man.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/kio_nepomuk.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/kio_nepomuksearch.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kio_network.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kio_nfs.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kio_remote.so
@@ -90,6 +96,7 @@ drwxr-xr-x root/root opt/kde/lib/kde4/
-rwxr-xr-x root/root opt/kde/lib/kde4/kio_sftp.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kio_smb.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kio_thumbnail.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/kio_timeline.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kio_trash.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kshorturifilter.so
-rwxr-xr-x root/root opt/kde/lib/kde4/kstyle_oxygen_config.so
@@ -112,6 +119,13 @@ drwxr-xr-x root/root opt/kde/lib/kde4/libexec/
-rwxr-xr-x root/root opt/kde/lib/kde4/librenaudioplugin.so
-rwxr-xr-x root/root opt/kde/lib/kde4/librenimageplugin.so
-rwxr-xr-x root/root opt/kde/lib/kde4/localdomainurifilter.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/nepomukfilewatch.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/nepomukmigration1.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/nepomukontologyloader.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/nepomukqueryservice.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/nepomukremovablestorageservice.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/nepomukstorage.so
+-rwxr-xr-x root/root opt/kde/lib/kde4/nepomukstrigiservice.so
-rwxr-xr-x root/root opt/kde/lib/kde4/plasma_appletscript_simple_javascript.so
-rwxr-xr-x root/root opt/kde/lib/kde4/plasma_dataenginescript_javascript.so
-rwxr-xr-x root/root opt/kde/lib/kde4/plasma_runnerscript_javascript.so
@@ -129,12 +143,15 @@ drwxr-xr-x root/root opt/kde/lib/kde4/plugins/styles/
-rwxr-xr-x root/root opt/kde/lib/libkdeinit4_khelpcenter.so
-rwxr-xr-x root/root opt/kde/lib/libkdeinit4_kuiserver.so
-rwxr-xr-x root/root opt/kde/lib/libkdeinit4_kwalletd.so
+-rwxr-xr-x root/root opt/kde/lib/libkdeinit4_nepomukserver.so
lrwxrwxrwx root/root opt/kde/lib/libkwalletbackend.so -> libkwalletbackend.so.4
lrwxrwxrwx root/root opt/kde/lib/libkwalletbackend.so.4 -> libkwalletbackend.so.4.4.0
-rwxr-xr-x root/root opt/kde/lib/libkwalletbackend.so.4.4.0
lrwxrwxrwx root/root opt/kde/lib/libmolletnetwork.so -> libmolletnetwork.so.4
lrwxrwxrwx root/root opt/kde/lib/libmolletnetwork.so.4 -> libmolletnetwork.so.4.4.0
-rwxr-xr-x root/root opt/kde/lib/libmolletnetwork.so.4.4.0
+drwxr-xr-x root/root opt/kde/lib/strigi/
+-rwxr-xr-x root/root opt/kde/lib/strigi/strigiindex_nepomukbackend.so
drwxr-xr-x root/root opt/kde/share/
drwxr-xr-x root/root opt/kde/share/applications/
drwxr-xr-x root/root opt/kde/share/applications/kde4/
@@ -365,11 +382,17 @@ drwxr-xr-x root/root opt/kde/share/apps/kwalletd/
-rw-r--r-- root/root opt/kde/share/apps/kwalletd/kwalletd.notifyrc
drwxr-xr-x root/root opt/kde/share/apps/libphonon/
-rw-r--r-- root/root opt/kde/share/apps/libphonon/hardwaredatabase
+drwxr-xr-x root/root opt/kde/share/apps/nepomukstorage/
+-rw-r--r-- root/root opt/kde/share/apps/nepomukstorage/nepomukstorage.notifyrc
+drwxr-xr-x root/root opt/kde/share/apps/nepomukstrigiservice/
+-rw-r--r-- root/root opt/kde/share/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
drwxr-xr-x root/root opt/kde/share/apps/phonon/
-rw-r--r-- root/root opt/kde/share/apps/phonon/phonon.notifyrc
drwxr-xr-x root/root opt/kde/share/apps/remoteview/
-rw-r--r-- root/root opt/kde/share/apps/remoteview/network.desktop
-rw-r--r-- root/root opt/kde/share/apps/remoteview/smb-network.desktop
+drwxr-xr-x root/root opt/kde/share/autostart/
+-rw-r--r-- root/root opt/kde/share/autostart/nepomukserver.desktop
drwxr-xr-x root/root opt/kde/share/config.kcfg/
-rw-r--r-- root/root opt/kde/share/config.kcfg/khelpcenter.kcfg
drwxr-xr-x root/root opt/kde/share/config/
@@ -381,7 +404,16 @@ drwxr-xr-x root/root opt/kde/share/config/
drwxr-xr-x root/root opt/kde/share/dbus-1/
drwxr-xr-x root/root opt/kde/share/dbus-1/interfaces/
-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.KTimeZoned.xml
+-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.NepomukServer.xml
-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
+-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
+-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.nepomuk.Query.xml
+-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml
+-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.nepomuk.RemovableStorage.xml
+-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml
+-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
+-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
+-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.nepomuk.Strigi.xml
-rw-r--r-- root/root opt/kde/share/dbus-1/interfaces/org.kde.network.kioslavenotifier.xml
drwxr-xr-x root/root opt/kde/share/dbus-1/services/
-rw-r--r-- root/root opt/kde/share/dbus-1/services/org.kde.knotify.service
@@ -526,6 +558,7 @@ drwxr-xr-x root/root opt/kde/share/kde4/services/
-rw-r--r-- root/root opt/kde/share/kde4/services/jpegthumbnail.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/kcm_attica.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/kcm_kdnssd.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/kcm_nepomuk.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/kcm_phonon.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/kcm_phononxine.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/kcmcgi.desktop
@@ -537,6 +570,7 @@ drwxr-xr-x root/root opt/kde/share/kde4/services/kded/
-rw-r--r-- root/root opt/kde/share/kde4/services/kded/device_automounter.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/kded/kpasswdserver.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/kded/ktimezoned.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/kded/nepomuksearchmodule.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/kded/networkwatcher.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/kded/phononserver.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/kded/remotedirnotify.desktop
@@ -555,6 +589,15 @@ drwxr-xr-x root/root opt/kde/share/kde4/services/kded/
-rw-r--r-- root/root opt/kde/share/kde4/services/localdomainurifilter.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/lzma.protocol
-rw-r--r-- root/root opt/kde/share/kde4/services/man.protocol
+-rw-r--r-- root/root opt/kde/share/kde4/services/nepomuk.protocol
+-rw-r--r-- root/root opt/kde/share/kde4/services/nepomukfilewatch.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/nepomukmigration1.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/nepomukontologyloader.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/nepomukqueryservice.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/nepomukremovablestorageservice.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/nepomuksearch.protocol
+-rw-r--r-- root/root opt/kde/share/kde4/services/nepomukstorage.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/nepomukstrigiservice.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/network.protocol
-rw-r--r-- root/root opt/kde/share/kde4/services/nfs.protocol
-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-scriptengine-applet-simple-javascript.desktop
@@ -670,12 +713,14 @@ drwxr-xr-x root/root opt/kde/share/kde4/services/searchproviders/
-rw-r--r-- root/root opt/kde/share/kde4/services/tar.protocol
-rw-r--r-- root/root opt/kde/share/kde4/services/textthumbnail.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/thumbnail.protocol
+-rw-r--r-- root/root opt/kde/share/kde4/services/timeline.protocol
-rw-r--r-- root/root opt/kde/share/kde4/services/trash.protocol
-rw-r--r-- root/root opt/kde/share/kde4/services/windowsexethumbnail.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/windowsimagethumbnail.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/xz.protocol
-rw-r--r-- root/root opt/kde/share/kde4/services/zip.protocol
drwxr-xr-x root/root opt/kde/share/kde4/servicetypes/
+-rw-r--r-- root/root opt/kde/share/kde4/servicetypes/nepomukservice.desktop
-rw-r--r-- root/root opt/kde/share/kde4/servicetypes/phononbackend.desktop
-rw-r--r-- root/root opt/kde/share/kde4/servicetypes/searchprovider.desktop
-rw-r--r-- root/root opt/kde/share/kde4/servicetypes/thumbcreator.desktop
diff --git a/kde/kdebase-runtime/Pkgfile b/kde/kdebase-runtime/Pkgfile
index 933e47b34..8f640dca2 100755
--- a/kde/kdebase-runtime/Pkgfile
+++ b/kde/kdebase-runtime/Pkgfile
@@ -6,7 +6,7 @@
name=kdebase-runtime
version=4.4.1
-release=2
+release=1
source=(http://download.kde.org/stable/$version/src/$name-$version.tar.bz2)
build() {
diff --git a/kde/kdebase-workspace/.footprint b/kde/kdebase-workspace/.footprint
index 8b6d830c8..f895fd9d3 100644
--- a/kde/kdebase-workspace/.footprint
+++ b/kde/kdebase-workspace/.footprint
@@ -98,7 +98,6 @@ drwxr-xr-x root/root opt/kde/include/ksgrd/
-rw-r--r-- root/root opt/kde/include/ksgrd/SensorShellAgent.h
-rw-r--r-- root/root opt/kde/include/ksgrd/SensorSocketAgent.h
drwxr-xr-x root/root opt/kde/include/ksysguard/
--rw-r--r-- root/root opt/kde/include/ksysguard/DisplayProcessDlg.h
-rw-r--r-- root/root opt/kde/include/ksysguard/KTextEditVT.h
-rw-r--r-- root/root opt/kde/include/ksysguard/ProcessFilter.h
-rw-r--r-- root/root opt/kde/include/ksysguard/ProcessModel.h
@@ -192,11 +191,11 @@ drwxr-xr-x root/root opt/kde/include/taskmanager/
-rw-r--r-- root/root opt/kde/include/taskmanager/taskmanager_export.h
drwxr-xr-x root/root opt/kde/lib/
drwxr-xr-x root/root opt/kde/lib/cmake/
-drwxr-xr-x root/root opt/kde/lib/cmake/KDE4Workspace-4.4.0/
--rw-r--r-- root/root opt/kde/lib/cmake/KDE4Workspace-4.4.0/KDE4WorkspaceConfig.cmake
--rw-r--r-- root/root opt/kde/lib/cmake/KDE4Workspace-4.4.0/KDE4WorkspaceConfigVersion.cmake
--rw-r--r-- root/root opt/kde/lib/cmake/KDE4Workspace-4.4.0/KDE4WorkspaceLibraryTargets-relwithdebinfo.cmake
--rw-r--r-- root/root opt/kde/lib/cmake/KDE4Workspace-4.4.0/KDE4WorkspaceLibraryTargets.cmake
+drwxr-xr-x root/root opt/kde/lib/cmake/KDE4Workspace-4.4.1/
+-rw-r--r-- root/root opt/kde/lib/cmake/KDE4Workspace-4.4.1/KDE4WorkspaceConfig.cmake
+-rw-r--r-- root/root opt/kde/lib/cmake/KDE4Workspace-4.4.1/KDE4WorkspaceConfigVersion.cmake
+-rw-r--r-- root/root opt/kde/lib/cmake/KDE4Workspace-4.4.1/KDE4WorkspaceLibraryTargets-relwithdebinfo.cmake
+-rw-r--r-- root/root opt/kde/lib/cmake/KDE4Workspace-4.4.1/KDE4WorkspaceLibraryTargets.cmake
drwxr-xr-x root/root opt/kde/lib/kconf_update_bin/
-rwxr-xr-x root/root opt/kde/lib/kconf_update_bin/krdb_clearlibrarypath
-rwxr-xr-x root/root opt/kde/lib/kconf_update_bin/kwin_update_default_rules
@@ -921,6 +920,17 @@ drwxr-xr-x root/root opt/kde/share/apps/plasma/services/
-rw-r--r-- root/root opt/kde/share/apps/plasma/services/nowplaying.operations
-rw-r--r-- root/root opt/kde/share/apps/plasma/services/searchlaunch.operations
-rw-r--r-- root/root opt/kde/share/apps/plasma/services/tasks.operations
+drwxr-xr-x root/root opt/kde/share/apps/plasma_scriptengine_python/
+-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_python/plasma_importer.py
+-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_python/plasma_importer.pyc
+-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_python/pyappletscript.py
+-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_python/pyappletscript.pyc
+-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_python/pydataengine.py
+-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_python/pydataengine.pyc
+-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_python/pyrunner.py
+-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_python/pyrunner.pyc
+-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_python/pywallpaper.py
+-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_python/pywallpaper.pyc
drwxr-xr-x root/root opt/kde/share/apps/plasma_scriptengine_ruby/
-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_ruby/applet.rb
-rw-r--r-- root/root opt/kde/share/apps/plasma_scriptengine_ruby/data_engine.rb
@@ -2061,9 +2071,13 @@ drwxr-xr-x root/root opt/kde/share/kde4/services/kwin/
-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-sal-system.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-sal-utility.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-scriptengine-applet-dashboard.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-scriptengine-applet-python.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-scriptengine-applet-web.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-scriptengine-dataengine-python.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-scriptengine-ruby-applet.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-scriptengine-runner-python.desktop
+-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-scriptengine-wallpaper-python.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-tasks-default.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-wallpaper-color.desktop
-rw-r--r-- root/root opt/kde/share/kde4/services/plasma-wallpaper-image.desktop
@@ -2137,3 +2151,10 @@ drwxr-xr-x root/root opt/kde/share/wallpapers/Air/contents/images/
-rw-r--r-- root/root opt/kde/share/wallpapers/Air/contents/images/1920x1200.jpg
-rw-r--r-- root/root opt/kde/share/wallpapers/Air/contents/screenshot.png
-rw-r--r-- root/root opt/kde/share/wallpapers/Air/metadata.desktop
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/python2.6/
+drwxr-xr-x root/root usr/lib/python2.6/site-packages/
+drwxr-xr-x root/root usr/lib/python2.6/site-packages/PyKDE4/
+-rw-r--r-- root/root usr/lib/python2.6/site-packages/PyKDE4/plasmascript.py
+-rw-r--r-- root/root usr/lib/python2.6/site-packages/PyKDE4/plasmascript.pyc
diff --git a/kde/kdebase-workspace/.md5sum b/kde/kdebase-workspace/.md5sum
index 8b1378917..02b99256d 100644
--- a/kde/kdebase-workspace/.md5sum
+++ b/kde/kdebase-workspace/.md5sum
@@ -1 +1,8 @@
-
+88a7a094728a782ae74b8c443cca0c82 Xsession.kde4
+994d7d29bb6b02afe5f158192e0019b1 absolute-nutyx.tar.gz
+304ef605ca6fc78f538ef38f7ae93b26 ede.desktop
+c5a5826ce0e8b0faa760971850b29111 kdebase-workspace-4.4.1.tar.bz2
+a6e11d5c5320bdd96e6d7d01a9317e9b kdm
+802071ae9851617e991da7e3352b3e23 kdm-nutyx2009-2.tar.gz
+48803caf97653dfcffb68b5ed9a184fd lxde.desktop
+8ae311a47f3baccf11544cb4dec35546 nutyx-wall2009-2.tar.gz
diff --git a/kde/kdegraphics/Pkgfile b/kde/kdegraphics/Pkgfile
index 62f964e24..0b8ab81ca 100755
--- a/kde/kdegraphics/Pkgfile
+++ b/kde/kdegraphics/Pkgfile
@@ -6,7 +6,7 @@
name=kdegraphics
version=4.4.1
-release=2
+release=3
source=(http://download.kde.org/stable/$version/src/$name-$version.tar.bz2)
build() {
cd $name-$version
diff --git a/kde/strigi/Pkgfile b/kde/strigi/Pkgfile
index b87593686..9b768dc89 100755
--- a/kde/strigi/Pkgfile
+++ b/kde/strigi/Pkgfile
@@ -6,7 +6,7 @@
name=strigi
version=0.7.2
-release=1
+release=2
source=(http://www.vandenoever.info/software/$name/$name-$version.tar.bz2)
build() {
diff --git a/test/rxvt-unicode/gcc4.4.patch b/test/rxvt-unicode/gcc4.4.patch
deleted file mode 100644
index 06be6c4ba..000000000
--- a/test/rxvt-unicode/gcc4.4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/command.C.old 2009-05-28 15:21:04.457772957 +0200
-+++ src/command.C 2009-05-28 15:18:52.684597530 +0200
-@@ -3336,7 +3336,7 @@
- }
- else
- {
-- char *eq = strchr (str, '='); // constness lost, but verified to be ok
-+ char *eq = (char *) strchr ( str, '='); // constness lost, but verified to be ok
-
- if (eq)
- {
---- src/misc.C.old 2009-05-28 15:21:16.400270603 +0200
-+++ src/misc.C 2009-05-28 15:21:51.697108339 +0200
-@@ -170,7 +170,7 @@
- char *
- rxvt_basename (const char *str) NOTHROW
- {
-- char *base = strrchr (str, '/');
-+ char *base = (char *) strrchr (str, '/');
-
- return (char *) (base ? base + 1 : str);
- }
-
diff --git a/test/units/.md5sum b/test/units/.md5sum
deleted file mode 100644
index f0c6610b3..000000000
--- a/test/units/.md5sum
+++ /dev/null
@@ -1 +0,0 @@
-8cf47adf29e38a9aa744e8d5246d1bec units.1.87.tar.gz
diff --git a/xfce/midori/.footprint b/xfce/midori/.footprint
index 12e41581e..4a9616cc2 100644
--- a/xfce/midori/.footprint
+++ b/xfce/midori/.footprint
@@ -1,10 +1,9 @@
drwxr-xr-x root/root etc/
-drwxr-xr-x root/root etc/midori/
-drwxr-xr-x root/root etc/midori/extensions/
-drwxr-xr-x root/root etc/midori/extensions/libadblock.so/
--rw-r--r-- root/root etc/midori/extensions/libadblock.so/config
drwxr-xr-x root/root etc/xdg/
drwxr-xr-x root/root etc/xdg/midori/
+drwxr-xr-x root/root etc/xdg/midori/extensions/
+drwxr-xr-x root/root etc/xdg/midori/extensions/libadblock.so/
+-rw-r--r-- root/root etc/xdg/midori/extensions/libadblock.so/config
-rw-r--r-- root/root etc/xdg/midori/search
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
@@ -14,7 +13,6 @@ drwxr-xr-x root/root usr/lib/midori/
-rw-r--r-- root/root usr/lib/midori/libadblock.so
-rw-r--r-- root/root usr/lib/midori/libcolorful-tabs.so
-rw-r--r-- root/root usr/lib/midori/libcookie-manager.so
--rw-r--r-- root/root usr/lib/midori/libdnsprefetch.so
-rw-r--r-- root/root usr/lib/midori/libfeed-panel.so
-rw-r--r-- root/root usr/lib/midori/libformhistory.so
-rw-r--r-- root/root usr/lib/midori/libmouse-gestures.so
diff --git a/xfce/midori/.md5sum b/xfce/midori/.md5sum
index 9ef674fe5..f2fe8678a 100644
--- a/xfce/midori/.md5sum
+++ b/xfce/midori/.md5sum
@@ -1 +1 @@
-3cee94c9a22316504a3ba99bc92e0245 midori-0.2.1.tar.bz2
+7289b170ab14925c2dc889f57a0b6a70 midori-0.2.3.tar.bz2
diff --git a/xfce/midori/Pkgfile b/xfce/midori/Pkgfile
index 5cec7a0a2..1431c1d01 100755
--- a/xfce/midori/Pkgfile
+++ b/xfce/midori/Pkgfile
@@ -5,7 +5,7 @@
# Depends on: atk, cairo, desktop-file-utils, enchant, fontconfig, freetype, gtk, gnutls, glib, gstreamer, hicolor-icon-theme, intltool, libgcrypt, libgpg-error, libtasn1, libsoup, libunique, libxml2, pango, sqlite3, webkit, xdg-utils, librsvg
name=midori
-version=0.2.1
+version=0.2.3
release=1
source=(http://archive.xfce.org/src/apps/$name/0.2/$name-$version.tar.bz2)
diff --git a/test/xorg-xf86-input-aiptek/.footprint b/xorg/xorg-xf86-input-aiptek/.footprint
index 77125a23c..77125a23c 100644
--- a/test/xorg-xf86-input-aiptek/.footprint
+++ b/xorg/xorg-xf86-input-aiptek/.footprint
diff --git a/test/xorg-xf86-input-aiptek/.md5sum b/xorg/xorg-xf86-input-aiptek/.md5sum
index 529ea4533..529ea4533 100644
--- a/test/xorg-xf86-input-aiptek/.md5sum
+++ b/xorg/xorg-xf86-input-aiptek/.md5sum
diff --git a/test/xorg-xf86-input-aiptek/Pkgfile b/xorg/xorg-xf86-input-aiptek/Pkgfile
index b1de4bbf4..d39b7d274 100644
--- a/test/xorg-xf86-input-aiptek/Pkgfile
+++ b/xorg/xorg-xf86-input-aiptek/Pkgfile
@@ -4,7 +4,7 @@
# Packager: thierryn1 at hispeed dot ch
# Depends on: xorg-server
-name=xorg-xf86-input-acecad
+name=xorg-xf86-input-aiptek
version=1.3.0
release=1
source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-$version.tar.bz2)
diff --git a/test/xorg-xf86-input-fpit/.footprint b/xorg/xorg-xf86-input-fpit/.footprint
index 3987d099a..3987d099a 100644
--- a/test/xorg-xf86-input-fpit/.footprint
+++ b/xorg/xorg-xf86-input-fpit/.footprint
diff --git a/test/xorg-xf86-input-fpit/.md5sum b/xorg/xorg-xf86-input-fpit/.md5sum
index e58572d1b..01512000c 100644
--- a/test/xorg-xf86-input-fpit/.md5sum
+++ b/xorg/xorg-xf86-input-fpit/.md5sum
@@ -1 +1,2 @@
+9d8f1033924deb04edc1775bc82440f3 fpit-1.3.0-abi.patch
e5bfda480f25121e3c4222e5e1eb5880 xf86-input-fpit-1.3.0.tar.bz2
diff --git a/test/xorg-xf86-input-fpit/Pkgfile b/xorg/xorg-xf86-input-fpit/Pkgfile
index 7cbe90a34..3dc1b78f9 100644
--- a/test/xorg-xf86-input-fpit/Pkgfile
+++ b/xorg/xorg-xf86-input-fpit/Pkgfile
@@ -6,12 +6,13 @@
name=xorg-xf86-input-fpit
version=1.3.0
-release=2
-source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-$version.tar.bz2)
+release=3
+source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-$version.tar.bz2 \
+ fpit-1.3.0-abi.patch)
build() {
cd xf86-input-fpit-$version
-
+ patch -Np1 -i ../fpit-1.3.0-abi.patch
./configure --prefix=/usr
make
diff --git a/xorg/xorg-xf86-input-fpit/fpit-1.3.0-abi.patch b/xorg/xorg-xf86-input-fpit/fpit-1.3.0-abi.patch
new file mode 100644
index 000000000..a9864e20a
--- /dev/null
+++ b/xorg/xorg-xf86-input-fpit/fpit-1.3.0-abi.patch
@@ -0,0 +1,95 @@
+From 7d203627e7e3e7a6f8d0e847ed650b0b89760c09 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 17 Jul 2009 14:38:31 +1000
+Subject: [PATCH] Cope with XINPUT ABI 7.
+
+---
+ src/xf86Fpit.c | 40 +++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 35 insertions(+), 5 deletions(-)
+
+diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
+index 528ebb9..f40c6a9 100644
+--- a/src/xf86Fpit.c
++++ b/src/xf86Fpit.c
+@@ -188,6 +188,9 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv)
+ * screen to fit one meter.
+ */
+ int quarter_turns;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ Atom axis_labels[2] = { 0, 0 };
++#endif
+
+ priv->screen_width = screenInfo.screens[priv->screen_no]->width;
+ priv->screen_height = screenInfo.screens[priv->screen_no]->height;
+@@ -212,14 +215,30 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv)
+ }
+
+ if (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY) {
+- InitValuatorAxisStruct(dev, 1, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
++ InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[1],
++#endif
++ priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
+ 9500 /* max_res */ );
+- InitValuatorAxisStruct(dev, 0, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
++ InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[0],
++#endif
++ priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
+ 10500 /* max_res */ );
+ } else {
+- InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
++ InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[0],
++#endif
++ priv->fpitMinY, priv->fpitMaxY, 9500, 0 /* min_res */ ,
+ 9500 /* max_res */ );
+- InitValuatorAxisStruct(dev, 1, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
++ InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[1],
++#endif
++ priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
+ 10500 /* max_res */ );
+ }
+ }
+@@ -408,6 +427,10 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
+ unsigned char map[] = {
+ 0, 1, 2, 3 /* DMC: changed this so we can use all three buttons */
+ };
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ Atom btn_labels[3] = { 0 };
++ Atom axis_labels[2] = { 0, 0 };
++#endif
+
+
+ switch (mode) {
+@@ -420,7 +443,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
+ /*
+ * Device reports button press for up to 3 buttons.
+ */
+- if (InitButtonClassDeviceStruct(dev, 3, map) == FALSE) {
++ if (InitButtonClassDeviceStruct(dev, 3,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ btn_labels,
++#endif
++ map) == FALSE) {
+ ErrorF("Unable to allocate Fpit touchscreen ButtonClassDeviceStruct\n");
+ return !Success;
+ }
+@@ -435,6 +462,9 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
+ }
+
+ if (InitValuatorClassDeviceStruct(dev, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels,
++#endif
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+ #endif
+--
+1.6.3.rc1.2.g0164.dirty
+
diff --git a/test/xorg-xf86-input-hyperpen/.footprint b/xorg/xorg-xf86-input-hyperpen/.footprint
index e07e7074c..e07e7074c 100644
--- a/test/xorg-xf86-input-hyperpen/.footprint
+++ b/xorg/xorg-xf86-input-hyperpen/.footprint
diff --git a/test/xorg-xf86-input-hyperpen/.md5sum b/xorg/xorg-xf86-input-hyperpen/.md5sum
index ac88bbd9e..a0ee1c138 100644
--- a/test/xorg-xf86-input-hyperpen/.md5sum
+++ b/xorg/xorg-xf86-input-hyperpen/.md5sum
@@ -1 +1,2 @@
+d04c41d6f00487f36b2ea14ae86df708 hyperpen-1.3.0-abi.patch
c50d0da3206d18d9d94f720e3688eca5 xf86-input-hyperpen-1.3.0.tar.bz2
diff --git a/test/xorg-xf86-input-hyperpen/Pkgfile b/xorg/xorg-xf86-input-hyperpen/Pkgfile
index 41bc98882..8dd6cacdb 100644
--- a/test/xorg-xf86-input-hyperpen/Pkgfile
+++ b/xorg/xorg-xf86-input-hyperpen/Pkgfile
@@ -7,11 +7,12 @@
name=xorg-xf86-input-hyperpen
version=1.3.0
release=2
-source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-$version.tar.bz2)
+source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-$version.tar.bz2 \
+ hyperpen-1.3.0-abi.patch )
build() {
cd xf86-input-hyperpen-$version
-
+ patch -Np1 -i ../hyperpen-1.3.0-abi.patch
./configure --prefix=/usr
make
diff --git a/xorg/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch b/xorg/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch
new file mode 100644
index 000000000..efc5294bb
--- /dev/null
+++ b/xorg/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch
@@ -0,0 +1,89 @@
+From 7f3815f74e77df6122320d845d6e7e9541a28b76 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 17 Jul 2009 14:28:42 +1000
+Subject: [PATCH] Cope with XINPUT ABI 7.
+
+---
+ src/xf86HyperPen.c | 24 ++++++++++++++++++++++--
+ 1 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c
+index bd630a5..3920a04 100644
+--- a/src/xf86HyperPen.c
++++ b/src/xf86HyperPen.c
+@@ -719,6 +719,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
+ {
+ LocalDevicePtr local = (LocalDevicePtr)pHyp->public.devicePrivate;
+ HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp);
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ Atom axis_labels[3] = { 0 };
++#endif
+
+ if (xf86HypOpen(local) != Success) {
+ if (local->fd >= 0) {
+@@ -730,6 +733,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
+ /* Set the real values */
+ InitValuatorAxisStruct(pHyp,
+ 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[0],
++#endif
+ 0, /* min val */
+ priv->hypXSize, /* max val */
+ LPI2CPM(priv->hypRes), /* resolution */
+@@ -737,6 +743,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
+ LPI2CPM(priv->hypRes)); /* max_res */
+ InitValuatorAxisStruct(pHyp,
+ 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[1],
++#endif
+ 0, /* min val */
+ priv->hypYSize, /* max val */
+ LPI2CPM(priv->hypRes), /* resolution */
+@@ -744,6 +753,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
+ LPI2CPM(priv->hypRes)); /* max_res */
+ InitValuatorAxisStruct(pHyp,
+ 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[2],
++#endif
+ 0, /* min val */
+ 511, /* max val */
+ 512, /* resolution */
+@@ -765,8 +777,10 @@ xf86HypProc(DeviceIntPtr pHyp, int what)
+ int loop;
+ LocalDevicePtr local = (LocalDevicePtr)pHyp->public.devicePrivate;
+ HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp);
+-
+-
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ Atom btn_labels[4] = { 0 };
++ Atom axis_labels[3] = { 0 };
++#endif
+
+ switch (what) {
+ case DEVICE_INIT:
+@@ -779,6 +793,9 @@ xf86HypProc(DeviceIntPtr pHyp, int what)
+
+ if (InitButtonClassDeviceStruct(pHyp,
+ nbbuttons,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ btn_labels,
++#endif
+ map) == FALSE) {
+ ErrorF("unable to allocate Button class device\n");
+ return !Success;
+@@ -802,6 +819,9 @@ xf86HypProc(DeviceIntPtr pHyp, int what)
+
+ if (InitValuatorClassDeviceStruct(pHyp,
+ nbaxes,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels,
++#endif
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+ #endif
+--
+1.6.3.rc1.2.g0164.dirty
+
diff --git a/test/xorg-xf86-input-mutouch/.footprint b/xorg/xorg-xf86-input-mutouch/.footprint
index 33db3c496..33db3c496 100644
--- a/test/xorg-xf86-input-mutouch/.footprint
+++ b/xorg/xorg-xf86-input-mutouch/.footprint
diff --git a/test/xorg-xf86-input-mutouch/.md5sum b/xorg/xorg-xf86-input-mutouch/.md5sum
index bb3efe209..8ced93213 100644
--- a/test/xorg-xf86-input-mutouch/.md5sum
+++ b/xorg/xorg-xf86-input-mutouch/.md5sum
@@ -1 +1,2 @@
+720ecbcc20aaf0b5a78325d048095369 mutouch-1.2.1-abi.patch
f28998cdfae2a4c41589299a4ee1f459 xf86-input-mutouch-1.2.1.tar.bz2
diff --git a/test/xorg-xf86-input-mutouch/Pkgfile b/xorg/xorg-xf86-input-mutouch/Pkgfile
index 45610b54e..58098c004 100644
--- a/test/xorg-xf86-input-mutouch/Pkgfile
+++ b/xorg/xorg-xf86-input-mutouch/Pkgfile
@@ -7,11 +7,11 @@
name=xorg-xf86-input-mutouch
version=1.2.1
release=2
-source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-$version.tar.bz2)
-
+source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-$version.tar.bz2 \
+ mutouch-1.2.1-abi.patch)
build() {
cd xf86-input-mutouch-$version
-
+ patch -Np1 -i ../mutouch-1.2.1-abi.patch
./configure --prefix=/usr
make
diff --git a/xorg/xorg-xf86-input-mutouch/mutouch-1.2.1-abi.patch b/xorg/xorg-xf86-input-mutouch/mutouch-1.2.1-abi.patch
new file mode 100644
index 000000000..ec4e72139
--- /dev/null
+++ b/xorg/xorg-xf86-input-mutouch/mutouch-1.2.1-abi.patch
@@ -0,0 +1,73 @@
+From db04a5333b545a0442b995bae47d2c5527a7459e Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 17 Jul 2009 14:18:51 +1000
+Subject: [PATCH] Cope with XINPUT ABI 7.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/xf86MuTouch.c | 25 ++++++++++++++++++++++---
+ 1 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c
+index 2d5cdb0..de319fc 100644
+--- a/src/xf86MuTouch.c
++++ b/src/xf86MuTouch.c
+@@ -749,6 +749,10 @@ xf86MuTControl(DeviceIntPtr dev,
+ unsigned char req[MuT_PACKET_SIZE];
+ unsigned char reply[MuT_BUFFER_SIZE];
+ char *id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus";
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ Atom btn_label;
++ Atom axis_labels[2] = { 0, 0 };
++#endif
+
+ switch(mode) {
+
+@@ -766,7 +770,11 @@ xf86MuTControl(DeviceIntPtr dev,
+ /*
+ * Device reports button press for up to 1 button.
+ */
+- if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) {
++ if (InitButtonClassDeviceStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ &btn_label,
++#endif
++ map) == FALSE) {
+ ErrorF("Unable to allocate ButtonClassDeviceStruct\n");
+ return !Success;
+ }
+@@ -779,6 +787,9 @@ xf86MuTControl(DeviceIntPtr dev,
+ * screen to fit one meter.
+ */
+ if (InitValuatorClassDeviceStruct(dev, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels,
++#endif
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+ #endif
+@@ -787,11 +798,19 @@ xf86MuTControl(DeviceIntPtr dev,
+ return !Success;
+ }
+ else {
+- InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
++ InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[0],
++#endif
++ priv->min_x, priv->max_x,
+ 9500,
+ 0 /* min_res */,
+ 9500 /* max_res */);
+- InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y,
++ InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[1],
++#endif
++ priv->min_y, priv->max_y,
+ 10500,
+ 0 /* min_res */,
+ 10500 /* max_res */);
+--
+1.6.3.rc1.2.g0164.dirty
+