xorg-server: Changes to 'debian-unstable'
debian/changelog | 5 +++-
debian/patches/05_module_defaults.diff | 37 ++++++++++++++++++++-------------
2 files changed, 27 insertions(+), 15 deletions(-)
New commits:
commit 9dfb62d3cc46d5f708f9dfd076131bb267b871d6
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Apr 26 22:38:20 2007 -0400
Fix compilation warnings for 05_module_defaults.diff.
Previously the patch used a generic pointer for the options record, but
now we use the actual XF86OptionsPtr type.
diff --git a/debian/changelog b/debian/changelog
index f365393..a3a062c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ xorg-server (2:1.3.0.0.dfsg-3) UNRElEASED; urgency=low
will allow people to specify additional font paths in their xorg.conf
without losing their current paths. This will also help avoid people
having ye olde "fixed font" problem.
+ * Fix compilation warnings for 05_module_defaults.diff. Previously the patch
+ used a generic pointer for the options record, but now we use the actual
+ XF86OptionsPtr type.
- -- David Nusinow <dnusinow@debian.org> Tue, 24 Apr 2007 00:18:04 -0400
+ -- David Nusinow <dnusinow@debian.org> Thu, 26 Apr 2007 22:37:06 -0400
xorg-server (2:1.3.0.0.dfsg-2) unstable; urgency=low
diff --git a/debian/patches/05_module_defaults.diff b/debian/patches/05_module_defaults.diff
index 9acb676..b961528 100644
--- a/debian/patches/05_module_defaults.diff
+++ b/debian/patches/05_module_defaults.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-04-21 09:31:59.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-04-21 09:33:43.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-04-26 21:27:35.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-04-26 22:36:32.000000000 -0400
@@ -254,6 +254,7 @@
char *ignore[] = { "GLcore", "speedo", "bitmap", "drm", NULL };
pointer *optarray;
@@ -142,16 +142,25 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
Index: xorg-server/hw/xfree86/common/xf86Config.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-04-21 09:31:59.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-04-21 09:33:00.000000000 -0400
-@@ -46,6 +46,23 @@
+--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-04-26 21:27:35.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-04-26 22:17:43.000000000 -0400
+@@ -33,6 +33,8 @@
+ #ifndef _xf86_config_h
+ #define _xf86_config_h
+
++#include "xf86Optrec.h"
++
+ #ifdef HAVE_PARSER_DECLS
+ /*
+ * global structure that holds the result of parsing the config file
+@@ -46,6 +48,23 @@
CONFIG_NOFILE
} ConfigStatus;
+typedef struct _ModuleDefault {
+ char *name;
+ Bool toLoad;
-+ pointer *load_opt;
++ XF86OptionPtr load_opt;
+} ModuleDefault;
+
+static ModuleDefault ModuleDefaults[] = {
@@ -170,8 +179,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.h
*/
Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
===================================================================
---- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-21 09:32:00.000000000 -0400
-+++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-21 09:33:00.000000000 -0400
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-26 21:27:35.000000000 -0400
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-26 22:36:33.000000000 -0400
@@ -639,6 +639,20 @@
.B "Load \*qtype1\*q"
.RE
@@ -195,8 +204,8 @@ Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
.BR SubSection,
Index: xorg-server/hw/xfree86/parser/Module.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/Module.c 2007-04-21 09:32:00.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/Module.c 2007-04-21 09:33:00.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/Module.c 2007-04-26 21:27:35.000000000 -0400
++++ xorg-server/hw/xfree86/parser/Module.c 2007-04-26 21:30:53.000000000 -0400
@@ -76,6 +76,7 @@
{
{ENDSECTION, "endsection"},
@@ -237,8 +246,8 @@ Index: xorg-server/hw/xfree86/parser/Module.c
}
Index: xorg-server/hw/xfree86/parser/xf86Parser.h
===================================================================
---- xorg-server.orig/hw/xfree86/parser/xf86Parser.h 2007-04-21 09:32:00.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/xf86Parser.h 2007-04-21 09:33:00.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/xf86Parser.h 2007-04-26 21:27:35.000000000 -0400
++++ xorg-server/hw/xfree86/parser/xf86Parser.h 2007-04-26 21:30:53.000000000 -0400
@@ -82,6 +82,7 @@
/* Values for load_type */
#define XF86_LOAD_MODULE 0
@@ -257,8 +266,8 @@ Index: xorg-server/hw/xfree86/parser/xf86Parser.h
XF86ConfModuleRec, *XF86ConfModulePtr;
Index: xorg-server/hw/xfree86/parser/xf86tokens.h
===================================================================
---- xorg-server.orig/hw/xfree86/parser/xf86tokens.h 2007-04-21 09:32:00.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/xf86tokens.h 2007-04-21 09:33:00.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/xf86tokens.h 2007-04-26 21:27:35.000000000 -0400
++++ xorg-server/hw/xfree86/parser/xf86tokens.h 2007-04-26 21:30:53.000000000 -0400
@@ -170,6 +170,7 @@
/* Module tokens */
LOAD,
Reply to: