diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2020-03-08 12:18:38 +0100 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2020-03-08 12:27:31 +0100 |
| commit | 8138ad761e60a46eed814f4c71b0efd734e2529c (patch) | |
| tree | ec1bd87a7cc5c4461d123b70d2694236bfb58edd /x11-plugins | |
| parent | sci-visualization/gwyddion: Temporarily require gtk-doc, bug 710664 (diff) | |
| download | gentoo-8138ad761e60a46eed814f4c71b0efd734e2529c.tar.gz gentoo-8138ad761e60a46eed814f4c71b0efd734e2529c.tar.bz2 gentoo-8138ad761e60a46eed814f4c71b0efd734e2529c.zip | |
x11-plugins/wmbio: fix build with -fno-common
Closes: https://bugs.gentoo.org/707180
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmbio/files/wmbio-1.02-fno-common.patch | 26 | ||||
| -rw-r--r-- | x11-plugins/wmbio/wmbio-1.02.ebuild | 6 |
2 files changed, 29 insertions, 3 deletions
diff --git a/x11-plugins/wmbio/files/wmbio-1.02-fno-common.patch b/x11-plugins/wmbio/files/wmbio-1.02-fno-common.patch new file mode 100644 index 000000000000..ce53876b7ecd --- /dev/null +++ b/x11-plugins/wmbio/files/wmbio-1.02-fno-common.patch @@ -0,0 +1,26 @@ +diff -Naur src.orig/wmbio.c src/wmbio.c +--- src.orig/wmbio.c 2004-01-21 13:58:12.000000000 +0100 ++++ src/wmbio.c 2020-03-08 12:13:32.177944932 +0100 +@@ -78,6 +78,8 @@ + struct tm *local; // for the local time + time_t tempo; + ++Display *display; ++Window Root, iconwin, win; + + /* MAIN */ + int main (int argc, char *argv[]); +diff -Naur src.orig/wmgeneral.h src/wmgeneral.h +--- src.orig/wmgeneral.h 2002-04-27 16:02:09.000000000 +0200 ++++ src/wmgeneral.h 2020-03-08 12:13:24.853941688 +0100 +@@ -24,8 +24,8 @@ + } XpmIcon; + + +-Display *display; +-Window Root, iconwin, win; ++extern Display *display; ++extern Window Root, iconwin, win; + + + void AddMouseRegion(int index, int left, int top, int right, int bottom); diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild index 6f9afadd6ebf..d2d2e7ccc5fb 100644 --- a/x11-plugins/wmbio/wmbio-1.02.ebuild +++ b/x11-plugins/wmbio/wmbio-1.02.ebuild @@ -18,15 +18,15 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-base/xorg-proto" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) S=${WORKDIR}/${P}/src src_prepare() { default # Honour Gentoo CFLAGS - sed -i "s/-g -O2/\$(CFLAGS)/" Makefile || die "sed for CFLAGS failed" - + sed -i "s/-g -O2/\$(CFLAGS)/" Makefile || die # Honour Gentoo LDFLAGS - sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile || die "sed for LDFLAGS failed" + sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile || die } src_install() { |