summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Puntiy2017-05-19 09:29:08 +0300
committerIvan Puntiy2017-05-19 09:29:08 +0300
commit66fae0d416e9950e1621347ab9d7c583ed88c99d (patch)
treea1707cfa39da711abc718f69f9e2ef2e3b313984
parent8ab46627a0d6bad984daf6ae9d0407b3ed881d74 (diff)
downloadaur-66fae0d416e9950e1621347ab9d7c583ed88c99d.tar.gz
Clean up
-rw-r--r--PR222.patch34
-rw-r--r--wxWidgets-3.0.2-msw-dc-orientation-fix.patch13
2 files changed, 0 insertions, 47 deletions
diff --git a/PR222.patch b/PR222.patch
deleted file mode 100644
index 7d1b02288b3e..000000000000
--- a/PR222.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From aae8432e4cc8557a4e6c2b189e2924d1ae3f7ea7 Mon Sep 17 00:00:00 2001
-From: Scott Talbert <swt@techie.net>
-Date: Sat, 20 Feb 2016 00:08:14 -0500
-Subject: [PATCH] Fix STC compilation with GCC6
-
-Closes #17147
----
- src/stc/scintilla/src/Editor.cxx | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
-index cd72953..2081df2 100644
---- a/src/stc/scintilla/src/Editor.cxx
-+++ b/src/stc/scintilla/src/Editor.cxx
-@@ -11,6 +11,7 @@
- #include <ctype.h>
- #include <assert.h>
-
-+#include <cmath>
- #include <string>
- #include <vector>
- #include <map>
-@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) {
- }
-
- 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;
- }
diff --git a/wxWidgets-3.0.2-msw-dc-orientation-fix.patch b/wxWidgets-3.0.2-msw-dc-orientation-fix.patch
deleted file mode 100644
index 28969f62dba9..000000000000
--- a/wxWidgets-3.0.2-msw-dc-orientation-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
-index abd8956..d9168af 100644
---- a/src/msw/dc.cpp
-+++ b/src/msw/dc.cpp
-@@ -2007,7 +2007,7 @@ void wxMSWDCImpl::RealizeScaleAndOrigin()
- // Becaue only devExtX/logExtX ratio and devExtY/logExtY ratio are counted
- // we can reduce the fractions to avoid large absolute numbers
- // and possible arithmetic overflows.
-- unsigned int gcd = CalcGCD(abs(devExtX), abs(logExtX));
-+ int gcd = CalcGCD(abs(devExtX), abs(logExtX));
- devExtX /= gcd;
- logExtX /= gcd;
- gcd = CalcGCD(abs(devExtY), abs(logExtY));