summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2017-11-19 12:28:38 +1100
committerMichael Palimaka <kensington@gentoo.org>2017-11-19 12:28:50 +1100
commit6c7e9c0e57b8b644f02a1b61dd5b628930015a06 (patch)
tree30a04507d748e70b204564ec428b28d57bf9f2b1 /x11-terms/aterm/files
parentapp-text/blogc: Version bump (diff)
downloadgentoo-6c7e9c0e57b8b644f02a1b61dd5b628930015a06.tar.gz
gentoo-6c7e9c0e57b8b644f02a1b61dd5b628930015a06.tar.bz2
gentoo-6c7e9c0e57b8b644f02a1b61dd5b628930015a06.zip
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
Diffstat (limited to 'x11-terms/aterm/files')
-rw-r--r--x11-terms/aterm/files/aterm-1.0.1-dpy.patch28
1 files changed, 28 insertions, 0 deletions
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;