Attachment 5734 Details for Bug 6742 – ok fine, i did it

[patch] ok fine, i did it

xprtforbrokenmodularxorgxserver.diff (text/plain), 2.03 KB, created by paul on 2006-05-25 02:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: paul

Created: 2006-05-25 02:40:04 UTC

Size: 2.03 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
>retrieving revision 1.198
>diff -u -d -b -w -r1.198 configure.ac
>--- configure.ac	23 May 2006 16:17:09 -0000	1.198
>+++ configure.ac	24 May 2006 16:38:54 -0000
>@@ -1298,7 +1298,7 @@
> if test "x$XPRINT" = xyes; then
> 	PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau])
> 	XPRINT_EXTENSIONS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $LBX_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
>-	XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $CWRAP_LIB $OS_LIB"
>+	XPRINT_LIBS="$DIX_LIB $XKB_LIB $XKB_STUB_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $CWRAP_LIB $OS_LIB $XPRINT_LIBS"
> 	AC_SUBST([XPRINT_CFLAGS])
> 	AC_SUBST([XPRINT_LIBS])
> 
>Index: Xext/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Xext/Makefile.am,v
>retrieving revision 1.22
>diff -u -d -b -w -r1.22 Makefile.am
>--- Xext/Makefile.am	5 Apr 2006 21:08:45 -0000	1.22
>+++ Xext/Makefile.am	24 May 2006 16:38:54 -0000
>@@ -73,7 +73,7 @@
> if XCSECURITY   
> BUILTIN_SRCS += $(XCSECURITY_SRCS)
> 
>-SERVERCONFIGdir = $(libdir)/xserver
>+SERVERCONFIGdir = $(libdir)/X11/xserver
> SERVERCONFIG_DATA = SecurityPolicy
> AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
> endif
>Index: Xprint/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Xprint/Makefile.am,v
>retrieving revision 1.9
>diff -u -d -b -w -r1.9 Makefile.am
>--- Xprint/Makefile.am	3 Apr 2006 21:45:54 -0000	1.9
>+++ Xprint/Makefile.am	24 May 2006 16:38:54 -0000
>@@ -4,7 +4,7 @@
> 
> Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
> 	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
>-	-DXPRINTDIR=\"$(prefix)/X11/xserver\"    \
>+	-DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
> 	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
> 
> Xprt_LDFLAGS = -L$(top_srcdir)

Actions: View | Splinter Review

Attachments on bug 6742: 5734 | 5736

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.