mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-03 19:27:15 +08:00
Re-add patch
This commit is contained in:
Manuel
parent
b81e66a3c4
commit
f508ee49cd
@ -16,7 +16,7 @@ _default_wp="Ariya"
|
||||
pkgname="kde-workspace"
|
||||
arch=('x86_64')
|
||||
pkgver=${_kdever}
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="KDE Workspace"
|
||||
url="http://www.kde.org"
|
||||
license=('GPL' 'LGPL' 'FDL')
|
||||
@ -27,11 +27,10 @@ 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' 'qedje' "kde-runtime>=${_kdever}" 'gpsd' 'samba'
|
||||
'oxygen-icons' "kde-runtime>=${_kdever}" 'gpsd' 'samba'
|
||||
'libraw1394' 'libdmtx' 'docbook-xsl' 'prison' 'qrencode')
|
||||
optdepends=("kdebindings-pykde4: Python Support for Plasma"
|
||||
"kdeedu-marble: Marble Wallpaper Plugin"
|
||||
"qedje: Plasma Support for Edje Files"
|
||||
"gpsd: Plasma geolocation support"
|
||||
"ntp: Time/date sync support"
|
||||
"opentp: Optional time/date sync support")
|
||||
@ -44,7 +43,6 @@ backup=('usr/share/config/kdm/kdmrc'
|
||||
#'etc/pam.d/kde-np'
|
||||
'etc/pam.d/kscreensaver')
|
||||
|
||||
|
||||
source=($_mirror/${pkgname}-$_kdever.tar.xz
|
||||
$_mirror/kde-wallpapers-$_kdever.tar.xz
|
||||
mishaaq-kcm_touchpad-00370b5.tar.gz
|
||||
@ -65,9 +63,9 @@ source=($_mirror/${pkgname}-$_kdever.tar.xz
|
||||
07_always_show_kickoff_subtext.patch
|
||||
09_enable_start-shutdown-scripts.patch
|
||||
|
||||
# fixes
|
||||
# let KDM wait a big longer for X to start up, fixes problems on some gfx hardware that needs a lot of time to initialize
|
||||
#fix_kdm-increase-xserver-timeout-bnc#462478.patch
|
||||
kdm-increase-xserver-timeout.patch
|
||||
|
||||
# restart xserver on logout
|
||||
fix_terminate-server.patch
|
||||
# fix kdm default user for greeter
|
||||
@ -78,34 +76,27 @@ source=($_mirror/${pkgname}-$_kdever.tar.xz
|
||||
appmenu.diff)
|
||||
|
||||
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
|
||||
'f355a658d2e9267fdf4e8d8f88038bcf' # mishaaq-kcm_touchpad-00370b5.tar.gz
|
||||
'd4570491bcf9986d84aeb77c939090a9' # 114856-kcm_tablet-1.1.3.tar.gz
|
||||
'b60baabccbd302d00923e053db0dc0ae' # 117639-favorites-0.1.tar.bz2
|
||||
`grep kde-wallpapers-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` # kde-wallpapers
|
||||
'f355a658d2e9267fdf4e8d8f88038bcf'
|
||||
'd4570491bcf9986d84aeb77c939090a9'
|
||||
'b60baabccbd302d00923e053db0dc0ae'
|
||||
'5b137f8b00c578ec324e72b455814fd0'
|
||||
'ce53d3a059f5ccbf7429058f935ee9a4'
|
||||
'367a3538f54db71f108b34cfa31088ac'
|
||||
'169c6fc83d5562b5d7249db7fc46d8d6'
|
||||
'c328f1c5cfa3e551205ffdc0fdda41a8'
|
||||
'c4b5f1b342b3dad38642318ca077daee'
|
||||
'721e97031b62aee8914e8617e86f9235'
|
||||
'e2eb9d270fe0e93901b29256bdedd7e2'
|
||||
'8e623bb5608025417ff9ed061e5a03f1'
|
||||
'd4d7d3fc3ac072a8ca848e9c96e517dc'
|
||||
'89d96455c6a446ef59b0620d1b8606af'
|
||||
'5eb9285268916492012151045bdebd26'
|
||||
'6e091f08464e7e07ced90011e02b5493'
|
||||
'814350c52c135d6f7bdada1e29223d38'
|
||||
'5f963f80a026f0600edae1b1c70411e5'
|
||||
'ca3877bf428d13eead45756fa94376b5')
|
||||
|
||||
'5b137f8b00c578ec324e72b455814fd0' # kde.pam
|
||||
'ce53d3a059f5ccbf7429058f935ee9a4' # kde-np.pam
|
||||
'367a3538f54db71f108b34cfa31088ac' # kscreensaver.pam
|
||||
'169c6fc83d5562b5d7249db7fc46d8d6' # chakra-branding.tar.gz
|
||||
'c328f1c5cfa3e551205ffdc0fdda41a8' # chakra-themes.tar.gz
|
||||
'c4b5f1b342b3dad38642318ca077daee' # kdm.service
|
||||
|
||||
'721e97031b62aee8914e8617e86f9235' # 01_kdm_zsh_profile.patch
|
||||
'e2eb9d270fe0e93901b29256bdedd7e2' # 02_sane_env_and_shutdown_path.patch
|
||||
'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
|
||||
|
||||
#'db2d8166f5ea80ecd291deb9c0e2bb71' # fix_kdm-increase-xserver-timeout-bnc#462478.patch
|
||||
'814350c52c135d6f7bdada1e29223d38' # fix_terminate-server.patch
|
||||
#'97a5eb51e6f9d460f0d61bb322a1db5e' # fix_kdm_configdef.patch
|
||||
'5f963f80a026f0600edae1b1c70411e5' # fix_root-only-kcms.patch
|
||||
'ca3877bf428d13eead45756fa94376b5') # appmenu.diff
|
||||
|
||||
#
|
||||
# build function
|
||||
#
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
|
||||
@ -118,7 +109,7 @@ build() {
|
||||
patch -Np1 -i ${srcdir}/09_enable_start-shutdown-scripts.patch
|
||||
|
||||
msg "applying fixes ..."
|
||||
#patch -Np0 -i ${srcdir}/fix_kdm-increase-xserver-timeout-bnc#462478.patch
|
||||
patch -p0 -i ${srcdir}/kdm-increase-xserver-timeout.patch
|
||||
patch -p0 -i ${srcdir}/fix_terminate-server.patch
|
||||
#patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch
|
||||
patch -p1 -i ${srcdir}/fix_root-only-kcms.patch
|
||||
|
||||
@ -11,7 +11,7 @@ See the bugreport. In short, some drivers suck.
|
||||
|
||||
Key: ServerTimeout
|
||||
Type: int
|
||||
-Default: 15
|
||||
-Default: 30
|
||||
+Default: 60
|
||||
User: core
|
||||
Instance: #:*/
|
||||
Loading…
Reference in New Issue
Block a user