[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD kdm-desktopnames.patch)
Andrea Scarpino
andrea at nymeria.archlinux.org
Tue Jun 10 23:03:03 UTC 2014
Date: Wednesday, June 11, 2014 @ 01:03:03
Author: andrea
Revision: 214965
upgpkg: kdebase-workspace 4.11.10-1
Upstream release
Modified:
kdebase-workspace/trunk/PKGBUILD
Deleted:
kdebase-workspace/trunk/kdm-desktopnames.patch
------------------------+
PKGBUILD | 17 ++++++-----------
kdm-desktopnames.patch | 35 -----------------------------------
2 files changed, 6 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-10 22:47:54 UTC (rev 214964)
+++ PKGBUILD 2014-06-10 23:03:03 UTC (rev 214965)
@@ -4,9 +4,9 @@
pkgname=kdebase-workspace
_pkgname=kde-workspace
-pkgver=4.11.9
-_pkgver=4.12.5
-pkgrel=2
+pkgver=4.11.10
+_pkgver=4.13.2
+pkgrel=1
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -29,9 +29,8 @@
source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
- 'khotkeys-qt4.patch'
- 'kdm-desktopnames.patch')
-sha1sums=('ea4f3b3401b7304613adcc21acb92b5c3d11c9c1'
+ 'khotkeys-qt4.patch')
+sha1sums=('2968043563e25d2d2618c9f49fdfbab5fa14c8cd'
'660eae40a707d2711d8d7f32a93214865506b795'
'6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
'c6afdf8964b2b2c4809b2e8e694729b2661e29df'
@@ -40,8 +39,7 @@
'c079ebd157c836ba996190f0d2bcea1a7828d02c'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
'd509dac592bd8b310df27991b208c95b6d907514'
- 'aa9d2e5a69986c4c3d47829721ea99edb473be12'
- '51d3a3a83e01ce1998c57b0389e7b094d8e9d7b8')
+ 'aa9d2e5a69986c4c3d47829721ea99edb473be12')
prepare() {
mkdir build
@@ -57,9 +55,6 @@
# KDEBUG#202629
patch -p0 -i "${srcdir}"/terminate-server.patch
-
- # KDEBUG#334159
- patch -p1 -i "${srcdir}"/kdm-desktopnames.patch
}
build() {
Deleted: kdm-desktopnames.patch
===================================================================
--- kdm-desktopnames.patch 2014-06-10 22:47:54 UTC (rev 214964)
+++ kdm-desktopnames.patch 2014-06-10 23:03:03 UTC (rev 214965)
@@ -1,35 +0,0 @@
-From: David Faure <faure at kde.org>
-Date: Fri, 02 May 2014 08:26:38 +0000
-Subject: Fix crash when DesktopNames isn't set
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f
----
-Fix crash when DesktopNames isn't set
-
-BUG: 334159
-FIXED-IN: 4.11.10
----
-
-
---- a/kdm/backend/client.c
-+++ b/kdm/backend/client.c
-@@ -1810,12 +1810,14 @@
- !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0)))
- sessargs = "";
- buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
-- for (buf2 = buf; *buf2; ++buf2) {
-- if (*buf2 == ';')
-- *buf2 = ':';
-+ if (buf) {
-+ for (buf2 = buf; *buf2; ++buf2) {
-+ if (*buf2 == ';')
-+ *buf2 = ':';
-+ }
-+ userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
-+ free(buf);
- }
-- userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
-- free(buf);
- free(str);
- free(fname);
- goto gotit;
-
More information about the arch-commits
mailing list