gentoo resync : 13.01.2018

6 files changed, 29 insertions, 4 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e8f56aa8364e..d87d9b5e0e24 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index 27aac3b5ee29..2d74ab579226 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -5,7 +5,8 @@ AUX gtkmathview-0.8.0-gcc43.patch 1437 BLAKE2B a4f0cd2d3f0a9efbd1d0dc9c515ca8e28
 AUX gtkmathview-0.8.0-gcc44.patch 263 BLAKE2B cbca90326ff7762ed5685d1e0992b2a50a81f6073792fd60687d4abef51d91bf1f142f56170a955a8d107fd297789061cc2f6952fd1a7f95ab2465080d35742e SHA512 fed98000cd4ac710f8b683fbf2c5a0ecfa4064d56af314e0367e6ae84a7c6fdcc56cefb2a2998854f765783b5c3ce6d930e6969087dd88acef47d4cfb26ef3b6
 AUX gtkmathview-0.8.0-gcc47.patch 3123 BLAKE2B 8d2d93dcc3d0935ee4bbeaaec699e7dc334198452993e71f4d3bdfd2fa590b184c618f450166c2743acfd831470f6b886e30cda3a77d6c5dd39aeb6361757544 SHA512 e5c7a1d32bd578ad56d5008bd46f99f49a1d292f46b1f525da8f6c4d20b3fde796d93c7520f5161f43dabba7e7275aa1daf990b08d1aad0ac3445af6b9989f5a
 AUX gtkmathview-0.8.0-gcc6.patch 2043 BLAKE2B 5534acd718f3b4423a1325c109483de3111a5f12ef0ad0530c0ea6641e07b5fd5fd4cdb3984604ad887ad1b836ddba77300c3e383af0c23f04c15e9add74fba8 SHA512 c2a9d5b1bf14130ddea729a7cbe158f2029ba18ff5c3fd89882e1948e5eb1b903f4f4a7d3c02fb33f9fa9e3dff9db80516a6c3c895daa5f4b5612dfa2e5f4629
+AUX gtkmathview-0.8.0-gcc7.patch 1150 BLAKE2B 28c122d1ac04cdbe6b232325da3e5994e9680c670ad51387c0d0f7cd67618fca11d54163b563431c3ae3853ea05ada400627c6dc45b8e00f79f07c050d118073 SHA512 550646e134f43a47dd185b9ac2bb7c1713682685c78feca43fd6371d3e6455d06cb105fac9cc69f624cc8c3fef14d06aeabe91dae35ecdd096901cea9c802b17
 AUX gtkmathview-0.8.0-underlinking.patch 1926 BLAKE2B 6f50638ebb9c2a6af55e3b0f13b438b97a2e606fc7639a2aa6d7e3467bfcdeb4661c6b18db200b727a3de87c457ea99013f32e49b76ebaaf0a5d9793828f280b SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d
 DIST gtkmathview-0.8.0.tar.gz 987328 BLAKE2B 1c8403fcfab828153911a40850bdfcfdd15c8c19da5dc1d7c015a8718c647b4adde2f7201ee0abc72d6c2b5acc79b8c852d6aa4f09021bbeaa827291d963b646 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb
-EBUILD gtkmathview-0.8.0-r3.ebuild 1993 BLAKE2B ca3e63019922839bbd5b7634ad9f494a7487e32fdfcbffa9922660547ab311a40aeb3c1ad2395be7ca42fa6c13a7e97f1d8d0075ed5e2f5250f71ca714d17499 SHA512 f4167d1bdbbbb2a970cfc9286e7922880f9a158d97f19a646a2a92fee6abc39aa2452f0b56e6ce3fbb514648d980a15462f291bb55837aaf658ecbfa241f6e77
+EBUILD gtkmathview-0.8.0-r3.ebuild 2067 BLAKE2B 9bcab3945fa6d38b2c57c7d9c3a75939acb05584e0579d1cea09cf05909f0932aa59dfe3752bb527b495bf881ebfcc9c6e8e74474f3c47fe5eb12bf16a212f26 SHA512 2d8ced171ec564d631e1c6e3aefa4ffe4737793beadf3f38f386ac9f89fc73d2bfd6c4543c6ec99c548dd91bde9520e5e38fc9ee7ac051459e38a809029c20d8
 MISC metadata.xml 413 BLAKE2B 795e9acaab179d9cf4e0ab6f3232dbf079b418420a55ff58d06f5b81b2fa785121a6b4bb734f45f4df9b15435b3af8bf26abf773100b70c362a98805057f8a38 SHA512 734ee7fb5aa123fb2794a22b1a374e514a92a640e7bbd35ee53de045126d0b330f177db4018ddf76e9932f984a2f5c1646d3a3f642b29972df0af88f64fb1352
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch
new file mode 100644
index 000000000000..917f41bc2889
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch
@@ -0,0 +1,22 @@
+Patch from FreeBSD
+
+--- a/src/widget/gtkmathview_common.cc
++++ b/src/widget/gtkmathview_common.cc
+@@ -909,7 +909,7 @@ gtk_math_view_button_release_event(GtkWi
+ 	  math_view->select_state == SELECT_STATE_NO &&
+ 	  fabs(math_view->button_press_x - event->x) <= CLICK_SPACE_RANGE &&
+ 	  fabs(math_view->button_press_y - event->y) <= CLICK_SPACE_RANGE &&
+-	  abs(math_view->button_press_time - event->time) <= CLICK_TIME_RANGE)
++	  abs((long)math_view->button_press_time - (long)event->time) <= CLICK_TIME_RANGE)
+ 	{
+ 	  // the mouse should have not moved more than one pixel in each direction
+ 	  // and the time elapsed from the press event should be no more than 250ms
+@@ -969,7 +969,7 @@ gtk_math_view_motion_notify_event(GtkWid
+       (math_view->select_state == SELECT_STATE_YES ||
+        fabs(math_view->button_press_x - x) > CLICK_SPACE_RANGE ||
+        fabs(math_view->button_press_y - y) > CLICK_SPACE_RANGE ||
+-       abs(math_view->button_press_time - event->time) > CLICK_TIME_RANGE))
++       abs((long)math_view->button_press_time - (long)event->time) > CLICK_TIME_RANGE))
+     {
+       if (math_view->select_state == SELECT_STATE_NO)
+ 	{
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
index 07ae521431c3..1e4f1c3bf83e 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,6 +44,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-underlinking.patch
 	"${FILESDIR}"/${P}-gcc47.patch
 	"${FILESDIR}"/${P}-gcc6.patch
+	# Fix building against GCC 7, bug #639448
+	"${FILESDIR}"/${P}-gcc7.patch
 )
 
 src_prepare() {
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 98184db8577b..6a758d3e2430 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -25,5 +25,5 @@ EBUILD wxGTK-3.0.2.0-r3.ebuild 4539 BLAKE2B 2ec974f3cc0b2e4426030ca1a16564e2c9e2
 EBUILD wxGTK-3.0.2.0-r300.ebuild 5062 BLAKE2B 971833ccf9e6b4761f5760a6f9ea2e060df4efcf2ba36b19351499413dee08fbe573f18a2b044e18438639d663cda6ab4e67b40951818c20ebb50bb2b7f1eadf SHA512 666d0c45c7711fa5883e5b5b99a0b84e3e85ef1a1060ebff57e14f562c0f6d17de0605507bdb6c90483d8c516917d7620aad9ed213dcca613b1c1d2326799531
 EBUILD wxGTK-3.0.2.0-r301.ebuild 5292 BLAKE2B 9ff8380ead99e923c1fdb32066d9519400321918011c94012117be87dd524e787d418a9434f5a1eb6443c9b44db68f7360c725f8cc8869141027ccc394c6f5cc SHA512 309f9f41afc1fff5001f9a01189c022bb9c40a2f4bfb66dfc4f41361cff9e6214f68f5f5110364b53dab3cdb0c28c7b1bb96893262829c3f54301f5e8723a970
 EBUILD wxGTK-3.0.3-r300.ebuild 5176 BLAKE2B 80083420300535ba88704b9c25271931de3ce9da76ac40db0aae31cafccf5794fb737e10bb1ebd0f4a443d73a0cfbc510228d056ffc367ac8d9872beae59d870 SHA512 bc531ed938cc83bbd6ec1fcd30b71991f718cafdc6e6701ce9fa8b32e5f937feac8dbf1092fc87b3b41112ddb9fae5b7ba7dd95cb88b5df9f5da89588387fd80
-EBUILD wxGTK-3.0.3.ebuild 4101 BLAKE2B e1243c6ecc5dba146893ae111061d850a0a0b36c76a9d20ac5721919c3a809d26fd38cb113a445f8b6749bae6e30fb28a47cc908db3c8c60328400b28dd45593 SHA512 5e7c29b06aa73476935a76571448ec5a284b873e5ab469f2874fba7efa890b48dd9371784f733895ff3d237b333d36cd101f16be31c08dbd8123bdd3f2026d46
+EBUILD wxGTK-3.0.3.ebuild 4100 BLAKE2B 9dbb3627f0e19b6eb9be35c536adbba0af8523da99320759c7ccbf1e0862e7c1ca769662cb06f2e99e60819ad8dc484c26c7984be80fd0c30ba1cdd31f89b352 SHA512 d288ea76dcac332438e33ca3c72ab46fb9bd8dcd0ac42677638b60b094d4375419147846d4fee39885066ddec69ef9afb941e2d3c6cf9b9d9cf59739d5c38479
 MISC metadata.xml 856 BLAKE2B 9f03dc05155eba5aee9ca7233d96dc7d0929df2a016dce4131b3b639358eea8ebbecfb5e7f59e7382f5467259885c14bcdc3df416a678f213cd58cd3096b4252 SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
index 987bcd123555..135db8994cc8 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"