[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmCalClock/files/, x11-plugins/wmCalClock/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmCalClock/files/, x11-plugins/wmCalClock/

[Bernard Cafarelli]

commit:     89c42194bc3c288dd15809d56393e415c436079e
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jun 11 20:18:29 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Jun 14 09:01:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c42194

x11-plugins/wmCalClock: EAPI7, use HTTPS, improve ebuild

 .../files/wmCalClock-1.25-makefile.patch           |  4 +--
 x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild   | 31 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch b/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch
index 64046c83f4b..68756636be2 100644
--- a/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch
+++ b/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	1999-03-27 07:46:38.000000000 +0100
-+++ Makefile	2008-01-27 22:45:09.000000000 +0100
+--- a/Makefile	1999-03-27 07:46:38.000000000 +0100
++++ b/Makefile	2008-01-27 22:45:09.000000000 +0100
 @@ -1,8 +1,8 @@
 -CC     = gcc
 -CFLAGS = -O2 -Wall

diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
new file mode 100644
index 00000000000..b211b179bcf
--- /dev/null
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.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="WMaker DockApp: A Calendar clock with antialiased text"
+HOMEPAGE="https://www.dockapps.net/wmcalclock"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${P}/Src"
+
+DOCS=( ../{BUGS,CHANGES,HINTS,README,TODO} )
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)" LIBDIR="-L/usr/$(get_libdir)/"
+}

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmCalClock/files/, x11-plugins/wmCalClock/

[Bernard Cafarelli]

commit:     66edbfc31b168de0d42a813e0c810d558b437a2c
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 17:57:29 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 18:26:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66edbfc3

x11-plugins/wmCalClock: fix build with -fno-common

Closes: https://bugs.gentoo.org/706686
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../wmCalClock/files/wmCalClock-1.25-gcc-10.patch  | 35 ++++++++++++++++++++++
 x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild   |  7 +++--
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch b/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch
new file mode 100644
index 00000000000..c6a737e6b44
--- /dev/null
+++ b/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch
@@ -0,0 +1,35 @@
+diff -Naur wmCalClock-1.25.orig/Src/xutils.c wmCalClock-1.25/Src/xutils.c
+--- a/xutils.c	1999-03-27 07:46:38.000000000 +0100
++++ b/xutils.c	2020-01-29 18:55:05.062360592 +0100
+@@ -52,6 +52,11 @@
+ GC		NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
++Window      Root;
++Window      iconwin, win;
++int         screen; 
++int         DisplayDepth;
+ 
+ 
+ /*
+diff -Naur wmCalClock-1.25.orig/Src/xutils.h wmCalClock-1.25/Src/xutils.h
+--- a/xutils.h	1999-03-27 07:46:38.000000000 +0100
++++ b/xutils.h	2020-01-29 18:54:54.360359886 +0100
+@@ -18,11 +18,11 @@
+ /*
+  *   Global variable
+  */
+-Display		*display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen; 
+-int             DisplayDepth;
++extern Display	*display;
++extern Window   Root;
++extern Window   iconwin, win;
++extern int      screen; 
++extern int      DisplayDepth;
+ 
+ 
+ 

diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
index 3ace8130324..c7508ab5e8e 100644
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.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
@@ -24,7 +24,10 @@ S="${WORKDIR}/${P}/Src"
 
 DOCS=( ../{BUGS,CHANGES,HINTS,README,TODO} )
 
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+	)
 
 src_compile() {
 	emake CC="$(tc-getCC)" LIBDIR="-L/usr/$(get_libdir)/"