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
