| 1 |
commit: e0f93f2f3e042cbed4b5257f39586c8b3e738452 |
| 2 |
Author: S. Lockwood-Childs <sjl <AT> vctlabs <DOT> com> |
| 3 |
AuthorDate: Wed May 23 09:42:14 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 4 22:08:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e0f93f2f |
| 7 |
|
| 8 |
app-admin/hardinfo: add package |
| 9 |
|
| 10 |
fix compiler error by renaming "stdout" struct member |
| 11 |
|
| 12 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 13 |
|
| 14 |
app-admin/hardinfo/Manifest | 1 + |
| 15 |
app-admin/hardinfo/files/hardinfo-musl.patch | 25 ++++++++++++++++++++ |
| 16 |
.../hardinfo/hardinfo-0.5.2_pre20130823.ebuild | 27 ++++++++++++++++++++++ |
| 17 |
app-admin/hardinfo/metadata.xml | 5 ++++ |
| 18 |
4 files changed, 58 insertions(+) |
| 19 |
|
| 20 |
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..cc90aef |
| 23 |
--- /dev/null |
| 24 |
+++ b/app-admin/hardinfo/Manifest |
| 25 |
@@ -0,0 +1 @@ |
| 26 |
+DIST hardinfo-0.5.2_pre20130823.tar.xz 280472 BLAKE2B d72883e7e57234b3328d03daf4d81cc478b383b51f4de08981792c42b3278ede81731ca831fbc285a594aa7f00f861c870aa6d784b7c282960f5541f04f9ce45 SHA512 e36bd4eec0090461de5fdb6c17dccf76937ee8fa9cb3411068fc568847f519023037999278bbb8b9a24608ed5b1d7fd2bebfe7115c631ccca1c35fa259cb20b1 |
| 27 |
|
| 28 |
diff --git a/app-admin/hardinfo/files/hardinfo-musl.patch b/app-admin/hardinfo/files/hardinfo-musl.patch |
| 29 |
new file mode 100644 |
| 30 |
index 0000000..70151eb |
| 31 |
--- /dev/null |
| 32 |
+++ b/app-admin/hardinfo/files/hardinfo-musl.patch |
| 33 |
@@ -0,0 +1,25 @@ |
| 34 |
+Rename struct member to fix build failure with musl: |
| 35 |
+ |
| 36 |
+ modules/computer.c:240:27: error: expected identifier before '(' token |
| 37 |
+ if (detect_lang[i].stdout) { |
| 38 |
+ ^ |
| 39 |
+--- hardinfo-0.5.2_pre20130823/modules/computer.c.orig 2018-05-22 13:02:50.873031729 -0700 |
| 40 |
++++ hardinfo-0.5.2_pre20130823/modules/computer.c 2018-05-22 13:02:54.537055912 -0700 |
| 41 |
+@@ -194,7 +194,7 @@ |
| 42 |
+ gchar *compiler_name; |
| 43 |
+ gchar *version_command; |
| 44 |
+ gchar *regex; |
| 45 |
+- gboolean stdout; |
| 46 |
++ gboolean out; |
| 47 |
+ } detect_lang[] = { |
| 48 |
+ { "Scripting Languages", NULL, FALSE }, |
| 49 |
+ { "CPython", "python -V", "\\d+\\.\\d+\\.\\d+", FALSE }, |
| 50 |
+@@ -237,7 +237,7 @@ |
| 51 |
+ continue; |
| 52 |
+ } |
| 53 |
+ |
| 54 |
+- if (detect_lang[i].stdout) { |
| 55 |
++ if (detect_lang[i].out) { |
| 56 |
+ found = g_spawn_command_line_sync(detect_lang[i].version_command, &output, NULL, NULL, NULL); |
| 57 |
+ } else { |
| 58 |
+ found = g_spawn_command_line_sync(detect_lang[i].version_command, NULL, &output, NULL, NULL); |
| 59 |
|
| 60 |
diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild |
| 61 |
new file mode 100644 |
| 62 |
index 0000000..bd12e60 |
| 63 |
--- /dev/null |
| 64 |
+++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild |
| 65 |
@@ -0,0 +1,27 @@ |
| 66 |
+# Copyright 1999-2018 Gentoo Foundation |
| 67 |
+# Distributed under the terms of the GNU General Public License v2 |
| 68 |
+ |
| 69 |
+EAPI=5 |
| 70 |
+ |
| 71 |
+inherit cmake-utils |
| 72 |
+ |
| 73 |
+DESCRIPTION="A system information and benchmark tool for Linux systems" |
| 74 |
+HOMEPAGE="http://hardinfo.org/" |
| 75 |
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz" |
| 76 |
+ |
| 77 |
+LICENSE="GPL-2" |
| 78 |
+SLOT="0" |
| 79 |
+KEYWORDS="amd64 x86" |
| 80 |
+IUSE="" |
| 81 |
+ |
| 82 |
+RDEPEND="dev-libs/glib:2 |
| 83 |
+ net-libs/libsoup |
| 84 |
+ x11-libs/gdk-pixbuf |
| 85 |
+ x11-libs/gtk+:2 |
| 86 |
+ x11-libs/pango" |
| 87 |
+DEPEND="${RDEPEND} |
| 88 |
+ virtual/pkgconfig" |
| 89 |
+ |
| 90 |
+PATCHES=( |
| 91 |
+ "${FILESDIR}"/${PN}-musl.patch |
| 92 |
+) |
| 93 |
|
| 94 |
diff --git a/app-admin/hardinfo/metadata.xml b/app-admin/hardinfo/metadata.xml |
| 95 |
new file mode 100644 |
| 96 |
index 0000000..6f49eba |
| 97 |
--- /dev/null |
| 98 |
+++ b/app-admin/hardinfo/metadata.xml |
| 99 |
@@ -0,0 +1,5 @@ |
| 100 |
+<?xml version="1.0" encoding="UTF-8"?> |
| 101 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 102 |
+<pkgmetadata> |
| 103 |
+<!-- maintainer-needed --> |
| 104 |
+</pkgmetadata> |
Archives