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

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

[Bernard Cafarelli]

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

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

 .../wmMatrix/files/wmMatrix-0.2-makefile.patch     |  4 +--
 x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild        | 31 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmMatrix/files/wmMatrix-0.2-makefile.patch b/x11-plugins/wmMatrix/files/wmMatrix-0.2-makefile.patch
index 5225ad38f67..691ff7e424d 100644
--- a/x11-plugins/wmMatrix/files/wmMatrix-0.2-makefile.patch
+++ b/x11-plugins/wmMatrix/files/wmMatrix-0.2-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	1999-08-16 18:01:58.000000000 +0200
-+++ Makefile	2008-01-27 23:23:36.000000000 +0100
+--- a/Makefile	1999-08-16 18:01:58.000000000 +0200
++++ b/Makefile	2008-01-27 23:23:36.000000000 +0100
 @@ -1,8 +1,8 @@
 -CC     = gcc
 -CFLAGS = -O2 -Wall 

diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
new file mode 100644
index 00000000000..2b088ebf2f1
--- /dev/null
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.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: Slightly modified version of Jamie Zawinski's xmatrix screenhack"
+HOMEPAGE="https://www.dockapps.net/wmmatrix"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+CDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${CDEPEND}
+	x11-base/xorg-proto"
+RDEPEND="${CDEPEND}
+	x11-misc/xscreensaver"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_compile() {
+	# this version is distributed with compiled binaries!
+	make clean
+	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}

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

[Bernard Cafarelli]

commit:     cf12d7fd5d98f5209513bcc9b93388e98d785fd5
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  2 23:28:08 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 23:28:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf12d7fd

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

Thanks jer for patch

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

 .../wmMatrix/files/wmMatrix-0.2-fno-common.patch   | 37 ++++++++++++++++++++++
 x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild        |  7 ++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch b/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch
new file mode 100644
index 00000000000..1bb92d66a6c
--- /dev/null
+++ b/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch
@@ -0,0 +1,37 @@
+--- a/xutils.h
++++ b/xutils.h
+@@ -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;
+ 
+ 
+ 
+--- a/xutils.c
++++ b/xutils.c
+@@ -42,6 +42,15 @@
+ #include "xutils.h"
+ 
+ 
++/*
++ *   Global variable
++ */
++Display		*display;
++Window          Root;
++Window          iconwin, win;
++int             screen; 
++int             DisplayDepth;
++
+ 
+ /*
+  *   X11 Variables 

diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
index e6692825831..5b686f451ee 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.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
@@ -22,7 +22,10 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
 
 src_compile() {
 	# this version is distributed with compiled binaries!