diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2014-05-10 19:43:14 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2014-05-10 19:43:14 +0000 |
| commit | 90e380e1cbd656e275c9638cb1b043378d6ecca7 (patch) | |
| tree | 5c7300991656b5e02bd8042ba30767f043c9814c /x11/kde4-workspace | |
| parent | ceea69bb4b397171f4247dcb81598e0e666267b9 (diff) | |
| download | ports-90e380e1cbd656e275c9638cb1b043378d6ecca7.tar.gz ports-90e380e1cbd656e275c9638cb1b043378d6ecca7.zip | |
KDE/FreeBSD team presents KDE SC 4.12.5 and KDE Workspace 4.11.9!
deskutils/kdepim4:
- Remove no longer needed patch, the problem was fixed since Qt 4.8.4.
The area51 repository features commits by rakuco and makc.
Notes
Notes:
svn path=/head/; revision=353599
Diffstat (limited to 'x11/kde4-workspace')
| -rw-r--r-- | x11/kde4-workspace/Makefile | 1 | ||||
| -rw-r--r-- | x11/kde4-workspace/distinfo | 4 | ||||
| -rw-r--r-- | x11/kde4-workspace/files/patch-git1724800 | 33 |
3 files changed, 35 insertions, 3 deletions
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 38b54e108589..90ff4c9b3ca4 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -2,7 +2,6 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 5007532346ec..d47d637b03c2 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.11.8/kde-workspace-4.11.8.tar.xz) = 1b8a55a9f3e24c0aa462669f33be7206aebdfc35909b2e929eefa52824104ce2 -SIZE (KDE/4.11.8/kde-workspace-4.11.8.tar.xz) = 13535344 +SHA256 (KDE/4.11.9/kde-workspace-4.11.9.tar.xz) = aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf +SIZE (KDE/4.11.9/kde-workspace-4.11.9.tar.xz) = 13536252 diff --git a/x11/kde4-workspace/files/patch-git1724800 b/x11/kde4-workspace/files/patch-git1724800 new file mode 100644 index 000000000000..0f38887872a2 --- /dev/null +++ b/x11/kde4-workspace/files/patch-git1724800 @@ -0,0 +1,33 @@ +commit e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f +Author: David Faure <faure@kde.org> +Date: Fri May 2 10:26:38 2014 +0200 + + Fix crash when DesktopNames isn't set + + BUG: 334159 + FIXED-IN: 4.11.10 + +diff --git a/kdm/backend/client.c b/kdm/backend/client.c +index 335cc3e..a2d06c2 100644 +--- ./kdm/backend/client.c ++++ ./kdm/backend/client.c +@@ -1810,12 +1810,14 @@ startClient(volatile int *pid) + !(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; |