Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=27795c2bdb36fcf1d8b63bed211db2ddcfe122ea
commit 27795c2bdb36fcf1d8b63bed211db2ddcfe122ea Author: Melko <[email protected]> Date: Tue Jun 10 19:40:45 2014 +0200 kdebase-workspace-4.11.10-1-x86_64 * version bump diff --git a/source/kde/kdebase-workspace/FrugalBuild b/source/kde/kdebase-workspace/FrugalBuild index eb6e4f1..62af9ff 100644 --- a/source/kde/kdebase-workspace/FrugalBuild +++ b/source/kde/kdebase-workspace/FrugalBuild @@ -9,13 +9,13 @@ USE_GPSD=${USE_GPSD:-"n"} USE_NETWORKMANAGER=${USE_NETWORKMANAGER:-"y"} pkgname=kdebase-workspace -pkgver=4.11.9 -pkgrel=3 +pkgver=4.11.10 +pkgrel=1 pkgdesc="Programs specific for the KDE4 desktop." groups=('kde' 'kde-minimal') archs=('i686' 'x86_64') _F_kde_name=kde-workspace -_F_kde_dirname="stable/4.12.5/src" +_F_kde_dirname="stable/4.13.2/src" Finclude kde ## these have to go to package-to-be-desktop-default once we know what the virtual package is called here. rodepends=("${rodepends[@]}" 'xorg-server>=1.6.1' 'kde-frugalware>=1.5' \ @@ -35,15 +35,13 @@ source=("${source[@]}" \ kde.pamd \ kde-np.pamd \ kdm.service \ - kdebase-workspace-4.7.0-enable-lcdfilter.patch \ - kdm-desktopnames.patch) -sha1sums=('ea4f3b3401b7304613adcc21acb92b5c3d11c9c1' \ + kdebase-workspace-4.7.0-enable-lcdfilter.patch) +sha1sums=('2968043563e25d2d2618c9f49fdfbab5fa14c8cd' \ 'e1f706c984fc81633663c662e674b6f2c64d2f83' \ '6216aad404aa0b846c835a0e8f9df4941bf74d37' \ '072f69fd5bdf5ea20b23bb9b3fae688a500d7169' \ '8322ef283c3070dda27ce9cb443ee2cc8e89c37d' \ - '48e6d8e6a38438d93ba53fff3784662814a2adb1' \ - '51d3a3a83e01ce1998c57b0389e7b094d8e9d7b8') + '48e6d8e6a38438d93ba53fff3784662814a2adb1') provides=("libksysguard" "$pkgname-extra-cursors" "plasma-scriptengine-google-gadgets") conflicts=("${provides[@]}") diff --git a/source/kde/kdebase-workspace/kdm-desktopnames.patch b/source/kde/kdebase-workspace/kdm-desktopnames.patch deleted file mode 100644 index d6d6a96..0000000 --- a/source/kde/kdebase-workspace/kdm-desktopnames.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: David Faure <[email protected]> -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; - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
