mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-05 11:57:17 +08:00
kdebase-workspace: remove MALLOC_CHECK from startkde script
This commit is contained in:
parent
257c675575
commit
2361f4d5d1
@ -26,7 +26,7 @@ pkgname=('kdebase-workspace'
|
||||
|
||||
arch=('i686' 'x86_64')
|
||||
pkgver=${_kdever}
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
|
||||
pkgdesc="split package"
|
||||
url="http://www.kde.org"
|
||||
@ -92,7 +92,8 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
|
||||
|
||||
# feature_kdm-plymouth.patch
|
||||
|
||||
screensaver-sleep.patch)
|
||||
screensaver-sleep.patch
|
||||
malloc_check.patch)
|
||||
|
||||
md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
|
||||
'f355a658d2e9267fdf4e8d8f88038bcf' # mishaaq-kcm_touchpad-00370b5.tar.gz
|
||||
@ -125,7 +126,9 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
|
||||
# '894815a80f99a9a0dee1adbcda49b161' # feature_battery-tooltip.patch
|
||||
# '9b97ac1b4deb8d0c8ca7afffb80b4320' # feature_history-notifications-enable-disable-kde#119207.patch
|
||||
# '42b3b5e09372c57910c3435e63e2dfd6' # feature_kdm-plymouth.patch
|
||||
'bf36e9cc623c7c3da6668e560e29975c') # screensaver-sleep.patch
|
||||
'bf36e9cc623c7c3da6668e560e29975c' # screensaver-sleep.patch
|
||||
'3d10907980fe73ebbb3e323c69ade74a') # malloc_check.patch
|
||||
|
||||
|
||||
#
|
||||
# build function
|
||||
@ -175,7 +178,8 @@ build()
|
||||
|
||||
msg "applying arch patches ..."
|
||||
patch -p1 -i ${srcdir}/screensaver-sleep.patch || return 1 # FS#19426
|
||||
|
||||
# remove MALLOC_CHECK from startkde script
|
||||
patch -Np0 -i ${srcdir}/malloc_check.patch
|
||||
|
||||
|
||||
|
||||
|
21
kdebase-workspace/malloc_check.patch
Normal file
21
kdebase-workspace/malloc_check.patch
Normal file
@ -0,0 +1,21 @@
|
||||
--- startkde.cmake.old 2010-08-11 19:45:21.546666823 +0200
|
||||
+++ startkde.cmake 2010-08-11 19:45:34.563333482 +0200
|
||||
@@ -36,18 +36,6 @@
|
||||
# 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
|
Loading…
Reference in New Issue
Block a user