<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/788db542d18dbb325925b2428837ce0b4b985dee">https://github.com/macports/macports-ports/commit/788db542d18dbb325925b2428837ce0b4b985dee</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 788db54 codeblocks: Fix building up to Sierra - Update to svn revision 11098. - Remove no longer needed patch files.
</span>788db54 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 788db542d18dbb325925b2428837ce0b4b985dee
</span>Author: Frank Schima <mf2k@macports.org>
AuthorDate: Wed Jun 28 14:20:04 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> codeblocks: Fix building up to Sierra
</span><span style='display:block; white-space:pre;color:#404040;'> - Update to svn revision 11098.
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove no longer needed patch files.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/40390
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/43214
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/54390
</span>---
devel/codeblocks/Portfile | 31 +++++++++++++---------
devel/codeblocks/files/README | 10 -------
devel/codeblocks/files/patch-sdk-configmanager.cpp | 18 -------------
3 files changed, 19 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/codeblocks/Portfile b/devel/codeblocks/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a3b5bd8..767deec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/codeblocks/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/codeblocks/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,15 @@
</span> PortSystem 1.0
PortGroup wxWidgets 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type svn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svn.url svn://svn.code.sf.net/p/codeblocks/code/trunk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svn.revision 11098
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Get the svn last changed date by running the following command:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# svn info http://svn.code.sf.net/p/codeblocks/code/trunk| grep "^Last Changed Date:" | cut -d" " -f4,5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set LCD "2017-06-21 13:35:48"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name codeblocks
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 16.01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 16.01-${svn.revision}
</span>
platforms darwin freebsd
categories devel aqua x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,17 +26,13 @@ long_description Code::Blocks is a free C++ IDE built specifically \
</span> extensible and configurable.
homepage http://www.codeblocks.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/codeblocks/Sources/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}_${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}-${version}.release
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e98b034eb8d6cf52a89312f2d5eaa10b17f1355e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 30fb9d206df4ab3c2e2fec2451a0a7c9723bfed9a673cc9be71e881c529d5a03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir trunk
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:boost \
</span> port:hunspell
# TODO: for a weird reason CB tries to run autotools and fails
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,13 +44,17 @@ depends_build-append \
</span> use_autoconf yes
autoconf.cmd ./bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-sdk-configmanager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # FileManager requires "gamin" to be installed when using wxGTK,
# not sure whether it works with Carbon/Cocoa at all,
# so it was disabled for now
configure.args --with-contrib-plugins=all,-FileManager
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix svn revision and last changed date in app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\tREV=0|\tREV=${svn.revision}|g" ${worksrcpath}/update_revision.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\tLCD=\"\"|\tLCD=\"${LCD}\"|g" ${worksrcpath}/update_revision.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# TODO: this might need a review
system "strip -S ${destroot}${prefix}/bin/codeblocks"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +64,7 @@ post-destroot {
</span> system "strip -S ${destroot}${prefix}/lib/libwxsmithlib*.dylib || true"
# system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.so || true"
# system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.dylib || true"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "strip -S ${destroot}${prefix}/lib/codeblocks/plugins/*.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# system "strip -S ${destroot}${prefix}/lib/codeblocks/plugins/*.so"
</span>
set appPath ${destroot}${applications_dir}/CodeBlocks.app/Contents
xinstall -d -m 0755 ${destroot}${applications_dir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/codeblocks/files/README b/devel/codeblocks/files/README
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ac77e27..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/codeblocks/files/README
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Summary of issues that need to be properly fixed upstream:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (currently none)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Patches written by afb (submit upstream):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * patch-sdk-configmanager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See also:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * http://forums.codeblocks.org/index.php/topic,18394.0.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * http://forums.codeblocks.org/index.php/topic,18727.0.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * https://trac.macports.org/ticket/40390
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/codeblocks/files/patch-sdk-configmanager.cpp b/devel/codeblocks/files/patch-sdk-configmanager.cpp
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 795968c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/codeblocks/files/patch-sdk-configmanager.cpp
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-written by afb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-properly sets the directory where CB looks for plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/sdk/configmanager.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/sdk/configmanager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1503,8 +1503,10 @@ void ConfigManager::InitPaths()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef CB_AUTOCONF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (plugin_path_global.IsEmpty())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (platform::windows || platform::macosx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (platform::windows)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ConfigManager::plugin_path_global = data_path_global;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (platform::macosx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ConfigManager::plugin_path_global = res_path + _T("/lib/codeblocks/plugins");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // It seems we can not longer rely on wxStandardPathsBase::Get().GetPluginsDir(),
</span></pre><pre style='margin:0'>
</pre>