From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F0C4138330 for ; Thu, 11 Jan 2018 10:36:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4B3CE0BB6; Thu, 11 Jan 2018 10:36:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8672DE0BB6 for ; Thu, 11 Jan 2018 10:36:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06C7E335C4B for ; Thu, 11 Jan 2018 10:36:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CC891AE for ; Thu, 11 Jan 2018 10:36:02 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1515666942.8e4a31551c1ab5081d8f0a3f5684549eea0de6ce.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkmathview/, x11-libs/gtkmathview/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild X-VCS-Directories: x11-libs/gtkmathview/ x11-libs/gtkmathview/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8e4a31551c1ab5081d8f0a3f5684549eea0de6ce X-VCS-Branch: master Date: Thu, 11 Jan 2018 10:36:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5721565a-edfc-44d8-a22b-44e9367ab419 X-Archives-Hash: a4dd9c8eb6b851bf478f466e16d41c77 commit: 8e4a31551c1ab5081d8f0a3f5684549eea0de6ce Author: David Seifert gentoo org> AuthorDate: Thu Jan 11 10:34:51 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Jan 11 10:35:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4a3155 x11-libs/gtkmathview: Fix building with GCC 7 Closes: https://bugs.gentoo.org/639448 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../gtkmathview/files/gtkmathview-0.8.0-gcc7.patch | 22 ++++++++++++++++++++++ x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) 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 00000000000..917f41bc288 --- /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 07ae521431c..1e4f1c3bf83 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() {