[111795] trunk/dports/devel/codeblocks
mojca at macports.org
mojca at macports.org
Wed Oct 2 00:24:07 PDT 2013
Revision: 111795
https://trac.macports.org/changeset/111795
Author: mojca at macports.org
Date: 2013-10-02 00:24:07 -0700 (Wed, 02 Oct 2013)
Log Message:
-----------
codeblocks: sync with upstream patches
Modified Paths:
--------------
trunk/dports/devel/codeblocks/Portfile
trunk/dports/devel/codeblocks/files/patch-MouseSap-Makefile.diff
trunk/dports/devel/codeblocks/files/patch-src-include-prep.h.diff
trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-lib_finder-librariesdlg.cpp.diff
trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-profiler-cbprofiler.cpp.diff
trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-core.diff
trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-codesnippets.diff
trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-wxcontrib.diff
Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile 2013-10-02 02:58:51 UTC (rev 111794)
+++ trunk/dports/devel/codeblocks/Portfile 2013-10-02 07:24:07 UTC (rev 111795)
@@ -33,17 +33,17 @@
port:hunspell
# TODO:
-# patch-MouseSap-Makefile.diff: https://developer.berlios.de/bugs/?func=detailbug&bug_id=19115&group_id=5358
+# patch-MouseSap-Makefile.diff: fixed upstream
# patch-Makefile.diff: not sure why it is needed
-# patch-src-include-prep.h.diff: https://developer.berlios.de/bugs/?func=detailbug&bug_id=19125&group_id=5358
-# patch-src-plugins-contrib-lib_finder-librariesdlg.cpp.diff: https://developer.berlios.de/patch/?func=detailpatch&patch_id=3498&group_id=5358
-# patch-src-plugins-contrib-profiler-cbprofiler.cpp.diff: https://developer.berlios.de/patch/?func=detailpatch&patch_id=3496&group_id=5358
+# patch-src-include-prep.h.diff: fixed upstream
+# patch-src-plugins-contrib-lib_finder-librariesdlg.cpp.diff: fixed upstream
+# patch-src-plugins-contrib-profiler-cbprofiler.cpp.diff: fixed upstream
# patch-src-sdk-wxscintilla-src-PlatWX.cpp.diff: fixed upstream
# patch-src-src-Makefile.in.diff: https://trac.macports.org/ticket/40531
-# patch-wxWidgets30-compatibility-core.diff: https://developer.berlios.de/patch/?func=detailpatch&patch_id=3499&group_id=5358
-# patch-wxWidgets30-compatibility-plugins-codesnippets.diff: https://developer.berlios.de/patch/?func=detailpatch&patch_id=3500&group_id=5358
+# patch-wxWidgets30-compatibility-core.diff: fixed upstream
+# patch-wxWidgets30-compatibility-plugins-codesnippets.diff: fixed upstream
# patch-wxWidgets30-compatibility-plugins-exporter.diff: fixed upstream
-# patch-wxWidgets30-compatibility-plugins-wxcontrib.diff: https://developer.berlios.de/patch/?func=detailpatch&patch_id=3501&group_id=5358
+# patch-wxWidgets30-compatibility-plugins-wxcontrib.diff: (almost) fixed upstream
patchfiles patch-MouseSap-Makefile.diff \
patch-Makefile.diff \
patch-src-include-prep.h.diff \
@@ -117,7 +117,7 @@
# disable precompiled headers for the universal build
variant universal {
- configure.args-append --enable-pch=no
+ configure.args-append --disable-pch
}
# TODO: keep the old variants/descriptions?
Modified: trunk/dports/devel/codeblocks/files/patch-MouseSap-Makefile.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-MouseSap-Makefile.diff 2013-10-02 02:58:51 UTC (rev 111794)
+++ trunk/dports/devel/codeblocks/files/patch-MouseSap-Makefile.diff 2013-10-02 07:24:07 UTC (rev 111795)
@@ -1,23 +1,23 @@
-http://developer.berlios.de/bugs/?func=detailbug&bug_id=19115&group_id=5358
+Upstream patch (fixed in r8904)
--- src/plugins/contrib/MouseSap/Makefile.am.orig
+++ src/plugins/contrib/MouseSap/Makefile.am
-@@ -7,7 +7,7 @@ pluginlibdir = $(pkglibdir)/plugins
+@@ -9,7 +9,7 @@
- pluginlib_LTLIBRARIES = libMouseSap.la
+ libMouseSap_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
--libMouseSap_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
-+libMouseSap_la_LDFLAGS = $(WX_GTK2_LIBS) -module -version-info 0:1:0 -shared -no-undefined -avoid-version
+-libMouseSap_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la
++libMouseSap_la_LIBADD = $(PLUGIN_WX_LIBS) $(WX_GTK2_LIBS) ../../../sdk/libcodeblocks.la
- libMouseSap_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la
+ libMouseSap_la_SOURCES = MouseSap.cpp
--- src/plugins/contrib/MouseSap/Makefile.in.orig
+++ src/plugins/contrib/MouseSap/Makefile.in
-@@ -347,7 +347,7 @@ INCLUDES = $(WX_CXXFLAGS) \
-
+@@ -348,7 +348,7 @@
pluginlibdir = $(pkglibdir)/plugins
pluginlib_LTLIBRARIES = libMouseSap.la
--libMouseSap_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
-+libMouseSap_la_LDFLAGS = $(WX_GTK2_LIBS) -module -version-info 0:1:0 -shared -no-undefined -avoid-version
- libMouseSap_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la
+ libMouseSap_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
+-libMouseSap_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la
++libMouseSap_la_LIBADD = $(PLUGIN_WX_LIBS) $(WX_GTK2_LIBS) ../../../sdk/libcodeblocks.la
libMouseSap_la_SOURCES = MouseSap.cpp
noinst_HEADERS = MouseSap.h
+ EXTRA_DIST = $(srcdir)/*.cbp \
Modified: trunk/dports/devel/codeblocks/files/patch-src-include-prep.h.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-include-prep.h.diff 2013-10-02 02:58:51 UTC (rev 111794)
+++ trunk/dports/devel/codeblocks/files/patch-src-include-prep.h.diff 2013-10-02 07:24:07 UTC (rev 111795)
@@ -1,5 +1,4 @@
-http://cplusplusmusings.wordpress.com/2013/06/03/whats-up-with-tr1-and-c11-and-libc/
-https://developer.berlios.de/bugs/?func=detailbug&bug_id=19125&group_id=5358
+Upstream patch (fixed in r9377)
--- src/include/prep.h.orig
+++ src/include/prep.h
@@ -406,14 +406,27 @@ template<typename whatever> inline ID GetID()
Modified: trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff 2013-10-02 02:58:51 UTC (rev 111794)
+++ trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff 2013-10-02 07:24:07 UTC (rev 111795)
@@ -1,3 +1,5 @@
+http://developer.berlios.de/bugs/?func=detailbug&bug_id=19139&group_id=5358
+
This patch might not work with wxGTK, but it's needed for wxMAC and wxOSX (2.8 and 2.9).
It needs to be fixed upstream, but a better patch is needed to deal with the problem.
See also http://docs.wxwidgets.org/2.9.5/overview_bitmap.html
Modified: trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-lib_finder-librariesdlg.cpp.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-lib_finder-librariesdlg.cpp.diff 2013-10-02 02:58:51 UTC (rev 111794)
+++ trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-lib_finder-librariesdlg.cpp.diff 2013-10-02 07:24:07 UTC (rev 111795)
@@ -1,5 +1,4 @@
-needed for compilation with clang
-https://developer.berlios.de/patch/?func=detailpatch&patch_id=3498&group_id=5358
+Upstream patch (fixed in r9378)
--- src/plugins/contrib/lib_finder/librariesdlg.cpp.orig
+++ src/plugins/contrib/lib_finder/librariesdlg.cpp
@@ -14,6 +14,7 @@
Modified: trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-profiler-cbprofiler.cpp.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-profiler-cbprofiler.cpp.diff 2013-10-02 02:58:51 UTC (rev 111794)
+++ trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-profiler-cbprofiler.cpp.diff 2013-10-02 07:24:07 UTC (rev 111795)
@@ -1,5 +1,4 @@
-needed for compilation with clang
-http://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=3496&group_id=5358
+Upstream patch (fixed in r9376)
--- src/plugins/contrib/profiler/cbprofiler.cpp.orig
+++ src/plugins/contrib/profiler/cbprofiler.cpp
@@ -101,7 +101,7 @@ int CBProfiler::Execute()
@@ -7,15 +6,17 @@
{
// more than one executable target? ask...
- wxString choices[project->GetBuildTargetsCount()];
-+ wxString *choices = new wxString[project->GetBuildTargetsCount()];
++ std::vector<wxString> choices(project->GetBuildTargetsCount());
wxString active_target = project->GetActiveBuildTarget();
int selected = 0;
for (int i=0; i<project->GetBuildTargetsCount(); ++i)
-@@ -114,6 +114,7 @@ int CBProfiler::Execute()
+@@ -112,7 +112,8 @@
+ }
+ wxSingleChoiceDialog dialog(Manager::Get()->GetAppWindow(),
_("Select the target you want to profile"),
- _("Select Target"),project->GetBuildTargetsCount(),choices);
+- _("Select Target"),project->GetBuildTargetsCount(),choices);
++ _("Select Target"),
++ project->GetBuildTargetsCount(), &choices[0]);
dialog.SetSelection(selected);
-+ delete [] choices;
if (dialog.ShowModal() != wxID_OK)
return -1;
- int targetIndex = dialog.GetSelection();
Modified: trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-core.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-core.diff 2013-10-02 02:58:51 UTC (rev 111794)
+++ trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-core.diff 2013-10-02 07:24:07 UTC (rev 111795)
@@ -1,4 +1,4 @@
-https://developer.berlios.de/patch/?func=detailpatch&patch_id=3499&group_id=5358
+Upstream patches (fixed in r9375 & r8639)
--- src/sdk/configmanager.cpp.orig
+++ src/sdk/configmanager.cpp
@@ -36,7 +36,11 @@
Modified: trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-codesnippets.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-codesnippets.diff 2013-10-02 02:58:51 UTC (rev 111794)
+++ trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-codesnippets.diff 2013-10-02 07:24:07 UTC (rev 111795)
@@ -1,4 +1,4 @@
-https://developer.berlios.de/patch/?func=detailpatch&patch_id=3500&group_id=5358
+Upstream patches (fixed in r9375 & 9239)
--- src/plugins/contrib/codesnippets/codesnippetsapp.cpp.orig
+++ src/plugins/contrib/codesnippets/codesnippetsapp.cpp
@@ -95,7 +95,11 @@
Modified: trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-wxcontrib.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-wxcontrib.diff 2013-10-02 02:58:51 UTC (rev 111794)
+++ trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-wxcontrib.diff 2013-10-02 07:24:07 UTC (rev 111795)
@@ -1,7 +1,5 @@
-https://developer.berlios.de/patch/?func=detailpatch&patch_id=3501&group_id=5358
+Upstream patches (1-3 fixed in r8775 & r9375)
-The first two patches have already been fixed upstream.
-The third patch is safe and straightforward.
I'm not sure how to properly fix the last one to achieve the desired functionality.
The constants are already deprecated on 2.8.
--- src/plugins/contrib/wxContribItems/KWIC/include/wx/KWIC/AngularRegulator.h.orig
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131002/22f4bbfd/attachment.html>
More information about the macports-changes
mailing list