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 3A6881382C5 for ; Sat, 14 Apr 2018 16:19:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50068E081E; Sat, 14 Apr 2018 16:19:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1D85FE081E for ; Sat, 14 Apr 2018 16:19:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6F667335C43 for ; Sat, 14 Apr 2018 16:19:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AAC55230 for ; Sat, 14 Apr 2018 16:19:49 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1523722707.7e72f270aaaaed1ce09b77b1b5f724bc76d77644.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/ode/files/, dev-games/ode/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/ode/files/ode-0.14-gcc7.patch dev-games/ode/ode-0.14-r1.ebuild X-VCS-Directories: dev-games/ode/files/ dev-games/ode/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 7e72f270aaaaed1ce09b77b1b5f724bc76d77644 X-VCS-Branch: master Date: Sat, 14 Apr 2018 16:19:49 +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: 5fabc159-c840-4ba3-a860-1cab6e1180ff X-Archives-Hash: 10673e85eeb2a1f32a7e2824979304b8 commit: 7e72f270aaaaed1ce09b77b1b5f724bc76d77644 Author: Peter Levine gmail com> AuthorDate: Sun Mar 25 05:47:01 2018 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sat Apr 14 16:18:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e72f270 dev-games/ode: Fix building with GCC-7 Bug: https://bugs.gentoo.org/646538 Package-Manager: Portage-2.3.16, Repoman-2.3.6 Closes: https://bugs.gentoo.org/646538 Closes: https://github.com/gentoo/gentoo/pull/7605 dev-games/ode/files/ode-0.14-gcc7.patch | 52 +++++++++++++++++++++++++++++++++ dev-games/ode/ode-0.14-r1.ebuild | 4 ++- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dev-games/ode/files/ode-0.14-gcc7.patch b/dev-games/ode/files/ode-0.14-gcc7.patch new file mode 100644 index 00000000000..aad0117f3be --- /dev/null +++ b/dev-games/ode/files/ode-0.14-gcc7.patch @@ -0,0 +1,52 @@ +Bug: https://bugs.gentoo.org/646538 +Upstream commit: https://bitbucket.org/odedevs/ode/commits/6f44023660dc830147a56314ea0627a23f11ad86 + +# HG changeset patch +# User oleh_derevenko <> +# Date 1521993135 -10800 +# Node ID 6f44023660dc830147a56314ea0627a23f11ad86 +# Parent 6a68227619feebf85513331d7320b5a89eadf44f +Fixed: Command line parameter validation errors have been fixed in some demos (reported by Peter Levine) + +diff --git a/ode/demo/demo_jointPR.cpp b/ode/demo/demo_jointPR.cpp +--- a/ode/demo/demo_jointPR.cpp ++++ b/ode/demo/demo_jointPR.cpp +@@ -328,8 +328,8 @@ + if (0 == strcmp("-t", argv[i]) || 0 == strcmp("--texture-path", argv[i])) + { + int j = i+1; +- if ( j+1 > argc || // Check if we have enough arguments +- argv[j] == '\0' || // We should have a path here ++ if ( j >= argc || // Check if we have enough arguments ++ argv[j][0] == '\0' || // We should have a path here + argv[j][0] == '-' ) // We should have a path not a command line + Help(argv); + else +diff --git a/ode/demo/demo_jointPU.cpp b/ode/demo/demo_jointPU.cpp +--- a/ode/demo/demo_jointPU.cpp ++++ b/ode/demo/demo_jointPU.cpp +@@ -575,8 +575,8 @@ + + if (0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) ) { + int j = i+1; +- if ( j+1 > argc || // Check if we have enough arguments +- argv[j] == '\0' || // We should have a path here ++ if ( j >= argc || // Check if we have enough arguments ++ argv[j][0] == '\0' || // We should have a path here + argv[j][0] == '-' ) // We should have a path not a command line + Help (argv); + else +diff --git a/ode/demo/demo_piston.cpp b/ode/demo/demo_piston.cpp +--- a/ode/demo/demo_piston.cpp ++++ b/ode/demo/demo_piston.cpp +@@ -658,8 +658,8 @@ + if ( 0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) ) + { + int j = i+1; +- if ( j+1 > argc || // Check if we have enough arguments +- argv[j] == '\0' || // We should have a path here ++ if ( j >= argc || // Check if we have enough arguments ++ argv[j][0] == '\0' || // We should have a path here + argv[j][0] == '-' ) // We should have a path not a command line + Help (argv); + else diff --git a/dev-games/ode/ode-0.14-r1.ebuild b/dev-games/ode/ode-0.14-r1.ebuild index 08bd2181aff..6cb52f0998f 100644 --- a/dev-games/ode/ode-0.14-r1.ebuild +++ b/dev-games/ode/ode-0.14-r1.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=5 @@ -22,6 +22,8 @@ DEPEND="${RDEPEND} MY_EXAMPLES_DIR=/usr/share/doc/${PF}/examples src_prepare() { + epatch "${FILESDIR}"/${PN}-0.14-gcc7.patch + sed -i \ -e "s:\$.*/drawstuff/textures:${MY_EXAMPLES_DIR}:" \ drawstuff/src/Makefile.am \