[gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/
commit: c08d9319231c7757161fadcac5db349ba3a812ef Author: Conrad Kostecki gentoo org> AuthorDate: Thu Mar 4 23:03:38 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Thu Mar 4 23:03:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c08d9319 x11-plugins/asmon: update HOMEPAGE, SRC_URI Closes: https://bugs.gentoo.org/680450 Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Conrad Kostecki gentoo.org> x11-plugins/asmon/Manifest | 2 +- x11-plugins/asmon/asmon-0.71-r1.ebuild | 18 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/x11-plugins/asmon/Manifest b/x11-plugins/asmon/Manifest index d2fec4ee050..a814dd78a45 100644 --- a/x11-plugins/asmon/Manifest +++ b/x11-plugins/asmon/Manifest @@ -1 +1 @@ -DIST asmon-0.71.tar.bz2 42235 BLAKE2B 5e82638ae115ea088e4936615e8a67074cb8a1bde42607f37837edb1d774f24bb71d3db1d69780e4810eafcdaef681306fc07ce50e8eed1a96edf610cc081cbc SHA512 20d321b228e0157e9e2611eeac017fdf6a9e9eb8ba6e02c7c30adadb411529da408b7a543e18b30de0659ccf4f86bfde21bef392e2a4756803c58a9f28c31c45 +DIST asmon-0.71.tar.gz 48359 BLAKE2B 0aa76a5d09f64a21a13ae735eefbe5b0f7504073da8c1aad5c009b1435a6f800eb191093542bee46677033a7a995100af051375ceab6f3c57d302f07747a4d16 SHA512 9ae6668da2507335268e046f216dbb5ebb11f3d9d7a1f7c994b297e791b33ce70a804a75f98d23a0a7a05916515802ca488d0ff44fd51e2737bb3686120700ef diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild index 2d2ce19ee4e..4aa0fba56eb 100644 --- a/x11-plugins/asmon/asmon-0.71-r1.ebuild +++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,19 +6,23 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="WindowMaker/AfterStep system monitor dockapp" -HOMEPAGE="http://rio.vg/asmon; -SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2; +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage; +SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ppc sparc x86" -RDEPEND="x11-libs/libXext +RDEPEND=" + x11-libs/libXext x11-libs/libXpm - x11-libs/libX11" -DEPEND="${RDEPEND} - x11-base/xorg-proto" + x11-libs/libX11 +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/files/, x11-plugins/asmon/
commit: 645b62c84d25e8d90617e53cd62b5cf9bc1b2ac3 Author: Sam James gentoo org> AuthorDate: Sun Nov 1 05:01:40 2020 + Commit: Sam James gentoo org> CommitDate: Sun Nov 1 05:02:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645b62c8 x11-plugins/asmon: fix build with gcc 10 Closes: https://bugs.gentoo.org/708118 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> x11-plugins/asmon/asmon-0.71-r1.ebuild | 18 ++ .../asmon/files/asmon-0.71-fno-common.patch| 22 ++ x11-plugins/asmon/files/asmon-0.71-list.patch | 10 -- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild index 2c91504fc69..2d2ce19ee4e 100644 --- a/x11-plugins/asmon/asmon-0.71-r1.ebuild +++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="WindowMaker/AfterStep system monitor dockapp" HOMEPAGE="http://rio.vg/asmon; SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2; +S="${WORKDIR}/${P}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ppc sparc x86" -IUSE="" RDEPEND="x11-libs/libXext x11-libs/libXpm @@ -19,13 +20,14 @@ RDEPEND="x11-libs/libXext DEPEND="${RDEPEND} x11-base/xorg-proto" -S=${WORKDIR}/${P}/${PN} - src_prepare() { + default + sed -i -e "s:gcc:$(tc-getCC):g" Makefile || die - cd "${WORKDIR}"/${P} || die - epatch "${FILESDIR}"/${P}-list.patch + cd "../wmgeneral" || die + eapply "${FILESDIR}/${P}-list.patch" + eapply "${FILESDIR}/${P}-fno-common.patch" } src_compile() { diff --git a/x11-plugins/asmon/files/asmon-0.71-fno-common.patch b/x11-plugins/asmon/files/asmon-0.71-fno-common.patch new file mode 100644 index 000..831d6b25816 --- /dev/null +++ b/x11-plugins/asmon/files/asmon-0.71-fno-common.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/708118 +--- a/wmgeneral.c b/wmgeneral.c +@@ -50,6 +50,7 @@ Window iconwin, win; + GCNormalGC; + XpmIcon wmgen; + Pixmappixmask; ++Display *display; + + /*/ + /* Mouse Regions */ +--- a/wmgeneral.h b/wmgeneral.h +@@ -28,7 +28,7 @@ typedef struct { + /* Global variable */ + /***/ + +-Display *display; ++extern Display*display; + + /***/ + /* Function Prototypes */ diff --git a/x11-plugins/asmon/files/asmon-0.71-list.patch b/x11-plugins/asmon/files/asmon-0.71-list.patch index 1b1ac317669..89e9ef32167 100644 --- a/x11-plugins/asmon/files/asmon-0.71-list.patch +++ b/x11-plugins/asmon/files/asmon-0.71-list.patch @@ -1,6 +1,5 @@ -diff -Naur wmgeneral.orig/list.c wmgeneral/list.c wmgeneral.orig/list.c 2016-01-04 13:28:36.583339716 +0100 -+++ wmgeneral/list.c 2016-01-04 13:28:48.694343645 +0100 +--- a/list.c b/list.c @@ -38,7 +38,7 @@ /* Return a cons cell produced from (head . tail) @@ -82,9 +81,8 @@ diff -Naur wmgeneral.orig/list.c wmgeneral/list.c list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) -diff -Naur wmgeneral.orig/list.h wmgeneral/list.h wmgeneral.orig/list.h 2016-01-04 13:28:36.583339716 +0100 -+++ wmgeneral/list.h 2016-01-04 13:28:39.471340654 +0100 +--- a/list.h b/list.h @@ -29,31 +29,25 @@ #ifndef __LIST_H_ #define __LIST_H_
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/
commit: f02f8f1531a2000b49031b4a982d977dac5fcb60 Author: Michał Górny gentoo org> AuthorDate: Sat Oct 12 07:05:01 2019 + Commit: Michał Górny gentoo org> CommitDate: Sat Oct 12 07:06:28 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f02f8f15 x11-plugins/asmon: Drop old (EAPI 0) Signed-off-by: Michał Górny gentoo.org> x11-plugins/asmon/asmon-0.71.ebuild | 39 - 1 file changed, 39 deletions(-) diff --git a/x11-plugins/asmon/asmon-0.71.ebuild b/x11-plugins/asmon/asmon-0.71.ebuild deleted file mode 100644 index b94604bd5ee..000 --- a/x11-plugins/asmon/asmon-0.71.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit toolchain-funcs - -DESCRIPTION="WindowMaker/AfterStep system monitor dockapp" -HOMEPAGE="http://rio.vg/asmon; -SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc sparc x86" -IUSE="" - -RDEPEND="x11-libs/libXext - x11-libs/libXpm - x11-libs/libX11" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S=${WORKDIR}/${P}/${PN} - -src_unpack() { - unpack ${A} - sed -i -e "s:gcc:$(tc-getCC):g" "${S}"/Makefile -} - -src_compile() { - emake clean || die "emake clean failed." - emake SOLARIS="${CFLAGS}" LIBDIR="${LDFLAGS}" \ - || die "emake failed." -} - -src_install() { - dobin ${PN} - dodoc ../Changelog -}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/
commit: 871d32cd902f5b1c0e5d8336444baacecfb28d99 Author: Matt Turner gentoo org> AuthorDate: Sat Oct 12 04:15:06 2019 + Commit: Matt Turner gentoo org> CommitDate: Sat Oct 12 04:29:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871d32cd x11-plugins/asmon: drop to ~alpha, bug 696390 Signed-off-by: Matt Turner gentoo.org> x11-plugins/asmon/asmon-0.71.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/asmon/asmon-0.71.ebuild b/x11-plugins/asmon/asmon-0.71.ebuild index 6bea68eeba7..b94604bd5ee 100644 --- a/x11-plugins/asmon/asmon-0.71.ebuild +++ b/x11-plugins/asmon/asmon-0.71.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2; LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ppc sparc x86" +KEYWORDS="~alpha amd64 ppc sparc x86" IUSE="" RDEPEND="x11-libs/libXext
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/
commit: 5150067c71c72c7af05465b99cfdfe633e612749 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Oct 7 19:17:35 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Oct 7 19:17:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5150067c x11-plugins/asmon: stable 0.71-r1 for ppc, bug #696390 Package-Manager: Portage-2.3.76, Repoman-2.3.17 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> x11-plugins/asmon/asmon-0.71-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild index 7eec6c2d16a..2c91504fc69 100644 --- a/x11-plugins/asmon/asmon-0.71-r1.ebuild +++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc sparc x86" +KEYWORDS="~alpha amd64 ppc sparc x86" IUSE="" RDEPEND="x11-libs/libXext
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/
commit: 23d8fcafa144c524e841595cee5f8a00199abd7c Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Oct 7 10:44:11 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Oct 7 10:44:11 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d8fcaf x11-plugins/asmon: sparc stable wrt bug #696390 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> x11-plugins/asmon/asmon-0.71-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild index 389c6d4601e..7eec6c2d16a 100644 --- a/x11-plugins/asmon/asmon-0.71-r1.ebuild +++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~sparc x86" +KEYWORDS="~alpha amd64 ~ppc sparc x86" IUSE="" RDEPEND="x11-libs/libXext
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/
commit: 36e10f71583e8874ea4060c7470873850f71b6e9 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Oct 7 08:41:42 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Oct 7 08:41:42 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36e10f71 x11-plugins/asmon: amd64 stable wrt bug #696390 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> x11-plugins/asmon/asmon-0.71-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild index c86b2f353b5..389c6d4601e 100644 --- a/x11-plugins/asmon/asmon-0.71-r1.ebuild +++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86" +KEYWORDS="~alpha amd64 ~ppc ~sparc x86" IUSE="" RDEPEND="x11-libs/libXext
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/files/
commit: 1687fb4190e289d50bfff7b49edc8cdc46852376 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Jan 4 12:57:36 2016 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Jan 4 12:57:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1687fb41 x11-plugins/asmon: unused file Package-Manager: portage-2.2.26 x11-plugins/asmon/files/asmon-0.7.cflags.diff | 31 --- 1 file changed, 31 deletions(-) diff --git a/x11-plugins/asmon/files/asmon-0.7.cflags.diff b/x11-plugins/asmon/files/asmon-0.7.cflags.diff deleted file mode 100644 index b69c692..000 --- a/x11-plugins/asmon/files/asmon-0.7.cflags.diff +++ /dev/null @@ -1,31 +0,0 @@ asmon/Makefile.orig1999-06-26 03:35:13.0 +0200 -+++ asmon/Makefile 2006-08-24 20:21:52.0 +0200 -@@ -4,7 +4,7 @@ - #SOLARIS_LIBS = -lsocket -lkstat - #SOLARIS_OBJS = solaris26.o - --LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L/usr/lib - LIBS = -lXpm -lXext -lX11 $(SOLARIS_LIBS) - OBJS = asmon.o $(SOLARIS_OBJS) \ - ../wmgeneral/wmgeneral.o \ -@@ -12,16 +12,16 @@ - ../wmgeneral/list.o - - .c.o: -- gcc -c -Wall $(SOLARIS) $< -o $*.o -+ gcc -c -Wall $(CFLAGS) $(SOLARIS) $< -o $*.o - - asmon: $(OBJS) - gcc -o asmon $(OBJS) $(LIBDIR) $(LIBS) - - clean:: - for i in $(OBJS) ; do \ -- rm $$i;\ -+ rm -f $$i;\ - done -- rm asmon -+ rm -f asmon - - install:: - cp -f asmon /usr/local/bin
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/files/, x11-plugins/asmon/
commit: 8257db5a530efd327e25324952fb6f746be148bb Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Jan 4 12:54:16 2016 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Jan 4 12:56:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8257db5a x11-plugins/asmon: fix compilation with gcc 5, bug #569756 Cleaned ebuild with EAPI bump Package-Manager: portage-2.2.26 x11-plugins/asmon/asmon-0.71-r1.ebuild| 40 x11-plugins/asmon/files/asmon-0.71-list.patch | 127 ++ 2 files changed, 167 insertions(+) diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild new file mode 100644 index 000..c423506 --- /dev/null +++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils toolchain-funcs + +DESCRIPTION="WindowMaker/AfterStep system monitor dockapp" +HOMEPAGE="http://rio.vg/asmon; +SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +IUSE="" + +RDEPEND="x11-libs/libXext + x11-libs/libXpm + x11-libs/libX11" +DEPEND="${RDEPEND} + x11-proto/xextproto" + +S=${WORKDIR}/${P}/${PN} + +src_prepare() { + sed -i -e "s:gcc:$(tc-getCC):g" Makefile || die + + cd "${WORKDIR}"/${P} || die + epatch "${FILESDIR}"/${P}-list.patch +} + +src_compile() { + emake clean + emake SOLARIS="${CFLAGS}" LIBDIR="${LDFLAGS}" +} + +src_install() { + dobin ${PN} + dodoc ../Changelog +} diff --git a/x11-plugins/asmon/files/asmon-0.71-list.patch b/x11-plugins/asmon/files/asmon-0.71-list.patch new file mode 100644 index 000..1b1ac31 --- /dev/null +++ b/x11-plugins/asmon/files/asmon-0.71-list.patch @@ -0,0 +1,127 @@ +diff -Naur wmgeneral.orig/list.c wmgeneral/list.c +--- wmgeneral.orig/list.c 2016-01-04 13:28:36.583339716 +0100 wmgeneral/list.c 2016-01-04 13:28:48.694343645 +0100 +@@ -38,7 +38,7 @@ + + /* Return a cons cell produced from (head . tail) + +-INLINE LinkedList* ++LinkedList* + list_cons(void* head, LinkedList* tail) + { + LinkedList* cell; +@@ -51,7 +51,7 @@ + + /* Return the length of a list, list_length(NULL) returns zero + +-INLINE int ++int + list_length(LinkedList* list) + { + int i = 0; +@@ -66,7 +66,7 @@ + /* Return the Nth element of LIST, where N count from zero. If N +larger than the list length, NULL is returned + +-INLINE void* ++void* + list_nth(int index, LinkedList* list) + { + while(index-- != 0) +@@ -81,7 +81,7 @@ + + /* Remove the element at the head by replacing it by its successor + +-INLINE void ++void + list_remove_head(LinkedList** list) + { + if (!*list) return; +@@ -101,7 +101,7 @@ + + /* Remove the element with `car' set to ELEMENT + /* +-INLINE void ++void + list_remove_elem(LinkedList** list, void* elem) + { + while (*list) +@@ -112,7 +112,7 @@ + } + + +-INLINE LinkedList * ++LinkedList * + list_remove_elem(LinkedList* list, void* elem) + { + LinkedList *tmp; +@@ -132,7 +132,7 @@ + + /* Return element that has ELEM as car + +-INLINE LinkedList* ++LinkedList* + list_find(LinkedList* list, void* elem) + { + while(list) +@@ -146,7 +146,7 @@ + + /* Free list (backwards recursive) + +-INLINE void ++void + list_free(LinkedList* list) + { + if(list) +@@ -158,7 +158,7 @@ + + /* Map FUNCTION over all elements in LIST + +-INLINE void ++void + list_mapcar(LinkedList* list, void(*function)(void*)) + { + while(list) +diff -Naur wmgeneral.orig/list.h wmgeneral/list.h +--- wmgeneral.orig/list.h 2016-01-04 13:28:36.583339716 +0100 wmgeneral/list.h 2016-01-04 13:28:39.471340654 +0100 +@@ -29,31 +29,25 @@ + #ifndef __LIST_H_ + #define __LIST_H_ + +-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +-# define INLINE inline +-#else +-# define INLINE +-#endif +- + typedef struct LinkedList { + void *head; + struct LinkedList *tail; + } LinkedList; + +-INLINE LinkedList* list_cons(void* head, LinkedList* tail); ++LinkedList* list_cons(void* head, LinkedList* tail); + +-INLINE int list_length(LinkedList* list); ++int list_length(LinkedList* list); + +-INLINE void* list_nth(int index, LinkedList* list); ++void* list_nth(int index, LinkedList* list); + +-INLINE void list_remove_head(LinkedList** list); ++void list_remove_head(LinkedList** list); + +-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem); ++LinkedList *list_remove_elem(LinkedList* list, void* elem); + +-INLINE void list_mapcar(LinkedList* list, void(*function)(void*)); ++void list_mapcar(LinkedList* list, void(*function)(void*)); + +-INLINE LinkedList*list_find(LinkedList* list, void* elem); ++LinkedList*list_find(LinkedList* list, void* elem); + +-INLINE void list_free(LinkedList* list); ++void list_free(LinkedList* list); + + #endif