mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-04 00:27:15 +08:00
Merge branch 'unstable' of gitorious.org:chakra-packages/desktop into unstable
This commit is contained in:
commit
842607d48e
@ -13,7 +13,7 @@ _default_wp="Ariya"
|
||||
pkgname="kde-workspace"
|
||||
arch=('x86_64')
|
||||
pkgver=${_kdever}
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="KDE Workspace"
|
||||
url="http://www.kde.org"
|
||||
license=('GPL' 'LGPL' 'FDL')
|
||||
@ -33,7 +33,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')
|
||||
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')
|
||||
@ -60,8 +60,7 @@ source=($_mirror/${pkgname}-$_kdever.tar.xz
|
||||
# restart xserver on logout
|
||||
fix_terminate-server.patch
|
||||
# "fix" some sytemsettings modules that need root access
|
||||
fix_root-only-kcms.patch
|
||||
appmenu.diff)
|
||||
fix_root-only-kcms.patch)
|
||||
|
||||
md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
|
||||
`grep kde-wallpapers-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` # kde-wallpapers
|
||||
@ -82,8 +81,7 @@ md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
|
||||
'89d96455c6a446ef59b0620d1b8606af' # 07_always_show_kickoff_subtext.patch
|
||||
|
||||
'814350c52c135d6f7bdada1e29223d38' # fix_terminate-server.patch
|
||||
'5f963f80a026f0600edae1b1c70411e5' # fix_root-only-kcms.patch
|
||||
'ca3877bf428d13eead45756fa94376b5') # appmenu.diff
|
||||
'5f963f80a026f0600edae1b1c70411e5') # fix_root-only-kcms.patch
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
@ -97,7 +95,6 @@ build() {
|
||||
msg "applying fixes ..."
|
||||
patch -p0 -i ${srcdir}/fix_terminate-server.patch
|
||||
patch -p1 -i ${srcdir}/fix_root-only-kcms.patch
|
||||
#patch -p1 -i ${srcdir}/appmenu.diff
|
||||
|
||||
msg "starting workspace build ..."
|
||||
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
|
||||
|
Loading…
Reference in New Issue
Block a user