[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmSMPmon/files/, x11-plugins/wmSMPmon/
commit: 56952c803f8f37df9896b9016cf8ced7dc05f2b4
Author: Bernard Cafarelli gentoo org>
AuthorDate: Sun Mar 29 11:35:13 2020 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Sun Mar 29 11:35:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56952c80
x11-plugins/wmSMPmon: fix build with -fno-common
Closes: https://bugs.gentoo.org/707812
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli gentoo.org>
.../wmSMPmon/files/wmSMPmon-3.1-fno-common.patch | 36 ++
x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild| 11 +--
2 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-fno-common.patch
b/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-fno-common.patch
new file mode 100644
index 000..f1416fcc024
--- /dev/null
+++ b/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-fno-common.patch
@@ -0,0 +1,36 @@
+diff -Naur wmSMPmon-3.1.orig/wmgeneral/wmgeneral.h
wmSMPmon-3.1/wmgeneral/wmgeneral.h
+--- wmSMPmon-3.1.orig/wmgeneral/wmgeneral.h1999-04-25 05:08:22.0
+0200
wmSMPmon-3.1/wmgeneral/wmgeneral.h 2020-03-29 13:32:55.253627166 +0200
+@@ -36,7 +36,7 @@
+ /* Global variable */
+ /***/
+
+-Display *display;
++extern Display*display;
+
+ /***/
+ /* Function Prototypes */
+diff -Naur wmSMPmon-3.1.orig/wmSMPmon/standards.h
wmSMPmon-3.1/wmSMPmon/standards.h
+--- wmSMPmon-3.1.orig/wmSMPmon/standards.h 2004-11-19 14:57:30.0
+0100
wmSMPmon-3.1/wmSMPmon/standards.h 2020-03-29 13:32:14.39432 +0200
+@@ -37,7 +37,7 @@
+ #define HAUTEUR 31 /* Max. height of CPU Load Bar+Graph */
+
+ /* Program name used in error messages */
+-char *Myname;
++extern char *Myname;
+
+ /* NumCPUs_DoInit returns the number of CPUs present in the system and
+performs any initialization necessary for the sysinfo-XXX module */
+diff -Naur wmSMPmon-3.1.orig/wmSMPmon/wmSMPmon.c
wmSMPmon-3.1/wmSMPmon/wmSMPmon.c
+--- wmSMPmon-3.1.orig/wmSMPmon/wmSMPmon.c 2005-11-07 01:24:32.0
+0100
wmSMPmon-3.1/wmSMPmon/wmSMPmon.c 2020-03-29 13:33:03.630624637 +0200
+@@ -35,6 +35,8 @@
+ /*## Funcition definitions ##*/
+ void usage(int cpus, const char *str);
+
++char *Myname;
++Display *display;
+
+ /*## MAIN PROGRAM ###*/
+ int main(int argc, char **argv)
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
index 9619fe673e8..cc153566aa1 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,10 +22,17 @@ DEPEND="${RDEPEND}
DOCS=( ../Changelog )
-S="${WORKDIR}/${P}/${PN}"
+S=${WORKDIR}/${P}/${PN}
PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+src_prepare() {
+ default
+
+ pushd "${WORKDIR}"/${P} || die
+ eapply "${FILESDIR}"/${P}-fno-common.patch
+}
+
src_compile() {
emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmSMPmon/
commit: 55e09205cb89d51aa6c670234da62e94a8c25187
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Oct 5 13:49:32 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Oct 5 13:55:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e09205
x11-plugins/wmSMPmon: amd64 stable wrt bug #666088
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
index 268d59eb521..9619fe673e8 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmSMPmon/
commit: 59338734b4668bb82afa964f86eea8dd1cf99edd
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Oct 5 13:49:50 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Oct 5 13:55:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59338734
x11-plugins/wmSMPmon: Drop old
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild | 38 -
1 file changed, 38 deletions(-)
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
deleted file mode 100644
index 8005c831f09..000
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="SMP system monitor dockapp"
-HOMEPAGE="https://www.dockapps.net/wmsmpmon;
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXpm"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "compile
failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc ../Changelog
-}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmSMPmon/
commit: 5b5ea0d02d0961494bebdbaffccf0c6f0770c0dc
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Sep 19 18:18:23 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Sep 19 18:28:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5ea0d0
x11-plugins/wmSMPmon: x86 stable (bug #666088)
Package-Manager: Portage-2.3.49, Repoman-2.3.10
x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
index 5ec664e00fd..268d59eb521 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
RDEPEND="x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmSMPmon/
commit: 8cff6d4d9d33566a4d3008d2e97d61886a1fb768
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Mon Jun 11 20:17:03 2018 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Thu Jun 14 09:01:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cff6d4d
x11-plugins/wmSMPmon: use HTTPS
x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
index 7994fea1f0d..8005c831f09 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=0
inherit eutils multilib toolchain-funcs
DESCRIPTION="SMP system monitor dockapp"
-HOMEPAGE="http://www.dockapps.net/wmsmpmon;
-SRC_URI="http://www.dockapps.net/download/${P}.tar.gz;
+HOMEPAGE="https://www.dockapps.net/wmsmpmon;
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmSMPmon/files/, x11-plugins/wmSMPmon/
commit: d52abe88f3211bf2109f7c9b470250cae1929145
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Mon Jun 11 20:17:31 2018 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Thu Jun 14 09:01:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52abe88
x11-plugins/wmSMPmon: EAPI7, use HTTPS, improve ebuild
.../wmSMPmon/files/wmSMPmon-3.1-makefile.patch | 4 +--
x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild| 31 ++
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch
b/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch
index 1bd27f47c0f..3dd1b0636d8 100644
--- a/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch
+++ b/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch
@@ -1,5 +1,5 @@
Makefile.orig 2005-02-22 23:24:23.0 +0100
-+++ Makefile 2008-01-28 00:12:33.0 +0100
+--- a/Makefile 2005-02-22 23:24:23.0 +0100
b/Makefile 2008-01-28 00:12:33.0 +0100
@@ -2,22 +2,24 @@
# Adapted for wmSMPmon 2.9.x and higher: Thomas Ribbrock
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
new file mode 100644
index 000..5ec664e00fd
--- /dev/null
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="SMP system monitor dockapp"
+HOMEPAGE="https://www.dockapps.net/wmsmpmon;
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+DOCS=( ../Changelog )
+
+S="${WORKDIR}/${P}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_compile() {
+ emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmSMPmon/
commit: 7f3f04764bb7e7337a3642f5daea584e395f96b9
Author: Bernard Cafarelli gentoo org>
AuthorDate: Fri Nov 24 23:10:33 2017 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Fri Nov 24 23:16:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3f0476
x11-plugins/wmSMPmon: update homepage and SRC_URI
Package-Manager: Portage-2.3.16, Repoman-2.3.6
x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
index d411e871375..75c97998bf5 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils multilib toolchain-funcs
DESCRIPTION="SMP system monitor dockapp"
-HOMEPAGE="http://lancre.ribbrock.org/binabit/wmSMPmon/;
-SRC_URI="http://lancre.ribbrock.org/binabit/wmSMPmon/src/${P}.tar.gz;
+HOMEPAGE="http://www.dockapps.net/wmsmpmon;
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
