[111719] trunk/dports/devel/codeblocks
mojca at macports.org
mojca at macports.org
Sun Sep 29 15:19:34 PDT 2013
Revision: 111719
https://trac.macports.org/changeset/111719
Author: mojca at macports.org
Date: 2013-09-29 15:19:34 -0700 (Sun, 29 Sep 2013)
Log Message:
-----------
codeblocks: fetch upstream patches (no change in functionality)
Modified Paths:
--------------
trunk/dports/devel/codeblocks/Portfile
trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-exporter.diff
trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-wxcontrib.diff
Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile 2013-09-29 21:18:56 UTC (rev 111718)
+++ trunk/dports/devel/codeblocks/Portfile 2013-09-29 22:19:34 UTC (rev 111719)
@@ -42,6 +42,7 @@
# 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-plugins-exporter.diff: fixed upstream
# patch-wxWidgets30-compatibility-plugins-wxcontrib.diff: https://developer.berlios.de/patch/?func=detailpatch&patch_id=3501&group_id=5358
patchfiles patch-MouseSap-Makefile.diff \
patch-Makefile.diff \
@@ -52,6 +53,7 @@
patch-src-src-Makefile.in.diff \
patch-wxWidgets30-compatibility-core.diff \
patch-wxWidgets30-compatibility-plugins-codesnippets.diff \
+ patch-wxWidgets30-compatibility-plugins-exporter.diff \
patch-wxWidgets30-compatibility-plugins-wxcontrib.diff \
# not sure what this patch was used for
@@ -118,8 +120,7 @@
wxWidgets.use wxWidgets-3.0
depends_lib-append port:${wxWidgets.port}
# TODO: maybe the patch for NassiShneiderman also solves the issue with wxWidgets 2.8
- patchfiles-append patch-wxWidgets30-compatibility-plugins-NassiShneiderman.diff \
- patch-wxWidgets30-compatibility-plugins-exporter.diff
+ patchfiles-append patch-wxWidgets30-compatibility-plugins-NassiShneiderman.diff
configure.args-append --with-wxdir=${wxWidgets.wxdir} \
--with-contrib-plugins=all,-FileManager
Modified: trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-exporter.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-exporter.diff 2013-09-29 21:18:56 UTC (rev 111718)
+++ trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-exporter.diff 2013-09-29 22:19:34 UTC (rev 111719)
@@ -1,75 +1,138 @@
-This patch is only needed and only works with wxWidgets >= 2.9.5.
-This should be fixed upstream, but a better patch is needed for backward compatibility.
-
---- src/plugins/contrib/source_exporter/wxPdfDocument/include/wx/pdfdc29.h.orig
-+++ src/plugins/contrib/source_exporter/wxPdfDocument/include/wx/pdfdc29.h
-@@ -162,9 +162,9 @@
+Upstream patch (fixed in r8891)
+--- src/plugins/contrib/source_exporter/wxPdfDocument/include/wx/pdfdc29.h (revision 8890)
++++ src/plugins/contrib/source_exporter/wxPdfDocument/include/wx/pdfdc29.h (revision 8891)
+@@ -162,9 +162,19 @@
virtual void DoGetSize(int* width, int* height) const;
virtual void DoGetSizeMM(int* width, int* height) const;
- virtual void DoDrawLines(int n, wxPoint points[],
-+ virtual void DoDrawLines(int n, const wxPoint points[],
++ virtual void DoDrawLines(int n,
++#if wxCHECK_VERSION(2, 9, 5)
++ const wxPoint points[],
++#else
++ wxPoint points[],
++#endif
wxCoord xoffset, wxCoord yoffset);
- virtual void DoDrawPolygon(int n, wxPoint points[],
-+ virtual void DoDrawPolygon(int n, const wxPoint points[],
++ virtual void DoDrawPolygon(int n,
++#if wxCHECK_VERSION(2, 9, 5)
++ const wxPoint points[],
++#else
++ wxPoint points[],
++#endif
wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
---- src/plugins/contrib/source_exporter/wxPdfDocument/include/wx/pdfprint.h.orig
-+++ src/plugins/contrib/source_exporter/wxPdfDocument/include/wx/pdfprint.h
-@@ -867,7 +867,7 @@
+--- src/plugins/contrib/source_exporter/wxPdfDocument/include/wx/pdfprint.h (revision 8890)
++++ src/plugins/contrib/source_exporter/wxPdfDocument/include/wx/pdfprint.h (revision 8891)
+@@ -867,7 +867,12 @@
return rval;
}
- virtual void DoDrawLines(int n, wxPoint points[],
-+ virtual void DoDrawLines(int n, const wxPoint points[],
++ virtual void DoDrawLines(int n,
++#if wxCHECK_VERSION(2, 9, 5)
++ const wxPoint points[],
++#else
++ wxPoint points[],
++#endif
wxCoord xoffset, wxCoord yoffset)
{
m_dc.DoDrawLines(n, points,xoffset, yoffset);
-@@ -874,7 +874,7 @@
+@@ -874,7 +879,12 @@
UpdateBoundingBox();
}
- virtual void DoDrawPolygon(int n, wxPoint points[],
-+ virtual void DoDrawPolygon(int n, const wxPoint points[],
++ virtual void DoDrawPolygon(int n,
++#if wxCHECK_VERSION(2, 9, 5)
++ const wxPoint points[],
++#else
++ wxPoint points[],
++#endif
wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
{
---- src/plugins/contrib/source_exporter/wxPdfDocument/src/pdfdc29.inc.orig
-+++ src/plugins/contrib/source_exporter/wxPdfDocument/src/pdfdc29.inc
-@@ -1032,7 +1032,7 @@
+@@ -1209,7 +1219,12 @@
+ m_dc.DoGetSizeMM(w,h);
+ }
+
+- virtual void DoDrawLines(int n, wxPoint points[],
++ virtual void DoDrawLines(int n,
++#if wxCHECK_VERSION(2, 9, 5)
++ const wxPoint points[],
++#else
++ wxPoint points[],
++#endif
+ wxCoord xoffset, wxCoord yoffset)
+ {
+ m_dc.DoDrawLines(n, points,xoffset, yoffset);
+@@ -1216,7 +1231,12 @@
+ UpdateBoundingBox();
+ }
+
+- virtual void DoDrawPolygon(int n, wxPoint points[],
++ virtual void DoDrawPolygon(int n,
++#if wxCHECK_VERSION(2, 9, 5)
++ const wxPoint points[],
++#else
++ wxPoint points[],
++#endif
+ wxCoord xoffset, wxCoord yoffset,
+ int fillStyle = wxODDEVEN_RULE)
+ {
+--- src/plugins/contrib/source_exporter/wxPdfDocument/src/pdfdc29.inc (revision 8890)
++++ src/plugins/contrib/source_exporter/wxPdfDocument/src/pdfdc29.inc (revision 8891)
+@@ -1032,7 +1032,13 @@
}
void
-wxPdfDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
-+wxPdfDCImpl::DoDrawLines(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset)
++wxPdfDCImpl::DoDrawLines(int n,
++#if wxCHECK_VERSION(2, 9, 5)
++ const wxPoint points[],
++#else
++ wxPoint points[],
++#endif
++ wxCoord xoffset, wxCoord yoffset)
{
wxCHECK_RET(m_pdfDocument, wxT("Invalid PDF DC"));
SetupPen();
-@@ -1039,7 +1039,7 @@
+@@ -1039,7 +1045,11 @@
int i;
for (i = 0; i < n; ++i)
{
-- wxPoint& point = points[i];
-+ const wxPoint& point = points[i];
++#if wxCHECK_VERSION(2, 9, 5)
++ wxPoint point = points[i];
++#else
+ wxPoint& point = points[i];
++#endif
double xx = ScaleLogicalToPdfX(xoffset + point.x);
double yy = ScaleLogicalToPdfY(yoffset + point.y);
CalcBoundingBox(point.x+xoffset, point.y+yoffset);
-@@ -1056,7 +1056,7 @@
+@@ -1056,7 +1066,12 @@
}
void
-wxPdfDCImpl::DoDrawPolygon(int n, wxPoint points[],
-+wxPdfDCImpl::DoDrawPolygon(int n, const wxPoint points[],
++wxPdfDCImpl::DoDrawPolygon(int n,
++#if wxCHECK_VERSION(2, 9, 5)
++ const wxPoint points[],
++#else
++ wxPoint points[],
++#endif
wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle /* = wxODDEVEN_RULE*/)
{
-@@ -1068,7 +1068,7 @@
+@@ -1068,7 +1083,11 @@
int i;
for (i = 0; i < n; ++i)
{
-- wxPoint& point = points[i];
-+ const wxPoint& point = points[i];
++#if wxCHECK_VERSION(2, 9, 5)
++ wxPoint point = points[i];
++#else
+ wxPoint& point = points[i];
++#endif
xp.Add(ScaleLogicalToPdfX(xoffset + point.x));
yp.Add(ScaleLogicalToPdfY(yoffset + point.y));
CalcBoundingBox(point.x + xoffset, point.y + yoffset);
Modified: trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-wxcontrib.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-wxcontrib.diff 2013-09-29 21:18:56 UTC (rev 111718)
+++ trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-wxcontrib.diff 2013-09-29 22:19:34 UTC (rev 111719)
@@ -1,7 +1,8 @@
https://developer.berlios.de/patch/?func=detailpatch&patch_id=3501&group_id=5358
-This needs to be fixed upstream.
-The first three patches are safe, but I'm not sure how to properly fix
-the last one to achieve the desired functionality.
+
+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
+++ src/plugins/contrib/wxContribItems/KWIC/include/wx/KWIC/AngularRegulator.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130929/432aa6b1/attachment.html>
More information about the macports-changes
mailing list