[arch-commits] Commit in wxgtk/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Thu May 19 21:17:03 UTC 2016
Date: Thursday, May 19, 2016 @ 23:17:03
Author: arojas
Revision: 268338
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
wxgtk/repos/extra-i686/PKGBUILD
(from rev 268337, wxgtk/trunk/PKGBUILD)
wxgtk/repos/extra-i686/make-abicheck-non-fatal.patch
(from rev 268337, wxgtk/trunk/make-abicheck-non-fatal.patch)
wxgtk/repos/extra-i686/wxgtk-gcc6.patch
(from rev 268337, wxgtk/trunk/wxgtk-gcc6.patch)
wxgtk/repos/extra-x86_64/PKGBUILD
(from rev 268337, wxgtk/trunk/PKGBUILD)
wxgtk/repos/extra-x86_64/make-abicheck-non-fatal.patch
(from rev 268337, wxgtk/trunk/make-abicheck-non-fatal.patch)
wxgtk/repos/extra-x86_64/wxgtk-gcc6.patch
(from rev 268337, wxgtk/trunk/wxgtk-gcc6.patch)
Deleted:
wxgtk/repos/extra-i686/PKGBUILD
wxgtk/repos/extra-i686/make-abicheck-non-fatal.patch
wxgtk/repos/extra-x86_64/PKGBUILD
wxgtk/repos/extra-x86_64/make-abicheck-non-fatal.patch
--------------------------------------------+
/PKGBUILD | 92 +++++++++++++++++++++++++++
/make-abicheck-non-fatal.patch | 30 ++++++++
extra-i686/PKGBUILD | 42 ------------
extra-i686/make-abicheck-non-fatal.patch | 15 ----
extra-i686/wxgtk-gcc6.patch | 39 +++++++++++
extra-x86_64/PKGBUILD | 42 ------------
extra-x86_64/make-abicheck-non-fatal.patch | 15 ----
extra-x86_64/wxgtk-gcc6.patch | 39 +++++++++++
8 files changed, 200 insertions(+), 114 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-05-19 21:16:41 UTC (rev 268337)
+++ extra-i686/PKGBUILD 2016-05-19 21:17:03 UTC (rev 268338)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=wxgtk
-pkgver=3.0.2
-pkgrel=5
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
-url="http://wxwidgets.org"
-license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libsm')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu')
-optdepends=('webkitgtk2: for webview support')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
- make-abicheck-non-fatal.patch)
-sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800'
- 'dfe38650c655395b90bf082b5734c4093508bfa3')
-
-prepare() {
- cd wxWidgets-${pkgver}
-
- # C++ ABI check is too strict and breaks with GCC 5.1
- # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
- patch -Np1 -i ../make-abicheck-non-fatal.patch
-}
-
-build() {
- cd wxWidgets-${pkgver}
- ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
- --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
- --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
- --disable-precomp-headers
- make
- make -C locale allmo
-}
-
-package() {
- cd wxWidgets-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: wxgtk/repos/extra-i686/PKGBUILD (from rev 268337, wxgtk/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-19 21:17:03 UTC (rev 268338)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=wxgtk
+pkgver=3.0.2
+pkgrel=5
+pkgdesc="GTK+ implementation of wxWidgets API for GUI"
+arch=('i686' 'x86_64')
+url="http://wxwidgets.org"
+license=('custom:wxWindows')
+depends=('gtk2' 'gstreamer0.10-base' 'libsm')
+makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu')
+optdepends=('webkitgtk2: for webview support')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
+ make-abicheck-non-fatal.patch wxgtk-gcc6.patch)
+sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800'
+ 'dfe38650c655395b90bf082b5734c4093508bfa3'
+ '498202334c69d49c1ebbc9d36ad382cfa237f3f8')
+
+prepare() {
+ cd wxWidgets-${pkgver}
+
+ # C++ ABI check is too strict and breaks with GCC 5.1
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
+ patch -Np1 -i ../make-abicheck-non-fatal.patch
+
+ # Fix build with GCC 6
+ patch -p1 -i ../wxgtk-gcc6.patch
+}
+
+build() {
+ cd wxWidgets-${pkgver}
+ ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
+ --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
+ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
+ --disable-precomp-headers
+ make
+ make -C locale allmo
+}
+
+package() {
+ cd wxWidgets-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-i686/make-abicheck-non-fatal.patch
===================================================================
--- extra-i686/make-abicheck-non-fatal.patch 2016-05-19 21:16:41 UTC (rev 268337)
+++ extra-i686/make-abicheck-non-fatal.patch 2016-05-19 21:17:03 UTC (rev 268338)
@@ -1,15 +0,0 @@
-diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
---- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
-+++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100
-@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
- msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
- lib.c_str(), progName.c_str(), prog.c_str());
-
-- wxLogFatalError(msg.c_str());
--
-- // normally wxLogFatalError doesn't return
-- return false;
-+ wxLogWarning(msg.c_str());
- }
- #undef wxCMP
-
Copied: wxgtk/repos/extra-i686/make-abicheck-non-fatal.patch (from rev 268337, wxgtk/trunk/make-abicheck-non-fatal.patch)
===================================================================
--- extra-i686/make-abicheck-non-fatal.patch (rev 0)
+++ extra-i686/make-abicheck-non-fatal.patch 2016-05-19 21:17:03 UTC (rev 268338)
@@ -0,0 +1,15 @@
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
+--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
++++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100
+@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
+ msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+ lib.c_str(), progName.c_str(), prog.c_str());
+
+- wxLogFatalError(msg.c_str());
+-
+- // normally wxLogFatalError doesn't return
+- return false;
++ wxLogWarning(msg.c_str());
+ }
+ #undef wxCMP
+
Copied: wxgtk/repos/extra-i686/wxgtk-gcc6.patch (from rev 268337, wxgtk/trunk/wxgtk-gcc6.patch)
===================================================================
--- extra-i686/wxgtk-gcc6.patch (rev 0)
+++ extra-i686/wxgtk-gcc6.patch 2016-05-19 21:17:03 UTC (rev 268338)
@@ -0,0 +1,39 @@
+From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt at 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;
+ }
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-05-19 21:16:41 UTC (rev 268337)
+++ extra-x86_64/PKGBUILD 2016-05-19 21:17:03 UTC (rev 268338)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=wxgtk
-pkgver=3.0.2
-pkgrel=5
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
-url="http://wxwidgets.org"
-license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libsm')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu')
-optdepends=('webkitgtk2: for webview support')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
- make-abicheck-non-fatal.patch)
-sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800'
- 'dfe38650c655395b90bf082b5734c4093508bfa3')
-
-prepare() {
- cd wxWidgets-${pkgver}
-
- # C++ ABI check is too strict and breaks with GCC 5.1
- # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
- patch -Np1 -i ../make-abicheck-non-fatal.patch
-}
-
-build() {
- cd wxWidgets-${pkgver}
- ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
- --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
- --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
- --disable-precomp-headers
- make
- make -C locale allmo
-}
-
-package() {
- cd wxWidgets-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: wxgtk/repos/extra-x86_64/PKGBUILD (from rev 268337, wxgtk/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-05-19 21:17:03 UTC (rev 268338)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=wxgtk
+pkgver=3.0.2
+pkgrel=5
+pkgdesc="GTK+ implementation of wxWidgets API for GUI"
+arch=('i686' 'x86_64')
+url="http://wxwidgets.org"
+license=('custom:wxWindows')
+depends=('gtk2' 'gstreamer0.10-base' 'libsm')
+makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu')
+optdepends=('webkitgtk2: for webview support')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
+ make-abicheck-non-fatal.patch wxgtk-gcc6.patch)
+sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800'
+ 'dfe38650c655395b90bf082b5734c4093508bfa3'
+ '498202334c69d49c1ebbc9d36ad382cfa237f3f8')
+
+prepare() {
+ cd wxWidgets-${pkgver}
+
+ # C++ ABI check is too strict and breaks with GCC 5.1
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
+ patch -Np1 -i ../make-abicheck-non-fatal.patch
+
+ # Fix build with GCC 6
+ patch -p1 -i ../wxgtk-gcc6.patch
+}
+
+build() {
+ cd wxWidgets-${pkgver}
+ ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
+ --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
+ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
+ --disable-precomp-headers
+ make
+ make -C locale allmo
+}
+
+package() {
+ cd wxWidgets-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-x86_64/make-abicheck-non-fatal.patch
===================================================================
--- extra-x86_64/make-abicheck-non-fatal.patch 2016-05-19 21:16:41 UTC (rev 268337)
+++ extra-x86_64/make-abicheck-non-fatal.patch 2016-05-19 21:17:03 UTC (rev 268338)
@@ -1,15 +0,0 @@
-diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
---- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
-+++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100
-@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
- msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
- lib.c_str(), progName.c_str(), prog.c_str());
-
-- wxLogFatalError(msg.c_str());
--
-- // normally wxLogFatalError doesn't return
-- return false;
-+ wxLogWarning(msg.c_str());
- }
- #undef wxCMP
-
Copied: wxgtk/repos/extra-x86_64/make-abicheck-non-fatal.patch (from rev 268337, wxgtk/trunk/make-abicheck-non-fatal.patch)
===================================================================
--- extra-x86_64/make-abicheck-non-fatal.patch (rev 0)
+++ extra-x86_64/make-abicheck-non-fatal.patch 2016-05-19 21:17:03 UTC (rev 268338)
@@ -0,0 +1,15 @@
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
+--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
++++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100
+@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
+ msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+ lib.c_str(), progName.c_str(), prog.c_str());
+
+- wxLogFatalError(msg.c_str());
+-
+- // normally wxLogFatalError doesn't return
+- return false;
++ wxLogWarning(msg.c_str());
+ }
+ #undef wxCMP
+
Copied: wxgtk/repos/extra-x86_64/wxgtk-gcc6.patch (from rev 268337, wxgtk/trunk/wxgtk-gcc6.patch)
===================================================================
--- extra-x86_64/wxgtk-gcc6.patch (rev 0)
+++ extra-x86_64/wxgtk-gcc6.patch 2016-05-19 21:17:03 UTC (rev 268338)
@@ -0,0 +1,39 @@
+From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt at 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;
+ }
More information about the arch-commits
mailing list