<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7302cbc14ed97e034474f9985972182223afb5b3">https://github.com/macports/macports-ports/commit/7302cbc14ed97e034474f9985972182223afb5b3</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 7302cbc kdevelop: update to version 4.7.4
</span>7302cbc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7302cbc14ed97e034474f9985972182223afb5b3
</span>Author: Nicolas Pavillon <nicos@macports.org>
AuthorDate: Mon Jan 23 23:09:42 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> kdevelop: update to version 4.7.4
</span>---
kde/kdevelop/Portfile | 22 +++++++++++++---------
kde/kdevelop/files/patch-cmakeOldPolicy.diff | 12 ------------
kde/kdevplatform/Portfile | 16 +++++++---------
kde/kdevplatform/files/patch-KDEmacros.diff | 12 ++++++++++++
kde/kdevplatform/files/patch-cmakeOldPolicy.diff | 12 ------------
5 files changed, 32 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdevelop/Portfile b/kde/kdevelop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bcc00d..56818f1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdevelop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdevelop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,7 @@ PortGroup muniversal 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name kdevelop
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.7.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.7.4
</span> categories kde kde4
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,12 +21,12 @@ long_description KDevelop is a free, open source IDE (Integrated \
</span> and Qt libraries and is under development since 1998.
homepage http://www.kdevelop.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites kde:stable/kdevelop/${version}/src/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites kde:stable/kdevelop/${version}/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8798f919e7c4f70e1c3fa2486b84dacb1f62f052 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 047f2d2203f25a66a69e7f5b38a2a70cb2005966 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cdef56196364eb97a4d9f15b6d47e12d893ef0bfa7100855f532ba7a9ff69130
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
depends_run-append port:cmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,8 +45,7 @@ license_noconflict openssl
</span> #2-3. Change use of std::list with QList which is recognized during build
patchfiles patch-okteta.diff \
patch-declarationbuilder.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-context.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmakeOldPolicy.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-context.diff
</span>
if {![variant_isset docs]} {
patchfiles-append patch-CMakeLists.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +54,13 @@ if {![variant_isset docs]} {
</span> variant okteta description "Adds support for okteta" {
depends_lib-append port:okteta
patchfiles-delete patch-okteta.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Printer tests fail building in version 4.7.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|add_subdirectory(tests)|#add_subdirectory(tests)|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/debuggers/gdb/printers/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
#Using c++0x for Lion and higher in case of clang 64-bit
if {${configure.compiler} eq "clang" && ${os.platform} eq "darwin" && ${os.major} >= 11} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdevelop/files/patch-cmakeOldPolicy.diff b/kde/kdevelop/files/patch-cmakeOldPolicy.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1eb869f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdevelop/files/patch-cmakeOldPolicy.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- po/CMakeLists.txt.orig 2016-02-25 00:28:04.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ po/CMakeLists.txt 2016-02-25 00:28:08.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# The pofiles macro creates in some versions same name targets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# which since cmake 2.8 leads to target clashes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Hence force the old policy for all po directories.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# http://public.kitware.com/Bug/view.php?id=12952
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cmake_policy(SET CMP0002 OLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Gettext REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdevplatform/Portfile b/kde/kdevplatform/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f8ea2c..5914199 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdevplatform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdevplatform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,7 @@ PortGroup muniversal 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name kdevplatform
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.7.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.7.4
</span> categories kde kde4
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,16 +19,15 @@ long_description KDevPlatform is a free, open source set of libraries \
</span> is planned to be used by programs like: KDevelop, \
Quanta, Kile, KTechLab ... etc.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set kdevelopversion 4.7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set kdevelopversion 4.7.4
</span>
homepage http://www.kdevelop.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites kde:stable/kdevelop/${kdevelopversion}/src/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites kde:stable/kdevelop/${kdevelopversion}/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ad41c852ea86374274428bcd348b7f125fd3393d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1175ef36e0b3626703d2caccc8f01be0f7aa55ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 21ea4a6c4e241e3b9d6f991ac98b2df8b9c45e17bdb416e836cefbde2d524574
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
depends_lib-append port:kdelibs4 \
port:boost \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +43,7 @@ license_noconflict openssl
</span> #1. Deactivating subversion detection at configure to avoid hidden \
# use of system one (ticket #35185)
patchfiles-append patch-pluginsCMakeLists.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmakeOldPolicy.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-KDEmacros.diff
</span>
variant subversion description {Add subversion support for kdevelop} {
depends_lib-append port:subversion
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdevplatform/files/patch-KDEmacros.diff b/kde/kdevplatform/files/patch-KDEmacros.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..883af57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdevplatform/files/patch-KDEmacros.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/modules/KDevPlatformMacros.cmake.orig 2017-01-22 21:58:31.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/KDevPlatformMacros.cmake 2017-01-23 00:12:05.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,8 +52,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(OUTPUT ${_template}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND tar ARGS -c -C ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --exclude .kdev_ignore --exclude .svn --mode=go=rX,u+rw,a-s --owner=root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --group=root --numeric-owner -j -f ${_template} .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --exclude .kdev_ignore --exclude .svn -j -f ${_template} .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDS ${_deps}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(WIN32)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdevplatform/files/patch-cmakeOldPolicy.diff b/kde/kdevplatform/files/patch-cmakeOldPolicy.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 02ef984..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdevplatform/files/patch-cmakeOldPolicy.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- po/CMakeLists.txt.orig 2016-02-25 00:24:53.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ po/CMakeLists.txt 2016-02-25 00:24:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# The pofiles macro creates in some versions same name targets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# which since cmake 2.8 leads to target clashes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Hence force the old policy for all po directories.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# http://public.kitware.com/Bug/view.php?id=12952
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cmake_policy(SET CMP0002 OLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Gettext REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
</span></pre><pre style='margin:0'>
</pre>