* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmpop3lb/, x11-plugins/wmpop3lb/files/
@ 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: cfe8855f79cb29d24b14426fabbafb0aebbe1c75
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 12:25:03 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=cfe8855f
x11-plugins/wmpop3lb: fix compilation with gcc 5, bug #569234
Package-Manager: portage-2.2.26
.../wmpop3lb/files/wmpop3lb-2.4.2-list.patch | 127 +++++++++++++++++++++
x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild | 4 +-
2 files changed, 130 insertions(+), 1 deletion(-)
diff --git a/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch
new file mode 100644
index 0000000..604498f
--- /dev/null
+++ b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c 2016-01-04 13:22:26.492218531 +0100
++++ wmgeneral/list.c 2016-01-04 13:22:59.018229270 +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:22:26.492218531 +0100
++++ wmgeneral/list.h 2016-01-04 13:22:30.028219699 +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
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
index 4c005d6..7eadfc9 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -36,6 +36,8 @@ src_prepare() {
#Honour Gentoo LDFLAGS - bug #335986
sed -i -e "s:\$(FLAGS) -o wmpop3lb:\$(LDFLAGS) -o wmpop3lb:" "wmpop3/Makefile"
+
+ epatch "${FILESDIR}"/${P}-list.patch
}
src_compile() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmpop3lb/, x11-plugins/wmpop3lb/files/
@ 2018-06-12 21:38 Bernard Cafarelli
0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli @ 2018-06-12 21:38 UTC (permalink / raw
To: gentoo-commits
commit: 88694ef713d47540ca303a46ce44c9f2f453f1a5
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jun 12 18:01:18 2018 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 21:37:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88694ef7
x11-plugins/wmpop3lb: EAPI7, improve ebuild, use HTTPs
...2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch | 4 +-
.../wmpop3lb/files/wmpop3lb-2.4.2-list.patch | 12 +++---
x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild | 44 ++++++++++++++++++++++
3 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch
index 16cbe4ed6bc..93d2ab29174 100644
--- a/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch
+++ b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch
@@ -1,5 +1,5 @@
---- wmpop3lb2.4.2/wmpop3/Pop3Client.c 2002-06-27 16:04:42.000000000 +0200
-+++ wmpop3lb2.4.2-pathed/wmpop3/Pop3Client.c 2007-01-11 14:39:12.000000000 +0200
+--- a/wmpop3/Pop3Client.c 2002-06-27 16:04:42.000000000 +0200
++++ b/wmpop3/Pop3Client.c 2007-01-11 14:39:12.000000000 +0200
@@ -27,6 +27,49 @@
#include "Pop3Client.h"
diff --git a/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch
index 604498f3b31..684b5a171c9 100644
--- a/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch
+++ b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch
@@ -1,6 +1,6 @@
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
---- wmgeneral.orig/list.c 2016-01-04 13:22:26.492218531 +0100
-+++ wmgeneral/list.c 2016-01-04 13:22:59.018229270 +0100
+diff -Naur a/wmgeneral/list.c b/wmgeneral/list.c
+--- a/wmgeneral/list.c 2016-01-04 13:22:26.492218531 +0100
++++ b/wmgeneral/list.c 2016-01-04 13:22:59.018229270 +0100
@@ -38,7 +38,7 @@
/* Return a cons cell produced from (head . tail) */
@@ -82,9 +82,9 @@ 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:22:26.492218531 +0100
-+++ wmgeneral/list.h 2016-01-04 13:22:30.028219699 +0100
+diff -Naur a/wmgeneral/list.h b/wmgeneral/list.h
+--- a/wmgeneral/list.h 2016-01-04 13:22:26.492218531 +0100
++++ b/wmgeneral/list.h 2016-01-04 13:22:30.028219699 +0100
@@ -29,31 +29,25 @@
#ifndef __LIST_H_
#define __LIST_H_
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
new file mode 100644
index 00000000000..b9cf7b50e8e
--- /dev/null
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="dockapp for checking up to 7 pop3 accounts"
+HOMEPAGE="https://www.dockapps.net/wmpop3lb"
+SRC_URI="https://www.dockapps.net/download/${P/-}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/-}
+
+PATCHES=( "${FILESDIR}"/${P}-fix-RECV-and-try-STAT-if-LAST-wont-work.patch
+ "${FILESDIR}"/${P}-list.patch )
+
+src_prepare() {
+ #Honour Gentoo CFLAGS
+ sed -i -e "s:-g2 -D_DEBUG:${CFLAGS}:" "wmpop3/Makefile" || die
+
+ #De-hardcode compiler
+ sed -i -e "s:cc:\$(CC):g" "wmpop3/Makefile" || die
+
+ #Honour Gentoo LDFLAGS - bug #335986
+ sed -i -e "s:\$(FLAGS) -o wmpop3lb:\$(LDFLAGS) -o wmpop3lb:" "wmpop3/Makefile" || die
+ default
+}
+
+src_compile() {
+ emake -C wmpop3
+}
+
+src_install() {
+ dobin wmpop3/wmpop3lb
+ dodoc CHANGE_LOG README
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-12 21:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-12 21:38 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmpop3lb/, x11-plugins/wmpop3lb/files/ Bernard Cafarelli
-- 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