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/wmmon+smp/Manifest | 3 ++- .../wmmon+smp/files/wmmon+smp-1.0-fno-common.patch | 24 ++++++++++++++++++++++ x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild | 4 +++- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch (limited to 'x11-plugins/wmmon+smp') diff --git a/x11-plugins/wmmon+smp/Manifest b/x11-plugins/wmmon+smp/Manifest index c5db6e120cb0..c096b2cb31ef 100644 --- a/x11-plugins/wmmon+smp/Manifest +++ b/x11-plugins/wmmon+smp/Manifest @@ -1,4 +1,5 @@ +AUX wmmon+smp-1.0-fno-common.patch 795 BLAKE2B 8f54e0dd05c3dba2f05d3639d1cd8cd0db785e1938c2cfd259a9b0000aca61d7a9b438f552cd7f2d3b6460aada5fe4aec4c5d35b1497c38b1d1e9b3ef3062e51 SHA512 8f71653e969e1050c9c3f23bb868746cc3efac94555fbf6cb4d0d47330ea6b8bd0cacefa8128ebe29ac1a049fcacce68b500ae1a74238e32f9f36b4abedaf334 AUX wmmon+smp-1.0-list.patch 2916 BLAKE2B 112b15af9d697dff61fd9273526f88330b14a4882d2ed0346df318ffcf0eb53d2778a924fbcae9bb392375545dd4a2103283f129068a499e5bfc44c7186104af SHA512 6b0032f8c518f77cf7d221bf06900209018dca35a75998cb80bac636a8cd8a19f6aee3628acf75780bdfcd09aec454dd1a7e4670627524812040d829a6b0d7fd DIST wmmon+smp-1.0.tar.gz 15807 BLAKE2B e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728 SHA512 9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94 -EBUILD wmmon+smp-1.0-r3.ebuild 854 BLAKE2B df0f31fa5d192e9866979566b112efa3e7e782c25143e1089bc5a5b2d1dffbf50746d0ef76eb9303da6a6a4c9239aa3a70e1890f983ea47e68eadac3692dc28a SHA512 28a91a16564389a0e1f1611e2300248210126b69638df9da510b7f073e58ea012d47f56dd999b338d4641220ba2c8ccd5f14dca10a1c0e3f58892afec7c00e71 +EBUILD wmmon+smp-1.0-r3.ebuild 892 BLAKE2B 30c58df7dd0e5efd1b56c8c0594d61243bf6a65388e87a1897bcc4d236deec1e5b5c4c772fccd3f93dd44cc0fff777fe497b4232532092263b630f057a0a19d7 SHA512 5d35adff2773e550f6dc6791f1e30f688b955e939223dc63bb87f4879e6a0f5053a74cf187d81ceba2f2d209f6bbed126030f425454afb289001e931655ae9f5 MISC metadata.xml 533 BLAKE2B e0e0d04cd468503f8219f1fb6b0c30eb7272344f23e8477670372f3d5d347dc9e3558326bb90cfe79ec245f591cc28d5c20520f76f250a58f279a003385cbb90 SHA512 9ea486d5d5b12a67fb8b25ab2be9c67420f8f7903a00ebf414f3f85441b543775085c2c85cfb2c5eda28e264e9ac0878bdb670e7eb9646644bae0b803f90d67e diff --git a/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch new file mode 100644 index 000000000000..6ec3ba03520d --- /dev/null +++ b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch @@ -0,0 +1,24 @@ +diff -Naur wmmon.app.orig/wmgeneral/wmgeneral.h wmmon.app/wmgeneral/wmgeneral.h +--- wmmon.app.orig/wmgeneral/wmgeneral.h 1999-06-07 03:09:36.000000000 +0200 ++++ wmmon.app/wmgeneral/wmgeneral.h 2020-03-08 12:20:10.345121264 +0100 +@@ -36,7 +36,7 @@ + /* Global variable */ + /*******************/ + +-Display *display; ++extern Display *display; + + /***********************/ + /* Function Prototypes */ +diff -Naur wmmon.app.orig/wmmon/wmmon.c wmmon.app/wmmon/wmmon.c +--- wmmon.app.orig/wmmon/wmmon.c 1999-06-07 05:49:45.000000000 +0200 ++++ wmmon.app/wmmon/wmmon.c 2020-03-08 12:20:18.657124944 +0100 +@@ -19,6 +19,8 @@ + int wmmon_mask_width = 64; + int wmmon_mask_height = 64; + ++Display *display; ++ + void usage(void); + void drawstat(int *, int, int, int, int); + void wmmon_routine(int, char **); diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild index b1e2679d8c7f..e16511eaf5bb 100644 --- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild +++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild @@ -22,7 +22,9 @@ DEPEND="${RDEPEND} S="${WORKDIR}/wmmon.app/wmmon" -PATCHES=( "${FILESDIR}"/${P}-list.patch ) +PATCHES=( "${FILESDIR}"/${P}-list.patch + "${FILESDIR}"/${P}-fno-common.patch + ) src_prepare() { tc-export CC -- cgit v1.2.3