From c5677c938a9517e3d41f3d06e356e072f7b96f45 Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 15 May 2011 13:55:03 +0200 Subject: kdegraphics, maj des dépendances MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kde/kdegraphics/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde/kdegraphics/Pkgfile b/kde/kdegraphics/Pkgfile index c3f581688..13adeaeee 100755 --- a/kde/kdegraphics/Pkgfile +++ b/kde/kdegraphics/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: NuTyX packager team # Packager: lesibel at free dot fr # Depends on: automoc4, kdebase-runtime, qca, qimageblitz, libdbusmenu-qt, exiv2, poppler-qt, strigi, shared-mime-info, sane, libgphoto2, chmlib, djvulibre, docbook-xsl, ebook-tools, libspectre -# Run on: kdebase-runtime,qimageblitz,libdbusmenu-qt,exiv2,lcms,libxxf86vm,poppler-qt,strigi,shared-mime-info,sane,libgphoto2,chmlib,djvulibre,ebook-tools,libspectre +# Run on: kdebase-runtime,qimageblitz,libdbusmenu-qt,exiv2,lcms,xorg-libxxf86vm,poppler-qt,strigi,shared-mime-info,sane,libgphoto2,chmlib,djvulibre,ebook-tools,libspectre name=kdegraphics version=4.6.3 -- cgit v1.2.3-70-g09d2 From 628820722f4248c97a5f4af7286347a1eeba2bfb Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 15 May 2011 13:55:25 +0200 Subject: kdebase-workspace, maj des dépendances MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kde/kdebase-workspace/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde/kdebase-workspace/Pkgfile b/kde/kdebase-workspace/Pkgfile index dda9eaf4d..577bfbcca 100755 --- a/kde/kdebase-workspace/Pkgfile +++ b/kde/kdebase-workspace/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: NuTyX packager team # Packager: lesibel at free dot fr # Depends on: cmake, automoc4, phonon-backend-xine, phonon-backend-gstreamer, kdelibs, kdepimlibs, kdebase-runtime, kdebase, kdegraphics, kdebindings, libdbusmenu-qt, polkit-qt, polkit-kde, lm_sensors, libraw1394, qimageblitz, pciutils, usbutils, consolekit, xorg-libxtst, xorg-libxkbfile, xorg-libxdamage, networkmanager -# Run on: lm_sensors,libraw1394,qimageblitz,polkit-kde,consolekit,xorg-xprop,xorg-libxdamage,xorg-libxkbfile,phonon-backend-xine,phonon-backend-gstreamer,kdelibs,kdepimlibs,kdebase-runtime,kdebase,kdegraphics,kdebindings,phonon-backend-xine,phonon-backend-gstreamer +# Run on: xorg,lm_sensors,libraw1394,qimageblitz,polkit-kde,consolekit,xorg-xprop,xorg-libxdamage,xorg-libxkbfile,phonon-backend-xine,phonon-backend-gstreamer,kdelibs,kdepimlibs,kdebase-runtime,kdebase,kdegraphics,kdebindings,phonon-backend-xine,phonon-backend-gstreamer,kde-l10n-fr name=kdebase-workspace version=4.6.3 -- cgit v1.2.3-70-g09d2 From 934c17585baad0f6485067b6be201a6a2becda32 Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 15 May 2011 13:56:11 +0200 Subject: xfwm4, lancement auto de xfwm4 forcé MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xfce/xfwm4/.footprint.i686 | 4 ++++ xfce/xfwm4/.footprint.x86_64 | 4 ++++ xfce/xfwm4/Pkgfile | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/xfce/xfwm4/.footprint.i686 b/xfce/xfwm4/.footprint.i686 index cb43106db..107d68e37 100644 --- a/xfce/xfwm4/.footprint.i686 +++ b/xfce/xfwm4/.footprint.i686 @@ -1,3 +1,7 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/xdg/ +drwxr-xr-x root/root etc/xdg/autostart/ +-rw-r--r-- root/root etc/xdg/autostart/xfce-wm-start.desktop drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/xfwm4 diff --git a/xfce/xfwm4/.footprint.x86_64 b/xfce/xfwm4/.footprint.x86_64 index cb43106db..107d68e37 100644 --- a/xfce/xfwm4/.footprint.x86_64 +++ b/xfce/xfwm4/.footprint.x86_64 @@ -1,3 +1,7 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/xdg/ +drwxr-xr-x root/root etc/xdg/autostart/ +-rw-r--r-- root/root etc/xdg/autostart/xfce-wm-start.desktop drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/xfwm4 diff --git a/xfce/xfwm4/Pkgfile b/xfce/xfwm4/Pkgfile index e1066ce11..250830cef 100755 --- a/xfce/xfwm4/Pkgfile +++ b/xfce/xfwm4/Pkgfile @@ -7,7 +7,7 @@ name=xfwm4 version=4.8.1 -release=1 +release=2 source=(http://archive.xfce.org/src/xfce/$name/4.8/$name-$version.tar.bz2) build() { @@ -22,4 +22,7 @@ cd $name-$version make make DESTDIR=$PKG install rm -r $PKG/usr/share/doc + mkdir -p $PKG/etc/xdg/autostart + sed "s/xfwm4-settings/xfwm4/" $PKG/usr/share/applications/xfce-wm-settings.desktop > \ + $PKG/etc/xdg/autostart/xfce-wm-start.desktop } -- cgit v1.2.3-70-g09d2 From 683f1cb1708384650b799dc208380b1e053ad207 Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 15 May 2011 13:56:55 +0200 Subject: xfce4-session, suppression tips --- xfce/xfce4-session/.footprint.i686 | 1 - xfce/xfce4-session/.footprint.x86_64 | 1 - xfce/xfce4-session/Pkgfile | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xfce/xfce4-session/.footprint.i686 b/xfce/xfce4-session/.footprint.i686 index 994c472b7..cbdc6db6c 100644 --- a/xfce/xfce4-session/.footprint.i686 +++ b/xfce/xfce4-session/.footprint.i686 @@ -1,7 +1,6 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/xdg/ drwxr-xr-x root/root etc/xdg/autostart/ --rw-r--r-- root/root etc/xdg/autostart/xfce4-tips-autostart.desktop drwxr-xr-x root/root etc/xdg/xfce4/ drwxr-xr-x root/root etc/xdg/xfce4/xfconf/ drwxr-xr-x root/root etc/xdg/xfce4/xfconf/xfce-perchannel-xml/ diff --git a/xfce/xfce4-session/.footprint.x86_64 b/xfce/xfce4-session/.footprint.x86_64 index 994c472b7..cbdc6db6c 100644 --- a/xfce/xfce4-session/.footprint.x86_64 +++ b/xfce/xfce4-session/.footprint.x86_64 @@ -1,7 +1,6 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/xdg/ drwxr-xr-x root/root etc/xdg/autostart/ --rw-r--r-- root/root etc/xdg/autostart/xfce4-tips-autostart.desktop drwxr-xr-x root/root etc/xdg/xfce4/ drwxr-xr-x root/root etc/xdg/xfce4/xfconf/ drwxr-xr-x root/root etc/xdg/xfce4/xfconf/xfce-perchannel-xml/ diff --git a/xfce/xfce4-session/Pkgfile b/xfce/xfce4-session/Pkgfile index be842becd..fbe187076 100755 --- a/xfce/xfce4-session/Pkgfile +++ b/xfce/xfce4-session/Pkgfile @@ -7,7 +7,7 @@ name=xfce4-session version=4.8.1 -release=2 +release=3 source=(http://archive.xfce.org/src/xfce/$name/4.8/$name-$version.tar.bz2) build() { @@ -23,4 +23,5 @@ cd $name-$version make make DESTDIR=$PKG install rm -r $PKG/usr/share/doc + rm $PKG/etc/xdg/autostart/xfce4-tips-autostart.desktop } -- cgit v1.2.3-70-g09d2 From 36a24dde9a6c08a6ba056ce9cae7df66d00fd1ea Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 15 May 2011 13:57:22 +0200 Subject: xfce, ajustement auto inittab et dmrc --- xfce/xfce/post-install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce/xfce/post-install b/xfce/xfce/post-install index ee18fd997..c50db93a8 100755 --- a/xfce/xfce/post-install +++ b/xfce/xfce/post-install @@ -1,4 +1,7 @@ #!/bin/bash update-desktop-database -sed -i "s/^id:[3-5]/id:3/" /etc/inittab +sed -i "s/^id:[3-5]/id:4/" /etc/inittab + +# Activer kde par défaut +sed -i "s/^\(Session=\).*$/\1xfce4/g" /etc/skel/.dmrc -- cgit v1.2.3-70-g09d2 From ca8bb9c38adfe0b31ac984847d912ede08b9bc97 Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 15 May 2011 15:01:08 +0200 Subject: dbus, correction script --- base/dbus/.footprint.i686 | 5 +--- base/dbus/.footprint.x86_64 | 5 +--- base/dbus/.md5sum.i686 | 1 - base/dbus/.md5sum.x86_64 | 1 - base/dbus/80-dbus | 12 ---------- base/dbus/Pkgfile | 10 ++++---- base/dbus/dbus | 56 --------------------------------------------- 7 files changed, 6 insertions(+), 84 deletions(-) delete mode 100644 base/dbus/80-dbus delete mode 100644 base/dbus/dbus diff --git a/base/dbus/.footprint.i686 b/base/dbus/.footprint.i686 index 50638f868..be9cde8c7 100644 --- a/base/dbus/.footprint.i686 +++ b/base/dbus/.footprint.i686 @@ -7,7 +7,7 @@ drwxr-xr-x root/root etc/dbus-1/session.d/ drwxr-xr-x root/root etc/dbus-1/system.d/ 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/dbus +-rwxr-xr-- root/root etc/rc.d/init.d/dbus drwxr-xr-x root/root etc/rc.d/rc0.d/ lrwxrwxrwx root/root etc/rc.d/rc0.d/K85dbus -> ../init.d/dbus drwxr-xr-x root/root etc/rc.d/rc1.d/ @@ -69,9 +69,6 @@ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/dbus-1/ drwxr-xr-x root/root usr/share/dbus-1/services/ drwxr-xr-x root/root usr/share/dbus-1/system-services/ -drwxr-xr-x root/root usr/share/doc/ -drwxr-xr-x root/root usr/share/doc/dbus/ -drwxr-xr-x root/root usr/share/doc/dbus/api/ 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/dbus-cleanup-sockets.1.gz diff --git a/base/dbus/.footprint.x86_64 b/base/dbus/.footprint.x86_64 index 50638f868..be9cde8c7 100644 --- a/base/dbus/.footprint.x86_64 +++ b/base/dbus/.footprint.x86_64 @@ -7,7 +7,7 @@ drwxr-xr-x root/root etc/dbus-1/session.d/ drwxr-xr-x root/root etc/dbus-1/system.d/ 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/dbus +-rwxr-xr-- root/root etc/rc.d/init.d/dbus drwxr-xr-x root/root etc/rc.d/rc0.d/ lrwxrwxrwx root/root etc/rc.d/rc0.d/K85dbus -> ../init.d/dbus drwxr-xr-x root/root etc/rc.d/rc1.d/ @@ -69,9 +69,6 @@ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/dbus-1/ drwxr-xr-x root/root usr/share/dbus-1/services/ drwxr-xr-x root/root usr/share/dbus-1/system-services/ -drwxr-xr-x root/root usr/share/doc/ -drwxr-xr-x root/root usr/share/doc/dbus/ -drwxr-xr-x root/root usr/share/doc/dbus/api/ 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/dbus-cleanup-sockets.1.gz diff --git a/base/dbus/.md5sum.i686 b/base/dbus/.md5sum.i686 index 62de9d6f7..dde96cbcf 100644 --- a/base/dbus/.md5sum.i686 +++ b/base/dbus/.md5sum.i686 @@ -1,3 +1,2 @@ -627e775981fea688723dc6063f996998 dbus e30253e15f0f4e6c5ee9e6f0eba5046c dbus-1.4.8.tar.gz f78a3655ff83e4e991f5679840fe1b0b session-local.conf diff --git a/base/dbus/.md5sum.x86_64 b/base/dbus/.md5sum.x86_64 index 62de9d6f7..dde96cbcf 100644 --- a/base/dbus/.md5sum.x86_64 +++ b/base/dbus/.md5sum.x86_64 @@ -1,3 +1,2 @@ -627e775981fea688723dc6063f996998 dbus e30253e15f0f4e6c5ee9e6f0eba5046c dbus-1.4.8.tar.gz f78a3655ff83e4e991f5679840fe1b0b session-local.conf diff --git a/base/dbus/80-dbus b/base/dbus/80-dbus deleted file mode 100644 index 676d99551..000000000 --- a/base/dbus/80-dbus +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# launches a session dbus instance - -dbuslaunch="`which dbus-launch 2>/dev/null`" -if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - if [ -n "$command" ]; then - command="$dbuslaunch --exit-with-session $command" - else - eval `$dbuslaunch --sh-syntax --exit-with-session` - fi -fi diff --git a/base/dbus/Pkgfile b/base/dbus/Pkgfile index ad24728c8..7325471a8 100755 --- a/base/dbus/Pkgfile +++ b/base/dbus/Pkgfile @@ -4,10 +4,9 @@ # Packager: thierryn1 at hispeed dot ch name=dbus version=1.4.8 -release=2 +release=3 source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \ - session-local.conf\ - dbus) + session-local.conf ) build() { source /etc/blfs-bootscripts @@ -34,14 +33,13 @@ build() { cd ../$scripts-$scriptsversion make DESTDIR=$PKG install-dbus - install -m755 ../dbus $PKG/etc/rc.d/init.d/ mv $PKG/etc/rc.d/rc0.d/K{30,85}dbus mv $PKG/etc/rc.d/rc6.d/K{30,85}dbus mv $PKG/etc/rc.d/rc1.d/K{30,85}dbus - + sed -i "s/dbus\/pid/dbus.pid/" $PKG/etc/rc.d/init.d/dbus mkdir -p $PKG/usr/lib/dbus-1.0/services mkdir -p $PKG/usr/share/dbus-1/services mkdir -p $PKG/etc/dbus-1/system.d/ mkdir -p $PKG/etc/dbus-1/session.d/ -# rm -r $PKG/usr/share/doc + rm -r $PKG/usr/share/doc } diff --git a/base/dbus/dbus b/base/dbus/dbus deleted file mode 100644 index c2c5f5086..000000000 --- a/base/dbus/dbus +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# Begin $rc_base/init.d/messagebus - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org - -#$LastChangedBy: dnicholson $ -#$Date: 2007-07-09 18:30:26 -0500 (Mon, 09 Jul 2007) $ - -. /etc/sysconfig/rc -. $rc_functions -newgroup=messagebus -newuser=messagebus -newid=18 - -# check for messagebus group or add one -getent group $newgroup > /dev/null || /usr/sbin/groupadd -g $newid $newgroup - -# check for messagebus user or add one -getent passwd $newuser > /dev/null || /usr/sbin/useradd -g $newgroup \ --u $newid -d /dev/null \ --s /bin/false -c "D-BUS Message Daemon User" $newuser - -pidfile=/var/run/dbus/pid -socket=/var/run/dbus/system_bus_socket - -case "$1" in - start) - boot_mesg "Starting the D-Bus Messagebus Daemon..." - /usr/bin/dbus-uuidgen --ensure - loadproc -p "$pidfile" /usr/bin/dbus-daemon --system - ;; - - stop) - boot_mesg "Stopping the D-Bus Messagebus Daemon..." - killproc -p "$pidfile" /usr/bin/dbus-daemon - [ $? -eq 0 ] && rm -f "$socket" - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc /usr/bin/dbus-daemon - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/messagebus -- cgit v1.2.3-70-g09d2