summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2020-05-08 19:24:08 +0200
committerBernard Cafarelli <voyageur@gentoo.org>2020-05-09 00:54:17 +0200
commit5730709102944de0364de11866c36b9279d27b87 (patch)
treea99e0bb10e8c4dde5ddca2d0ebc90575da51d986
parentx11-plugins/wmmp3: fix build with -fno-common (diff)
downloadgentoo-5730709102944de0364de11866c36b9279d27b87.tar.gz
gentoo-5730709102944de0364de11866c36b9279d27b87.tar.bz2
gentoo-5730709102944de0364de11866c36b9279d27b87.zip
x11-plugins/cputnik: fix build with -fno-common
Closes: https://bugs.gentoo.org/707716 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
-rw-r--r--x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild6
-rw-r--r--x11-plugins/cputnik/files/cputnik-0.2.0-fno-common.patch67
2 files changed, 71 insertions, 2 deletions
diff --git a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
index ec561276c8a..eb195d5a676 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 00000000000..d774b600a13
--- /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);