From ea5ff48d96075db937d5a78bc0c4dbe828df6853 Mon Sep 17 00:00:00 2001 From: stahta01 Date: Sun, 24 Sep 2017 14:04:58 -0400 Subject: [PATCH] wxWidgets: Added provides="mingw-w64-wxmsw3.0". (#2945) * wxWidgets: Added and Applying "003-wxWidgets-3.0.2-fix-access-sample.patch". Added check() to build samples. * wxWidgets: Deleted no longer used patch files. * wxWidgets: Added provides="${MINGW_PACKAGE_PREFIX}-wxmsw${_wx_basever}". --- ...03-wxWidgets-3.0.2-fix-access-sample.patch | 11 +++++++ mingw-w64-wxWidgets/PKGBUILD | 22 ++++++++++--- .../wxWidgets-3.0.0-gcc-codelight.patch | 33 ------------------- .../wxWidgets-3.0.2-gcc6-abs.patch | 23 ------------- ...Widgets-3.0.2-msw-dc-orientation-fix.patch | 13 -------- .../wxWidgets-3.0.2-windows-version.patch | 27 --------------- 6 files changed, 29 insertions(+), 100 deletions(-) create mode 100644 mingw-w64-wxWidgets/003-wxWidgets-3.0.2-fix-access-sample.patch delete mode 100644 mingw-w64-wxWidgets/wxWidgets-3.0.0-gcc-codelight.patch delete mode 100644 mingw-w64-wxWidgets/wxWidgets-3.0.2-gcc6-abs.patch delete mode 100644 mingw-w64-wxWidgets/wxWidgets-3.0.2-msw-dc-orientation-fix.patch delete mode 100644 mingw-w64-wxWidgets/wxWidgets-3.0.2-windows-version.patch diff --git a/mingw-w64-wxWidgets/003-wxWidgets-3.0.2-fix-access-sample.patch b/mingw-w64-wxWidgets/003-wxWidgets-3.0.2-fix-access-sample.patch new file mode 100644 index 0000000000..5325c4f18c --- /dev/null +++ b/mingw-w64-wxWidgets/003-wxWidgets-3.0.2-fix-access-sample.patch @@ -0,0 +1,11 @@ +--- a/samples/access/accesstest.cpp ++++ b/samples/access/accesstest.cpp +@@ -637,7 +637,7 @@ wxAccStatus SplitterWindowAccessible::HitTest(const wxPoint& pt, int* childId, w + if (splitter->IsSplit()) + { + wxPoint clientPt = splitter->ScreenToClient(pt); +- if (splitter->SashHitTest(clientPt.x, clientPt.y, 1)) ++ if (splitter->SashHitTest(clientPt.x, clientPt.y)) + { + // We're over the sash + *childId = 2; diff --git a/mingw-w64-wxWidgets/PKGBUILD b/mingw-w64-wxWidgets/PKGBUILD index 58bb11e22d..46cc3a9d05 100644 --- a/mingw-w64-wxWidgets/PKGBUILD +++ b/mingw-w64-wxWidgets/PKGBUILD @@ -5,10 +5,12 @@ # Contributor: Tim S _realname=wxWidgets +_wx_basever=3.0 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +provides=("${MINGW_PACKAGE_PREFIX}-wxmsw${_wx_basever}") pkgbase=mingw-w64-${_realname} -pkgver=3.0.3 -pkgrel=2 +pkgver=${_wx_basever}.3 +pkgrel=3 pkgdesc="A C++ library that lets developers create applications for Windows, Linux and UNIX (mingw-w64)" arch=('any') license=("custom:wxWindows") @@ -26,16 +28,28 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-cppunit") options=('strip' 'staticlibs' 'buildflags') source=(https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}/wxWidgets-${pkgver}.tar.bz2 "001-wxWidgets-3.0.2-relocate-prefix-in-bin-wx-config.patch" - "002-wxWidgets-3.0.2-relax-abi-compatibility-gcc.patch") + "002-wxWidgets-3.0.2-relax-abi-compatibility-gcc.patch" + "003-wxWidgets-3.0.2-fix-access-sample.patch") sha256sums=('08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b' '7c3b8f6ba275a448a5e82d64c4914acd5aefb8bbb952389688f3e7167a787c56' - '3138f7b84bf988892f62167afc6fa640ac154b629b243d86413f7c811e508713') + '3138f7b84bf988892f62167afc6fa640ac154b629b243d86413f7c811e508713' + 'b8684dca94b288a023a8a3d55ad56bce87570576ead71670a237d909ff1c3625') prepare() { cd "${srcdir}"/${_realname}-${pkgver} patch -p1 -i "${srcdir}"/001-wxWidgets-3.0.2-relocate-prefix-in-bin-wx-config.patch patch -p1 -i "${srcdir}"/002-wxWidgets-3.0.2-relax-abi-compatibility-gcc.patch + patch -p1 -i "${srcdir}"/003-wxWidgets-3.0.2-fix-access-sample.patch +} + +check() { + cd "${srcdir}"/build-${CARCH}/samples && make + cd "${srcdir}"/build-${CARCH}-static/samples && make + +# cd "${srcdir}"/build-${CARCH}/tests && make || true + # static test errors out because of mingw64 CRT duplicate symbol issue +# cd "${srcdir}"/build-${CARCH}-static/tests && make || true } build() { diff --git a/mingw-w64-wxWidgets/wxWidgets-3.0.0-gcc-codelight.patch b/mingw-w64-wxWidgets/wxWidgets-3.0.0-gcc-codelight.patch deleted file mode 100644 index b020355152..0000000000 --- a/mingw-w64-wxWidgets/wxWidgets-3.0.0-gcc-codelight.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- wxWidgets-3.0.0/include/wx/msw/setup.h.orig 2013-11-29 13:58:33.429600000 +0400 -+++ wxWidgets-3.0.0/include/wx/msw/setup.h 2013-11-29 13:58:41.682000000 +0400 -@@ -778,7 +778,7 @@ - // - // Notice that this will be set by configure under non-Windows platforms - // anyhow so the value there is not important. --# define wxUSE_GRAPHICS_CONTEXT 0 -+# define wxUSE_GRAPHICS_CONTEXT 1 - #endif - - // Enable wxGraphicsContext implementation using Cairo library. ---- wxWidgets-3.0.0/include/wx/dlimpexp.h.orig 2013-11-29 14:00:40.803400000 +0400 -+++ wxWidgets-3.0.0/include/wx/dlimpexp.h 2013-11-29 14:00:48.603400000 +0400 -@@ -33,7 +33,7 @@ - we rely on binutils auto export/import support which seems to work - quite well for 4.5+. - */ --# elif defined(__GNUC__) && !wxCHECK_GCC_VERSION(4, 5) -+# elif defined(__GNUC__) - /* - __declspec could be used here too but let's use the native - __attribute__ instead for clarity. ---- wxWidgets-3.0.0/build/msw/config.gcc.orig 2013-11-29 13:57:55.490400000 +0400 -+++ wxWidgets-3.0.0/build/msw/config.gcc 2013-11-29 13:58:20.544000000 +0400 -@@ -29,7 +29,7 @@ - CXXFLAGS ?= - - # Standard preprocessor flags (common for CC and CXX) --CPPFLAGS ?= -+CPPFLAGS ?= -fno-keep-inline-dllexport - - # Standard linker flags - LDFLAGS ?= diff --git a/mingw-w64-wxWidgets/wxWidgets-3.0.2-gcc6-abs.patch b/mingw-w64-wxWidgets/wxWidgets-3.0.2-gcc6-abs.patch deleted file mode 100644 index 1f150e4088..0000000000 --- a/mingw-w64-wxWidgets/wxWidgets-3.0.2-gcc6-abs.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -uNr wxWidgets-3.0.2.orig/src/stc/scintilla/src/Editor.cxx wxWidgets-3.0.2.mod/src/stc/scintilla/src/Editor.cxx ---- wxWidgets-3.0.2.orig/src/stc/scintilla/src/Editor.cxx 2016-07-22 11:35:57.000000000 +0500 -+++ wxWidgets-3.0.2.mod/src/stc/scintilla/src/Editor.cxx 2016-07-22 11:30:51.000000000 +0500 -@@ -11,6 +11,7 @@ - #include - #include - -+#include - #include - #include - #include -@@ -5841,9 +5842,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; - } diff --git a/mingw-w64-wxWidgets/wxWidgets-3.0.2-msw-dc-orientation-fix.patch b/mingw-w64-wxWidgets/wxWidgets-3.0.2-msw-dc-orientation-fix.patch deleted file mode 100644 index 28969f62db..0000000000 --- a/mingw-w64-wxWidgets/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)); diff --git a/mingw-w64-wxWidgets/wxWidgets-3.0.2-windows-version.patch b/mingw-w64-wxWidgets/wxWidgets-3.0.2-windows-version.patch deleted file mode 100644 index f3b1078cec..0000000000 --- a/mingw-w64-wxWidgets/wxWidgets-3.0.2-windows-version.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -uNr wxWidgets-3.0.2.orig/include/wx/msw/private.h wxWidgets-3.0.2.mod/include/wx/msw/private.h ---- wxWidgets-3.0.2.orig/include/wx/msw/private.h 2014-10-06 23:33:44.000000000 +0200 -+++ wxWidgets-3.0.2.mod/include/wx/msw/private.h 2016-06-12 15:08:29.833102400 +0200 -@@ -929,7 +929,9 @@ - - wxWinVersion_7 = 0x601, - -- wxWinVersion_8 = 0x602 -+ wxWinVersion_8 = 0x602, -+ -+ wxWinVersion_10 = 0x1000 - }; - - WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion(); -diff -uNr wxWidgets-3.0.2.orig/src/msw/utils.cpp wxWidgets-3.0.2.mod/src/msw/utils.cpp ---- wxWidgets-3.0.2.orig/src/msw/utils.cpp 2014-10-06 23:33:44.000000000 +0200 -+++ wxWidgets-3.0.2.mod/src/msw/utils.cpp 2016-06-12 15:07:26.487621500 +0200 -@@ -1497,6 +1497,9 @@ - return wxWinVersion_8; - } - break; -+ -+ case 10: -+ return wxWinVersion_8; - } - default: - // Do nothing just to silence GCC warning