From 1e7c27838fa4e86e655ee352cfaad8ce121880e8 Mon Sep 17 00:00:00 2001 From: sibel Date: Fri, 8 Apr 2011 11:09:02 +0200 Subject: kdebase-workspace, 4.6.2 corrections port --- kde/kdebase-workspace/.footprint.i686 | 4 ++++ kde/kdebase-workspace/.footprint.x86_64 | 4 ++++ kde/kdebase-workspace/.md5sum.x86_64 | 2 +- kde/kdebase-workspace/Pkgfile | 11 ++++++++--- kde/kdebase-workspace/Xsession.kde4 | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/kde/kdebase-workspace/.footprint.i686 b/kde/kdebase-workspace/.footprint.i686 index 19a31092b..0c33664e6 100644 --- a/kde/kdebase-workspace/.footprint.i686 +++ b/kde/kdebase-workspace/.footprint.i686 @@ -249,6 +249,7 @@ drwxr-xr-x root/root usr/lib/kde4/ -rwxr-xr-x root/root usr/lib/kde4/kcm_standard_actions.so -rwxr-xr-x root/root usr/lib/kde4/kcm_style.so -rwxr-xr-x root/root usr/lib/kde4/kcm_usb.so +-rwxr-xr-x root/root usr/lib/kde4/kcm_view1394.so -rwxr-xr-x root/root usr/lib/kde4/kcm_workspaceoptions.so -rwxr-xr-x root/root usr/lib/kde4/kcm_xinerama.so -rwxr-xr-x root/root usr/lib/kde4/kded_freespacenotifier.so @@ -582,6 +583,8 @@ drwxr-xr-x root/root usr/share/apps/kcmsolidactions/ -rw-r--r-- root/root usr/share/apps/kcmsolidactions/solid-action-template.desktop drwxr-xr-x root/root usr/share/apps/kcmusb/ -rw-r--r-- root/root usr/share/apps/kcmusb/usb.ids +drwxr-xr-x root/root usr/share/apps/kcmview1394/ +-rw-r--r-- root/root usr/share/apps/kcmview1394/oui.db drwxr-xr-x root/root usr/share/apps/kconf_update/ -rwxr-xr-x root/root usr/share/apps/kconf_update/convertShortcuts.pl -rw-r--r-- root/root usr/share/apps/kconf_update/kaccel.upd @@ -2221,6 +2224,7 @@ drwxr-xr-x root/root usr/share/kde4/services/ServiceMenus/ -rw-r--r-- root/root usr/share/kde4/services/kcmlaunch.desktop -rw-r--r-- root/root usr/share/kde4/services/kcmsmserver.desktop -rw-r--r-- root/root usr/share/kde4/services/kcmusb.desktop +-rw-r--r-- root/root usr/share/kde4/services/kcmview1394.desktop drwxr-xr-x root/root usr/share/kde4/services/kded/ -rw-r--r-- root/root usr/share/kde4/services/kded/freespacenotifier.desktop -rw-r--r-- root/root usr/share/kde4/services/kded/kephal.desktop diff --git a/kde/kdebase-workspace/.footprint.x86_64 b/kde/kdebase-workspace/.footprint.x86_64 index 19a31092b..0c33664e6 100644 --- a/kde/kdebase-workspace/.footprint.x86_64 +++ b/kde/kdebase-workspace/.footprint.x86_64 @@ -249,6 +249,7 @@ drwxr-xr-x root/root usr/lib/kde4/ -rwxr-xr-x root/root usr/lib/kde4/kcm_standard_actions.so -rwxr-xr-x root/root usr/lib/kde4/kcm_style.so -rwxr-xr-x root/root usr/lib/kde4/kcm_usb.so +-rwxr-xr-x root/root usr/lib/kde4/kcm_view1394.so -rwxr-xr-x root/root usr/lib/kde4/kcm_workspaceoptions.so -rwxr-xr-x root/root usr/lib/kde4/kcm_xinerama.so -rwxr-xr-x root/root usr/lib/kde4/kded_freespacenotifier.so @@ -582,6 +583,8 @@ drwxr-xr-x root/root usr/share/apps/kcmsolidactions/ -rw-r--r-- root/root usr/share/apps/kcmsolidactions/solid-action-template.desktop drwxr-xr-x root/root usr/share/apps/kcmusb/ -rw-r--r-- root/root usr/share/apps/kcmusb/usb.ids +drwxr-xr-x root/root usr/share/apps/kcmview1394/ +-rw-r--r-- root/root usr/share/apps/kcmview1394/oui.db drwxr-xr-x root/root usr/share/apps/kconf_update/ -rwxr-xr-x root/root usr/share/apps/kconf_update/convertShortcuts.pl -rw-r--r-- root/root usr/share/apps/kconf_update/kaccel.upd @@ -2221,6 +2224,7 @@ drwxr-xr-x root/root usr/share/kde4/services/ServiceMenus/ -rw-r--r-- root/root usr/share/kde4/services/kcmlaunch.desktop -rw-r--r-- root/root usr/share/kde4/services/kcmsmserver.desktop -rw-r--r-- root/root usr/share/kde4/services/kcmusb.desktop +-rw-r--r-- root/root usr/share/kde4/services/kcmview1394.desktop drwxr-xr-x root/root usr/share/kde4/services/kded/ -rw-r--r-- root/root usr/share/kde4/services/kded/freespacenotifier.desktop -rw-r--r-- root/root usr/share/kde4/services/kded/kephal.desktop diff --git a/kde/kdebase-workspace/.md5sum.x86_64 b/kde/kdebase-workspace/.md5sum.x86_64 index c4a893eaa..4e46d00e1 100644 --- a/kde/kdebase-workspace/.md5sum.x86_64 +++ b/kde/kdebase-workspace/.md5sum.x86_64 @@ -1,5 +1,5 @@ 5a8c274168dcacd657c1f0c6fe4f72a0 Pakxe.tar.bz2 -2b0d7acd26d472a7295d489973672094 Xsession.kde4 +2e3f3525323055c74da28cd431e35b0e Xsession.kde4 304ef605ca6fc78f538ef38f7ae93b26 ede.desktop 98068b12ed7ea671ae631ff5893249a2 kde-np.pam d388941b3e86b14ce25a72be945ed3d9 kde.pam diff --git a/kde/kdebase-workspace/Pkgfile b/kde/kdebase-workspace/Pkgfile index 2f295b171..88eceaa78 100755 --- a/kde/kdebase-workspace/Pkgfile +++ b/kde/kdebase-workspace/Pkgfile @@ -2,9 +2,9 @@ # URL: http://www.kde.org # Maintainer: NuTyX packager team # Packager: lesibel at free dot fr -# Depends on: cmake, automoc4, boost, polkit-kde, qimageblitz, lm_sensors, xorg-libxkbfile, xorg-libxdamage, xorg-libxtst, kdepimlibs, gpsd, consolekit -# Run on: lm_sensors,libraw1394,qimageblitz,polkit-kde,consolekit,xorg-xprop,xorg-libxdamage,xorg-libxkbfile +# Depends on: cmake, automoc4, kdelibs, kdepimlibs, kdebase-runtime, kdebase, libdbusmenu-qt, polkit-qt, lm_sensors, libraw1394, gpsd, qimageblitz, pciutils, usbutils, consolekit, xorg-libxtst, xorg-libxkbfile, xorg-libxdamage +# Run on: lm_sensors,libraw1394,qimageblitz,polkit-kde,consolekit,xorg-xprop,xorg-libxdamage,xorg-libxkbfile name=kdebase-workspace version=4.6.2 @@ -19,13 +19,18 @@ build() { cd $name-* + sed -e "s#@REPLACE_LDFLAGS@##" \ + -i startkde.cmake + sed -e "s#@REPLACE_LIBDIR@#$(get_libdir)#" \ + -i startkde.cmake + mkdir build cd build cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=ON \ + -DWITH_Googlegadgets=OFF \ -DWITH_PolkitQt=OFF make make DESTDIR=$PKG install diff --git a/kde/kdebase-workspace/Xsession.kde4 b/kde/kdebase-workspace/Xsession.kde4 index c01c73ad0..d50f24565 100755 --- a/kde/kdebase-workspace/Xsession.kde4 +++ b/kde/kdebase-workspace/Xsession.kde4 @@ -55,7 +55,7 @@ case $session in exec $HOME/.xsession ;; default) - exec /usr/bin/startkde + exec dbus-launch startkde ;; *) eval exec "$session" -- cgit v1.2.3-70-g09d2