From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- x11-plugins/wmfrog/Manifest | 3 +- x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch | 36 ++++++++++++++++++++++ x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild | 3 +- 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch (limited to 'x11-plugins/wmfrog') diff --git a/x11-plugins/wmfrog/Manifest b/x11-plugins/wmfrog/Manifest index 52d598fa01a6..d6b073c9054f 100644 --- a/x11-plugins/wmfrog/Manifest +++ b/x11-plugins/wmfrog/Manifest @@ -1,3 +1,4 @@ +AUX wmfrog-0.3.1-gcc-10.patch 871 BLAKE2B c9aa926d5657ecadff21413f164a07c6e9ac40fb142bee2a669ac62a11cd0f765642bede1e5732e2702b3d04fa68bb9e8af54089634a652d73da0cbf5cd9d6dd SHA512 7fb0217ac69f552ab3d58a6c8d3ac7d6252fd2e9a1186d2ffd99e9d4d29072156d09b932f1353df64bc0fe18ae4a17eee4349c6ed7254afd623ff8d033efcf1e DIST wmfrog-0.3.1.tgz 128499 BLAKE2B 5bde4ccf41fda8e1a7e4fe9d40727e0d86d65830cc749955f5b1c97949c543f8f7253ddc6fffa48fc606e23c2ff6b4c66e07c66807a43e02f68961dfbb20d683 SHA512 35cd7da8ec0173f4799119191cd28befaed0fd5ea09c0dd2e9789ce37e9a1a4a83a9fb4562051a8da9c1449eafc8299c86914cb6f0e5bc35bd051560442af7ee -EBUILD wmfrog-0.3.1-r1.ebuild 667 BLAKE2B a8681e90de83acdf40bbe8297aed249ad0c19c6a352bcd68c496a651c09ee399ed872bd2704486ca995cfc3c80efe12e4962e7eb6ce3bd0ca2db60d49299c3ca SHA512 ba65b0d12577829123c55f97830d9ab554e097f305b5b38ba5526b1c06b786eb517ded7be86decb908877172b8269a5458d68d6320bff49f215929c99646884f +EBUILD wmfrog-0.3.1-r1.ebuild 711 BLAKE2B 93155549a667423a9c56b636626f1548e0b133b40388d28bfb786416735195cbe08bc324ffbc967925f85d0e0817c3bae76666d92d28e0c0dba1d5aad1a50d1f SHA512 411031fedff47abe6f991f3eab14afede4312fdb65aae5ed3ba33744f259fd7da375cfb8c59bbd919239c27e17639ee7ede881bf27c32f7c97432664127ebfc6 MISC metadata.xml 328 BLAKE2B 4d9379b73162de003a92fc6b9aa8bdce8969c815e2181b62a1be2331e422deb78ae7283a29f28a85a20ff7664378ee88e41f3db4cc302a2351f08e8a349e0fab SHA512 279b5bfe4731afe774f94c0588cb4939e33a8680d07fd1c0504f18f23e47dd4b11bea2237c5422896a5b204926dd6fc39237a62dc70d751891f2cd1bacfa48e7 diff --git a/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch b/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch new file mode 100644 index 000000000000..9d25464c8eac --- /dev/null +++ b/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch @@ -0,0 +1,36 @@ +diff -Naur Src.orig/wmFrog.c Src/wmFrog.c +--- Src.orig/wmFrog.c 2010-12-01 19:48:50.000000000 +0100 ++++ Src/wmFrog.c 2020-03-01 15:54:30.428083446 +0100 +@@ -77,6 +77,12 @@ + char* folder; + int needsUpdate = 1; + ++Display *display; ++Window Root; ++Window iconwin, win; ++int screen; ++int DisplayDepth; ++ + /* + * main + */ +diff -Naur Src.orig/xutils.h Src/xutils.h +--- Src.orig/xutils.h 2010-08-04 20:28:46.000000000 +0200 ++++ Src/xutils.h 2020-03-01 15:54:37.027084834 +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/wmfrog/wmfrog-0.3.1-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild index b3b8ab1a8a4d..fa1b1ed45fc2 100644 --- a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild +++ b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.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 @@ -21,6 +21,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}/Src" +PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) DOCS=( ../{CHANGES,HINTS} ) src_prepare() { -- cgit v1.2.3