diff options
| -rw-r--r-- | community/wxgtk/APKBUILD | 13 | ||||
| -rw-r--r-- | community/wxgtk/gcc6.patch | 39 |
2 files changed, 3 insertions, 49 deletions
diff --git a/community/wxgtk/APKBUILD b/community/wxgtk/APKBUILD index 33e95ff790..680cf421df 100644 --- a/community/wxgtk/APKBUILD +++ b/community/wxgtk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Pavel Kalian <pavel@kalian.cz> # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to> pkgname=wxgtk -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=0 pkgdesc="GTK2 port of wxWidgets GUI library" url="http://www.wxwidgets.org/" @@ -14,9 +14,7 @@ makedepends="$depends_dev glu-dev sdl-dev gst-plugins-base0.10-dev gstreamer0.10-dev gconf-dev" install="" subpackages="$pkgname-dev $pkgname-lang $pkgname-media $pkgname-base" -source="https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}/wxWidgets-${pkgver}.tar.bz2 - gcc6.patch" - +source="https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}/wxWidgets-${pkgver}.tar.bz2" builddir="$srcdir/wxWidgets-$pkgver" prepare() { @@ -72,9 +70,4 @@ base() { "$subpkgdir"/usr/lib/ } -md5sums="ba4cd1f3853d0cd49134c5ae028ad080 wxWidgets-3.0.2.tar.bz2 -f624f8a0c1163a1376d43f5b57c5f39a gcc6.patch" -sha256sums="346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d wxWidgets-3.0.2.tar.bz2 -6e659eb4f1cfbfe31e0da0c8719e496e16efa5be36265388a639964e4b39cf78 gcc6.patch" -sha512sums="098f79863103f3be0b7e21e4f0f1b34ab5277ef0033c1ef1387a9c673b0e0b76a2d732b183fa11b22cfcbbfdb7a4884f243d12f65cd49baa1772852307b393c4 wxWidgets-3.0.2.tar.bz2 -6da02b4cdd6e4d33cfd8da5554f1400e2ccb33de7fa12d9da23a8eeac52c724fa339d2e1d413abf5f4590cf0514cf9a8d951589d3e498aae936ab10caf93f585 gcc6.patch" +sha512sums="dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1 wxWidgets-3.0.3.tar.bz2" diff --git a/community/wxgtk/gcc6.patch b/community/wxgtk/gcc6.patch deleted file mode 100644 index 119175c624..0000000000 --- a/community/wxgtk/gcc6.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 73e9e18ea09ffffcaac50237def0d9728a213c02 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 - -Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems -with ambiguous overloads. - -Closes #17147. - -Closes https://github.com/wxWidgets/wxWidgets/pull/222 ---- - 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; - } |