[gentoo-commits] proj/musl:master commit in: app-admin/hardinfo/, app-admin/hardinfo/files/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     bf0e101eb7fc70352c3a398978c8ea669fbb0aaa
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 00:42:07 2020 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> 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 <anarchy <AT> 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