Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-02-03 21:57:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

workspace rebuild to re-add one more patch

Browse Source
This commit is contained in:
abveritas 2012-12-19 20:44:53 +00:00
parent 85d49603b5
commit eb19bcb3cf
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kde-wallpapers/PKGBUILD
View File

@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname="kde-wallpapers"
pkgver=${_kdever}
pkgrel=1
pkgrel=2
_default_wp="Elarun"

24
kde-workspace/09_enable_start-shutdown-scripts.patch Normal file
View File

@ -0,0 +1,24 @@
--- kdebase-workspace-4.3.3/startkde.cmake.patched 2009-11-03 02:26:54.000000000 +0100
+++ kdebase-workspace-4.3.3/startkde.cmake 2009-11-11 14:45:33.000000000 +0100
@@ -193,8 +193,9 @@
# better use the Autostart folder.
libpath=`kde4-config --path lib | tr : '\n'`'\n/etc/kde/lib/'
+envpath=/etc/kde/env/
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
for file in "$prefix"*.sh; do
test -r "$file" && . "$file"
done
@@ -407,7 +408,9 @@
echo 'startkde: Running shutdown scripts...' 1>&2
# Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
test -x "$prefix$file" && "$prefix$file"
done

9
kde-workspace/PKGBUILD
View File

@ -13,7 +13,7 @@ _default_wp="Elarun"
pkgname="kde-workspace"
arch=('x86_64')
pkgver=${_kdever}
pkgrel=1
pkgrel=2
pkgdesc="KDE Workspace"
url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL')
@ -24,7 +24,7 @@ depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kde-runtime>=${_kdever}" '
'xorg-utils' 'libxrandr' 'libxres' 'libdmtx' 'libqalculate' 'prison' 'qrencode' "kdepim-runtime>=${_kdever}" "kde-base-artwork>=${_kdever}")
makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-pykde4>=${_kdever}"
'oxygen-icons' "kde-runtime>=${_kdever}" 'gpsd' 'samba'
'libraw1394' 'libdmtx' 'docbook-xsl' 'prison' 'qrencode') #google-gadgets-qt
'libraw1394' 'libdmtx' 'docbook-xsl' 'prison' 'qrencode')
optdepends=("kdebindings-pykde4: Python Support for Plasma"
"kdeedu-marble: Marble Wallpaper Plugin"
"gpsd: Plasma geolocation support"
@ -32,7 +32,7 @@ optdepends=("kdebindings-pykde4: Python Support for Plasma"
"opentp: Optional time/date sync support")
provides=('kdebase-workspace' 'powerdevil' 'kcm_tablet=1.1.3' 'kde-workspace-doc')
replaces=('guidance-power-manager' 'kdebase-workspace' 'kde-workspace-doc')
conflicts=('kdebase-workspace' 'powerdevil' 'kcm_tablet' 'guidance-power-manager' 'kde-workspace-doc' 'kded-appmenu' 'kde-base-artwork')
conflicts=('kdebase-workspace' 'powerdevil' 'kcm_tablet' 'guidance-power-manager' 'kde-workspace-doc' 'kded-appmenu')
groups=("kde" "kde-uninstall" "kde-minimal")
backup=('usr/share/config/kdm/kdmrc'
'etc/pam.d/kscreensaver')
@ -56,6 +56,7 @@ source=($_mirror/${pkgname}-$_kdever.tar.xz
03_plasma_menubutton_branding.patch
06_kickoff_default_favourites.patch
07_always_show_kickoff_subtext.patch
09_enable_start-shutdown-scripts.patch
# restart xserver on logout
fix_terminate-server.patch
@ -80,6 +81,7 @@ md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
'8e623bb5608025417ff9ed061e5a03f1' # 03_plasma_menubutton_branding.patch
'd4d7d3fc3ac072a8ca848e9c96e517dc' # 06_kickoff_default_favourites.patch
'89d96455c6a446ef59b0620d1b8606af' # 07_always_show_kickoff_subtext.patch
'5eb9285268916492012151045bdebd26' # 09_enable_start-shutdown-scripts.patch
'814350c52c135d6f7bdada1e29223d38' # fix_terminate-server.patch
'5f963f80a026f0600edae1b1c70411e5') # fix_root-only-kcms.patch
@ -93,6 +95,7 @@ build() {
patch -Np1 -i ${srcdir}/03_plasma_menubutton_branding.patch
patch -Np1 -i ${srcdir}/06_kickoff_default_favourites.patch
patch -Np1 -i ${srcdir}/07_always_show_kickoff_subtext.patch
patch -Np1 -i ${srcdir}/09_enable_start-shutdown-scripts.patch
msg "applying fixes ..."
patch -p0 -i ${srcdir}/fix_terminate-server.patch