summaryrefslogtreecommitdiff
path: root/x11-libs/gtkmathview
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-01-13 06:19:51 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-01-13 06:19:51 +0000
commit8be70107efbb417f839292165ee39d07a062046f (patch)
tree013918887ec4a00f0cefdb4b4d1313cbc3054305 /x11-libs/gtkmathview
parent343a7272d559a21a0e0ed13cb743fabb2bfcc479 (diff)
gentoo resync : 13.01.2018
Diffstat (limited to 'x11-libs/gtkmathview')
-rw-r--r--x11-libs/gtkmathview/Manifest3
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch22
-rw-r--r--x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild4
3 files changed, 27 insertions, 2 deletions
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() {