gentoo resync : 14.05.2020

3 files changed, 73 insertions, 3 deletions

diff --git a/x11-plugins/cputnik/Manifest b/x11-plugins/cputnik/Manifest
index d4c5ef23fb98..4aaf6cca004e 100644
--- a/x11-plugins/cputnik/Manifest
+++ b/x11-plugins/cputnik/Manifest
@@ -1,4 +1,5 @@
+AUX cputnik-0.2.0-fno-common.patch 1429 BLAKE2B 564cd629a6782aa9747be1460185cd612758b701db6700f21800ce9c9425e9e1cac883f7beb540ce525e9b601f451457c6dab6188a2bf9cee4002c59e3d98202 SHA512 bfc90e8e43b4be13d36e546b4d03bb1a1456c03d9602d7802dbfc6a3f0fa0b68b8deb82f9f5e7f0d7d8224667c2caf9f70c82cae29a662ee748fc6678ca62976
 AUX cputnik-0.2.0-makefile.patch 709 BLAKE2B d40b5743f8bedf589d18e020374a38daf10563542c5e9f93514013880dceb16629c7ee83737ecdb6ff7dbde189697bebe6679b931e4cf5996245f2049a811f31 SHA512 4aff01e83540a7c08e777be8726b07fdb9d34798da957c85b9c27c87760854db335ed9f45b1dd250f63ae16c1e96c59615db79ca818f7233822103695458744d
 DIST cputnik-0.2.0.tar.gz 17850 BLAKE2B 90824218a349d9b6cdf592cafe8dd29674f975a190a19a3dd6b941383d47f4fc492af339cbbb88240499363a1048b2564855d5a17caeaf53437fe34bf0d55ee1 SHA512 829d9d63f82a2d41c0160be575b3fb7840a5c295c6dd16702240a6aa104e557bff83936c46243e850edf918b41ddc22fd123dab7f5ffd6492302d60c374df55f
-EBUILD cputnik-0.2.0-r1.ebuild 638 BLAKE2B f4c865c26818780722b8a828f8c70f5285e956f047c91ee4898a491fd7d4cc495f422fd1c788d081d1b3f756ddf3c745f462473293b16038eec8b72bf58b91ac SHA512 d82d8f76e99611c82b3a0c48b459c4f768ff51276f117a21ecb155b6752e83386d2c2907bed2ddad089261558269f5e0025f83e476826fc90597e06c4813d00e
+EBUILD cputnik-0.2.0-r1.ebuild 673 BLAKE2B 8a4cd4828e036461ee72518e8a712cd2e22a5bc362958cbd1f9267708b7ff11c4759536d78611f935d75e15b774721757f432a8744c58113487f9ec016d43097 SHA512 ac27e947b81f04db7d2d32101aa8a79ec2f03dd060bb15ad5f372bc74006ac1e7b3771c39aaf2405505926297f70c60f981a411221de789827693a0d35b880d4
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
index ec561276c8a1..eb195d5a676b 100644
--- a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,9 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}/src
 
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/x11-plugins/cputnik/files/cputnik-0.2.0-fno-common.patch b/x11-plugins/cputnik/files/cputnik-0.2.0-fno-common.patch
new file mode 100644
index 000000000000..d774b600a134
--- /dev/null
+++ b/x11-plugins/cputnik/files/cputnik-0.2.0-fno-common.patch
@@ -0,0 +1,67 @@
+diff -Naur src.orig/docklib.c src/docklib.c
+--- src.orig/docklib.c	2005-03-26 22:53:38.000000000 +0100
++++ src/docklib.c	2020-05-08 19:21:45.930313064 +0200
+@@ -40,6 +40,29 @@
+ char            *Geometry = "";
+ char            *fonts_xpm[], *leds_xpm[];
+ 
++enum {          /* don't change the order! */
++    GRAY = 0,
++    YELLOW,
++    GREEN,
++    CYAN,
++    SKYBLUE,
++    ORANGE,
++    RED,
++    MAGENTA,
++    BROWN,
++    WHITE   
++} led_colors;
++
++enum {
++    F_NOT_AVAILABLE = 0,
++    F_REGULAR,
++    F_DIRECTORY,
++    F_CHAR_DEVICE,
++    F_BLOCK_DEVICE,
++    F_LINK,
++    F_FIFO,
++    F_SOCK
++} file_types;
+ 
+ /******************************************************************************
+  *
+diff -Naur src.orig/docklib.h src/docklib.h
+--- src.orig/docklib.h	2005-03-26 22:53:50.000000000 +0100
++++ src/docklib.h	2020-05-08 19:21:22.600284802 +0200
+@@ -79,30 +79,6 @@
+ 
+ #define NUM_COLORS  10
+ 
+-enum {          /* don't change the order! */
+-    GRAY = 0,
+-    YELLOW,
+-    GREEN,
+-    CYAN,
+-    SKYBLUE,
+-    ORANGE,
+-    RED,
+-    MAGENTA,
+-    BROWN,
+-    WHITE   
+-} led_colors;
+-
+-enum {
+-    F_NOT_AVAILABLE = 0,
+-    F_REGULAR,
+-    F_DIRECTORY,
+-    F_CHAR_DEVICE,
+-    F_BLOCK_DEVICE,
+-    F_LINK,
+-    F_FIFO,
+-    F_SOCK
+-} file_types;
+-
+ /*-------------------------------------------------------------------------------*/
+ 
+ void    dcl_open_x_window       (int argc, char *argv[], char **, char *, int, int);