<pre style='margin:0'>
Marko Käning (mkae) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2fcd9df1457d52ea1bf3552c60713604aa91044b">https://github.com/macports/macports-ports/commit/2fcd9df1457d52ea1bf3552c60713604aa91044b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2fcd9df kde-extra-cmake-modules: update to 5.29.0 + 3 new patches
</span>2fcd9df is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2fcd9df1457d52ea1bf3552c60713604aa91044b
</span>Author: R.J.V. Bertin <rjvbertin@gmail.com>
AuthorDate: Tue Jan 10 20:50:18 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> kde-extra-cmake-modules: update to 5.29.0 + 3 new patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - upgrade to 5.30.0 rc2 (5.29.92)
</span><span style='display:block; white-space:pre;color:#404040;'> - upstreamed app icon patch
</span><span style='display:block; white-space:pre;color:#404040;'> - fixes an incompatibility with recent Qt5 PG changes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: #155
</span>---
kde/kde-extra-cmake-modules/Portfile | 98 +++++++++++++++-------
.../files/patch-BUNDLEDIR.diff | 22 +++++
.../files/patch-doc-building.diff | 34 ++------
.../files/patch-ecm-addappicon.diff | 36 ++++++++
.../files/patch-no-undefined.diff | 13 +++
5 files changed, 146 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/Portfile b/kde/kde-extra-cmake-modules/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ce7225..943b0c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,36 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> cmake.out_of_source yes
set ECM extra-cmake-modules
name kde-${ECM}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.11.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-devel {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set kf5.branch 5.29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch.type git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.url git://anongit.kde.org/extra-cmake-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# v5.30.0-rc2-1-gf63f400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch f63f400787ac42f64fafe006ef19579238067f40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.29.92
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ECM-5.1x.git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version ${kf5.branch}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites http://download.kde.org/stable/frameworks/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${ECM}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 bdf712bed088fc497f14b625cd5dc48f4b8d7b3f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 48f76e626e2235bd4b64aeea9bbbcb803eb8966a6d020d0ab8ddbe81930e98d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> supported_archs noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span> categories kde kf5 devel
license GPL-2+
maintainers gmail.com:rjvbertin mk openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,47 +41,64 @@ long_description Extra CMake Modules, or ECM, aims to augment CMake with addi
</span> whatever reason, are not a good fit for CMake itself.
platforms darwin
homepage http://projects.kde.org/projects/kdesupport/${ECM}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.kde.org/stable/frameworks/${branch}/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${ECM}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-BUNDLEDIR.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://commits.kde.org/extra-cmake-modules/f63f400787ac42f64fafe006ef19579238067f40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ecm-addappicon.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://commits.kde.org/extra-cmake-modules/187d8881a6a0c33f50eb65689aa1dd74a8d107a4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-undefined.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # Not used here, but these are used when configuring KF5 packages (cf KF5 PortGroup):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DCMAKE_DISABLE_FIND_PACKAGE_X11=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DAPPLE_SUPPRESS_X11_WARNING=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DCMAKE_INSTALL_LIBEXECDIR=${prefix}/libexec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DKDE_INSTALL_LIBEXECDIR=${prefix}/libexec/kde5
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f5df1f931934433cce0496630d7eca5e9efbe69c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9ee39c08ca4a6066e9c7061b740ed8b1d5f289e6b19a568d1704585d883cb718
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DBUILD_HTML_DOCS:BOOL=OFF
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt4 conflicts qt5 description {Use Qt4 to build the Qt documentation} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 conflicts qt4 description {Use Qt5 to build the Qt documentation} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt4 description {Use qt4-mac to build the Qt documentation} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 description {Use qt5-mac to build the Qt documentation} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant docs description {Build documentation} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset qt4] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant docs description {Build documentation} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset qt4] && ![variant_isset qt5]} {
</span> # user didn't request a Qt variant to use for building the documentation
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${prefix}/libexec/qt5/bin/qcollectiongenerator] || [file exists ${prefix}/libexec/qt5-mac/bin/qcollectiongenerator]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qcollectiongenerator is installed and provided by a concurrent qt5-mac port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/libexec/qt5/bin/qcollectiongenerator] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || [file exists ${prefix}/libexec/qt5-mac/bin/qcollectiongenerator]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qcollectiongenerator is installed and provided by a concurrent qt5 port
</span> default_variants +qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span> } elseif {[file exists ${prefix}/libexec/qt4/bin/qcollectiongenerator]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # qcollectiongenerator is installed and provided by a concurrent qt4-mac port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qcollectiongenerator is installed and provided by a concurrent qt4 port
</span> default_variants +qt4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span> } else {
# a qcollectiongenerator version cannot be found in a location indicating who provides it
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fall back to using the most Qt version most likely to be installed at this time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (and which at this exact time won't need to be built from source)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fall back to using the Qt version most likely to be required by ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # that use ECM.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +qt5
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no else here!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt5.prefer_kde 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> patchfiles-append patch-doc-building.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DBUILD_HTML_DOCS:BOOL=OFF -DBUILD_QTHELP_DOCS:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBUILD_QTHELP_DOCS:BOOL=ON
</span> pre-destroot {
system -W ${build.dir}/docs "${qt_bins_dir}/qcollectiongenerator qthelp/ExtraCMakeModules.qhcp"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url http://download.kde.org/stable/frameworks/${kf5.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex (5+(\\.\\d+)+)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff b/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..91c9313
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-BUNDLEDIR.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git kde-modules/KDEInstallDirs.cmake kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b7cd34d..89b37b6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kde-modules/KDEInstallDirs.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # deprecated variable name in square brackets):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ``BUNDLEDIR``
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# application bundles (``/Applications/KDE``) [``BUNDLE_INSTALL_DIR``]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# application bundles (``/Applications/MacPorts/KF5``) [``BUNDLE_INSTALL_DIR``]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ``EXECROOTDIR``
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # executables and libraries (``<empty>``) [``EXEC_INSTALL_PREFIX``]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ``BINDIR``
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -383,7 +383,7 @@ macro(_define_non_cache varname value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endmacro()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _define_absolute(BUNDLEDIR "/Applications/KDE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _define_absolute(BUNDLEDIR "/Applications/MacPorts/KF5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "application bundles"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE_INSTALL_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(APPLE)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-doc-building.diff b/kde/kde-extra-cmake-modules/files/patch-doc-building.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 09100e5..2a84168 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kde-extra-cmake-modules/files/patch-doc-building.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-doc-building.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +1,14 @@
</span> diff --git docs/CMakeLists.txt docs/CMakeLists.txt
index f17400f..2dd6b8b 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- docs/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ docs/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,8 +17,9 @@ message(STATUS "Looking for Sphinx Documentation Builder...")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_program(SPHINX_EXECUTABLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NAMES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/orig.FindSphinx.cmake 2015-12-06 15:09:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/FindSphinx.cmake 2015-12-15 13:06:38.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,6 +56,9 @@
</span> sphinx-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- sphinx-build2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sphinx-build3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sphinx-build-3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sphinx-build-3.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sphinx-build2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sphinx-build3
</span> + sphinx-build-2.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ sphinx-build-3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sphinx-build-3.5
</span> DOC "Sphinx Documentation Builder (http://sphinx-doc.org/)"
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(SPHINX_EXECUTABLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +68,7 @@ if(BUILD_QTHELP_DOCS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(qthelp_extra_commands
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qcollectiongenerator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_CURRENT_BINARY_DIR}/qthelp/extra-cmake-modules.qhcp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${CMAKE_CURRENT_BINARY_DIR}/qthelp/ExtraCMakeModules.qhcp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,7 +123,7 @@ if(BUILD_HTML_DOCS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(BUILD_QTHELP_DOCS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FILES ${CMAKE_CURRENT_BINARY_DIR}/qthelp/extra-cmake-modules.qch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FILES ${CMAKE_CURRENT_BINARY_DIR}/qthelp/ExtraCMakeModules.qch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION ${DOC_INSTALL_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-ecm-addappicon.diff b/kde/kde-extra-cmake-modules/files/patch-ecm-addappicon.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..30fef65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-ecm-addappicon.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/ECMAddAppIcon.cmake modules/ECMAddAppIcon.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ca64314..aec7e1c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/ECMAddAppIcon.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/ECMAddAppIcon.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,6 +77,31 @@ function(ecm_add_app_icon appsources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR "Unexpected arguments to ecm_add_app_icon: ${ARG_UNPARSED_ARGUMENTS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_program(KSVG2ICNS NAMES ksvg2icns)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ foreach(icon ${ARG_ICONS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_filename_component(icon_full ${icon} ABSOLUTE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_filename_component(icon_type ${icon_full} EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # do we have ksvg2icns in the path and did we receive an svg (or compressed svg) icon?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(KSVG2ICNS AND (${icon_type} STREQUAL ".svg" OR ${icon_type} STREQUAL ".svgz"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # convert the svg icon to an icon resource
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ execute_process(COMMAND ${KSVG2ICNS} "${icon_full}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} RESULT_VARIABLE KSVG2ICNS_ERROR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(${KSVG2ICNS_ERROR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(AUTHOR_WARNING "ksvg2icns could not generate an OS X application icon from ${icon}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install the icns file we just created
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_filename_component(icon_name ${icon_full} NAME_WE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(MACOSX_BUNDLE_ICON_FILE ${icon_name}.icns PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(${appsources} "${${appsources}};${CMAKE_CURRENT_BINARY_DIR}/${icon_name}.icns" PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${icon_name}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # we're done now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(known_sizes 16 32 48 64 128 256 512 1024)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach(size ${known_sizes})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(icons_at_${size}px)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kde-extra-cmake-modules/files/patch-no-undefined.diff b/kde/kde-extra-cmake-modules/files/patch-no-undefined.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..478f6cf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kde-extra-cmake-modules/files/patch-no-undefined.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git kde-modules/KDECompilerSettings.cmake kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f81b661..8b458f5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kde-modules/KDECompilerSettings.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -332,7 +332,7 @@ endfunction()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Better diagnostics (warnings, errors)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ############################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Linker warnings should be treated as errors
</span></pre><pre style='margin:0'>
</pre>