* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/files/, x11-plugins/asmon/
@ 2016-01-04 12:57 Bernard Cafarelli
0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli @ 2016-01-04 12:57 UTC (permalink / raw
To: gentoo-commits
commit: 8257db5a530efd327e25324952fb6f746be148bb
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 12:54:16 2016 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 12:56:48 2016 +0000
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 0000000..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 0000000..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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/files/, x11-plugins/asmon/
@ 2020-11-01 5:02 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2020-11-01 5:02 UTC (permalink / raw
To: gentoo-commits
commit: 645b62c84d25e8d90617e53cd62b5cf9bc1b2ac3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 1 05:01:40 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 1 05:02:06 2020 +0000
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 <sam <AT> 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 00000000000..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;
+ GC NormalGC;
+ XpmIcon wmgen;
+ Pixmap pixmask;
++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_
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-01 5:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-01 5:02 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmon/files/, x11-plugins/asmon/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2016-01-04 12:57 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox