summaryrefslogtreecommitdiff
path: root/dev-perl/Wx-Scintilla/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-perl/Wx-Scintilla/files')
-rw-r--r--dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.34-flags.patch19
-rw-r--r--dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-gcc6.patch32
2 files changed, 51 insertions, 0 deletions
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.34-flags.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.34-flags.patch
new file mode 100644
index 000000000000..31b669dc6844
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.34-flags.patch
@@ -0,0 +1,19 @@
+--- a/inc/Module/Build/Scintilla/GTK.pm
++++ b/inc/Module/Build/Scintilla/GTK.pm
+@@ -48,7 +48,6 @@
+ $self->stc_defines,
+ '-c -fPIC',
+ '-o ' . $object_name,
+- '-O2',
+ '-Wall',
+ $object_name !~ /((Plat|Scintilla)WX|scintilla)\.o/
+ ? '-Wno-missing-braces -Wno-char-subscripts'
+@@ -143,7 +142,7 @@
+ Alien::wxWidgets->link_flags,
+ $Config{lddlflags},
+ '-fPIC -L.',
+- '-s -o ' . $dll,
++ '-o ' . $dll,
+ 'Scintilla.o',
+ '-Lblib/arch/auto/Wx/Scintilla ' . $self->stc_scintilla_link,
+ Alien::wxWidgets->libraries(qw(core base)),
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-gcc6.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-gcc6.patch
new file mode 100644
index 000000000000..269d1d483d34
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-gcc6.patch
@@ -0,0 +1,32 @@
+diff -ruN Wx-Scintilla-0.39.orig/wx-scintilla/src/scintilla/src/Editor.cxx Wx-Scintilla-0.39/wx-scintilla/src/scintilla/src/Editor.cxx
+--- Wx-Scintilla-0.39.orig/wx-scintilla/src/scintilla/src/Editor.cxx 2012-09-04 12:20:46.000000000 +0200
++++ Wx-Scintilla-0.39/wx-scintilla/src/scintilla/src/Editor.cxx 2017-04-25 01:20:51.586427196 +0200
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+
++#include <cmath>
+ #include <string>
+ #include <vector>
+ #include <map>
+@@ -989,7 +990,7 @@
+ // Try to optimise small scrolls
+ #ifndef UNDER_CE
+ int linesToMove = topLine - topLineNew;
+- bool performBlit = (abs(linesToMove) <= 10) && (paintState == notPainting);
++ bool performBlit = (std::abs(linesToMove) <= 10) && (paintState == notPainting);
+ willRedrawAll = !performBlit;
+ #endif
+ SetTopLine(topLineNew);
+@@ -5868,9 +5869,9 @@
+ }
+
+ static bool Close(Point pt1, Point pt2) {
+- if (abs(pt1.x - pt2.x) > 3)
++ if (std::abs(pt1.x - pt2.x) > 3)
+ return false;
+- if (abs(pt1.y - pt2.y) > 3)
++ if (std::abs(pt1.y - pt2.y) > 3)
+ return false;
+ return true;
+ }