diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2020-03-29 13:08:19 +0200 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2020-03-29 13:35:23 +0200 |
| commit | c1eb239fdf5a90663dddb79c520bbacae2974687 (patch) | |
| tree | c722f53189d1b9e809b7199d1b16747f2400c5e8 | |
| parent | dev-python/rfc3987: stable 1.3.8-r1 for arm/arm64, bug #715096 (diff) | |
| download | gentoo-c1eb239fdf5a90663dddb79c520bbacae2974687.tar.gz gentoo-c1eb239fdf5a90663dddb79c520bbacae2974687.tar.bz2 gentoo-c1eb239fdf5a90663dddb79c520bbacae2974687.zip | |
x11-plugins/wmcms: fix build with -fno-common
Latest libdockapp revbump now defines a global variable as extern
Bug: https://bugs.gentoo.org/715260
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
| -rw-r--r-- | x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch | 11 | ||||
| -rw-r--r-- | x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild (renamed from x11-plugins/wmcms/wmcms-0.3.5-r3.ebuild) | 10 |
2 files changed, 18 insertions, 3 deletions
diff --git a/x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch b/x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch new file mode 100644 index 000000000000..3b060769667c --- /dev/null +++ b/x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch @@ -0,0 +1,11 @@ +diff -Naur wmcms-0.3.5.orig/wmcms.c wmcms-0.3.5/wmcms.c +--- wmcms-0.3.5.orig/wmcms.c 2001-09-24 00:57:06.000000000 +0200 ++++ wmcms-0.3.5/wmcms.c 2020-03-29 13:04:56.465162877 +0200 +@@ -28,6 +28,7 @@ + GC gc; + Pixmap pixmap; + Pixmap backdrop; ++Display *display; + + int advanced; + int up; diff --git a/x11-plugins/wmcms/wmcms-0.3.5-r3.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild index 3c00c746459e..cddbcd6bd97d 100644 --- a/x11-plugins/wmcms/wmcms-0.3.5-r3.ebuild +++ b/x11-plugins/wmcms/wmcms-0.3.5-r4.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 @@ -11,11 +11,15 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -DEPEND=">=x11-libs/libdockapp-0.7:=" +DEPEND=">=x11-libs/libdockapp-0.7-r1:=" + +PATCHES=( + "${FILESDIR}"/${P}-s4t4n.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { default - eapply "${FILESDIR}"/wmcms-0.3.5-s4t4n.patch # Respect LDFLAGS, see bug #335031 sed -e 's/ -o wmcms/ ${LDFLAGS} -o wmcms/' -i Makefile || die |