commit: 6c7e9c0e57b8b644f02a1b61dd5b628930015a06 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Nov 19 01:28:38 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Nov 19 01:28:50 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c7e9c0e
x11-terms/aterm: add patch from Fedora solving build failure Closes: https://bugs.gentoo.org/615836 Package-Manager: Portage-2.3.8, Repoman-2.3.4 x11-terms/aterm/aterm-1.0.1-r3.ebuild | 1 + x11-terms/aterm/files/aterm-1.0.1-dpy.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r3.ebuild index e8db05b719d..13ec64d087d 100644 --- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild +++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild @@ -31,6 +31,7 @@ src_prepare() { # Security bug #219746 eapply "${FILESDIR}/${P}-display-security-issue.patch" eapply "${FILESDIR}"/${P}-deadkeys.patch + eapply "${FILESDIR}/${P}-dpy.patch" #fix pre-stripped files sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile failed" diff --git a/x11-terms/aterm/files/aterm-1.0.1-dpy.patch b/x11-terms/aterm/files/aterm-1.0.1-dpy.patch new file mode 100644 index 00000000000..fbe9800d218 --- /dev/null +++ b/x11-terms/aterm/files/aterm-1.0.1-dpy.patch @@ -0,0 +1,28 @@ +Resolve build failure. Patch from Fedora. + +Bug: https://bugs.gentoo.org/615836 + +diff -up aterm-1.0.1/src/main.c.orig aterm-1.0.1/src/main.c +--- aterm-1.0.1/src/main.c.orig 2011-02-19 09:12:01.000000000 +0200 ++++ aterm-1.0.1/src/main.c 2011-02-19 09:25:02.000000000 +0200 +@@ -2087,10 +2087,10 @@ main(int argc, char *argv[]) + #endif + + ConnectX ( &Scr, 0 ); +- Xdisplay = dpy ; +- Xscreen = Scr.screen ; ++ Xscreen = Scr.screen ; + asv = Scr.asv ; + ++ Xdisplay = asv->dpy; + Xcmap = asv->colormap; + Xdepth = asv->visual_info.depth; + Xvisual = asv->visual_info.visual; +@@ -2125,7 +2125,6 @@ main(int argc, char *argv[]) + XdisplayHeight = DisplayHeight (Xdisplay, Xscreen); + + #ifdef HAVE_AFTERIMAGE +- dpy = Xdisplay ; + asv = create_asvisual (Xdisplay, Xscreen, Xdepth, NULL); + Xcmap = asv->colormap; + Xdepth = asv->visual_info.depth;
