X Strike Force X.Org X11 SVN commit: r3534 - in trunk/xserver/xorg-server/debian: . patches
Author: dnusinow
Date: 2006-09-27 22:38:59 -0400 (Wed, 27 Sep 2006)
New Revision: 3534
Removed:
trunk/xserver/xorg-server/debian/patches/11_debian_always_use_default_font_path.diff
trunk/xserver/xorg-server/debian/patches/14_debian_always_look_in_our_module_path.diff
Modified:
trunk/xserver/xorg-server/debian/changelog
trunk/xserver/xorg-server/debian/patches/12_security_policy_in_etc.diff
trunk/xserver/xorg-server/debian/patches/17_ignoreabi.diff
trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff
trunk/xserver/xorg-server/debian/patches/series
trunk/xserver/xorg-server/debian/rules
trunk/xserver/xorg-server/debian/xserver-xorg-core.install
Log:
* Use --with-default-font-path instead of --with-fontdir.
* Set RGBPath through --with-rgb-path.
* Drop 11_debian_always_use_default_font_path.diff.
* Drop 14_debian_always_look_in_our_module_path.diff.
* Ship SecurityPolicy in xserver-xorg-core.
Modified: trunk/xserver/xorg-server/debian/changelog
===================================================================
--- trunk/xserver/xorg-server/debian/changelog 2006-09-28 01:23:09 UTC (rev 3533)
+++ trunk/xserver/xorg-server/debian/changelog 2006-09-28 02:38:59 UTC (rev 3534)
@@ -22,8 +22,15 @@
explicitly breaks the build on hurd. Thanks Samuel Thibault and Michael
Banck. Closes: #358015
- -- David Nusinow <dnusinow@debian.org> Wed, 27 Sep 2006 21:04:09 -0400
+ [ Eugene Konev ]
+ * Use --with-default-font-path instead of --with-fontdir.
+ * Set RGBPath through --with-rgb-path.
+ * Drop 11_debian_always_use_default_font_path.diff.
+ * Drop 14_debian_always_look_in_our_module_path.diff.
+ * Ship SecurityPolicy in xserver-xorg-core.
+ -- David Nusinow <dnusinow@debian.org> Wed, 27 Sep 2006 22:37:39 -0400
+
xorg-server (2:1.1.1-8) unstable; urgency=low
* Update mesa symlink patch to the latest from HEAD
Deleted: trunk/xserver/xorg-server/debian/patches/11_debian_always_use_default_font_path.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/11_debian_always_use_default_font_path.diff 2006-09-28 01:23:09 UTC (rev 3533)
+++ trunk/xserver/xorg-server/debian/patches/11_debian_always_use_default_font_path.diff 2006-09-28 02:38:59 UTC (rev 3534)
@@ -1,19 +0,0 @@
-Index: xorg-server-1.0.2/hw/xfree86/common/xf86Config.c
-===================================================================
---- xorg-server-1.0.2.orig/hw/xfree86/common/xf86Config.c 2006-04-15 17:01:15.000000000 +0800
-+++ xorg-server-1.0.2/hw/xfree86/common/xf86Config.c 2006-04-15 17:02:43.000000000 +0800
-@@ -616,9 +616,11 @@
- if (fileconf->file_fontpath) {
- char *f = xf86ValidateFontPath(fileconf->file_fontpath);
- pathFrom = X_CONFIG;
-- if (*f)
-- defaultFontPath = f;
-- else {
-+ if (*f) {
-+ char *fp = xnfalloc(strlen(defaultFontPath) + strlen(f) + 2);
-+ sprintf(fp, "%s,%s", f, defaultFontPath);
-+ defaultFontPath = fp;
-+ } else {
- xf86Msg(X_WARNING,
- "FontPath is completely invalid. Using compiled-in default.\n");
- fontPath = NULL;
Modified: trunk/xserver/xorg-server/debian/patches/12_security_policy_in_etc.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/12_security_policy_in_etc.diff 2006-09-28 01:23:09 UTC (rev 3533)
+++ trunk/xserver/xorg-server/debian/patches/12_security_policy_in_etc.diff 2006-09-28 02:38:59 UTC (rev 3534)
@@ -1,8 +1,8 @@
-Index: xorg-server-1.1.0/configure.ac
+Index: xorg-server/configure.ac
===================================================================
---- xorg-server-1.1.0.orig/configure.ac 2006-05-22 20:40:00.000000000 +0000
-+++ xorg-server-1.1.0/configure.ac 2006-08-06 14:04:45.000000000 +0000
-@@ -375,6 +375,9 @@
+--- xorg-server.orig/configure.ac 2006-09-27 21:00:27.000000000 -0400
++++ xorg-server/configure.ac 2006-09-27 22:38:20.000000000 -0400
+@@ -376,6 +376,9 @@
AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to RGB database (default: ${datadir}/X11/rgb)]),
[ RGBPATH="$withval" ],
[ RGBPATH="${datadir}/X11/rgb" ])
@@ -12,7 +12,7 @@
AC_ARG_WITH(dri-driver-path, AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]),
[ DRI_DRIVER_PATH="$withval" ],
[ DRI_DRIVER_PATH="${libdir}/dri" ])
-@@ -806,6 +809,7 @@
+@@ -807,6 +810,7 @@
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
@@ -20,10 +20,10 @@
AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
-Index: xorg-server-1.1.0/Xext/Makefile.am
+Index: xorg-server/Xext/Makefile.am
===================================================================
---- xorg-server-1.1.0.orig/Xext/Makefile.am 2006-04-05 21:23:06.000000000 +0000
-+++ xorg-server-1.1.0/Xext/Makefile.am 2006-08-06 14:03:48.000000000 +0000
+--- xorg-server.orig/Xext/Makefile.am 2006-09-27 21:00:27.000000000 -0400
++++ xorg-server/Xext/Makefile.am 2006-09-27 22:38:20.000000000 -0400
@@ -73,7 +73,6 @@
if XCSECURITY
BUILTIN_SRCS += $(XCSECURITY_SRCS)
Deleted: trunk/xserver/xorg-server/debian/patches/14_debian_always_look_in_our_module_path.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/14_debian_always_look_in_our_module_path.diff 2006-09-28 01:23:09 UTC (rev 3533)
+++ trunk/xserver/xorg-server/debian/patches/14_debian_always_look_in_our_module_path.diff 2006-09-28 02:38:59 UTC (rev 3534)
@@ -1,15 +0,0 @@
-Index: xorg-server-1.1.0/hw/xfree86/common/xf86Config.c
-===================================================================
---- xorg-server-1.1.0.orig/hw/xfree86/common/xf86Config.c 2006-08-06 14:02:44.000000000 +0000
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86Config.c 2006-08-06 14:05:33.000000000 +0000
-@@ -725,7 +725,9 @@
-
- if (fileconf) {
- if (xf86ModPathFrom != X_CMDLINE && fileconf->file_modulepath) {
-- xf86ModulePath = fileconf->file_modulepath;
-+ char *mpath = xnfalloc(strlen(DEFAULT_MODULE_PATH) + strlen(fileconf->file_modulepath) + 2);
-+ sprintf(mpath, "%s,%s", fileconf->file_modulepath, DEFAULT_MODULE_PATH);
-+ xf86ModulePath = mpath;
- xf86ModPathFrom = X_CONFIG;
- }
- }
Modified: trunk/xserver/xorg-server/debian/patches/17_ignoreabi.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/17_ignoreabi.diff 2006-09-28 01:23:09 UTC (rev 3533)
+++ trunk/xserver/xorg-server/debian/patches/17_ignoreabi.diff 2006-09-28 02:38:59 UTC (rev 3534)
@@ -1,8 +1,8 @@
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2006-08-23 21:59:22.000000000 +0000
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2006-08-23 22:01:00.000000000 +0000
-@@ -789,7 +789,8 @@
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2006-09-27 22:38:19.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2006-09-27 22:38:25.000000000 -0400
+@@ -785,7 +785,8 @@
FLAG_RENDER_COLORMAP_MODE,
FLAG_HANDLE_SPECIAL_KEYS,
FLAG_RANDR,
@@ -12,7 +12,7 @@
} FlagValues;
static OptionInfoRec FlagOptions[] = {
-@@ -861,6 +862,8 @@
+@@ -857,6 +858,8 @@
{0}, FALSE },
{ FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN,
{0}, FALSE },
@@ -21,7 +21,7 @@
{ -1, NULL, OPTV_NONE,
{0}, FALSE },
};
-@@ -919,6 +922,10 @@
+@@ -915,6 +918,10 @@
&(xf86Info.grabInfo.allowDeactivate));
xf86GetOptValBool(FlagOptions, FLAG_ALLOW_CLOSEDOWN_GRABS,
&(xf86Info.grabInfo.allowClosedown));
@@ -34,8 +34,8 @@
* Set things up based on the config file information. Some of these
Index: xorg-server/hw/xfree86/common/xf86Privstr.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Privstr.h 2006-08-23 01:16:01.000000000 +0000
-+++ xorg-server/hw/xfree86/common/xf86Privstr.h 2006-08-23 21:59:22.000000000 +0000
+--- xorg-server.orig/hw/xfree86/common/xf86Privstr.h 2006-09-27 21:00:26.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Privstr.h 2006-09-27 22:38:25.000000000 -0400
@@ -167,6 +167,7 @@
MessageType randRFrom;
Bool aiglx;
@@ -46,8 +46,8 @@
* grabs or closing the
Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
===================================================================
---- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2006-08-23 21:59:21.000000000 +0000
-+++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2006-08-23 21:59:22.000000000 +0000
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2006-09-27 22:38:18.000000000 -0400
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2006-09-27 22:38:25.000000000 -0400
@@ -662,6 +662,10 @@
.B Terminate
action and, if found, use XKEYBOARD for processing actions, otherwise
@@ -61,8 +61,8 @@
.B Module
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2006-08-23 21:59:33.000000000 +0000
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2006-08-23 22:00:17.000000000 +0000
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2006-09-27 21:00:26.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Init.c 2006-09-27 22:38:25.000000000 -0400
@@ -346,6 +346,10 @@
/* Tell the loader the default module search path */
LoaderSetPath(xf86ModulePath);
Modified: trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff 2006-09-28 01:23:09 UTC (rev 3533)
+++ trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff 2006-09-28 02:38:59 UTC (rev 3534)
@@ -1,7 +1,7 @@
Index: xorg-server/configure
===================================================================
---- xorg-server.orig/configure 2006-09-27 20:54:33.000000000 -0400
-+++ xorg-server/configure 2006-09-27 20:58:22.000000000 -0400
+--- xorg-server.orig/configure 2006-09-27 21:00:26.000000000 -0400
++++ xorg-server/configure 2006-09-27 22:38:32.000000000 -0400
@@ -26162,11 +26162,14 @@
KDRIVE_HW=no
case $host_os in
@@ -84,7 +84,7 @@
Index: xorg-server/debian/patches/20_kbsd.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/debian/patches/20_kbsd.patch 2006-09-27 20:58:22.000000000 -0400
++++ xorg-server/debian/patches/20_kbsd.patch 2006-09-27 22:38:32.000000000 -0400
@@ -0,0 +1,126 @@
+Index: xorg-server-1.1.1/configure.ac
+===================================================================
@@ -214,9 +214,9 @@
+ #endif
Index: xorg-server/debian/xserver-xorg-core.install
===================================================================
---- xorg-server.orig/debian/xserver-xorg-core.install 2006-09-27 20:54:33.000000000 -0400
-+++ xorg-server/debian/xserver-xorg-core.install 2006-09-27 20:58:22.000000000 -0400
-@@ -2,6 +2,7 @@
+--- xorg-server.orig/debian/xserver-xorg-core.install 2006-09-27 22:37:36.000000000 -0400
++++ xorg-server/debian/xserver-xorg-core.install 2006-09-27 22:38:32.000000000 -0400
+@@ -3,6 +3,7 @@
usr/lib/xorg/modules/extensions/*.so
usr/lib/xorg/modules/fonts/*
usr/lib/xorg/modules/linux/*.so
Modified: trunk/xserver/xorg-server/debian/patches/series
===================================================================
--- trunk/xserver/xorg-server/debian/patches/series 2006-09-28 01:23:09 UTC (rev 3533)
+++ trunk/xserver/xorg-server/debian/patches/series 2006-09-28 02:38:59 UTC (rev 3534)
@@ -8,10 +8,8 @@
08_s390_servermd.diff -p3
09_debian_xserver_rtff.diff -p0
10_dont_look_in_home_for_config.diff -p0
-11_debian_always_use_default_font_path.diff -p1
12_security_policy_in_etc.diff
13_debian_add_xkbpath_env_variable.diff
-14_debian_always_look_in_our_module_path.diff
15_symlink_mesa.diff
16_s390_fix.diff
17_ignoreabi.diff
Modified: trunk/xserver/xorg-server/debian/rules
===================================================================
--- trunk/xserver/xorg-server/debian/rules 2006-09-28 01:23:09 UTC (rev 3533)
+++ trunk/xserver/xorg-server/debian/rules 2006-09-28 02:38:59 UTC (rev 3534)
@@ -35,8 +35,9 @@
confflags += --disable-static \
--enable-xorg \
--with-mesa-source=/usr/share/mesa-source \
- --with-fontdir=/usr/share/fonts/X11 \
+ --with-default-font-path="/usr/share/fonts/X11/misc,/usr/X11R6/lib/X11/fonts/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/X11R6/lib/ X11/fonts/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" \
--with-serverconfig-path=/etc/X11/xserver \
+ --with-rgb-path=/etc/X11/rgb \
--enable-xtrap \
--enable-dmx \
--enable-vfb \
Modified: trunk/xserver/xorg-server/debian/xserver-xorg-core.install
===================================================================
--- trunk/xserver/xorg-server/debian/xserver-xorg-core.install 2006-09-28 01:23:09 UTC (rev 3533)
+++ trunk/xserver/xorg-server/debian/xserver-xorg-core.install 2006-09-28 02:38:59 UTC (rev 3534)
@@ -1,3 +1,4 @@
+etc/X11/xserver/SecurityPolicy
usr/lib/xorg/modules/*.so
usr/lib/xorg/modules/extensions/*.so
usr/lib/xorg/modules/fonts/*
Reply to: