[135138] trunk/dports/kde/kde4-workspace
nicos at macports.org
nicos at macports.org
Thu Apr 16 07:48:25 PDT 2015
Revision: 135138
https://trac.macports.org/changeset/135138
Author: nicos at macports.org
Date: 2015-04-16 07:48:25 -0700 (Thu, 16 Apr 2015)
Log Message:
-----------
kde4-workspace: update to latest version (ticket #46359)
Modified Paths:
--------------
trunk/dports/kde/kde4-workspace/Portfile
Added Paths:
-----------
trunk/dports/kde/kde4-workspace/files/no-oxygen-theme.patch
trunk/dports/kde/kde4-workspace/files/patch-kcontrol.patch
trunk/dports/kde/kde4-workspace/files/patch-libs-CMakeLists.patch
trunk/dports/kde/kde4-workspace/files/systemsettings-correct-menuplacement.patch
Removed Paths:
-------------
trunk/dports/kde/kde4-workspace/files/krdb-noX11onOSX.patch
trunk/dports/kde/kde4-workspace/files/libs-CmakeLists-deactivate-taskmanager.patch
trunk/dports/kde/kde4-workspace/files/patch-KControl-CmakeLists.patch
Modified: trunk/dports/kde/kde4-workspace/Portfile
===================================================================
--- 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)
@@ -4,9 +4,13 @@
PortSystem 1.0
PortGroup kde4 1.1
+fetch.type git
+git.url git://anongit.kde.org/kde-workspace
+git.branch b904af16
+
name kde4-workspace
-version 4.13.3
-set plasmaversion 4.11.11
+version 4.14.4.20150324
+set plasmaversion 4.11.17
categories kde kde4
maintainers gmail.com:rjvbertin
license GPL-2+ LGPL-2.1+
@@ -18,16 +22,15 @@
homepage http://www.kde.org/workspaces/
master_sites kde:stable/${version}/src/
use_xz yes
-distname kde-workspace-${plasmaversion}
+#distname kde-workspace-${plasmaversion}
-checksums rmd160 e0cdcde2c455e376a8bf785bb2c3ef114fa9a5f1 \
- sha256 f188b003c56d2a40f71d4eea8c91b7ae0febcf25c252c383913281fce73c4d73
+#checksums rmd160 e5f4ed10a6791b9a6cea37ec13d8a1141fd9707b \
+# sha256 09d8ae1ac1b704fc919bdedfec47c6561033dca125b0096cb9ed398445fa942f
-#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
+patchfiles patch-CMakeLists-for-OSX.patch \
+ patch-libs-CMakeLists.patch \
+ patch-kcontrol.patch \
+ systemsettings-correct-menuplacement.patch
depends_build-append port:boost \
port:freetype \
@@ -43,10 +46,24 @@
configure.args-append -DBUILD_webkit:BOOL=ON
-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
+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"
}
-livecheck.url http://kde.mirrors.hoobly.com/stable/
-livecheck.regex (\\d+(\\.\\d+)+)
+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+)+)
Deleted: trunk/dports/kde/kde4-workspace/files/krdb-noX11onOSX.patch
===================================================================
--- 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)
@@ -1,37 +0,0 @@
---- 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);
Deleted: trunk/dports/kde/kde4-workspace/files/libs-CmakeLists-deactivate-taskmanager.patch
===================================================================
--- 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)
@@ -1,12 +0,0 @@
---- 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")
-
Added: trunk/dports/kde/kde4-workspace/files/no-oxygen-theme.patch
===================================================================
--- 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)
@@ -0,0 +1,16 @@
+--- 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")
Deleted: trunk/dports/kde/kde4-workspace/files/patch-KControl-CmakeLists.patch
===================================================================
--- 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)
@@ -1,45 +0,0 @@
---- 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})
-
Added: trunk/dports/kde/kde4-workspace/files/patch-kcontrol.patch
===================================================================
--- 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)
@@ -0,0 +1,85 @@
+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})
+
Added: trunk/dports/kde/kde4-workspace/files/patch-libs-CMakeLists.patch
===================================================================
--- 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)
@@ -0,0 +1,25 @@
+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)
+
+
Added: trunk/dports/kde/kde4-workspace/files/systemsettings-correct-menuplacement.patch
===================================================================
--- 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)
@@ -0,0 +1,14 @@
+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()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150416/516e58f7/attachment.html>
More information about the macports-changes
mailing list