diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2007-12-28 12:46:12 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2007-12-28 12:46:12 +0000 |
| commit | e48a74dabe193a2f54e070b120f1f246eb60e12b (patch) | |
| tree | ca627e09fadeea866d63d7a6d656982c4fed7ef7 /x11-misc/xfractint | |
| parent | Add browser USE-flag, bug #203374 (diff) | |
| download | gentoo-2-e48a74dabe193a2f54e070b120f1f246eb60e12b.tar.gz gentoo-2-e48a74dabe193a2f54e070b120f1f246eb60e12b.tar.bz2 gentoo-2-e48a74dabe193a2f54e070b120f1f246eb60e12b.zip | |
Add a fix for bug #203552.
(Portage version: 2.1.4_rc11)
Diffstat (limited to 'x11-misc/xfractint')
| -rw-r--r-- | x11-misc/xfractint/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xfractint/files/xfractint-20.04p07-xioerror.patch | 50 | ||||
| -rw-r--r-- | x11-misc/xfractint/xfractint-20.04_p07.ebuild | 3 |
3 files changed, 57 insertions, 2 deletions
diff --git a/x11-misc/xfractint/ChangeLog b/x11-misc/xfractint/ChangeLog index 63062310afa2..dadf16a9b4fd 100644 --- a/x11-misc/xfractint/ChangeLog +++ b/x11-misc/xfractint/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xfractint # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.47 2007/12/28 11:57:35 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.48 2007/12/28 12:46:11 spock Exp $ + + 28 Dec 2007; Michał Januszewski <spock@gentoo.org> + +files/xfractint-20.04p07-xioerror.patch, xfractint-20.04_p07.ebuild: + Add a fix for bug #203552. 28 Dec 2007; Michał Januszewski <spock@gentoo.org> +files/xfractint-20.04p07-filename-buffer-overflow-fix.patch, diff --git a/x11-misc/xfractint/files/xfractint-20.04p07-xioerror.patch b/x11-misc/xfractint/files/xfractint-20.04p07-xioerror.patch new file mode 100644 index 000000000000..ac458e1f4f06 --- /dev/null +++ b/x11-misc/xfractint/files/xfractint-20.04p07-xioerror.patch @@ -0,0 +1,50 @@ +diff -Naurp xfractint-20.04p07/unix/unixscr.c xfractint-20.04p07-fixed/unix/unixscr.c +--- xfractint-20.04p07/unix/unixscr.c 2005-11-22 23:51:24.000000000 +0100 ++++ xfractint-20.04p07-fixed/unix/unixscr.c 2007-12-28 13:40:50.000000000 +0100 +@@ -137,6 +137,7 @@ static int doredraw = 0; /* 1 if we have + static Window FindRootWindow(void); + static Window pr_dwmroot(Display *dpy, Window pwin); + static int errhand(Display *dp, XErrorEvent *xe); ++static int ioerrhand(Display *dp); + static int getachar(void); + static int handleesc(void); + static int translatekey(int ch); +@@ -345,6 +346,30 @@ XErrorEvent *xe; + return(0); + } + ++/* ++ *---------------------------------------------------------------------- ++ * ++ * ioerrhand -- ++ * ++ * Called on an X IO server error. ++ * ++ * Results: ++ * None. ++ * ++ * Side effects: ++ * Prints the error message. ++ * ++ *---------------------------------------------------------------------- ++ */ ++static int ioerrhand(dp) ++Display *dp; ++{ ++ UnixDone(); ++ fflush(stdout); ++ printf("Fatal X IO error on display %s\n", DisplayString(dp)); ++ return(0); ++} ++ + #ifdef FPUERR + /* + *---------------------------------------------------------------------- +@@ -552,6 +577,7 @@ initUnixWindow() + XSynchronize(Xdp, True); + } + XSetErrorHandler(errhand); ++ XSetIOErrorHandler(ioerrhand); + Xsc = ScreenOfDisplay(Xdp, Xdscreen); + select_visual(); + if (fixcolors > 0) { diff --git a/x11-misc/xfractint/xfractint-20.04_p07.ebuild b/x11-misc/xfractint/xfractint-20.04_p07.ebuild index c907eaf2edad..8e095e44cf6d 100644 --- a/x11-misc/xfractint/xfractint-20.04_p07.ebuild +++ b/x11-misc/xfractint/xfractint-20.04_p07.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.04_p07.ebuild,v 1.3 2007/12/28 11:57:35 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.04_p07.ebuild,v 1.4 2007/12/28 12:46:11 spock Exp $ inherit eutils toolchain-funcs @@ -26,6 +26,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-Makefile.patch epatch "${FILESDIR}"/xfractint-20.04p07-filename-buffer-overflow-fix.patch + epatch "${FILESDIR}"/xfractint-20.04p07-xioerror.patch } src_compile() { |