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 4609F138350 for ; Fri, 17 Jan 2020 00:42:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E79DE0924; Fri, 17 Jan 2020 00:42:20 +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 3A3BEE0924 for ; Fri, 17 Jan 2020 00:42:18 +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 5210F34E16E for ; Fri, 17 Jan 2020 00:42:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C455C9B for ; Fri, 17 Jan 2020 00:42:14 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1579221727.bf0e101eb7fc70352c3a398978c8ea669fbb0aaa.anarchy@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: app-admin/hardinfo/, app-admin/hardinfo/files/ X-VCS-Repository: proj/musl X-VCS-Files: app-admin/hardinfo/files/hardinfo-musl.patch app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild X-VCS-Directories: app-admin/hardinfo/files/ app-admin/hardinfo/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: bf0e101eb7fc70352c3a398978c8ea669fbb0aaa X-VCS-Branch: master Date: Fri, 17 Jan 2020 00:42:14 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 12174764-64d2-4c3e-81c1-d16bbd2dde9c X-Archives-Hash: d1c8c7aa50bceeeab650ea693e8c1a12 commit: bf0e101eb7fc70352c3a398978c8ea669fbb0aaa Author: Jory Pratt gentoo org> AuthorDate: Fri Jan 17 00:42:07 2020 +0000 Commit: Jory Pratt gentoo org> CommitDate: Fri Jan 17 00:42:07 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bf0e101e app-admin/hardinfo: rebase patch Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jory Pratt gentoo.org> app-admin/hardinfo/files/hardinfo-musl.patch | 25 ++++++++++++++++------ .../hardinfo/hardinfo-0.5.2_pre20130823.ebuild | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app-admin/hardinfo/files/hardinfo-musl.patch b/app-admin/hardinfo/files/hardinfo-musl.patch index 70151eb..4aac094 100644 --- a/app-admin/hardinfo/files/hardinfo-musl.patch +++ b/app-admin/hardinfo/files/hardinfo-musl.patch @@ -1,11 +1,19 @@ -Rename struct member to fix build failure with musl: +From 9410c0a22d07b87e4ab38c35626cbe5c49ec471d Mon Sep 17 00:00:00 2001 +From: +Date: Thu, 16 Jan 2020 18:39:27 -0600 +Subject: [PATCH] Rename struct member to fix build failure with musl: modules/computer.c:240:27: error: expected identifier before '(' token if (detect_lang[i].stdout) { - ^ ---- hardinfo-0.5.2_pre20130823/modules/computer.c.orig 2018-05-22 13:02:50.873031729 -0700 -+++ hardinfo-0.5.2_pre20130823/modules/computer.c 2018-05-22 13:02:54.537055912 -0700 -@@ -194,7 +194,7 @@ +--- + modules/computer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/computer.c b/modules/computer.c +index cd015cf..13c8022 100644 +--- a/modules/computer.c ++++ b/modules/computer.c +@@ -194,7 +194,7 @@ void scan_dev(gboolean reload) gchar *compiler_name; gchar *version_command; gchar *regex; @@ -14,12 +22,15 @@ Rename struct member to fix build failure with musl: } detect_lang[] = { { "Scripting Languages", NULL, FALSE }, { "CPython", "python -V", "\\d+\\.\\d+\\.\\d+", FALSE }, -@@ -237,7 +237,7 @@ +@@ -237,7 +237,7 @@ void scan_dev(gboolean reload) continue; } - + - if (detect_lang[i].stdout) { + if (detect_lang[i].out) { found = g_spawn_command_line_sync(detect_lang[i].version_command, &output, NULL, NULL, NULL); } else { found = g_spawn_command_line_sync(detect_lang[i].version_command, NULL, &output, NULL, NULL); +-- +2.25.0 + diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild index bd12e60..b006400 100644 --- a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild +++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5