<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[135138] trunk/dports/kde/kde4-workspace</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/135138">135138</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2015-04-16 07:48:25 -0700 (Thu, 16 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>kde4-workspace: update to latest version (ticket #46359)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdekde4workspacePortfile">trunk/dports/kde/kde4-workspace/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportskdekde4workspacefilesnooxygenthemepatch">trunk/dports/kde/kde4-workspace/files/no-oxygen-theme.patch</a></li>
<li><a href="#trunkdportskdekde4workspacefilespatchkcontrolpatch">trunk/dports/kde/kde4-workspace/files/patch-kcontrol.patch</a></li>
<li><a href="#trunkdportskdekde4workspacefilespatchlibsCMakeListspatch">trunk/dports/kde/kde4-workspace/files/patch-libs-CMakeLists.patch</a></li>
<li><a href="#trunkdportskdekde4workspacefilessystemsettingscorrectmenuplacementpatch">trunk/dports/kde/kde4-workspace/files/systemsettings-correct-menuplacement.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportskdekde4workspacefileskrdbnoX11onOSXpatch">trunk/dports/kde/kde4-workspace/files/krdb-noX11onOSX.patch</a></li>
<li><a href="#trunkdportskdekde4workspacefileslibsCmakeListsdeactivatetaskmanagerpatch">trunk/dports/kde/kde4-workspace/files/libs-CmakeLists-deactivate-taskmanager.patch</a></li>
<li><a href="#trunkdportskdekde4workspacefilespatchKControlCmakeListspatch">trunk/dports/kde/kde4-workspace/files/patch-KControl-CmakeLists.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdekde4workspacePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kde4-workspace/Portfile (135137 => 135138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-workspace/Portfile        2015-04-16 14:42:23 UTC (rev 135137)
+++ trunk/dports/kde/kde4-workspace/Portfile        2015-04-16 14:48:25 UTC (rev 135138)
</span><span class="lines">@@ -4,9 +4,13 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup kde4 1.1
</span><span class="cx">
</span><ins>+fetch.type git
+git.url git://anongit.kde.org/kde-workspace
+git.branch b904af16
+
</ins><span class="cx"> name kde4-workspace
</span><del>-version 4.13.3
-set plasmaversion 4.11.11
</del><ins>+version 4.14.4.20150324
+set plasmaversion 4.11.17
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> maintainers gmail.com:rjvbertin
</span><span class="cx"> license GPL-2+ LGPL-2.1+
</span><span class="lines">@@ -18,16 +22,15 @@
</span><span class="cx"> homepage http://www.kde.org/workspaces/
</span><span class="cx"> master_sites kde:stable/${version}/src/
</span><span class="cx"> use_xz yes
</span><del>-distname kde-workspace-${plasmaversion}
</del><ins>+#distname kde-workspace-${plasmaversion}
</ins><span class="cx">
</span><del>-checksums rmd160 e0cdcde2c455e376a8bf785bb2c3ef114fa9a5f1 \
- sha256 f188b003c56d2a40f71d4eea8c91b7ae0febcf25c252c383913281fce73c4d73
</del><ins>+#checksums rmd160 e5f4ed10a6791b9a6cea37ec13d8a1141fd9707b \
+# sha256 09d8ae1ac1b704fc919bdedfec47c6561033dca125b0096cb9ed398445fa942f
</ins><span class="cx">
</span><del>-#Fully removing X11 only function to prevent automoc to include it (RR 120287)
-patchfiles patch-CmakeLists-for-OSX.patch \
- libs-CmakeLists-deactivate-taskmanager.patch \
- patch-KControl-CmakeLists.patch \
- krdb-noX11onOSX.patch
</del><ins>+patchfiles patch-CMakeLists-for-OSX.patch \
+ patch-libs-CMakeLists.patch \
+ patch-kcontrol.patch \
+ systemsettings-correct-menuplacement.patch
</ins><span class="cx">
</span><span class="cx"> depends_build-append port:boost \
</span><span class="cx"> port:freetype \
</span><span class="lines">@@ -43,10 +46,24 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append -DBUILD_webkit:BOOL=ON
</span><span class="cx">
</span><del>-variant nostrip description {Prevent stripping of binaries} {
-        configure.args-delete -DCMAKE_BUILD_TYPE=Release
-        configure.args-append -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_STRIP:FILEPATH=/bin/echo
</del><ins>+configure.args-delete -DCMAKE_BUILD_TYPE=Release
+configure.args-append -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_STRIP:FILEPATH=/bin/echo
+
+#Variant made obsolete on 2015/04/16
+variant nostrip description {obsolete} {
+ ui_warn "You have requested an obsolete variant for a build mode that is now the default"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.url http://kde.mirrors.hoobly.com/stable/
-livecheck.regex (\\d+(\\.\\d+)+)
</del><ins>+variant oxygen description {Build the Oxygen theme} {
+ patchfiles-append no-oxygen-theme.patch
+}
+
+default_variants +oxygen
+
+post-destroot {
+ ln -s /Applications/MacPorts/KDE4/plasma-windowed.app/Contents/MacOS/plasma-windowed ${destroot}${prefix}/bin/plasma-windowed
+}
+
+livecheck.type none
+#livecheck.url http://kde.mirrors.hoobly.com/stable/
+#livecheck.regex (\\d+(\\.\\d+)+)
</ins></span></pre></div>
<a id="trunkdportskdekde4workspacefileskrdbnoX11onOSXpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/kde/kde4-workspace/files/krdb-noX11onOSX.patch (135137 => 135138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-workspace/files/krdb-noX11onOSX.patch        2015-04-16 14:42:23 UTC (rev 135137)
+++ trunk/dports/kde/kde4-workspace/files/krdb-noX11onOSX.patch        2015-04-16 14:48:25 UTC (rev 135138)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>---- kcontrol/krdb/orig.krdb.cpp        2014-09-18 19:24:43.000000000 +0200
-+++ kcontrol/krdb/krdb.cpp        2014-09-18 20:20:36.000000000 +0200
-@@ -517,6 +517,7 @@
-
- if( cfgfonts.readEntry( "forceFontDPI", 0 ) != 0 )
- contents += "Xft.dpi: " + cfgfonts.readEntry( "forceFontDPI" ) + '\n';
-+#ifdef Q_WS_X11
- else
- {
- KProcess proc;
-@@ -529,6 +530,7 @@
- proc.waitForFinished();
- }
- }
-+#endif // Q_WS_X11
- }
-
- if (contents.length() > 0)
-@@ -536,13 +538,15 @@
-
- tmpFile.flush();
-
-+#ifdef Q_WS_X11
- KProcess proc;
--#ifndef NDEBUG
-+# ifndef NDEBUG
- proc << "xrdb" << "-merge" << tmpFile.fileName();
--#else
-+# else
- proc << "xrdb" << "-quiet" << "-merge" << tmpFile.fileName();
--#endif
-+# endif
- proc.execute();
-+#endif // Q_WS_X11
-
- applyGtkStyles(exportColors, 1);
- applyGtkStyles(exportColors, 2);
</del></span></pre></div>
<a id="trunkdportskdekde4workspacefileslibsCmakeListsdeactivatetaskmanagerpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/kde/kde4-workspace/files/libs-CmakeLists-deactivate-taskmanager.patch (135137 => 135138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-workspace/files/libs-CmakeLists-deactivate-taskmanager.patch        2015-04-16 14:42:23 UTC (rev 135137)
+++ trunk/dports/kde/kde4-workspace/files/libs-CmakeLists-deactivate-taskmanager.patch        2015-04-16 14:48:25 UTC (rev 135138)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- libs/CMakeLists.txt.orig        2014-04-28 06:38:04.000000000 +0200
-+++ libs/CMakeLists.txt        2014-06-21 12:10:54.000000000 +0200
-@@ -7,7 +7,9 @@
- add_subdirectory(kdm)
- add_subdirectory(plasmagenericshell)
- if(NOT WIN32)
-+ if (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
- add_subdirectory(taskmanager)
-+ endif (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
- endif(NOT WIN32)
- endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
-
</del></span></pre></div>
<a id="trunkdportskdekde4workspacefilesnooxygenthemepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/kde4-workspace/files/no-oxygen-theme.patch (0 => 135138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-workspace/files/no-oxygen-theme.patch         (rev 0)
+++ trunk/dports/kde/kde4-workspace/files/no-oxygen-theme.patch        2015-04-16 14:48:25 UTC (rev 135138)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+--- kstyles/orig.CMakeLists.txt        2014-10-03 18:30:13.000000000 +0200
++++ kstyles/CMakeLists.txt        2014-10-08 11:57:14.000000000 +0200
+@@ -1,2 +1,2 @@
+-add_subdirectory( oxygen )
++# add_subdirectory( oxygen )
+ add_subdirectory( themes )
+--- libs/oxy.CMakeLists.txt        2014-12-30 13:32:17.000000000 +0100
++++ libs/CMakeLists.txt        2014-12-30 14:25:25.000000000 +0100
+@@ -1,6 +1,6 @@
+ add_subdirectory(kephal)
+ add_subdirectory(kworkspace)
+-add_subdirectory(oxygen)
++#add_subdirectory(oxygen)
+ add_subdirectory(plasmaclock)
+
+ if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
</ins></span></pre></div>
<a id="trunkdportskdekde4workspacefilespatchKControlCmakeListspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/kde/kde4-workspace/files/patch-KControl-CmakeLists.patch (135137 => 135138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-workspace/files/patch-KControl-CmakeLists.patch        2015-04-16 14:42:23 UTC (rev 135137)
+++ trunk/dports/kde/kde4-workspace/files/patch-KControl-CmakeLists.patch        2015-04-16 14:48:25 UTC (rev 135138)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>---- kcontrol/orig.CMakeLists.txt        2014-04-28 06:38:04.000000000 +0200
-+++ kcontrol/CMakeLists.txt        2014-08-02 15:31:10.000000000 +0200
-@@ -18,14 +18,14 @@
- add_subdirectory( keyboard )
- endif(X11_Xkb_FOUND)
-
--if(NOT WIN32)
-+if(NOT WIN32 AND NOT APPLE)
- add_subdirectory( bell )
- add_subdirectory( input )
- add_subdirectory( access )
- add_subdirectory( screensaver )
- add_subdirectory( dateandtime )
- add_subdirectory( autostart )
--endif(NOT WIN32)
-+endif(NOT WIN32 AND NOT APPLE)
-
- add_subdirectory( launch )
- add_subdirectory( colors )
-@@ -43,9 +43,9 @@
- add_subdirectory( desktoppaths )
-
- if( FREETYPE_FOUND )
-- if( WIN32 OR FONTCONFIG_FOUND )
-+ if( WIN32 OR APPLE OR FONTCONFIG_FOUND )
- add_subdirectory( fonts )
-- endif( WIN32 OR FONTCONFIG_FOUND )
-+ endif( WIN32 OR APPLE OR FONTCONFIG_FOUND )
- endif( FREETYPE_FOUND )
- if(FONTCONFIG_FOUND AND FREETYPE_FOUND AND NOT WIN32)
- add_subdirectory( kfontinst )
---- kcontrol/style/orig.CMakeLists.txt        2014-04-28 06:38:04.000000000 +0200
-+++ kcontrol/style/CMakeLists.txt        2014-08-02 12:09:20.000000000 +0200
-@@ -18,9 +18,9 @@
-
- target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${X11_LIBRARIES}
- ${KDE4_PLASMA_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
--if(NOT WIN32)
-+if(NOT WIN32 AND NOT APPLE)
- target_link_libraries(kcm_style kdecorations)
--endif(NOT WIN32)
-+endif(NOT WIN32 AND NOT APPLE)
-
- install(TARGETS kcm_style DESTINATION ${PLUGIN_INSTALL_DIR})
-
</del></span></pre></div>
<a id="trunkdportskdekde4workspacefilespatchkcontrolpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/kde4-workspace/files/patch-kcontrol.patch (0 => 135138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-workspace/files/patch-kcontrol.patch         (rev 0)
+++ trunk/dports/kde/kde4-workspace/files/patch-kcontrol.patch        2015-04-16 14:48:25 UTC (rev 135138)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+diff --git kcontrol/CMakeLists.txt kcontrol/CMakeLists.txt
+index fc666b1..a7686d5 100644
+--- kcontrol/CMakeLists.txt
++++ kcontrol/CMakeLists.txt
+@@ -18,14 +18,14 @@ if(X11_Xkb_FOUND)
+ add_subdirectory( keyboard )
+ endif(X11_Xkb_FOUND)
+
+-if(NOT WIN32)
++if(NOT WIN32 AND NOT APPLE)
+ add_subdirectory( bell )
+ add_subdirectory( input )
+ add_subdirectory( access )
+ add_subdirectory( screensaver )
+ add_subdirectory( dateandtime )
+ add_subdirectory( autostart )
+-endif(NOT WIN32)
++endif(NOT WIN32 AND NOT APPLE)
+
+ add_subdirectory( launch )
+ add_subdirectory( colors )
+@@ -43,9 +43,9 @@ add_subdirectory( hardware )
+ add_subdirectory( desktoppaths )
+
+ if( FREETYPE_FOUND )
+- if( WIN32 OR FONTCONFIG_FOUND )
++ if( WIN32 OR APPLE OR FONTCONFIG_FOUND )
+ add_subdirectory( fonts )
+- endif( WIN32 OR FONTCONFIG_FOUND )
++ endif( WIN32 OR APPLE OR FONTCONFIG_FOUND )
+ endif( FREETYPE_FOUND )
+ if(FONTCONFIG_FOUND AND FREETYPE_FOUND AND NOT WIN32)
+ add_subdirectory( kfontinst )
+diff --git kcontrol/krdb/krdb.cpp kcontrol/krdb/krdb.cpp
+index 36fc99c..b49993e 100644
+--- kcontrol/krdb/krdb.cpp
++++ kcontrol/krdb/krdb.cpp
+@@ -518,6 +518,7 @@ void runRdb( uint flags )
+
+ if( cfgfonts.readEntry( "forceFontDPI", 0 ) != 0 )
+ contents += "Xft.dpi: " + cfgfonts.readEntry( "forceFontDPI" ) + '\n';
++#ifdef Q_WS_X11
+ else
+ {
+ KProcess proc;
+@@ -530,6 +531,7 @@ void runRdb( uint flags )
+ proc.waitForFinished();
+ }
+ }
++#endif // Q_WS_X11
+ }
+
+ if (contents.length() > 0)
+@@ -537,6 +539,7 @@ void runRdb( uint flags )
+
+ tmpFile.flush();
+
++#ifdef Q_WS_X11
+ KProcess proc;
+ #ifndef NDEBUG
+ proc << "xrdb" << "-merge" << tmpFile.fileName();
+@@ -544,6 +547,7 @@ void runRdb( uint flags )
+ proc << "xrdb" << "-quiet" << "-merge" << tmpFile.fileName();
+ #endif
+ proc.execute();
++#endif // Q_WS_X11
+
+ applyGtkStyles(exportColors, 1);
+ applyGtkStyles(exportColors, 2);
+diff --git kcontrol/style/CMakeLists.txt kcontrol/style/CMakeLists.txt
+index d832b20..7c84cf9 100644
+--- kcontrol/style/CMakeLists.txt
++++ kcontrol/style/CMakeLists.txt
+@@ -18,9 +18,9 @@ kde4_add_plugin(kcm_style ${kcm_style_PART_SRCS})
+
+ target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${X11_LIBRARIES}
+ ${KDE4_PLASMA_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
+-if(NOT WIN32)
++if(NOT WIN32 AND NOT APPLE)
+ target_link_libraries(kcm_style kdecorations)
+-endif(NOT WIN32)
++endif(NOT WIN32 AND NOT APPLE)
+
+ install(TARGETS kcm_style DESTINATION ${PLUGIN_INSTALL_DIR})
+
</ins></span></pre></div>
<a id="trunkdportskdekde4workspacefilespatchlibsCMakeListspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/kde4-workspace/files/patch-libs-CMakeLists.patch (0 => 135138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-workspace/files/patch-libs-CMakeLists.patch         (rev 0)
+++ trunk/dports/kde/kde4-workspace/files/patch-libs-CMakeLists.patch        2015-04-16 14:48:25 UTC (rev 135138)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+diff --git libs/CMakeLists.txt libs/CMakeLists.txt
+index c0576fe..1a34bca 100644
+--- libs/CMakeLists.txt
++++ libs/CMakeLists.txt
+@@ -6,14 +6,12 @@ add_subdirectory(plasmaclock)
+ if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
+ add_subdirectory(kdm)
+ add_subdirectory(plasmagenericshell)
+- if(NOT WIN32)
++ if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
+ add_subdirectory(taskmanager)
+- endif(NOT WIN32)
++ endif(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
+ endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
+
+-if(NOT WIN32)
+- if (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
+- add_subdirectory(ksysguard)
+- endif (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
+-endif(NOT WIN32)
++if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
++ add_subdirectory(ksysguard)
++endif(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
+
+
</ins></span></pre></div>
<a id="trunkdportskdekde4workspacefilessystemsettingscorrectmenuplacementpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/kde4-workspace/files/systemsettings-correct-menuplacement.patch (0 => 135138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-workspace/files/systemsettings-correct-menuplacement.patch         (rev 0)
+++ trunk/dports/kde/kde4-workspace/files/systemsettings-correct-menuplacement.patch        2015-04-16 14:48:25 UTC (rev 135138)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+diff --git systemsettings/app/SettingsBase.cpp systemsettings/app/SettingsBase.cpp
+index 74ccd4f..c08fce7 100644
+--- systemsettings/app/SettingsBase.cpp
++++ systemsettings/app/SettingsBase.cpp
+@@ -159,7 +159,9 @@ void SettingsBase::initHelpMenu()
+ // Add the custom actions
+ aboutModuleAction = actionCollection()->addAction( KStandardAction::AboutApp, "help_about_module", this, SLOT(about()) );
+ changeAboutMenu( 0, aboutModuleAction, i18n("About Active Module") );
++ aboutModuleAction->setMenuRole(QAction::NoRole);
+ aboutViewAction = actionCollection()->addAction( KStandardAction::AboutApp, "help_about_view", this, SLOT(about()) );
++ aboutViewAction->setMenuRole(QAction::NoRole);
+ }
+
+ void SettingsBase::initConfig()
</ins></span></pre>
</div>
</div>
</body>
</html>