diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2010-08-12 09:30:26 +0200 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2010-08-12 09:30:26 +0200 |
| commit | 807cbaf4673ca5152e0e4392b9f7c2a309c1d8c1 (patch) | |
| tree | 5dd64d8bd99c4d5d66fc99c22c764160746d141d /kde-base | |
| parent | c5c6239b20f6bacb66431f7929c052f21eea4b66 (diff) | |
| download | kde-807cbaf4673ca5152e0e4392b9f7c2a309c1d8c1.tar.gz kde-807cbaf4673ca5152e0e4392b9f7c2a309c1d8c1.tar.bz2 kde-807cbaf4673ca5152e0e4392b9f7c2a309c1d8c1.zip | |
[kde-base/startkde] do not mess with malloc
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdebase-startkde/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/kdebase-startkde/files/4.5.0-fix_malloc.patch | 22 | ||||
| -rw-r--r-- | kde-base/kdebase-startkde/kdebase-startkde-4.5.0-r1.ebuild (renamed from kde-base/kdebase-startkde/kdebase-startkde-4.5.0.ebuild) | 5 |
3 files changed, 28 insertions, 2 deletions
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest index bd037ee8f63..48aef7e5cac 100644 --- a/kde-base/kdebase-startkde/Manifest +++ b/kde-base/kdebase-startkde/Manifest @@ -1,9 +1,10 @@ +AUX 4.5.0-fix_malloc.patch 1078 RMD160 8933b56f8f63e7059fc34d956f051fca7d8a2531 SHA1 49ad052ed3dd2514befb65ac01e696c811e605f6 SHA256 803102c2e2cdbbefb56fa8c8e3bcdf37cff901400d18cacf034818b9076cc722 AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1abb7a1503a80d95e4db34fa7fe58accce6e8109 SHA256 6a2d645ef38d3db9d36166fac699848d07eb166f71a646d7f1466efeb394eb11 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9 AUX gentoo-startkde4-2.patch 2604 RMD160 7493f93872ca5fc494e209197ff16776c7e8322e SHA1 f5c995624a1653d073d33e5022f5f31a9621a8d1 SHA256 5f495b2bdfe35768262eceeb37da4a74e5083177006f1a986689f3d806188bb3 DIST kdebase-workspace-4.5.0.tar.bz2 65721613 RMD160 d0d4cc7ec336c125a39804a327bd768866f0a7be SHA1 86648def4f6c1791ed385b649b867d9a38db6e1c SHA256 fc17c12e81992436dbfa02e4edc4aac4ccbf5704d0eca3c20491cfc759168f73 EBUILD kdebase-startkde-4.4.9999.ebuild 3563 RMD160 2ffd31755912d86e04f0e57aa1d39cb9133d0740 SHA1 880f81ab544a78c455ae68d249d6e91541966fab SHA256 1671b42fdcc2b0a361403f2409556118199b6696c5a722887c97b563271e615f -EBUILD kdebase-startkde-4.5.0.ebuild 3598 RMD160 d559f2f47d2ecb3c4a5af60f0af74b585ce1d107 SHA1 6cfdfb03b605f7c4ea855477d5ad000e3bdd5962 SHA256 2b84100c39a9b734d3d004892b8187ba357834a65cd93c6d152393c742bd1e3c +EBUILD kdebase-startkde-4.5.0-r1.ebuild 3639 RMD160 6e19def1fc06caca5b398d80b266fafcf0d6cc84 SHA1 a7b9379838aed20ed91dc8bc5fb9a4a8d8b82c55 SHA256 e762d6cae06f3df3fab123e49bceb22c4973f1351027bad43cd310137cd79de8 EBUILD kdebase-startkde-4.5.9999.ebuild 3543 RMD160 dd2cedca9526847816ebefa686ff18732c05678d SHA1 e26ffe85c6dfb9b6fb5f29980109b5d5cee7de14 SHA256 ccd5a2dc011642f16aa6b2bcab90761eb8e548fef6c5e84af422e32859609d2b EBUILD kdebase-startkde-9999.ebuild 3543 RMD160 dd2cedca9526847816ebefa686ff18732c05678d SHA1 e26ffe85c6dfb9b6fb5f29980109b5d5cee7de14 SHA256 ccd5a2dc011642f16aa6b2bcab90761eb8e548fef6c5e84af422e32859609d2b MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-startkde/files/4.5.0-fix_malloc.patch b/kde-base/kdebase-startkde/files/4.5.0-fix_malloc.patch new file mode 100644 index 00000000000..c08d1c0c656 --- /dev/null +++ b/kde-base/kdebase-startkde/files/4.5.0-fix_malloc.patch @@ -0,0 +1,22 @@ +diff -urN kdebase-workspace-4.5.0/startkde.cmake kdebase-workspace-4.5.0.new//startkde.cmake +--- kdebase-workspace-4.5.0/startkde.cmake 2010-03-10 11:42:55.000000000 +0100 ++++ kdebase-workspace-4.5.0.new//startkde.cmake 2010-08-11 19:04:48.786127814 +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 +- + # in case we have been started with full pathname spec without being in PATH + bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` + if [ -n "$bindir" ]; then diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.5.0.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.5.0-r1.ebuild index 1bc2c7a43f5..2a6454325d2 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.5.0.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.5.0-r1.ebuild @@ -45,7 +45,10 @@ KMEXTRACTONLY=" startkde.cmake " -PATCHES=("${FILESDIR}/gentoo-startkde4-2.patch") +PATCHES=( + "${FILESDIR}/${PV}-fix_malloc.patch" + "${FILESDIR}/gentoo-startkde4-2.patch" +) src_prepare() { kde4-meta_src_prepare |