From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- x11-plugins/wmCalClock/Manifest | 3 +- .../wmCalClock/files/wmCalClock-1.25-gcc-10.patch | 35 ++++++++++++++++++++++ x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild | 9 ++++-- 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch (limited to 'x11-plugins/wmCalClock') diff --git a/x11-plugins/wmCalClock/Manifest b/x11-plugins/wmCalClock/Manifest index 64d3187cf247..3aa5e9bc2a95 100644 --- a/x11-plugins/wmCalClock/Manifest +++ b/x11-plugins/wmCalClock/Manifest @@ -1,4 +1,5 @@ +AUX wmCalClock-1.25-gcc-10.patch 869 BLAKE2B 163b61f4e3143b8f39982032d41e82874c601ab992d68a47ba15b8b9bde9ae0d2b17d44e04d975899937f77fdab15e8d412d52a3e550aefe4c50f7221401e3a5 SHA512 c2b773b546c8a19a90a7ff540973212cd3140d3ffdb680d6db317e447cc6813576874f17efd3e2c77594c67cece08eeafd62db4b75c042c814a5bdb0e2747746 AUX wmCalClock-1.25-makefile.patch 1054 BLAKE2B 4928c86294dffbf353d88910db3f6757746934738cd5027f5a12719f85dbd933a2d07f4cee5b1d856a6201ef97aa5591a0683a5554cabe15fe12cedd64861df0 SHA512 fc062a5cd3a18d6ac1485d953052e8519c6ba375fb6cfb61511e6526ba24cb7fb391dd0971422c78743cd8cf4cdcc3abb68910939e7f7b8160191f1c6eaff14c DIST wmCalClock-1.25.tar.gz 71574 BLAKE2B b1e308d99ee1b66fa9bb7cfcf0c83ae5e637ff7f17a2d07bb43a57d941c654d53f37ee9941e0fafedd617d64cde8c2880cfcbf664c03e109e80fa523ea9a6e09 SHA512 499f91856e79fee4fb776b3fa8cbcc70cae2e28a1e9ea5d2c1dbf5a7684cff4be4e5e9362d672aa7cf459d0bfe14f68ec51a10376558a9635d77e5e6ce7f149f -EBUILD wmCalClock-1.25-r3.ebuild 689 BLAKE2B 1f2d911653120c9fd463e222dd9689d94913f046e38b74e4482c1a68ae9d630b08734464d4e3ade4f016610d61cad84480918502acd85c5ce93b0535f19a4a5e SHA512 69528315f774ef2fb528ee9a168248e220ab1878e3ecf60975d034168f4f5d90355b09a6711aa9b3aebc8940455c4fa435c0f326fb0e93bbd8754521739e13ec +EBUILD wmCalClock-1.25-r3.ebuild 725 BLAKE2B 5576d8c9839af90b5d12433bdebabb1597bee04bb143ffef8fa26d8722aa3f15f15e62d8b17adc7de4a732f2a5f7e18edbd2687a7526e2aafaf87f15c45298ca SHA512 74c02eb1373aa084ee06b7616e8b648377769078605a5996e1e2386f715d0e9b8f8fa5b29527e9ab1bb49e9cd26a98ef5defcc8f034f135465530d8693114d69 MISC metadata.xml 476 BLAKE2B 743b22ba315a1e4f01909148a31b652ff649a05bed840f8c2a2a2c69ddc45afc32b5604083ec9e5c623621291a7603b66c5e0153e782fce98353c513655f049d SHA512 2281d53175fc5377c916eed033127c71d17b572982fb0c0c9264349866f9c0cc784771fb9d34b7542972b623e784c4bb76c0c4524db160884ad1d1e08e29aa43 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 000000000000..c6a737e6b443 --- /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 5acbd4856b4b..c7508ab5e8e8 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 @@ -17,14 +17,17 @@ DEPEND="${RDEPEND} SLOT="0" LICENSE="GPL-2" -KEYWORDS="alpha amd64 ~mips ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~sparc x86" IUSE="" 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)/" -- cgit v1.2.3