[arch-commits] Commit in kdebase-workspace/trunk (3 files)

[Andrea Scarpino]

    Date: Monday, August 30, 2010 @ 04:03:20
  Author: andrea
Revision: 89218

KDE 4.5.1

Modified:
  kdebase-workspace/trunk/PKGBUILD
  kdebase-workspace/trunk/kdebase-workspace.install
Deleted:
  kdebase-workspace/trunk/malloc_check.patch

---------------------------+
 PKGBUILD                  |   14 +++++---------
 kdebase-workspace.install |    2 ++
 malloc_check.patch        |   21 ---------------------
 3 files changed, 7 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-30 08:03:14 UTC (rev 89217)
+++ PKGBUILD	2010-08-30 08:03:20 UTC (rev 89218)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebase-workspace
-pkgver=4.5.0
-pkgrel=2
+pkgver=4.5.1
+pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -27,16 +27,15 @@
         'etc/pam.d/kscreensaver')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'malloc_check.patch')
-sha1sums=('86648def4f6c1791ed385b649b867d9a38db6e1c'
+        'fixpath.patch' 'terminate-server.patch')
+sha1sums=('b902ae08b2b64613b18ba8be478b244a569f8e0f'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           'f7b38af38549242a240f1a90ab9964ca8a366129'
           '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'bfd907a124705e72d01cec1afb613e2565cd0c44')
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -44,9 +43,6 @@
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p0 -i ${srcdir}/terminate-server.patch
 
-        # remove MALLOC_CHECK from startkde script
-        patch -Np0 -i ${srcdir}/malloc_check.patch
-
 	cd ${srcdir}
 	mkdir build
 	cd build

Modified: kdebase-workspace.install
===================================================================
--- kdebase-workspace.install	2010-08-30 08:03:14 UTC (rev 89217)
+++ kdebase-workspace.install	2010-08-30 08:03:20 UTC (rev 89218)
@@ -1,12 +1,14 @@
 post_install() {
 	groupadd -g 135 kdm &>/dev/null
 	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -m kdm &>/dev/null
+	chown 135:135 var/lib/kdm &>/dev/null
 	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
 }
 
 post_upgrade() {
 	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
 	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -m kdm &>/dev/null
+	chown 135:135 var/lib/kdm &>/dev/null
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 

Deleted: malloc_check.patch
===================================================================
--- malloc_check.patch	2010-08-30 08:03:14 UTC (rev 89217)
+++ malloc_check.patch	2010-08-30 08:03:20 UTC (rev 89218)
@@ -1,21 +0,0 @@
---- 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