diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-03 04:02:27 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-03 04:02:27 +0000 |
| commit | 5daf7a199ac436064eb4f3343e4a38ea383d628e (patch) | |
| tree | ef80c239155f9c38ac9de922eef30fdcb3810e01 /extra/kdebase-workspace | |
| parent | 747fac818a9021f876837c839ce15c301b7e229f (diff) | |
Sat May 3 03:56:22 UTC 2014
Diffstat (limited to 'extra/kdebase-workspace')
| -rw-r--r-- | extra/kdebase-workspace/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/kdebase-workspace/kdm-desktopnames.patch | 35 | ||||
| -rw-r--r-- | extra/kdebase-workspace/kscreensaver.pam | 3 |
3 files changed, 47 insertions, 6 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 014bec439..28c0ca431 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 211914 2014-04-29 17:37:18Z andrea $ +# $Id: PKGBUILD 211956 2014-05-02 08:31:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.11.9 _pkgver=4.12.5 -pkgrel=1 +pkgrel=2 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,17 +29,19 @@ backup=('usr/share/config/kdm/kdmrc') 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') + 'khotkeys-qt4.patch' + 'kdm-desktopnames.patch') sha1sums=('ea4f3b3401b7304613adcc21acb92b5c3d11c9c1' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'c6afdf8964b2b2c4809b2e8e694729b2661e29df' 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514' - 'aa9d2e5a69986c4c3d47829721ea99edb473be12') + 'aa9d2e5a69986c4c3d47829721ea99edb473be12' + '51d3a3a83e01ce1998c57b0389e7b094d8e9d7b8') prepare() { mkdir build @@ -55,6 +57,9 @@ prepare() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch + + # KDEBUG#334159 + patch -p1 -i "${srcdir}"/kdm-desktopnames.patch } build() { diff --git a/extra/kdebase-workspace/kdm-desktopnames.patch b/extra/kdebase-workspace/kdm-desktopnames.patch new file mode 100644 index 000000000..d6d6a961c --- /dev/null +++ b/extra/kdebase-workspace/kdm-desktopnames.patch @@ -0,0 +1,35 @@ +From: David Faure <faure@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; + diff --git a/extra/kdebase-workspace/kscreensaver.pam b/extra/kdebase-workspace/kscreensaver.pam index b4d80c21f..a32a14655 100644 --- a/extra/kdebase-workspace/kscreensaver.pam +++ b/extra/kdebase-workspace/kscreensaver.pam @@ -1 +1,2 @@ -auth required pam_unix_auth.so +#%PAM-1.0 +auth include system-login |