* [gentoo-commits] proj/musl:master commit in: app-admin/hardinfo/, app-admin/hardinfo/files/
@ 2020-01-17 0:42 Jory Pratt
0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt @ 2020-01-17 0:42 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/musl:master commit in: app-admin/hardinfo/, app-admin/hardinfo/files/
@ 2021-03-13 21:02 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-03-13 21:02 UTC (permalink / raw
To: gentoo-commits
commit: f691ecae3856f1c14f48166bc136982034ffbe1a
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 13 12:52:09 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 21:02:39 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f691ecae
app-admin/hardinfo: remove from overlay
Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --force
Manifest-Sign-Key: 0xA1919C830E9498E0
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
Closes: https://github.com/gentoo/musl/pull/405
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/hardinfo/Manifest | 1 -
app-admin/hardinfo/files/hardinfo-musl.patch | 36 ----------------------
.../hardinfo/hardinfo-0.5.2_pre20130823.ebuild | 27 ----------------
app-admin/hardinfo/metadata.xml | 5 ---
4 files changed, 69 deletions(-)
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
deleted file mode 100644
index cc90aef..0000000
--- a/app-admin/hardinfo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 4aac094..0000000
--- a/app-admin/hardinfo/files/hardinfo-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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) {
----
- 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;
-- gboolean stdout;
-+ gboolean out;
- } detect_lang[] = {
- { "Scripting Languages", NULL, FALSE },
- { "CPython", "python -V", "\\d+\\.\\d+\\.\\d+", FALSE },
-@@ -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
deleted file mode 100644
index b006400..0000000
--- a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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
deleted file mode 100644
index 6f49eba..0000000
--- a/app-admin/hardinfo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/musl:master commit in: app-admin/hardinfo/, app-admin/hardinfo/files/
@ 2018-07-04 22:08 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2018-07-04 22:08 UTC (permalink / raw
To: gentoo-commits
commit: e0f93f2f3e042cbed4b5257f39586c8b3e738452
Author: S. Lockwood-Childs <sjl <AT> vctlabs <DOT> com>
AuthorDate: Wed May 23 09:42:14 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> 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 <blueness <AT> 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-13 21:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-17 0:42 [gentoo-commits] proj/musl:master commit in: app-admin/hardinfo/, app-admin/hardinfo/files/ Jory Pratt
-- strict thread matches above, loose matches on Subject: below --
2021-03-13 21:02 Sam James
2018-07-04 22:08 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox