diff options
37 files changed, 289 insertions, 121 deletions
diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint index 8164755b1..b021ec33e 100644 --- a/base/aaabasicfs/.footprint +++ b/base/aaabasicfs/.footprint @@ -7,7 +7,7 @@ crw------- root/root dev/console (5, 1) crw-rw-rw- root/root dev/null (1, 3) drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/bashrc --rw-r--r-- root/root etc/blfs-bootscripts +lrwxrwxrwx root/root etc/blfs-bootscripts -> /var/lib/pkg/blfs-bootscripts drwxr-xr-x root/root etc/default/ -rw-r--r-- root/root etc/default/useradd -rw-r--r-- root/root etc/fstab @@ -16,6 +16,7 @@ drwxr-xr-x root/root etc/default/ -rw-r--r-- root/root etc/inittab -rw-r--r-- root/root etc/inputrc -rw-r--r-- root/root etc/mtab (EMPTY) +lrwxrwxrwx root/root etc/nutyx-version -> /var/lib/pkg/nutyx-version drwxr-xr-x root/root etc/opt/ -rw-r--r-- root/root etc/passwd -rw-r--r-- root/root etc/profile @@ -23,7 +24,6 @@ drwxr-xr-x root/root etc/profile.d/ -rw-r--r-- root/root etc/profile.d/X.sh -rw-r--r-- root/root etc/profile.d/dircolors.sh -rw-r--r-- root/root etc/profile.d/extrapaths.sh --rw-r--r-- root/root etc/profile.d/i18n.sh -rw-r--r-- root/root etc/profile.d/readline.sh -rw-r--r-- root/root etc/profile.d/unmask.sh drwxr-xr-x root/root etc/rc.d/ @@ -34,6 +34,7 @@ drwxr-xr-x root/root etc/rc.d/init.d/ -rwxr-xr-- root/root etc/rc.d/init.d/consolelog -rw-r--r-- root/root etc/rc.d/init.d/functions -rwxr-xr-- root/root etc/rc.d/init.d/halt +-rwxr-xr-- root/root etc/rc.d/init.d/iplink -rwxr-xr-- root/root etc/rc.d/init.d/localnet -rwxr-xr-- root/root etc/rc.d/init.d/modules -rwxr-xr-- root/root etc/rc.d/init.d/mountfs @@ -101,7 +102,6 @@ drwxr-xr-x root/root etc/skel/ -rw-r--r-- root/root etc/skel/.dmrc lrwxrwxrwx root/root etc/skel/.xinitrc -> /etc/slim.xinitrc drwxr-xr-x root/root etc/sysconfig/ --rw-r--r-- root/root etc/sysconfig/clock -rw-r--r-- root/root etc/sysconfig/console -rw-r--r-- root/root etc/sysconfig/modules -rw-r--r-- root/root etc/sysconfig/network @@ -229,6 +229,7 @@ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/locate/ drwxr-xr-x root/root var/lib/misc/ drwxr-xr-x root/root var/lib/pkg/ +-rw-r--r-- root/root var/lib/pkg/blfs-bootscripts -rw-r--r-- root/root var/lib/pkg/nutyx-version drwxr-xr-x root/root var/local/ drwxr-xr-x root/root var/lock/ diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum index 5fad92ff6..28a0be1e7 100644 --- a/base/aaabasicfs/.md5sum +++ b/base/aaabasicfs/.md5sum @@ -3,20 +3,18 @@ f6b42961b3c2bd3b2e0bf0082d80d216 X.sh 427f04bb0e7ba3394054a1215fdca87c bashrc 427f04bb0e7ba3394054a1215fdca87c bashrc 3974f1b4242908346f309b096a7a6ed6 bashrc.etc -7e1cc42a760239d55d1985f574c53e13 blfs-bootscripts -4c0a776082e36f89970a9d7e5b7ff04a clock +f61338e6cd5addbd130c92a1c8533a00 blfs-bootscripts 94e5b6c4017e28684a683d39cbe4c72a console 248d4faa838949085a51003b2c0c3f00 dircolors.sh ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh 0286a09ca5d7515c29ad5ff8f88fb9f3 fstab 57ddbea584220ac4e74d0504a03721f4 hosts -7af11664c8a127c2d1e71ee3237ab543 i18n.sh -255dba011debefe08813959042bb56b4 inittab +9099d0e8faf5da80580c1652c919859a inittab 2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc 5d7c952bd09d718298dd60d3b976c349 lfs-bootscripts-01.patch 5a8b2aacde330663828176064c77b72d lfs-bootscripts-20100124.tar.bz2 4e77d38062489bdd53d0eb9065a37b3e message -c90e6466720260c377c89f5aa0c47eca network +54e851ced646c060f045b9e65344c5ae network 5478e2141b3d5504cd201b23dcc70531 nu 210fdabd07248f79617508807715167b profile fa6ce99e0329c7854e0a83d022da6fe3 readline.sh diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile index 393f6a9ce..f310f9dad 100644 --- a/base/aaabasicfs/Pkgfile +++ b/base/aaabasicfs/Pkgfile @@ -6,12 +6,12 @@ name=aaabasicfs version=2010 -release=beta-2 +release=beta-3 scriptsversion=lfs-bootscripts-20100124 source=( http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\ - hosts clock console fstab inittab message inputrc network \ + hosts console fstab inittab message inputrc network \ profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-01.patch \ - blfs-bootscripts nu readline.sh unmask.sh X.sh i18n.sh bashrc ) + blfs-bootscripts nu readline.sh unmask.sh X.sh bashrc ) build() { @@ -49,6 +49,8 @@ build() { ln -sv bash $PKG/bin/sh mkdir -p $PKG/var/lib/pkg/ echo "$version-$release" > $PKG/var/lib/pkg/nutyx-version + ln -s /var/lib/pkg/nutyx-version $PKG/etc/nutyx-version + cat > $PKG/etc/shells << "EOF" /bin/sh /bin/bash @@ -143,6 +145,9 @@ EOF cd $scriptsversion patch -Np1 -i ../lfs-bootscripts-01.patch make DESTDIR=$PKG install + # Rename network script + mv $PKG/etc/rc.d/init.d/{network,iplink} + cp $SRC/network $PKG/etc/rc.d/init.d/ # We want to start the network when init 2 mv $PKG/etc/rc.d/rc2.d/{K80,S20}network cd .. @@ -152,9 +157,10 @@ EOF # Configuration files cp -v {hosts,fstab,inittab,profile,inputrc,bashrc.etc} $PKG/etc/ mv $PKG/etc/bashrc.etc $PKG/etc/bashrc - cp -v {dircolors.sh,extrapaths.sh,readline.sh,unmask.sh,X.sh,i18n.sh}\ + cp -v {dircolors.sh,extrapaths.sh,readline.sh,unmask.sh,X.sh}\ $PKG/etc/profile.d/ - cp -v {clock,console,network} $PKG/etc/sysconfig/ + cp -v console $PKG/etc/sysconfig/ + echo "HOSTNAME=nutyx" > $PKG/etc/sysconfig/network cp -v bash_profile $PKG/etc/skel/.bash_profile cp -v bashrc $PKG/etc/skel/.bashrc ln -s /etc/slim.xinitrc $PKG/etc/skel/.xinitrc @@ -163,8 +169,8 @@ EOF mkdir -p $PKG/root/bin cp -v nu $PKG/root/bin # Customise startup scripts - cp blfs-bootscripts $PKG/etc/ - + cp blfs-bootscripts $PKG/var/lib/pkg/ + ln -s /var/lib/pkg/blfs-bootscripts $PKG/etc/blfs-bootscripts cp -v message $PKG/boot/ cat > $PKG/etc/skel/.dmrc << "EOF" diff --git a/base/aaabasicfs/blfs-bootscripts b/base/aaabasicfs/blfs-bootscripts index 0120d82e3..4e46f2ae2 100644 --- a/base/aaabasicfs/blfs-bootscripts +++ b/base/aaabasicfs/blfs-bootscripts @@ -1,3 +1,2 @@ scripts=blfs-bootscripts scriptsversion=20090302 - diff --git a/base/aaabasicfs/clock b/base/aaabasicfs/clock deleted file mode 100644 index ed6f78bfe..000000000 --- a/base/aaabasicfs/clock +++ /dev/null @@ -1,5 +0,0 @@ -# Begin /etc/sysconfig/clock - -UTC=0 - -# End /etc/sysconfig/clock diff --git a/base/aaabasicfs/i18n.sh b/base/aaabasicfs/i18n.sh deleted file mode 100644 index d9b120941..000000000 --- a/base/aaabasicfs/i18n.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Set up i18n variables -export LANG=fr_CH.utf8 diff --git a/base/aaabasicfs/inittab b/base/aaabasicfs/inittab index 6ff95c892..80dd89214 100644 --- a/base/aaabasicfs/inittab +++ b/base/aaabasicfs/inittab @@ -1,11 +1,10 @@ # Begin /etc/inittab -# Pour le lancement de slim, supprimer le commentaire de la ligne ci-dessous +# Pour le lancement de slim: id:3 +# Pour le lancement de gdm: id:4 +# Pour le lancement de kdm: id:5 + id:4:initdefault: -# Pour le lancement de gdm, supprimer le commentaire de la ligne ci-dessous -# id:4:initdefault: -# Pour le lancement de kdm, supprimer le commentaire la ligne ci-dessous -# id:5:initdefault: si::sysinit:/etc/rc.d/init.d/rc sysinit diff --git a/base/aaabasicfs/network b/base/aaabasicfs/network index 199c848f3..411f85b43 100644..100755 --- a/base/aaabasicfs/network +++ b/base/aaabasicfs/network @@ -1 +1,45 @@ -HOSTNAME=nutyx +#!/bin/sh +# Begin $rc_base/init.d/network + +# Based on sysklogd script from LFS-3.1 and earlier. +# Rewritten by thierryn1@hispeed.ch + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + if [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then + boot_mesg "Starting the wicd Daemon..." + loadproc /usr/share/wicd/daemon/wicd-daemon.py + if grep -v ^# /etc/fstab | grep _netdev > /dev/null; then + while ! grep "nameserver" /etc/resolv.conf ; do sleep 1;done + boot_mesg "Network successfully configured..." + echo_ok + fi + + else + if [ -f /etc/rc.d/init.d/iplink ]; then + /etc/rc.d/init.d/iplink start + fi + fi + ;; + + stop) + if [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then + boot_mesg "Stopping the wicd Daemon..." + loadproc /usr/share/wicd/daemon/wicd-daemon.py --kill + else + if [ -f /etc/rc.d/init.d/iplink ]; then + /etc/rc.d/init.d/iplink stop + fi + fi + ;; + + *) + echo "Usage: $0 {start|stop}" + exit 1 + ;; +esac + +# End $rc_base/init.d/network diff --git a/base/dhcpcd/.md5sum b/base/dhcpcd/.md5sum index a554e2067..11f82b397 100644 --- a/base/dhcpcd/.md5sum +++ b/base/dhcpcd/.md5sum @@ -1,2 +1,2 @@ e47afe62907b4b36997fa2634b22a541 dhcpcd -f852090ad221b6331478f50fc1aa539e dhcpcd-5.1.3.tar.bz2 +30a161c93bd4548a28d97041329bf335 dhcpcd-5.2.2.tar.bz2 diff --git a/base/dhcpcd/Pkgfile b/base/dhcpcd/Pkgfile index e0ed4769a..f13856528 100755 --- a/base/dhcpcd/Pkgfile +++ b/base/dhcpcd/Pkgfile @@ -2,10 +2,9 @@ # URL: http://roy.marples.name/projects/dhcpcd # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: name=dhcpcd -version=5.1.3 +version=5.2.2 release=1 source=( http://roy.marples.name/downloads/$name/$name-$version.tar.bz2\ dhcpcd \ @@ -13,7 +12,7 @@ source=( http://roy.marples.name/downloads/$name/$name-$version.tar.bz2\ build() { source /etc/blfs-bootscripts - wget http://www.linuxfromscratch.org/blfs/downloads/svn/${scripts}-${scriptsversion}.tar.bz2 + wget http://www.linuxfromscratch.org/blfs/downloads/svn/${scripts}-${scriptsversion}.tar.bz2 tar xvf $scripts-$scriptsversion.tar.bz2 cd $name-$version ./configure --prefix= \ diff --git a/test/madwifi/.footprint b/base/madwifi/.footprint index efe47b0ce..efe47b0ce 100644 --- a/test/madwifi/.footprint +++ b/base/madwifi/.footprint diff --git a/base/madwifi/.md5sum b/base/madwifi/.md5sum new file mode 100644 index 000000000..b105963a5 --- /dev/null +++ b/base/madwifi/.md5sum @@ -0,0 +1 @@ +a720a20264b312c0ff906b9888bb49ae madwifi-0.9.4.4119.tar.bz2 diff --git a/test/madwifi/Pkgfile b/base/madwifi/Pkgfile index 0afba8da4..316783588 100755 --- a/test/madwifi/Pkgfile +++ b/base/madwifi/Pkgfile @@ -1,15 +1,16 @@ # Description: Modules kernel pour les cartes wifi à base de Atheros # URL: http://madwifi.org # Maintainer: NuTyX core team -# Packager: guy +# Packager: guy name=madwifi -version=0.9.4.4100 +version=0.9.4.4119 release=1 source=(ftp://ftp.archlinux.org/other/$name/$name-$version.tar.bz2) build() { cd $name + sed -i -e 's/-Werror//g' Makefile.inc make make DESTDIR=$PKG BINDIR=/usr/bin MANDIR=/usr/share/man install } diff --git a/extra/lxde/Pkgfile b/extra/lxde/Pkgfile index 423b7afab..5c0dc93fd 100644 --- a/extra/lxde/Pkgfile +++ b/extra/lxde/Pkgfile @@ -1,8 +1,8 @@ -# Description: Lightweight X11 Desktop Environment -# URL: http://lxde.org +# Description: Bureau X11 très légé +# URL: http://lxde.org # Maintainer: NuTyX core team # Packager: geantbrun at gmail dot com -# Depends on: gestpkg, pcmanfm obconf lxterminal lxtask lxsession lxrandr lxpanel lxshortcut lxnm lxde-common lxappearance lxlauncher menu-cache alsa-utils alsa-oss dbus-glib leafpad shared-mime-info startup-notification gpicview hicolor-icon-theme lxmenu-data ktsuss midori gdm +# Depends on: gestpkg, wicd, pcmanfm obconf lxterminal lxtask lxsession lxrandr lxpanel lxshortcut lxnm lxde-common lxappearance lxlauncher menu-cache alsa-utils alsa-oss dbus-glib leafpad shared-mime-info startup-notification gpicview hicolor-icon-theme lxmenu-data ktsuss firefox gdm name=lxde diff --git a/extra/urwid/.footprint b/extra/urwid/.footprint index 5f4bde23c..f1dc204e8 100644 --- a/extra/urwid/.footprint +++ b/extra/urwid/.footprint @@ -2,14 +2,22 @@ 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/ --rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid-0.9.8.4-py2.6.egg-info +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid-0.9.9.1-py2.6.egg-info drwxr-xr-x root/root usr/lib/python2.6/site-packages/urwid/ -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/__init__.py -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/__init__.pyc -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/canvas.py -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/canvas.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/command_map.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/command_map.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/container.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/container.pyc -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/curses_display.py -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/curses_display.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/decoration.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/decoration.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/display_common.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/display_common.pyc -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/escape.py -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/escape.pyc -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/font.py @@ -20,14 +28,26 @@ drwxr-xr-x root/root usr/lib/python2.6/site-packages/urwid/ -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/html_fragment.pyc -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/listbox.py -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/listbox.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/main_loop.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/main_loop.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/monitored_list.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/monitored_list.pyc -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/old_str_util.py -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/old_str_util.pyc -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/raw_display.py -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/raw_display.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/signals.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/signals.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/split_repr.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/split_repr.pyc -rwxr-xr-x root/root usr/lib/python2.6/site-packages/urwid/str_util.so +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/text_layout.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/text_layout.pyc -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/util.py -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/util.pyc -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/web_display.py -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/web_display.pyc -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/widget.py -rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/widget.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/wimp.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/urwid/wimp.pyc diff --git a/extra/urwid/.md5sum b/extra/urwid/.md5sum index 0acfd3826..3ecbdcaa0 100644 --- a/extra/urwid/.md5sum +++ b/extra/urwid/.md5sum @@ -1 +1 @@ -28f918c66887d4e470ae0c3535579ad7 urwid-0.9.8.4.tar.gz +4722cdf898f711dcae1121aa80920152 urwid-0.9.9.1.tar.gz diff --git a/extra/urwid/Pkgfile b/extra/urwid/Pkgfile index dc3720a9d..e85399d2f 100644 --- a/extra/urwid/Pkgfile +++ b/extra/urwid/Pkgfile @@ -3,8 +3,9 @@ # Maintainer: NuTyX core team # Packager: Skippythekangoo AT yahoo DOT fr # Depends on: python + name=urwid -version=0.9.8.4 +version=0.9.9.1 release=1 source=(http://excess.org/$name/$name-$version.tar.gz) build() { diff --git a/extra/wicd/.footprint b/extra/wicd/.footprint index 79c67e2dc..1d44eadf2 100644 --- a/extra/wicd/.footprint +++ b/extra/wicd/.footprint @@ -2,21 +2,6 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/dbus-1/ drwxr-xr-x root/root etc/dbus-1/system.d/ -rw-r--r-- root/root etc/dbus-1/system.d/wicd.conf -drwxr-xr-x root/root etc/rc.d/ -drwxr-xr-x root/root etc/rc.d/init.d/ --rwxr-xr-x root/root etc/rc.d/init.d/wicd -drwxr-xr-x root/root etc/rc.d/rc0.d/ -lrwxrwxrwx root/root etc/rc.d/rc0.d/K80wicd -> ../init.d/wicd -drwxr-xr-x root/root etc/rc.d/rc1.d/ -lrwxrwxrwx root/root etc/rc.d/rc1.d/K80wicd -> ../init.d/wicd -drwxr-xr-x root/root etc/rc.d/rc3.d/ -lrwxrwxrwx root/root etc/rc.d/rc3.d/S20wicd -> ../init.d/wicd -drwxr-xr-x root/root etc/rc.d/rc4.d/ -lrwxrwxrwx root/root etc/rc.d/rc4.d/S20wicd -> ../init.d/wicd -drwxr-xr-x root/root etc/rc.d/rc5.d/ -lrwxrwxrwx root/root etc/rc.d/rc5.d/S20wicd -> ../init.d/wicd -drwxr-xr-x root/root etc/rc.d/rc6.d/ -lrwxrwxrwx root/root etc/rc.d/rc6.d/K80wicd -> ../init.d/wicd drwxr-xr-x root/root etc/wicd/ -rw-r--r-- root/root etc/wicd/dhclient.conf.template.default drwxr-xr-x root/root etc/wicd/encryption/ diff --git a/extra/wicd/.md5sum b/extra/wicd/.md5sum index 66ed5c5de..543ade4e2 100644 --- a/extra/wicd/.md5sum +++ b/extra/wicd/.md5sum @@ -1,5 +1,4 @@ -2a018ca53cff16c4fb1a2af06c9bff66 wicd 003d2e67240989db55934553437ba32a wicd-1.7.0.tar.gz b8edd56cf084347b0ae6dc0e02d1b747 wicd-locale.patch -c7970cd3f368523018633e3f3f584c84 wicd.desktop +190bac25d634be162bb4b848d806ef8a wicd.desktop 97736bc03057542e4184fe1bd33cbd20 wicd_in_usr.patch diff --git a/extra/wicd/Pkgfile b/extra/wicd/Pkgfile index 846dc407f..567563a1b 100644 --- a/extra/wicd/Pkgfile +++ b/extra/wicd/Pkgfile @@ -2,13 +2,13 @@ # URL: http://wicd.sourceforge.net/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: pygtk, wpa_supplicant, ethtool, dbus-python, wireless_tools +# Depends on: urwid, pygtk, wpa_supplicant, ethtool, dbus-python, wireless_tools, dhcpcd name=wicd version=1.7.0 -release=4 +release=5 source=(http://downloads.sourceforge.net/$name/wicd-$version.tar.gz \ - wicd wicd_in_usr.patch wicd-locale.patch wicd.desktop ) + wicd_in_usr.patch wicd-locale.patch wicd.desktop ) build() { cd $name-$version @@ -25,17 +25,5 @@ build() { done rm -rf $PKG/usr/share/autostart chmod 755 $PKG/usr/share/wicd/daemon/wicd-daemon.py - #Install the daemon service - - mkdir -v -p $PKG/etc/rc.d/init.d - mkdir -v -p $PKG/etc/rc.d/rc{0,1,3,4,5,6}.d - install -D -m 755 $SRC/wicd $PKG/etc/rc.d/init.d/wicd - - ln -svf ../init.d/wicd $PKG/etc/rc.d/rc3.d/S20wicd - ln -svf ../init.d/wicd $PKG/etc/rc.d/rc5.d/S20wicd - ln -svf ../init.d/wicd $PKG/etc/rc.d/rc4.d/S20wicd - ln -svf ../init.d/wicd $PKG/etc/rc.d/rc0.d/K80wicd - ln -svf ../init.d/wicd $PKG/etc/rc.d/rc1.d/K80wicd - ln -svf ../init.d/wicd $PKG/etc/rc.d/rc6.d/K80wicd chown -R 0:0 $PKG/ } diff --git a/extra/wicd/wicd b/extra/wicd/wicd deleted file mode 100644 index 49f204b03..000000000 --- a/extra/wicd/wicd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# Begin $rc_base/init.d/wicd - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by thierryn1@hispeed.ch - -. /etc/sysconfig/rc -. $rc_functions - -case "$1" in - start) - boot_mesg "Starting the wicd Daemon..." - loadproc /usr/share/wicd/daemon/wicd-daemon.py - ;; - - stop) - boot_mesg "Stopping the wicd Daemon..." - killproc /usr/share/wicd/daemon/wicd-daemon.py - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc /usr/share/wicd/daemon/wicd-daemon.py - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/wicd diff --git a/extra/wicd/wicd.desktop b/extra/wicd/wicd.desktop index dd4cfb6b8..210d713ee 100644 --- a/extra/wicd/wicd.desktop +++ b/extra/wicd/wicd.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Application;Network;Internet; Encoding=UTF-8 -Exec=wicd-client +Exec=wicd-client --no-tray GenericName=Network Manager GenericName[fr]=Gestionnaire de réseaux Icon=wicd-gtk diff --git a/extra/wireless_tools/Pkgfile b/extra/wireless_tools/Pkgfile index 14bb3e5c1..88098c643 100755 --- a/extra/wireless_tools/Pkgfile +++ b/extra/wireless_tools/Pkgfile @@ -2,7 +2,7 @@ # URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html # Maintainer: NutyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: ipw2100-fw, ipw2200-fw, iwlwifi-3945-ucode, iwlwifi-4965-ucode, iwlwifi-5000-ucode, iwlwifi-5150-ucode, rt2x00-rt61-fw, rt2x00-rt71w-fw +# Depends on: madwifi, ipw2100-fw, ipw2200-fw, iwlwifi-3945-ucode, iwlwifi-4965-ucode, iwlwifi-5000-ucode, iwlwifi-5150-ucode, rt2x00-rt61-fw, rt2x00-rt71w-fw name=wireless_tools version=29 diff --git a/gnome/gnome/Pkgfile b/gnome/gnome/Pkgfile index 09d2598a0..ee08d987b 100644 --- a/gnome/gnome/Pkgfile +++ b/gnome/gnome/Pkgfile @@ -2,7 +2,7 @@ # URL: http://www.gnome.org/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: glib, gtk, gestpkg, orbit2, libbonobo, gconf, alacarte, iso-codes, libunique, devicekit, devicekit-power, bug-buddy, gnome-control-center, dasher, deskbar-applet, eog, epiphany, evince, evolution-data-server, evolution-webcal, file-roller, gcalctool, gconf-editor, gdm, gedit, gnome-applets, gnome-backgrounds, gnome-desktop, gnome-device-manager, gnome-doc-utils, gnome-games, gnome-icon-theme, libgnome-keyring, gnome-keyring, gnome-keyring-manager, gnome-mag, gnome-media, gnome-audio, gnome-menus, gnome-netstatus, gnome-panel, gnome-power-manager, gnome-python-desktop, gnome-screensaver, gnome-session, gnome-speech, gnome-system-monitor, gnome-terminal, gnome-themes, gnome-user-docs, gnome-utils, gnome-volume-manager, gok, gst-plugins-base, gst-plugins-good, ekiga, gstreamer, gtk-engines, gtkhtml, gtksourceview, gucharmap, libgail-gnome, libgnomeprint, libgnomeprintui, libgtop, librsvg, libsoup, libwnck, pidgin, zenity, metacity, nautilus, nautilus-cd-burner, brasero, orca, rarian, sound-juicer, startup-notification, sound-theme-freedesktop, totem, vino, vte, yelp, vinagre, cheese, meld +# Depends on: glib, gtk, gestpkg, orbit2, libbonobo, gconf, wicd, alacarte, iso-codes, libunique, devicekit, devicekit-power, bug-buddy, gnome-control-center, dasher, deskbar-applet, eog, epiphany, evince, evolution-data-server, evolution-webcal, file-roller, gcalctool, gconf-editor, gdm, gedit, gnome-applets, gnome-backgrounds, gnome-desktop, gnome-device-manager, gnome-doc-utils, gnome-games, gnome-icon-theme, libgnome-keyring, gnome-keyring, gnome-keyring-manager, gnome-mag, gnome-media, gnome-audio, gnome-menus, gnome-netstatus, gnome-panel, gnome-power-manager, gnome-python-desktop, gnome-screensaver, gnome-session, gnome-speech, gnome-system-monitor, gnome-terminal, gnome-themes, gnome-user-docs, gnome-utils, gnome-volume-manager, gok, gst-plugins-base, gst-plugins-good, ekiga, gstreamer, gtk-engines, gtkhtml, gtksourceview, gucharmap, libgail-gnome, libgnomeprint, libgnomeprintui, libgtop, librsvg, libsoup, libwnck, pidgin, zenity, metacity, nautilus, nautilus-cd-burner, brasero, orca, rarian, sound-juicer, startup-notification, sound-theme-freedesktop, totem, vino, vte, yelp, vinagre, cheese, meld name=gnome version=2.30.0 diff --git a/kde/kde/Pkgfile b/kde/kde/Pkgfile index 4a2e51aa6..d6cf843ed 100755 --- a/kde/kde/Pkgfile +++ b/kde/kde/Pkgfile @@ -2,7 +2,7 @@ # URL: http://www.kde.org/ # Maintainer: NuTyX packager team # Packager: lesibel at free dot fr -# Depends on: jdk, curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdepim-runtime, kdegraphics, kdenetwork, kdemultimedia, kdeutils, kde-l10n-fr, kdebase, , kdeplasma-addons, kdepim, kdebindings, phonon, desktop-file-utils, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre, ede1 +# Depends on: jdk, curl, xorg, wicd, kdelibs, kdepimlibs, kdeadmin, kdepim-runtime, kdegraphics, kdenetwork, kdemultimedia, kdeutils, kde-l10n-fr, kdebase, , kdeplasma-addons, kdepim, kdebindings, phonon, desktop-file-utils, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre, ede1 name=kde version=4.4.3 diff --git a/kde/kmplayer/.footprint b/kde/kmplayer/.footprint index d93384017..c5b23d00d 100644 --- a/kde/kmplayer/.footprint +++ b/kde/kmplayer/.footprint @@ -33,6 +33,7 @@ drwxr-xr-x root/root usr/share/doc/ drwxr-xr-x root/root usr/share/doc/HTML/ drwxr-xr-x root/root usr/share/doc/HTML/en/ drwxr-xr-x root/root usr/share/doc/HTML/en/kmplayer/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/kmplayer/common -> /usr/share/doc/HTML/en/common -rw-r--r-- root/root usr/share/doc/HTML/en/kmplayer/index.cache.bz2 -rw-r--r-- root/root usr/share/doc/HTML/en/kmplayer/index.docbook drwxr-xr-x root/root usr/share/icons/ diff --git a/kde/koffice/.footprint b/kde/koffice/.footprint index 6ceb9f7ca..89e6b2e1d 100644 --- a/kde/koffice/.footprint +++ b/kde/koffice/.footprint @@ -475,7 +475,6 @@ drwxr-xr-x root/root usr/lib/kde4/ -rwxr-xr-x root/root usr/lib/kde4/libkritaoraexport.so -rwxr-xr-x root/root usr/lib/kde4/libkritaoraimport.so -rwxr-xr-x root/root usr/lib/kde4/libkritapart.so --rwxr-xr-x root/root usr/lib/kde4/libkritapdfimport.so -rwxr-xr-x root/root usr/lib/kde4/libkritapngexport.so -rwxr-xr-x root/root usr/lib/kde4/libkritapngimport.so -rwxr-xr-x root/root usr/lib/kde4/libkritatiffexport.so @@ -665,7 +664,6 @@ drwxr-xr-x root/root usr/share/applications/kde4/ -rw-r--r-- root/root usr/share/applications/kde4/krita_bmp.desktop -rw-r--r-- root/root usr/share/applications/kde4/krita_jpeg.desktop -rw-r--r-- root/root usr/share/applications/kde4/krita_ora.desktop --rw-r--r-- root/root usr/share/applications/kde4/krita_pdf.desktop -rw-r--r-- root/root usr/share/applications/kde4/krita_png.desktop -rw-r--r-- root/root usr/share/applications/kde4/krita_raw.desktop -rw-r--r-- root/root usr/share/applications/kde4/krita_tiff.desktop @@ -704,6 +702,7 @@ drwxr-xr-x root/root usr/share/apps/karbon/icons/hicolor/16x16/actions/ -rw-r--r-- root/root usr/share/apps/karbon/icons/hicolor/16x16/actions/rotate.png -rw-r--r-- root/root usr/share/apps/karbon/icons/hicolor/16x16/actions/shear.png -rw-r--r-- root/root usr/share/apps/karbon/icons/hicolor/16x16/actions/strokedocker.png +-rw-r--r-- root/root usr/share/apps/karbon/icons/hicolor/16x16/actions/tooloptions.png -rw-r--r-- root/root usr/share/apps/karbon/icons/hicolor/16x16/actions/translate.png -rw-r--r-- root/root usr/share/apps/karbon/icons/hicolor/16x16/actions/unlocked.png drwxr-xr-x root/root usr/share/apps/karbon/icons/hicolor/16x16/apps/ @@ -789,6 +788,7 @@ drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/16x16/actions/ -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/16x16/actions/chart_polar.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/16x16/actions/chart_ring.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/16x16/actions/data.png +-rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/16x16/actions/options.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/16x16/actions/wizard.png drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/22x22/ drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/22x22/actions/ @@ -805,6 +805,7 @@ drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/22x22/actions/ -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/22x22/actions/chart_polar.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/22x22/actions/chart_ring.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/22x22/actions/data.png +-rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/22x22/actions/options.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/22x22/actions/wizard.png drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/32x32/ drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/32x32/actions/ @@ -821,6 +822,7 @@ drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/32x32/actions/ -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/32x32/actions/chart_polar.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/32x32/actions/chart_ring.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/32x32/actions/data.png +-rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/32x32/actions/options.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/32x32/actions/wizard.png drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/48x48/ drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/48x48/actions/ @@ -836,6 +838,7 @@ drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/48x48/actions/ -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/48x48/actions/chart_pie_3d.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/48x48/actions/chart_polar.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/48x48/actions/chart_ring.png +-rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/48x48/actions/options.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/48x48/actions/template_barchart.png -rw-r--r-- root/root usr/share/apps/kchart/icons/hicolor/48x48/actions/template_empty.png drwxr-xr-x root/root usr/share/apps/kchart/icons/hicolor/scalable/ @@ -1927,6 +1930,7 @@ drwxr-xr-x root/root usr/share/apps/kspread/scripts/docker/ drwxr-xr-x root/root usr/share/apps/kspread/scripts/extensions/ -rw-r--r-- root/root usr/share/apps/kspread/scripts/extensions/csvexport.py -rw-r--r-- root/root usr/share/apps/kspread/scripts/extensions/csvimport.py +-rw-r--r-- root/root usr/share/apps/kspread/scripts/extensions/csvoptions.ui -rw-r--r-- root/root usr/share/apps/kspread/scripts/extensions/htmlexport.py -rw-r--r-- root/root usr/share/apps/kspread/scripts/extensions/htmlexportinfos.ui -rw-r--r-- root/root usr/share/apps/kspread/scripts/extensions/kexidbexport.py @@ -2123,9 +2127,11 @@ drwxr-xr-x root/root usr/share/doc/ drwxr-xr-x root/root usr/share/doc/HTML/ drwxr-xr-x root/root usr/share/doc/HTML/fr/ drwxr-xr-x root/root usr/share/doc/HTML/fr/karbon/ +lrwxrwxrwx root/root usr/share/doc/HTML/fr/karbon/common -> /usr/share/doc/HTML/fr//common -rw-r--r-- root/root usr/share/doc/HTML/fr/karbon/index.cache.bz2 -rw-r--r-- root/root usr/share/doc/HTML/fr/karbon/index.docbook drwxr-xr-x root/root usr/share/doc/HTML/fr/kchart/ +lrwxrwxrwx root/root usr/share/doc/HTML/fr/kchart/common -> /usr/share/doc/HTML/fr//common -rw-r--r-- root/root usr/share/doc/HTML/fr/kchart/file-toolbar.png -rw-r--r-- root/root usr/share/doc/HTML/fr/kchart/file-toolbar2.png -rw-r--r-- root/root usr/share/doc/HTML/fr/kchart/index.cache.bz2 @@ -2160,6 +2166,7 @@ drwxr-xr-x root/root usr/share/doc/HTML/fr/kchart/ -rw-r--r-- root/root usr/share/doc/HTML/fr/kchart/toolbars.png drwxr-xr-x root/root usr/share/doc/HTML/fr/kformula/ -rw-r--r-- root/root usr/share/doc/HTML/fr/kformula/ambiguous-string.png +lrwxrwxrwx root/root usr/share/doc/HTML/fr/kformula/common -> /usr/share/doc/HTML/fr//common -rw-r--r-- root/root usr/share/doc/HTML/fr/kformula/file-toolbar.png -rw-r--r-- root/root usr/share/doc/HTML/fr/kformula/file-toolbar2.png -rw-r--r-- root/root usr/share/doc/HTML/fr/kformula/green1.png @@ -2180,14 +2187,17 @@ drwxr-xr-x root/root usr/share/doc/HTML/fr/kformula/ -rw-r--r-- root/root usr/share/doc/HTML/fr/kformula/shortcut1.png -rw-r--r-- root/root usr/share/doc/HTML/fr/kformula/toolbars.png drwxr-xr-x root/root usr/share/doc/HTML/fr/koffice/ +lrwxrwxrwx root/root usr/share/doc/HTML/fr/koffice/common -> /usr/share/doc/HTML/fr//common -rw-r--r-- root/root usr/share/doc/HTML/fr/koffice/index.cache.bz2 -rw-r--r-- root/root usr/share/doc/HTML/fr/koffice/index.docbook drwxr-xr-x root/root usr/share/doc/HTML/fr/kplato/ -rw-r--r-- root/root usr/share/doc/HTML/fr/kplato/commands.docbook +lrwxrwxrwx root/root usr/share/doc/HTML/fr/kplato/common -> /usr/share/doc/HTML/fr//common -rw-r--r-- root/root usr/share/doc/HTML/fr/kplato/definitions.docbook -rw-r--r-- root/root usr/share/doc/HTML/fr/kplato/index.cache.bz2 -rw-r--r-- root/root usr/share/doc/HTML/fr/kplato/index.docbook -rw-r--r-- root/root usr/share/doc/HTML/fr/kplato/mainwindow.docbook +-rw-r--r-- root/root usr/share/doc/HTML/fr/kplato/options.docbook -rw-r--r-- root/root usr/share/doc/HTML/fr/kplato/wbs.docbook drwxr-xr-x root/root usr/share/doc/HTML/fr/kspread/ -rw-r--r-- root/root usr/share/doc/HTML/fr/kspread/advanced.docbook @@ -2200,6 +2210,7 @@ drwxr-xr-x root/root usr/share/doc/HTML/fr/kspread/ -rw-r--r-- root/root usr/share/doc/HTML/fr/kspread/cellformat5.png -rw-r--r-- root/root usr/share/doc/HTML/fr/kspread/chart1.png -rw-r--r-- root/root usr/share/doc/HTML/fr/kspread/commands.docbook +lrwxrwxrwx root/root usr/share/doc/HTML/fr/kspread/common -> /usr/share/doc/HTML/fr//common -rw-r--r-- root/root usr/share/doc/HTML/fr/kspread/config.docbook -rw-r--r-- root/root usr/share/doc/HTML/fr/kspread/configdialog.docbook -rw-r--r-- root/root usr/share/doc/HTML/fr/kspread/copy1.png @@ -2214,6 +2225,7 @@ drwxr-xr-x root/root usr/share/doc/HTML/fr/kspread/ -rw-r--r-- root/root usr/share/doc/HTML/fr/kspread/sort1.png -rw-r--r-- root/root usr/share/doc/HTML/fr/kspread/starting1.png drwxr-xr-x root/root usr/share/doc/HTML/fr/thesaurus/ +lrwxrwxrwx root/root usr/share/doc/HTML/fr/thesaurus/common -> /usr/share/doc/HTML/fr//common -rw-r--r-- root/root usr/share/doc/HTML/fr/thesaurus/index.cache.bz2 -rw-r--r-- root/root usr/share/doc/HTML/fr/thesaurus/index.docbook drwxr-xr-x root/root usr/share/icons/ @@ -2408,7 +2420,6 @@ drwxr-xr-x root/root usr/share/kde4/services/ServiceMenus/ -rw-r--r-- root/root usr/share/kde4/services/krita_jpeg_import.desktop -rw-r--r-- root/root usr/share/kde4/services/krita_ora_export.desktop -rw-r--r-- root/root usr/share/kde4/services/krita_ora_import.desktop --rw-r--r-- root/root usr/share/kde4/services/krita_pdf_import.desktop -rw-r--r-- root/root usr/share/kde4/services/krita_png_export.desktop -rw-r--r-- root/root usr/share/kde4/services/krita_png_import.desktop -rw-r--r-- root/root usr/share/kde4/services/krita_raw_import.desktop diff --git a/kde/koffice/.md5sum b/kde/koffice/.md5sum index 1ff911fbd..e9be9ccf3 100644 --- a/kde/koffice/.md5sum +++ b/kde/koffice/.md5sum @@ -1,2 +1,4 @@ +e4546d6e8b01e7182ac1887a6571c167 koffice-2.1.2-gcc-4.5.0-1.patch 8bd87b20e2a134cfd2f7db5f4fee4330 koffice-2.1.2.tar.bz2 0221e91c3aea51dbdf24ca2e91c73bec koffice-l10n-fr-2.1.2.tar.bz2 +8f139e0be95f3566cb860bd384c5aa8a libpng14.patch diff --git a/kde/koffice/Pkgfile b/kde/koffice/Pkgfile index e14a821a2..144c19e97 100644 --- a/kde/koffice/Pkgfile +++ b/kde/koffice/Pkgfile @@ -8,10 +8,15 @@ name=koffice version=2.1.2 release=1 source=(ftp://ftp.kde.org/pub/kde/stable/$name-$version/$name-$version.tar.bz2 \ - ftp://ftp.kde.org/pub/kde/stable/$name-$version/$name-l10n/$name-l10n-fr-$version.tar.bz2) + ftp://ftp.kde.org/pub/kde/stable/$name-$version/$name-l10n/$name-l10n-fr-$version.tar.bz2\ + libpng14.patch koffice-2.1.2-gcc-4.5.0-1.patch) build() { - mkdir build + cd $name-$version + patch -Np0 -i ../libpng14.patch + patch -Np1 -i ../koffice-2.1.2-gcc-4.5.0-1.patch + cd .. + mkdir build cd build cmake ../${name}-l10n-fr-$version \ -DCMAKE_INSTALL_PREFIX=/usr diff --git a/kde/koffice/koffice-2.1.2-gcc-4.5.0-1.patch b/kde/koffice/koffice-2.1.2-gcc-4.5.0-1.patch new file mode 100644 index 000000000..d380aeeb6 --- /dev/null +++ b/kde/koffice/koffice-2.1.2-gcc-4.5.0-1.patch @@ -0,0 +1,98 @@ +--- koffice-2.1.2/filters/kword/msword-odf/texthandler.cpp 2010-03-29 15:05:58.000000000 +0200 ++++ koffice-2.1.2.new/filters/kword/msword-odf/texthandler.cpp 2010-05-07 19:02:43.000000000 +0200 +@@ -863,7 +863,7 @@ + unsigned int code = text[0].unicode(); + if ( (code & 0xFF00) == 0xF000 ) // see wv2 + code &= 0x00FF; +- listStyleWriter.addAttribute( "text:bullet-char", QString::QString( code ).toUtf8() ); ++ listStyleWriter.addAttribute( "text:bullet-char", QString( code ).toUtf8() ); + } + else + kWarning(30513) << "Bullet with more than one character, not supported"; +--- koffice-2.1.2/krita/ui/widgets/kis_curve_widget.cpp 2010-03-29 15:07:17.000000000 +0200 ++++ koffice-2.1.2.new/krita/ui/widgets/kis_curve_widget.cpp 2010-05-07 20:14:22.000000000 +0200 +@@ -312,11 +312,11 @@ + curveY = d->m_points.at(i).y(); + + if (i == d->m_grab_point_index) { +- p.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine)); ++ p.setPen(QPen(Qt::red, 3, Qt::SolidLine)); + p.drawEllipse(QRectF(curveX * wWidth - 2, + wHeight - 2 - curveY * wHeight, 4, 4)); + } else { +- p.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine)); ++ p.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + p.drawEllipse(QRectF(curveX * wWidth - 3, + wHeight - 3 - curveY * wHeight, 6, 6)); + } +--- koffice-2.1.2/krita/ui/widgets/kis_curve_widget_p.h 2010-03-29 15:07:17.000000000 +0200 ++++ koffice-2.1.2.new/krita/ui/widgets/kis_curve_widget_p.h 2010-05-07 20:15:38.000000000 +0200 +@@ -439,7 +439,7 @@ + * That is not mandatory but desirable + */ + +- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); ++ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); + p.drawLine(div4_round(wWidth), 0, div4_round(wWidth), wHeight); + p.drawLine(div2_round(wWidth), 0, div2_round(wWidth), wHeight); + p.drawLine(div4_round(3*wWidth), 0, div4_round(3*wWidth), wHeight); +--- koffice-2.1.2/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp 2010-03-29 15:06:06.000000000 +0200 ++++ koffice-2.1.2.new/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp 2010-05-07 20:20:28.000000000 +0200 +@@ -123,7 +123,7 @@ + + QPixmap gradientpix(width, height); + QPainter p(&gradientpix); +- p.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); ++ p.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); + for (; *i < 256; (*i)++, col += inc) { + p.setPen(QColor(col, col, col)); + p.drawPoint(x, y); +@@ -138,7 +138,7 @@ + QPixmap pix(256, height); + pix.fill(); + QPainter p(&pix); +- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); ++ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); + + if(m_histogram) + { +--- koffice-2.1.2/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp 2010-03-29 15:06:06.000000000 +0200 ++++ koffice-2.1.2.new/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp 2010-05-07 20:45:21.000000000 +0200 +@@ -249,7 +249,7 @@ + // Create the horizontal gradient label + QPixmap hgradientpix(256, 1); + QPainter hgp(&hgradientpix); +- hgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); ++ hgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); + for (i = 0; i < 256; ++i) { + hgp.setPen(QColor(i, i, i)); + hgp.drawPoint(i, 0); +@@ -259,7 +259,7 @@ + // Create the vertical gradient label + QPixmap vgradientpix(1, 256); + QPainter vgp(&vgradientpix); +- vgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); ++ vgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); + for (i = 0; i < 256; ++i) { + vgp.setPen(QColor(i, i, i)); + vgp.drawPoint(0, 255 - i); +@@ -271,7 +271,7 @@ + QPixmap pix(256, height); + pix.fill(); + QPainter p(&pix); +- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); ++ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); + + double highest = (double)histogram.calculations().getHighest(); + qint32 bins = histogram.producer()->numberOfBins(); +--- koffice-2.1.2/krita/plugins/filters/levelfilter/kis_level_filter.cpp 2010-03-29 15:06:23.000000000 +0200 ++++ koffice-2.1.2.new/krita/plugins/filters/levelfilter/kis_level_filter.cpp 2010-05-07 20:48:49.000000000 +0200 +@@ -178,7 +178,7 @@ + pix.fill(); + QPainter p(&pix); + +- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); ++ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); + + double highest = (double)histogram->calculations().getHighest(); + qint32 bins = histogram->producer()->numberOfBins(); diff --git a/kde/koffice/libpng14.patch b/kde/koffice/libpng14.patch new file mode 100644 index 000000000..f4e8da5b1 --- /dev/null +++ b/kde/koffice/libpng14.patch @@ -0,0 +1,11 @@ +--- krita/ui/kis_png_converter.cpp.old 2010-01-20 17:48:11.890898029 +0100 ++++ krita/ui/kis_png_converter.cpp 2010-01-20 17:50:13.477553307 +0100 +@@ -404,7 +404,7 @@ + + png_byte signature[8]; + iod->peek((char*)signature, 8); +- if (!png_check_sig(signature, 8)) { ++ if (!png_sig_cmp(signature, 0, 8) == 0) { + iod->close(); + return (KisImageBuilder_RESULT_BAD_FETCH); + } diff --git a/kde/konversation/.footprint b/kde/konversation/.footprint index 6dfa9955c..a9da2e725 100644 --- a/kde/konversation/.footprint +++ b/kde/konversation/.footprint @@ -110,6 +110,7 @@ drwxr-xr-x root/root usr/share/doc/HTML/en/konversation/ -rw-r--r-- root/root usr/share/doc/HTML/en/konversation/checkidentities.png -rw-r--r-- root/root usr/share/doc/HTML/en/konversation/colorchooser_screen.png -rw-r--r-- root/root usr/share/doc/HTML/en/konversation/colorize.png +lrwxrwxrwx root/root usr/share/doc/HTML/en/konversation/common -> /usr/share/doc/HTML/en/common -rw-r--r-- root/root usr/share/doc/HTML/en/konversation/configure.png -rw-r--r-- root/root usr/share/doc/HTML/en/konversation/dccstatus_screen_co.png -rw-r--r-- root/root usr/share/doc/HTML/en/konversation/editserver_screen_co.png @@ -155,14 +156,17 @@ drwxr-xr-x root/root usr/share/doc/HTML/en/konversation/ -rw-r--r-- root/root usr/share/doc/HTML/en/konversation/webbrowser_screen_co.png drwxr-xr-x root/root usr/share/doc/HTML/et/ drwxr-xr-x root/root usr/share/doc/HTML/et/konversation/ +lrwxrwxrwx root/root usr/share/doc/HTML/et/konversation/common -> /usr/share/doc/HTML/et//common -rw-r--r-- root/root usr/share/doc/HTML/et/konversation/index.cache.bz2 -rw-r--r-- root/root usr/share/doc/HTML/et/konversation/index.docbook drwxr-xr-x root/root usr/share/doc/HTML/it/ drwxr-xr-x root/root usr/share/doc/HTML/it/konversation/ +lrwxrwxrwx root/root usr/share/doc/HTML/it/konversation/common -> /usr/share/doc/HTML/it//common -rw-r--r-- root/root usr/share/doc/HTML/it/konversation/index.cache.bz2 -rw-r--r-- root/root usr/share/doc/HTML/it/konversation/index.docbook drwxr-xr-x root/root usr/share/doc/HTML/pt_BR/ drwxr-xr-x root/root usr/share/doc/HTML/pt_BR/konversation/ +lrwxrwxrwx root/root usr/share/doc/HTML/pt_BR/konversation/common -> /usr/share/doc/HTML/pt_BR//common -rw-r--r-- root/root usr/share/doc/HTML/pt_BR/konversation/index.cache.bz2 -rw-r--r-- root/root usr/share/doc/HTML/pt_BR/konversation/index.docbook drwxr-xr-x root/root usr/share/doc/HTML/sv/ @@ -174,6 +178,7 @@ drwxr-xr-x root/root usr/share/doc/HTML/sv/konversation/ -rw-r--r-- root/root usr/share/doc/HTML/sv/konversation/channellist_screen_co.png -rw-r--r-- root/root usr/share/doc/HTML/sv/konversation/checkidentities.png -rw-r--r-- root/root usr/share/doc/HTML/sv/konversation/colorchooser_screen.png +lrwxrwxrwx root/root usr/share/doc/HTML/sv/konversation/common -> /usr/share/doc/HTML/sv//common -rw-r--r-- root/root usr/share/doc/HTML/sv/konversation/dccstatus_screen_co.png -rw-r--r-- root/root usr/share/doc/HTML/sv/konversation/first_channel_co.png -rw-r--r-- root/root usr/share/doc/HTML/sv/konversation/first_serverlist_co.png @@ -199,6 +204,7 @@ drwxr-xr-x root/root usr/share/doc/HTML/sv/konversation/ -rw-r--r-- root/root usr/share/doc/HTML/sv/konversation/webbrowser_screen_co.png drwxr-xr-x root/root usr/share/doc/HTML/uk/ drwxr-xr-x root/root usr/share/doc/HTML/uk/konversation/ +lrwxrwxrwx root/root usr/share/doc/HTML/uk/konversation/common -> /usr/share/doc/HTML/uk//common -rw-r--r-- root/root usr/share/doc/HTML/uk/konversation/index.cache.bz2 -rw-r--r-- root/root usr/share/doc/HTML/uk/konversation/index.docbook drwxr-xr-x root/root usr/share/icons/ diff --git a/kde/yawp/.footprint b/kde/yawp/.footprint index 868691866..d63617018 100644 --- a/kde/yawp/.footprint +++ b/kde/yawp/.footprint @@ -6,6 +6,10 @@ drwxr-xr-x root/root usr/lib/kde4/ -rwxr-xr-x root/root usr/lib/kde4/plasma_yawp.so drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/apps/ +drwxr-xr-x root/root usr/share/apps/desktoptheme/ +drwxr-xr-x root/root usr/share/apps/desktoptheme/default/ +drwxr-xr-x root/root usr/share/apps/desktoptheme/default/widgets/ +-rw-r--r-- root/root usr/share/apps/desktoptheme/default/widgets/yawp_theme15.svg drwxr-xr-x root/root usr/share/kde4/ drwxr-xr-x root/root usr/share/kde4/services/ -rw-r--r-- root/root usr/share/kde4/services/ion-accuweather.desktop diff --git a/kde/yawp/.md5sum b/kde/yawp/.md5sum index 4aa873c6d..c403f3b0f 100644 --- a/kde/yawp/.md5sum +++ b/kde/yawp/.md5sum @@ -1 +1,2 @@ +b9d849c840a97d224dba125589edb399 yawp-0.3.2-gcc-01.patch ba4941e81e61086ccec06584f7ae98dd yawp-0.3.2.tar.bz2 diff --git a/kde/yawp/Pkgfile b/kde/yawp/Pkgfile index 409e21e5b..fafe3fa5c 100755 --- a/kde/yawp/Pkgfile +++ b/kde/yawp/Pkgfile @@ -7,10 +7,12 @@ name=yawp version=0.3.2 release=2 -source=(http://downloads.sourceforge.net/yawp/yawp-$version.tar.bz2) +source=(http://downloads.sourceforge.net/yawp/yawp-$version.tar.bz2\ + yawp-0.3.2-gcc-01.patch) build() { cd $name-$version + patch -Np1 -i ../yawp-0.3.2-gcc-01.patch mkdir build cd build cmake ../ -DCMAKE_INSTALL_PREFIX=/usr diff --git a/kde/yawp/yawp-0.3.2-gcc-01.patch b/kde/yawp/yawp-0.3.2-gcc-01.patch new file mode 100644 index 000000000..cc72ebce6 --- /dev/null +++ b/kde/yawp/yawp-0.3.2-gcc-01.patch @@ -0,0 +1,31 @@ +--- yawp-0.3.2/applet/countrymap.cpp 2009-12-06 21:08:29.000000000 +0100 ++++ yawp-0.3.2.new/applet/countrymap.cpp 2010-05-07 18:11:21.000000000 +0200 +@@ -47,7 +47,7 @@ + const QString CountryMap::sFlagTemplate("l10n/%1/flag.png"); + + +-CountryMap::CountryMap * ++CountryMap * + CountryMap::instance() + { + QMutexLocker locker( &singeltonMutex ); +@@ -210,7 +210,7 @@ + + /******************************************************************************/ + +-UsStatesMap::UsStatesMap * ++UsStatesMap * + UsStatesMap::instance() + { + QMutexLocker locker( &singeltonMutex ); +--- yawp-0.3.2/applet/ionlistmodel.cpp 2009-12-06 21:08:29.000000000 +0100 ++++ yawp-0.3.2.new/applet/ionlistmodel.cpp 2010-05-07 18:12:09.000000000 +0200 +@@ -45,7 +45,7 @@ + return bReturnVal; + } + +-IonListModel::IonListModel * ++IonListModel * + IonListModel::instance() + { + QMutexLocker locker( &m_singeltonMutex ); diff --git a/test/madwifi/.md5sum b/test/madwifi/.md5sum deleted file mode 100644 index 3764be7a2..000000000 --- a/test/madwifi/.md5sum +++ /dev/null @@ -1 +0,0 @@ -64210992d137fdab66640edacdd0b69b madwifi-0.9.4.4100.tar.bz2 |