SOURCES: XaoS-ggi-fix.patch, XaoS-info.patch, XaoS-nosuid.patch, X...

qboosh qboosh at pld-linux.org
Thu Oct 19 21:56:35 CEST 2006 

Author: qboosh                       Date: Thu Oct 19 19:56:35 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 3.2.2

---- Files affected:
SOURCES:
   XaoS-ggi-fix.patch (1.1 -> 1.2) , XaoS-info.patch (1.1 -> 1.2) , XaoS-nosuid.patch (1.1 -> 1.2) , XaoS-svga-fix.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/XaoS-ggi-fix.patch
diff -u SOURCES/XaoS-ggi-fix.patch:1.1 SOURCES/XaoS-ggi-fix.patch:1.2
--- SOURCES/XaoS-ggi-fix.patch:1.1	Fri Jan 24 23:51:12 2003
+++ SOURCES/XaoS-ggi-fix.patch	Thu Oct 19 21:56:30 2006
@@ -1,12 +1,12 @@
---- XaoS-3.1pre5/src/ui/ui-drv/ggi/ui_ggi.c.orig	Tue Feb  6 14:00:41 2001
-+++ XaoS-3.1pre5/src/ui/ui-drv/ggi/ui_ggi.c	Fri Jan 24 21:20:17 2003
+--- XaoS/src/ui/ui-drv/ggi/ui_ggi.c.orig	2002-09-25 17:52:09.000000000 +0200
++++ XaoS/src/ui/ui-drv/ggi/ui_ggi.c	2006-10-19 21:11:26.283841500 +0200
 @@ -1,4 +1,4 @@
 -#include "aconfig.h"
 +#include "config.h"
  #ifdef GGI_DRIVER
  /*includes */
  #include <sys/time.h>
-@@ -312,7 +312,7 @@
+@@ -332,7 +332,7 @@
  #ifdef GIIK_Delete
  	    case GIIK_Delete:
  #endif
@@ -15,3 +15,12 @@
  	    case GIIUC_Delete:
  #endif
  	    case GIIUC_BackSpace:
+@@ -397,7 +397,7 @@
+   "32",
+   NULL
+ };
+-static CONST menudialog uih_resizedialog[] = {
++static menudialog uih_resizedialog[] = {
+   DIALOGINT ("X:", 0),
+   DIALOGINT ("Y:", 0),
+   DIALOGCHOICE ("Depth", names, 0),

================================================================
Index: SOURCES/XaoS-info.patch
diff -u SOURCES/XaoS-info.patch:1.1 SOURCES/XaoS-info.patch:1.2
--- SOURCES/XaoS-info.patch:1.1	Wed Jan 29 00:36:07 2003
+++ SOURCES/XaoS-info.patch	Thu Oct 19 21:56:30 2006
@@ -1,30 +1,29 @@
---- XaoS-3.1pre5/doc/xaos.texinfo.orig	Tue Feb  6 14:00:33 2001
-+++ XaoS-3.1pre5/doc/xaos.texinfo	Tue Jan 28 23:40:17 2003
-@@ -10,9 +10,9 @@
+--- XaoS/doc/xaos.texinfo.orig	2006-07-09 10:56:57.000000000 +0200
++++ XaoS/doc/xaos.texinfo	2006-10-19 20:16:35.698192750 +0200
+@@ -11,9 +11,9 @@
  
  @setfilename xaos.info
- @settitle An fast realtime interactive fractal zoomer---user's manual
+ @settitle An fast realtime interactive fractal zoomer --- user's manual
 - at dircategory Graphics
 + at dircategory Graphics Utilities:
  @direntry 
-- * XaoS: (xaos).               The fast realtime interactive fractal zoomer
-+* XaoS: (xaos).				Fast realtime interactive fractal zoomer
+- * XaoS: (xaos).               A fast real-time interactive fractal zoomer
++ * XaoS: (xaos).			A fast real-time interactive fractal zoomer
  @end direntry
  
  
---- XaoS-3.1pre5/doc/xaosdev.texinfo.orig	Tue Feb  6 14:00:34 2001
-+++ XaoS-3.1pre5/doc/xaosdev.texinfo	Tue Jan 28 23:41:53 2003
-@@ -7,10 +7,10 @@
+--- XaoS/doc/xaosdev.texinfo.orig	2005-02-05 13:23:28.000000000 +0100
++++ XaoS/doc/xaosdev.texinfo	2006-10-19 20:17:13.488554500 +0200
+@@ -7,10 +7,9 @@
  
  @setfilename xaosdev.info
- @settitle An fast real-time interactive fractal zoomer---hacker's guide
+ @settitle A fast real-time interactive fractal zoomer --- hacker's guide
 - at dircategory Graphics
 + at dircategory Graphics Utilities:
  @direntry 
 - * XaoS: (xaosdev).               The fast real-time interactive fractal zoomer
--                                  (developers documentation
-+* XaoS: (xaosdev).			Fast real-time interactive fractal zoomer
-+					(developer's documentation)
+-                                  (developers documentation)
++ * XaoS: (xaosdev).			The fast real-time interactive fractal zoomer (developers documentation)
  @end direntry
  
  

================================================================
Index: SOURCES/XaoS-nosuid.patch
diff -u SOURCES/XaoS-nosuid.patch:1.1 SOURCES/XaoS-nosuid.patch:1.2
--- SOURCES/XaoS-nosuid.patch:1.1	Wed Sep 12 23:00:55 2001
+++ SOURCES/XaoS-nosuid.patch	Thu Oct 19 21:56:30 2006
@@ -1,24 +1,10 @@
-diff -Naur XaoS-3.0/configure new/configure
---- XaoS-3.0/configure	Wed Mar  4 16:49:12 1998
-+++ new/configure	Mon Aug 16 14:22:05 1999
-@@ -5522,7 +5522,7 @@
- #define SVGA_DRIVER 1
- EOF
- 
--  STICKY='chmod +s $(bindir)/xaos; chown root $(bindir)/xaos; chgrp root $(bindir)/xaos'
-+  STICKY=''
-   DRIVERDIRS="$DRIVERDIRS ui/ui-drv/svga"
-   DRIVERLIBS="$DRIVERLIBS lib/libuisvga.a"
-   if test "x$ac_cv_func_pthread_sighandler" = xyes; then 
-
-diff -Naur XaoS-3.0/configure.in new/configure.in
---- XaoS-3.0/configure.in	Wed Mar  4 16:49:12 1998
-+++ new/configure.in	Mon Aug 16 14:15:24 1999
-@@ -647,7 +647,7 @@
+--- XaoS/configure.in.orig	2006-07-13 08:01:46.000000000 +0200
++++ XaoS/configure.in	2006-10-19 19:31:54.018598250 +0200
+@@ -843,7 +843,7 @@
  if test "x$ac_cv_lib_vga_vga_hasmode$ac_cv_lib_vgagl_gl_write" = xyesyes; then
    drivers=yes
    AC_DEFINE(SVGA_DRIVER)
--  STICKY='chmod +s $(bindir)/xaos; chown root $(bindir)/xaos; chgrp root $(bindir)/xaos'
+-  STICKY='chmod +s $(DESTDIR)$(bindir)/xaos; chown root $(DESTDIR)$(bindir)/xaos; chgrp root $(DESTDIR)$(bindir)/xaos'
 +  STICKY=''
    DRIVERDIRS="$DRIVERDIRS ui/ui-drv/svga"
    DRIVERLIBS="$DRIVERLIBS lib/libuisvga.a"

================================================================
Index: SOURCES/XaoS-svga-fix.patch
diff -u SOURCES/XaoS-svga-fix.patch:1.1 SOURCES/XaoS-svga-fix.patch:1.2
--- SOURCES/XaoS-svga-fix.patch:1.1	Fri Jan 24 23:51:27 2003
+++ SOURCES/XaoS-svga-fix.patch	Thu Oct 19 21:56:30 2006
@@ -1,15 +1,15 @@
---- XaoS-3.1pre5/src/ui/ui-drv/svga/ui_svga.c.orig	Thu May 31 19:07:17 2001
-+++ XaoS-3.1pre5/src/ui/ui-drv/svga/ui_svga.c	Fri Jan 24 21:57:08 2003
-@@ -338,8 +338,6 @@
+--- XaoS/src/ui/ui-drv/svga/ui_svga.c.orig	2004-11-24 08:11:48.000000000 +0100
++++ XaoS/src/ui/ui-drv/svga/ui_svga.c	2006-10-19 20:15:22.801637000 +0200
+@@ -339,8 +339,6 @@
      }
  #endif
    vga_setmode (mode);
 -  seteuid (getuid ());		/* Don't need supervisor rights anymore. */
 -  setegid (getgid ());
-   if (mode == G320x240x256
-       || mode == G320x400x256
-       || mode == G360x480x256)
-@@ -459,29 +457,6 @@
+   if (mode == G320x240x256 || mode == G320x400x256 || mode == G360x480x256)
+     svga_driver.textheight = 8 * 4;
+   else
+@@ -458,29 +456,6 @@
    int i;
    int fd;
    struct stat chkbuf;
@@ -39,15 +39,7 @@
    if (!initialised)
      {
        vga_setmousesupport (1);
-@@ -494,14 +469,14 @@
- 	info = vga_getmodeinfo (i);
- 	if (info->colors != 256 && info->colors != 32768 && info->colors != 65536 && info->colors != 16777216)
- 	  continue;
-+	else
-+	  break;
-       }
-   if (i == GLASTMODE + 1)
-     {
+@@ -500,8 +475,6 @@
        svga_uninitialise ();
        return 0;
      }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/XaoS-ggi-fix.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/XaoS-info.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/XaoS-nosuid.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/XaoS-svga-fix.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list