mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-25 02:52:13 +08:00
add missing settings to workspace
This commit is contained in:
parent
3438153d8e
commit
a4309e24e1
@ -99,7 +99,8 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
|
||||
|
||||
#upstream patches
|
||||
fix-plasma-crash-on-exit.patch
|
||||
fix-MALLOC_CHECK.patch)
|
||||
fix-MALLOC_CHECK.patch
|
||||
set-horos-theme.patch)
|
||||
|
||||
md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
|
||||
'f355a658d2e9267fdf4e8d8f88038bcf' # mishaaq-kcm_touchpad-00370b5.tar.gz
|
||||
@ -136,8 +137,8 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
|
||||
# '9b97ac1b4deb8d0c8ca7afffb80b4320' # feature_history-notifications-enable-disable-kde#119207.patch
|
||||
# '42b3b5e09372c57910c3435e63e2dfd6' # feature_kdm-plymouth.patch
|
||||
'274125012429317ebda1a4923d3d5770' # fix-plasma-crash-on-exit.patch
|
||||
'3f6b21d5163d3cb26fb4d33f2114ef7f') # fix-MALLOC_CHECK.patch
|
||||
|
||||
'172ea190664f4bdadd38406caf9a7597' # fix-MALLOC_CHECK.patch
|
||||
'66520736dc79f5a12f0bb12502146244') # set-horos-theme.patch
|
||||
#
|
||||
# build function
|
||||
#
|
||||
@ -185,6 +186,7 @@ build()
|
||||
msg "applying upstream patches ..."
|
||||
patch -Np1 -i ${srcdir}/fix-plasma-crash-on-exit.patch || return 1
|
||||
patch -Np0 -i ${srcdir}/fix-MALLOC_CHECK.patch || return 1
|
||||
patch -Np0 -i ${srcdir}/set-horos-theme.patch || return 1
|
||||
|
||||
# msg "applying chakra patches ..."
|
||||
|
||||
@ -311,11 +313,10 @@ package_kdebase-workspace()
|
||||
mkdir -p ${pkgdir}/usr/share/apps/ksplash/Themes
|
||||
mv -fv ${srcdir}/kdemod-themes/Default-Light ${pkgdir}/usr/share/apps/ksplash/Themes
|
||||
|
||||
# WORKAROUND -> install oxygen-air kdm theme
|
||||
cp -frv ${srcdir}/${_origname}-${pkgver}/kdm/kfrontend/themes/oxygen-air ${pkgdir}/usr/share/apps/kdm/themes
|
||||
# edit kdmrc
|
||||
sed -i -e s,#GUIStyle=.*,GUIStyle=Oxygen,g ${pkgdir}/usr/share/config/kdm/kdmrc
|
||||
sed -i -e s,#ColorScheme=.*,ColorScheme=Oxygen,g ${pkgdir}/usr/share/config/kdm/kdmrc
|
||||
sed -i -e s,Theme=/usr.*,Theme=/usr/share/apps/kdm/themes/oxygen-air,g ${pkgdir}/usr/share/config/kdm/kdmrc
|
||||
sed -i -e s,Theme=/usr.*,Theme=/usr/share/apps/kdm/themes/horos,g ${pkgdir}/usr/share/config/kdm/kdmrc
|
||||
sed -i -e s,MinShowUID=.*,MinShowUID=1000,g ${pkgdir}/usr/share/config/kdm/kdmrc
|
||||
|
||||
# WORKAROUND -> put ggl stuff into ggl package
|
||||
|
21
kdebase-workspace/fix-MALLOC_CHECK.patch
Normal file
21
kdebase-workspace/fix-MALLOC_CHECK.patch
Normal file
@ -0,0 +1,21 @@
|
||||
--- startkde.cmake.orig 2011-02-06 13:41:00.000000000 +0100
|
||||
+++ startkde.cmake 2011-02-06 13:43:49.866666677 +0100
|
||||
@@ -36,18 +36,6 @@ fi
|
||||
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
|
||||
unset DYLD_FORCE_FLAT_NAMESPACE
|
||||
|
||||
-# Enable lightweight memory corruption checker if not already set
|
||||
-# -- this is for trunk only, we remove it for releases
|
||||
-if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
|
||||
- # Extract the first two components of the version from the output.
|
||||
- glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
|
||||
-
|
||||
- MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
|
||||
- test $glibc_version \> 2.08 && MALLOC_CHECK_=3
|
||||
-
|
||||
- export MALLOC_CHECK_
|
||||
-fi
|
||||
-
|
||||
# Boot sequence:
|
||||
#
|
||||
# kdeinit is used to fork off processes which improves memory usage
|
13
kdebase-workspace/set-horos-theme.patch
Normal file
13
kdebase-workspace/set-horos-theme.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: kdm/config.def
|
||||
===================================================================
|
||||
--- kdm/config.def (revision 1216141)
|
||||
+++ kdm/config.def (revision 1216142)
|
||||
@@ -2680,7 +2680,7 @@
|
||||
Type: string
|
||||
Default: ""
|
||||
User: greeter
|
||||
-Instance: */KDMDATA "/themes/oxygen-air"
|
||||
+Instance: */KDMDATA "/themes/horos"
|
||||
Comment: &
|
||||
Description:
|
||||
The theme to use for the greeter. Can point to either a directory or an XML
|
Loading…
Reference in New Issue
Block a user