From 2dbd59356b577de7c5f9b9acb22a7b666b5dff204da67b39bfb2791d242e81ad Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 7 Jun 2007 11:17:09 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=31 --- p_default-module-path.diff | 25 +------------------------ xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 6 ++++-- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/p_default-module-path.diff b/p_default-module-path.diff index 2f36379..7ce83e3 100644 --- a/p_default-module-path.diff +++ b/p_default-module-path.diff @@ -6,30 +6,7 @@ diff -u -r hw/xfree86.orig/common/xf86Globals.c hw/xfree86/common/xf86Globals.c const char *xf86ConfigFile = NULL; const char *xf86InputDeviceList = NULL; -const char *xf86ModulePath = DEFAULT_MODULE_PATH; -+const char *xf86ModulePath = "/usr/LIBDIR/xorg/modules/updates,/usr/LIBDIR/xorg/modules"; ++const char *xf86ModulePath = DEFAULT_MODULE_PATH "/updates," DEFAULT_MODULE_PATH; MessageType xf86ModPathFrom = X_DEFAULT; const char *xf86LogFile = DEFAULT_LOGPREFIX; MessageType xf86LogFileFrom = X_DEFAULT; -diff -u -r hw/xfree86.orig/loader/loader.c hw/xfree86/loader/loader.c ---- hw/xfree86.orig/loader/loader.c 2006-07-05 12:37:33.000000000 +0200 -+++ hw/xfree86/loader/loader.c 2006-07-05 15:00:41.000000000 +0200 -@@ -410,7 +410,7 @@ - */ - { - int errmaj, errmin, wasLoaded; /* place holders */ -- char *xcrtpath = DEFAULT_MODULE_PATH "/libcrt.a"; -+ char *xcrtpath = "/usr/LIBDIR/xorg/modules/updates,/usr/LIBDIR/xorg/modules" "/libcrt.a"; - char *uwcrtpath = "/usr/ccs/lib/libcrt.a"; - char *path; - struct stat st; ---- hw/xfree86/common/xf86Init.c.orig 2006-12-03 17:35:17.412779270 +0100 -+++ hw/xfree86/common/xf86Init.c 2006-12-03 17:37:29.048826467 +0100 -@@ -1876,7 +1876,7 @@ - static void - xf86PrintDefaultModulePath(void) - { -- ErrorF("%s\n", DEFAULT_MODULE_PATH); -+ ErrorF("/usr/LIBDIR/xorg/modules\n"); - } - - static void diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 1342ca5..fb1805d 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 6 15:47:13 CEST 2007 - sndirsch@suse.de + +- simplified p_default-module-path.diff + ------------------------------------------------------------------- Tue May 22 18:22:44 CEST 2007 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index faf0476..c81ec03 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 88 +Release: 94 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -148,7 +148,7 @@ test -f ../Mesa-6.5.3/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1 test -f ../Mesa-6.5.3/progs/ggi/asc-view.c && exit 1 %patch %patch1 -sed 's/LIBDIR/%{_lib}/g' %{PATCH2} | patch -p0 +%patch2 %patch3 %patch4 %patch5 @@ -527,6 +527,8 @@ exit 0 %endif %changelog +* Wed Jun 06 2007 - sndirsch@suse.de +- simplified p_default-module-path.diff * Tue May 22 2007 - sndirsch@suse.de - disabled build of Xprt - moved Xdmx, Xephyr, Xnest and Xvfb to new subpackage