The following commit has been merged in the master branch:
commit 16515aa12f103089cc07448d7d27b6cb6d53c20d
Author: Ansgar Burchardt <[email protected]>
Date: Sun Apr 11 15:33:14 2010 +0900
Update patches.
Signed-off-by: Ansgar Burchardt <[email protected]>
diff --git a/debian/patches/const.patch b/debian/patches/const.patch
index 01603b6..0163c41 100644
--- a/debian/patches/const.patch
+++ b/debian/patches/const.patch
@@ -1,57 +1,46 @@
Origin: vendor
---- xaos-3.4.orig/src/ui/ui-drv/ggi/ui_ggi.c
-+++ xaos-3.4/src/ui/ui-drv/ggi/ui_ggi.c
-@@ -397,7 +398,7 @@ static CONST char *CONST names[] = { "1"
- "32",
- NULL
- };
--static CONST menudialog uih_resizedialog[] = {
-+menudialog uih_resizedialog[] = {
- DIALOGINT ("X:", 0),
- DIALOGINT ("Y:", 0),
- DIALOGCHOICE ("Depth", names, 0),
---- xaos-3.4.orig/src/util/xerror.c
-+++ xaos-3.4/src/util/xerror.c
-@@ -13,7 +13,7 @@
+--- xaos.orig/src/util/xerror.c
++++ xaos/src/util/xerror.c
+@@ -12,7 +12,7 @@
+ #ifndef BEOS_DRIVER
/*On windows we use message boxes done in the ui_win32.c code*/
#ifndef WIN32_DRIVER
- void
--x_message (CONST char *text, ...)
-+x_message (char *text, ...)
+-void x_message(CONST char *text, ...)
++void x_message(char *text, ...)
{
- va_list ap;
- va_start (ap, text);
-@@ -23,7 +23,7 @@ x_message (CONST char *text, ...)
+ va_list ap;
+ va_start(ap, text);
+@@ -21,7 +21,7 @@
+ va_end(ap);
}
- void
--x_error (CONST char *text, ...)
-+x_error (char *text, ...)
+-void x_error(CONST char *text, ...)
++void x_error(char *text, ...)
{
- va_list ap;
- va_start (ap, text);
-@@ -33,7 +33,7 @@ x_error (CONST char *text, ...)
+ va_list ap;
+ va_start(ap, text);
+@@ -30,7 +30,7 @@
+ va_end(ap);
}
- void
--x_fatalerror (CONST char *text, ...)
-+x_fatalerror (char *text, ...)
- {
- va_list ap;
- va_start (ap, text);
---- xaos-3.4.orig/src/include/xerror.h
-+++ xaos-3.4/src/include/xerror.h
-@@ -4,9 +4,9 @@
- extern "C"
+-void x_fatalerror(CONST char *text, ...)
++void x_fatalerror(char *text, ...)
{
+ va_list ap;
+ va_start(ap, text);
+--- xaos.orig/src/include/xerror.h
++++ xaos/src/include/xerror.h
+@@ -3,9 +3,9 @@
+ #ifdef __cplusplus
+ extern "C" {
#endif
-- void x_message (CONST char *text, ...);
-- void x_error (CONST char *text, ...);
-- void x_fatalerror (CONST char *text, ...) NORETURN;
-+ void x_message (char *text, ...);
-+ void x_error (char *text, ...);
-+ void x_fatalerror (char *text, ...);
+- void x_message(CONST char *text, ...);
+- void x_error(CONST char *text, ...);
+- void x_fatalerror(CONST char *text, ...) NORETURN;
++ void x_message(char *text, ...);
++ void x_error(char *text, ...);
++ void x_fatalerror(char *text, ...);
#ifdef __cplusplus
}
#endif
diff --git a/debian/patches/free-static-string.patch
b/debian/patches/free-static-string.patch
index d560b58..2ca3a9e 100644
--- a/debian/patches/free-static-string.patch
+++ b/debian/patches/free-static-string.patch
@@ -1,13 +1,13 @@
Origin: vendor
Subject: do not free a static string
---- xaos-3.4.orig/src/util/png.c
-+++ xaos-3.4/src/util/png.c
-@@ -194,6 +194,7 @@ writepng (FILE * file, CONST struct imag
+--- xaos.orig/src/util/png.c
++++ xaos/src/util/png.c
+@@ -192,6 +192,7 @@
#endif
}
- png_write_end (png_ptr, info_ptr);
-+ info_ptr->text = NULL; /* modification for Debian - don't try to free a
static string */
- png_destroy_write_struct (&png_ptr, &info_ptr);
- fclose (file);
- return NULL;
+ png_write_end(png_ptr, info_ptr);
++ info_ptr->text = NULL; /* Do not try to free a static string */
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(file);
+ return NULL;
diff --git a/debian/patches/make.patch b/debian/patches/make.patch
index 67d3219..88414a2 100644
--- a/debian/patches/make.patch
+++ b/debian/patches/make.patch
@@ -1,8 +1,8 @@
Origin: vendor
---- xaos-3.4.orig/Makefile.in
-+++ xaos-3.4/Makefile.in
-@@ -32,11 +32,11 @@ install:
+--- xaos.orig/Makefile.in
++++ xaos/Makefile.in
+@@ -32,11 +32,11 @@
@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/tutorial
@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/examples
@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/catalogs
@@ -17,13 +17,12 @@ Origin: vendor
@INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
@INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples
-@@ -48,17 +48,17 @@ install:
+@@ -49,16 +49,16 @@
@INSTALL@ -m 444 catalogs/*.cat catalogs/README
$(DESTDIR)$(datadir)/XaoS/catalogs
@INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help
-- @INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt
doc/AUTHORS doc/PROBLEMS $(DESTDIR)$(datadir)/XaoS/doc
+- @INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog
ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc
- @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
-- -...@sticky@
- test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)"
- @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info
- @if (install-info --version) >/dev/null 2>&1; then \
@@ -32,69 +31,16 @@ Origin: vendor
- install-info --info-dir="$(DESTDIR)$(infodir)" \
- "$(DESTDIR)$(infodir)/xaos.info"; \
- else : ; fi
-+# @INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt
doc/AUTHORS doc/PROBLEMS $(DESTDIR)$(datadir)/XaoS/doc
-+# @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
-+# -...@sticky@
-+# test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)"
-+# @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info
-+# @if (install-info --version) >/dev/null 2>&1; then \
-+# echo " install-info --info-dir='$(DESTDIR)$(infodir)' \
-+# '$(DESTDIR)$(infodir)/xaos.info'"; \
-+# install-info --info-dir="$(DESTDIR)$(infodir)" \
-+# "$(DESTDIR)$(infodir)/xaos.info"; \
-+# else : ; fi
++ #...@install@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog
ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc
++ #...@install@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
++ #test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)"
++ #...@install@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info
++ #...@if (install-info --version) >/dev/null 2>&1; then \
++ # echo " install-info --info-dir='$(DESTDIR)$(infodir)' \
++ # '$(DESTDIR)$(infodir)/xaos.info'"; \
++ # install-info --info-dir="$(DESTDIR)$(infodir)" \
++ # "$(DESTDIR)$(infodir)/xaos.info"; \
++ #else : ; fi
if [ "@USE_NLS@" = "yes" ]; then $(MAKE) -C src/i18n/ install; fi
---- xaos-3.4.orig/configure.in
-+++ xaos-3.4/configure.in
-@@ -637,40 +637,6 @@ if test "$aa_driver_test" = yes; then
- OLDCFLAGS="$CFLAGS"
- AC_CHECKING("location of curses")
- AC_CHECK_LIB(gpm, Gpm_Repeat)
-- dnl Replace `main' with a function in -lm:
-- AC_CHECK_LIB(slang, SLsmg_init_smg)
--
-- AC_NCURSES(/usr/include, ncurses.h, , -I/usr/include/ncurses , "ncurses
on /usr/include")
-- AC_NCURSES(/usr/include/ncurses, ncurses.h, , -I/usr/include/ncurses,
"ncurses on /usr/include/ncurses")
-- AC_NCURSES(/usr/local/include, ncurses.h, ,-L/usr/local/lib,
-I/usr/local/include, "ncurses on /usr/local")
-- AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib
-L/usr/local/lib/ncurses, -I/usr/local/include/ncurses, "ncurses on
/usr/local/include/ncurses")
--
-- AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib,
-I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on
/usr/local/.../ncurses")
--
-- AC_NCURSES(/usr/include/ncurses, curses.h, , -I/usr/include/ncurses
-DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
-- AC_CURSES(/usr/include, curses.h, , , "curses on /usr/include")
--
-- dnl
-- dnl We couldn't find ncurses, try SysV curses
-- dnl
-- if $search_ncurses
-- then
-- AC_EGREP_HEADER(init_color, /usr/include/curses.h,
-- AC_USE_SYSV_CURSES)
-- fi
--
-- dnl
-- dnl Try SunOS 4.x /usr/5{lib,include} ncurses
-- dnl The flags SUNOS_CURSES, USE_BSD_CURSES and BUGGY_CURSES
-- dnl should be replaced by a more fine grained selection routine
-- dnl
-- if $search_ncurses
-- then
-- if test -f /usr/5include/curses.h
-- then
-- AC_USE_SUNOS_CURSES
-- fi
-- fi
-
- search_aalib=true;
- if test "x$no_x" = x; then
---- xaos-3.4.orig/src/Makefile.in
-+++ xaos-3.4/src/Makefile.in
-@@ -1,5 +1,5 @@
- CC = @CC@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -g
- LIBS = @LIBS@
- LFLAGS = @LDFLAGS@
- AR = @AR@
diff --git a/debian/patches/series b/debian/patches/series
index 6bb7210..2a31258 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
const.patch
free-static-string.patch
make.patch
-ui-ggi.patch
window-size.patch
spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index 2747283..3b62003 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -1,21 +1,22 @@
From: Ansgar Burchardt <[email protected]>
Date: Fri, 26 Mar 2010 16:20:40 +0900
Subject: Fix spelling errors
+Forwarded: mailto:[email protected]
--- xaos.orig/configure.in
+++ xaos/configure.in
-@@ -996,7 +996,7 @@
- echo "READ CUREFULLY FOLLOWING WARNINGS"
+@@ -507,7 +507,7 @@
+ echo "READ THE FOLLOWING WARNINGS CAREFULLY"
echo " "
if test "x$ac_cv_header_stdc" = xno; then
- AC_MSG_WARN(There are no ANSI C headers avaiable. XaoS will have troubles
with compiling.)
+ AC_MSG_WARN(There are no ANSI C headers available. XaoS will have troubles
with compiling.)
config_problem=yes
fi
- if test "x$ac_cv_prog_gcc" = xyes; then
+ if test "x$ac_cv_c_compiler_gnu" = xyes; then
--- xaos.orig/src/engine/dither.c
+++ xaos/src/engine/dither.c
-@@ -94,7 +94,7 @@
+@@ -91,7 +91,7 @@
* Fills an lookup table with conversion data for the specified
* palette.
*
@@ -24,86 +25,86 @@ Subject: Fix spelling errors
* palette to its best possition. Then areas around seed are filled by
* same color because it is best aproximation for them, and then areas
* about them etc...
-@@ -436,7 +436,7 @@
- createpalette (0, 65536, TRUECOLOR, 0, 65536, NULL, NULL, NULL, NULL,
- NULL);
- f->data = i;
-- f->name = "Truecolor to 8bpp convertor";
-+ f->name = "Truecolor to 8bpp converter";
- return (f);
+@@ -409,7 +409,7 @@
+ createpalette(0, 65536, TRUECOLOR, 0, 65536, NULL, NULL, NULL,
+ NULL, NULL);
+ f->data = i;
+- f->name = "Truecolor to 8bpp convertor";
++ f->name = "Truecolor to 8bpp converter";
+ return (f);
}
- static void
+
--- xaos.orig/src/engine/itersmall.c
+++ xaos/src/engine/itersmall.c
-@@ -50,7 +50,7 @@
- createpalette (0, 65536, IMAGETYPE, 0, 65536, NULL, NULL, NULL, NULL,
- NULL);
- f->data = i;
-- f->name = "Smalliter image convertor";
-+ f->name = "Smalliter image converter";
- return (f);
+@@ -48,7 +48,7 @@
+ createpalette(0, 65536, IMAGETYPE, 0, 65536, NULL, NULL, NULL,
+ NULL, NULL);
+ f->data = i;
+- f->name = "Smalliter image convertor";
++ f->name = "Smalliter image converter";
+ return (f);
}
- static void
-@@ -166,7 +166,7 @@
+
+@@ -157,7 +157,7 @@
}
CONST struct filteraction smalliter_filter = {
-- "Smalliter image convertor",
-+ "Smalliter image converter",
- "smalliter",
- 0,
- getinstance,
+- "Smalliter image convertor",
++ "Smalliter image converter",
+ "smalliter",
+ 0,
+ getinstance,
--- xaos.orig/src/sffe/sffe.c
+++ xaos/src/sffe/sffe.c
-@@ -825,7 +825,7 @@
- case UNBALANCEDBRACKES : printf(" UNBALANCED BRACKETS!! :
%s\n",ch1); break;
- case INVALIDFUNCTION : printf(" UNKNOWN FUNCTION!! :
%s\n",ch1); break;
- case INAVLIDNUMBER : printf(" NUMBER FORMAT!! : %s\n",ch1);
break;
-- case UNKNOWNCONST : printf(" UNKOWN CONST or VAR NAME!! :
%s\n",ch1); break;
-+ case UNKNOWNCONST : printf(" UNKNOWN CONST or VAR NAME!! :
%s\n",ch1); break;
- case OPERATOR : printf(" UNKNOWN OPERATOR!! : %s\n",ch1);
break;
- case STACKERROR : printf(" INTERNAL STACK CORRUPTED!! :
%s\n",ch1); break;
- case PARCNTERROR : printf(" FUNCTION PARAMETERS ERROR!! :
%s\n",ch1); break;
-@@ -840,7 +840,7 @@
- case UNBALANCEDBRACKES : sprintf(p->errormsg, "Formula
error ! UNBALANCED BRACKETS!! : %s",ch1); break;
- case INVALIDFUNCTION : sprintf(p->errormsg, "Formula
error ! UNKNOWN FUNCTION!! : %s",ch1); break;
- case INAVLIDNUMBER : sprintf(p->errormsg, "Formula
error ! NUMBER FORMAT!! : %s",ch1); break;
-- case UNKNOWNCONST : sprintf(p->errormsg, "Formula error
! UNKOWN CONST or VAR NAME!! : %s",ch1); break;
-+ case UNKNOWNCONST : sprintf(p->errormsg, "Formula error
! UNKNOWN CONST or VAR NAME!! : %s",ch1); break;
- case OPERATOR : sprintf(p->errormsg, "Formula error !
UNKNOWN OPERATOR!! : %s",ch1); break;
- case STACKERROR : sprintf(p->errormsg, "Formula error !
INTERNAL STACK CORRUPTED!! : %s",ch1); break;
- case PARCNTERROR : sprintf(p->errormsg, "Formula error
! FUNCTION PARAMETERS ERROR!! : %s",ch1); break;
+@@ -921,7 +921,7 @@
+ printf(" NUMBER FORMAT!! : %s\n", ch1);
+ break;
+ case UNKNOWNCONST:
+- printf(" UNKOWN CONST or VAR NAME!! : %s\n", ch1);
++ printf(" UNKNOWN CONST or VAR NAME!! : %s\n", ch1);
+ break;
+ case OPERATOR:
+ printf(" UNKNOWN OPERATOR!! : %s\n", ch1);
+@@ -957,7 +957,7 @@
+ break;
+ case UNKNOWNCONST:
+ sprintf(p->errormsg,
+- "Formula error ! UNKOWN CONST or VAR NAME!! : %s",
++ "Formula error ! UNKNOWN CONST or VAR NAME!! : %s",
+ ch1);
+ break;
+ case OPERATOR:
--- xaos.orig/src/ui/param.c
+++ xaos/src/ui/param.c
-@@ -175,7 +175,7 @@
- name[par[p].type], "", par[p].help);
+@@ -158,7 +158,7 @@
+ name[par[p].type], "", par[p].help);
}
- if (p == 0)
-- printf (" No options avaiable for now\n");
-+ printf (" No options available for now\n");
+ if (p == 0)
+- printf(" No options avaiable for now\n");
++ printf(" No options available for now\n");
}
- menu_printhelp ();
- return 0;
+ menu_printhelp();
+ return 0;
--- xaos.orig/src/ui/ui-drv/x11/xlib.c
+++ xaos/src/ui/ui-drv/x11/xlib.c
-@@ -628,7 +628,7 @@
- d->xcolor.n--;
- if (d->xcolor.n <= 32)
- printf
-- ("Colormap is too full! close some colorfull applications or
use -private\n");
-+ ("Colormap is too full! close some colorful applications or
use -private\n");
- return (-1);
+@@ -570,7 +570,7 @@
+ d->xcolor.n--;
+ if (d->xcolor.n <= 32)
+ printf
+- ("Colormap is too full! close some colorfull
applications or use -private\n");
++ ("Colormap is too full! close some colorful
applications or use -private\n");
+ return (-1);
}
- d->xcolor.c[d->xcolor.n - 1].pixel = cell;
-@@ -641,7 +641,7 @@
- d->xcolor.n--;
- if (d->xcolor.n <= 32)
- printf
-- ("Colormap is too full! close some colorfull aplications or use
-private\n");
-+ ("Colormap is too full! close some colorful aplications or use
-private\n");
- return (-1);
+ d->xcolor.c[d->xcolor.n - 1].pixel = cell;
+@@ -584,7 +584,7 @@
+ d->xcolor.n--;
+ if (d->xcolor.n <= 32)
+ printf
+- ("Colormap is too full! close some colorfull aplications or use
-private\n");
++ ("Colormap is too full! close some colorful aplications or use
-private\n");
+ return (-1);
}
- d->pixels[d->xcolor.n - 1] = d->xcolor.c[d->xcolor.n - 1].pixel;
+ d->pixels[d->xcolor.n - 1] = d->xcolor.c[d->xcolor.n - 1].pixel;
--- xaos.orig/src/engine/btrace.c
+++ xaos/src/engine/btrace.c
@@ -71,8 +71,8 @@
@@ -119,23 +120,23 @@ Subject: Fix spelling errors
This hould trace boundaries to distance 1 (I hope) and do not miss anything.
--- xaos.orig/src/engine/zoom.c
+++ xaos/src/engine/zoom.c
-@@ -801,7 +801,7 @@
- * Situation is simplier now, since we know that behind us is
- * large hole and our decisions don't affect best solution for
- * previous problem. Se we have just one answer
-- * Situation is similiar to latest loop in previous case
-+ * Situation is similar to latest loop in previous case
- */
- int myprice1; /*simplified loop for case that previous
+@@ -735,7 +735,7 @@
+ * Situation is simplier now, since we know that behind us is
+ * large hole and our decisions don't affect best solution for
+ * previous problem. Se we have just one answer
+- * Situation is similiar to latest loop in previous case
++ * Situation is similar to latest loop in previous case
+ */
+ int myprice1; /*simplified loop for case that previous
y had no lines */
--- xaos.orig/src/ui/ui.c
+++ xaos/src/ui/ui.c
-@@ -179,7 +179,7 @@
- {"-screenheight", P_FLOAT, &defscreenheight,
- "exact size of screen in centimeters"},
- {"", P_HELP, NULL,
-- " Use this option in case you use some kind of virtual screen\n or
something similiar that confuses previous options"},
-+ " Use this option in case you use some kind of virtual screen\n or
something similar that confuses previous options"},
- {"-pixelwidth", P_FLOAT, &defpixelwidth,
- "exact size of one pixel in centimeters"},
- {"-pixelheight", P_FLOAT, &defpixelheight,
+@@ -177,7 +177,7 @@
+ {"-screenheight", P_FLOAT, &defscreenheight,
+ "exact size of screen in centimeters"},
+ {"", P_HELP, NULL,
+- " Use this option in case you use some kind of virtual screen\n or
something similiar that confuses previous options"},
++ " Use this option in case you use some kind of virtual screen\n or
something similar that confuses previous options"},
+ {"-pixelwidth", P_FLOAT, &defpixelwidth,
+ "exact size of one pixel in centimeters"},
+ {"-pixelheight", P_FLOAT, &defpixelheight,
diff --git a/debian/patches/ui-ggi.patch b/debian/patches/ui-ggi.patch
deleted file mode 100644
index 563af3c..0000000
--- a/debian/patches/ui-ggi.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Joey Hess <[email protected]>
-Date: Sun, 5 Mar 2006 20:20:30 -0500
-Subject: Fix ggi UI code to build with a current version of gcc.
-
-Fix ggi UI code to build with a current version of gcc. Not building with
-it by default since it still seems very buggy (squashed display, two xaos
-windows, etc).
-
---- xaos-3.4.orig/src/ui/ui-drv/ggi/ui_ggi.c
-+++ xaos-3.4/src/ui/ui-drv/ggi/ui_ggi.c
-@@ -331,10 +331,11 @@ ggi_processevents (int wait, int *mx, in
- break;
- #ifdef GIIK_Delete
- case GIIK_Delete:
--#endif
-+#else
- #ifdef GIIUC_Delete
- case GIIUC_Delete:
- #endif
-+#endif
- case GIIUC_BackSpace:
- ui_key (UIKEY_BACKSPACE);
- break;
diff --git a/debian/patches/window-size.patch b/debian/patches/window-size.patch
index 431ac0e..c366d13 100644
--- a/debian/patches/window-size.patch
+++ b/debian/patches/window-size.patch
@@ -2,17 +2,18 @@ From: Joey Hess <[email protected]>
Date: Sat, 22 Dec 2007 21:51:56 -0500
Bug-Debian: http://bugs.debian.org/452284
Subject: Get real window size
+Forwarded: mailto:[email protected]
Avoid segfault on startup if the window manager forces the window to a
larger size than xaos asked for.
---- xaos-3.4.orig/src/ui/ui-drv/x11/ui_x11.c
-+++ xaos-3.4/src/ui/ui-drv/x11/ui_x11.c
-@@ -430,6 +430,7 @@ x11_init (void)
- replay = XCreateFontCursor (d->display, XC_dot);
- if (d->truecolor || d->privatecolormap)
- x11_driver.flags &= ~RANDOM_PALETTE_SIZE;
-+ xupdate_size (d); /* get real window size (#452284) --JEH */
- if (!alloc_image (d))
- {
- xfree_display (d);
+--- xaos.orig/src/ui/ui-drv/x11/ui_x11.c
++++ xaos/src/ui/ui-drv/x11/ui_x11.c
+@@ -402,6 +402,7 @@
+ replay = XCreateFontCursor(d->display, XC_dot);
+ if (d->truecolor || d->privatecolormap)
+ x11_driver.flags &= ~RANDOM_PALETTE_SIZE;
++ xupdate_size(d); /* get real window size (http://bugs.debian.org/452284)
*/
+ if (!alloc_image(d)) {
+ xfree_display(d);
+ return (0);
--
real-time interactive fractal zoomer
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
