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 16A4F138334 for ; Wed, 4 Jul 2018 22:09:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEE25E0855; Wed, 4 Jul 2018 22:09:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 A4F2AE0855 for ; Wed, 4 Jul 2018 22:09:03 +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 B0ADF335C71 for ; Wed, 4 Jul 2018 22:09:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EB4A2E5 for ; Wed, 4 Jul 2018 22:08:59 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1530742125.e0f93f2f3e042cbed4b5257f39586c8b3e738452.blueness@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/Manifest app-admin/hardinfo/files/hardinfo-musl.patch app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild app-admin/hardinfo/metadata.xml X-VCS-Directories: app-admin/hardinfo/ app-admin/hardinfo/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: e0f93f2f3e042cbed4b5257f39586c8b3e738452 X-VCS-Branch: master Date: Wed, 4 Jul 2018 22:08:59 +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: 2b08a690-be1f-4e87-9191-04eedadd6560 X-Archives-Hash: 55dd6d71f3656c7b7bab7abe6e0c19fd commit: e0f93f2f3e042cbed4b5257f39586c8b3e738452 Author: S. Lockwood-Childs vctlabs com> AuthorDate: Wed May 23 09:42:14 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Jul 4 22:08:45 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e0f93f2f app-admin/hardinfo: add package fix compiler error by renaming "stdout" struct member Signed-off-by: Anthony G. Basile gentoo.org> app-admin/hardinfo/Manifest | 1 + app-admin/hardinfo/files/hardinfo-musl.patch | 25 ++++++++++++++++++++ .../hardinfo/hardinfo-0.5.2_pre20130823.ebuild | 27 ++++++++++++++++++++++ app-admin/hardinfo/metadata.xml | 5 ++++ 4 files changed, 58 insertions(+) diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest new file mode 100644 index 0000000..cc90aef --- /dev/null +++ b/app-admin/hardinfo/Manifest @@ -0,0 +1 @@ +DIST hardinfo-0.5.2_pre20130823.tar.xz 280472 BLAKE2B d72883e7e57234b3328d03daf4d81cc478b383b51f4de08981792c42b3278ede81731ca831fbc285a594aa7f00f861c870aa6d784b7c282960f5541f04f9ce45 SHA512 e36bd4eec0090461de5fdb6c17dccf76937ee8fa9cb3411068fc568847f519023037999278bbb8b9a24608ed5b1d7fd2bebfe7115c631ccca1c35fa259cb20b1 diff --git a/app-admin/hardinfo/files/hardinfo-musl.patch b/app-admin/hardinfo/files/hardinfo-musl.patch new file mode 100644 index 0000000..70151eb --- /dev/null +++ b/app-admin/hardinfo/files/hardinfo-musl.patch @@ -0,0 +1,25 @@ +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 @@ + gchar *compiler_name; + gchar *version_command; + gchar *regex; +- gboolean stdout; ++ gboolean out; + } detect_lang[] = { + { "Scripting Languages", NULL, FALSE }, + { "CPython", "python -V", "\\d+\\.\\d+\\.\\d+", FALSE }, +@@ -237,7 +237,7 @@ + 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); diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild new file mode 100644 index 0000000..bd12e60 --- /dev/null +++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="A system information and benchmark tool for Linux systems" +HOMEPAGE="http://hardinfo.org/" +SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="dev-libs/glib:2 + net-libs/libsoup + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/pango" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-musl.patch +) diff --git a/app-admin/hardinfo/metadata.xml b/app-admin/hardinfo/metadata.xml new file mode 100644 index 0000000..6f49eba --- /dev/null +++ b/app-admin/hardinfo/metadata.xml @@ -0,0 +1,5 @@ + + + + +