Attachment 521 Details for Bug 920 – proposed patch

[patch] proposed patch

dpstk.diff (text/plain), 9.65 KB, created by Alexander Gottwald on 2004-07-24 16:49:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Gottwald

Created: 2004-07-24 16:49:02 UTC

Size: 9.65 KB

patch

obsolete

>? lib/Makefile
>? lib/FS/Makefile
>? lib/FS/Makefile.dep
>? lib/FS/FS.def
>? lib/FS/cygFS-6.dll
>? lib/GL/Makefile
>? lib/GL/GL/Makefile
>? lib/GL/GL/GL.def
>? lib/GL/GL/cygGL-1.dll
>? lib/GL/glx/Makefile
>? lib/GL/glx/Makefile.dep
>? lib/GL/glx/DONE
>? lib/GL/mesa/Makefile
>? lib/GL/mesa/Makefile.dep
>? lib/GL/mesa/array_cache/Makefile
>? lib/GL/mesa/array_cache/Makefile.dep
>? lib/GL/mesa/array_cache/DONE
>? lib/GL/mesa/drivers/osmesa/Makefile
>? lib/GL/mesa/drivers/osmesa/Makefile.dep
>? lib/GL/mesa/drivers/osmesa/DONE
>? lib/GL/mesa/drivers/osmesa/OSMesa.def
>? lib/GL/mesa/drivers/osmesa/cygOSMesa-4.dll
>? lib/GL/mesa/main/Makefile
>? lib/GL/mesa/main/Makefile.dep
>? lib/GL/mesa/main/DONE
>? lib/GL/mesa/math/Makefile
>? lib/GL/mesa/math/Makefile.dep
>? lib/GL/mesa/math/DONE
>? lib/GL/mesa/shader/Makefile
>? lib/GL/mesa/shader/Makefile.dep
>? lib/GL/mesa/shader/DONE
>? lib/GL/mesa/swrast/Makefile
>? lib/GL/mesa/swrast/Makefile.dep
>? lib/GL/mesa/swrast/DONE
>? lib/GL/mesa/swrast_setup/Makefile
>? lib/GL/mesa/swrast_setup/Makefile.dep
>? lib/GL/mesa/swrast_setup/DONE
>? lib/GL/mesa/tnl/Makefile
>? lib/GL/mesa/tnl/Makefile.dep
>? lib/GL/mesa/tnl/DONE
>? lib/GL/mesa/tnl_dd/Makefile
>? lib/GL/mesa/tnl_dd/Makefile.dep
>? lib/GLU/Makefile
>? lib/GLU/GLU.def
>? lib/GLU/cygGLU-1.dll
>? lib/GLU/include/Makefile
>? lib/GLU/libnurbs/interface/Makefile
>? lib/GLU/libnurbs/interface/Makefile.dep
>? lib/GLU/libnurbs/interface/DONE
>? lib/GLU/libnurbs/internals/Makefile
>? lib/GLU/libnurbs/internals/Makefile.dep
>? lib/GLU/libnurbs/internals/DONE
>? lib/GLU/libnurbs/nurbtess/Makefile
>? lib/GLU/libnurbs/nurbtess/Makefile.dep
>? lib/GLU/libnurbs/nurbtess/DONE
>? lib/GLU/libtess/Makefile
>? lib/GLU/libtess/Makefile.dep
>? lib/GLU/libtess/DONE
>? lib/GLU/libutil/Makefile
>? lib/GLU/libutil/Makefile.dep
>? lib/GLU/libutil/DONE
>? lib/GLw/Makefile
>? lib/GLw/Makefile.dep
>? lib/ICE/Makefile
>? lib/ICE/Makefile.dep
>? lib/ICE/ICE.def
>? lib/ICE/cygICE-6.dll
>? lib/SM/Makefile
>? lib/SM/Makefile.dep
>? lib/SM/SM.def
>? lib/SM/cygSM-6.dll
>? lib/X11/Makefile
>? lib/X11/Makefile.dep
>? lib/X11/ks_tables.h
>? lib/X11/X11.def
>? lib/X11/cygX11-6.dll
>? lib/XRes/Makefile
>? lib/XRes/Makefile.dep
>? lib/XRes/XRes.def
>? lib/XRes/cygXRes-1.dll
>? lib/XRes/XRes._man
>? lib/XRes/XRes.3.html
>? lib/XTrap/Makefile
>? lib/XTrap/Makefile.dep
>? lib/XTrap/XTrap.def
>? lib/XTrap/cygXTrap-6.dll
>? lib/Xau/Makefile
>? lib/Xau/Makefile.dep
>? lib/Xaw/Makefile
>? lib/Xaw/Makefile.dep
>? lib/Xaw/Xaw.def
>? lib/Xaw/cygXaw-7.dll
>? lib/Xaw/Xaw._man
>? lib/Xaw/Xaw.3.html
>? lib/Xaw6/Makefile
>? lib/Xaw6/Makefile.dep
>? lib/Xaw6/Xaw.def
>? lib/Xaw6/cygXaw-6.dll
>? lib/Xcursor/Makefile
>? lib/Xcursor/Makefile.dep
>? lib/Xcursor/Xcursor.def
>? lib/Xcursor/cygXcursor-1.dll
>? lib/Xcursor/Xcursor._man
>? lib/Xcursor/xcursor.pc
>? lib/Xcursor/Xcursor.3.html
>? lib/Xcursor/xcursor-config.script
>? lib/Xdmcp/Makefile
>? lib/Xdmcp/Makefile.dep
>? lib/Xext/Makefile
>? lib/Xext/Makefile.dep
>? lib/Xext/Xext.def
>? lib/Xext/cygXext-6.dll
>? lib/Xft/Makefile
>? lib/Xft/Makefile.dep
>? lib/Xft/Xft.def
>? lib/Xft/cygXft-2.dll
>? lib/Xft/Xft._man
>? lib/Xft/xft.pc
>? lib/Xft/xft-config.script
>? lib/Xft/Xft.3.html
>? lib/Xft1/Makefile
>? lib/Xft1/Makefile.dep
>? lib/Xft1/Xft.def
>? lib/Xft1/cygXft-1.dll
>? lib/Xft1/Xft._man
>? lib/Xft1/Xft.3.html
>? lib/Xi/Makefile
>? lib/Xi/Makefile.dep
>? lib/Xi/Xi.def
>? lib/Xi/cygXi-6.dll
>? lib/Xmu/Makefile
>? lib/Xmu/Makefile.dep
>? lib/Xmu/Xmu.def
>? lib/Xmu/cygXmu-6.dll
>? lib/Xmuu/Makefile
>? lib/Xmuu/Makefile.dep
>? lib/Xmuu/Xmuu.def
>? lib/Xmuu/cygXmuu-1.dll
>? lib/Xp/Makefile
>? lib/Xp/Makefile.dep
>? lib/Xp/Xp.def
>? lib/Xp/cygXp-6.dll
>? lib/Xpm/Makefile
>? lib/Xpm/Makefile.dep
>? lib/Xpm/Xpm.def
>? lib/Xpm/cygXpm-4.dll
>? lib/XprintAppUtil/Makefile
>? lib/XprintAppUtil/Makefile.dep
>? lib/XprintUtil/Makefile
>? lib/XprintUtil/Makefile.dep
>? lib/Xrandr/Makefile
>? lib/Xrandr/Makefile.dep
>? lib/Xrandr/Xrandr.def
>? lib/Xrandr/cygXrandr-2.dll
>? lib/Xrandr/Xrandr._man
>? lib/Xrandr/Xrandr.3.html
>? lib/Xrender/Makefile
>? lib/Xrender/Makefile.dep
>? lib/Xrender/Xrender.def
>? lib/Xrender/cygXrender-1.dll
>? lib/Xrender/xrender.pc
>? lib/Xt/Makefile
>? lib/Xt/StringDefs.c
>? lib/Xt/StringDefs.h
>? lib/Xt/Shell.h
>? lib/Xt/Makefile.dep
>? lib/Xt/Xt.def
>? lib/Xt/cygXt-6.dll
>? lib/Xtst/Makefile
>? lib/Xtst/Makefile.dep
>? lib/Xtst/Xtst.def
>? lib/Xtst/cygXtst-6.dll
>? lib/dps/Makefile
>? lib/dps/dpsclrops.c
>? lib/dps/dpsclrops.h
>? lib/dps/dpsctrlops.c
>? lib/dps/dpsctrlops.h
>? lib/dps/dpsctxtops.c
>? lib/dps/dpsctxtops.h
>? lib/dps/dpsdataops.c
>? lib/dps/dpsdataops.h
>? lib/dps/dpsfontops.c
>? lib/dps/dpsfontops.h
>? lib/dps/dpsgsttops.c
>? lib/dps/dpsgsttops.h
>? lib/dps/dpsioops.c
>? lib/dps/dpsioops.h
>? lib/dps/dpsmathops.c
>? lib/dps/dpsmathops.h
>? lib/dps/dpsmtrxops.c
>? lib/dps/dpsmtrxops.h
>? lib/dps/dpsmiscops.c
>? lib/dps/dpsmiscops.h
>? lib/dps/dpsopstack.c
>? lib/dps/dpsopstack.h
>? lib/dps/dpspntops.c
>? lib/dps/dpspntops.h
>? lib/dps/dpspathops.c
>? lib/dps/dpspathops.h
>? lib/dps/dpssysops.c
>? lib/dps/dpssysops.h
>? lib/dps/dpswinops.c
>? lib/dps/dpswinops.h
>? lib/dps/dpsXops.c
>? lib/dps/dpsXops.h
>? lib/dps/dpsl2ops.c
>? lib/dps/dpsl2ops.h
>? lib/dps/psclrops.c
>? lib/dps/psclrops.h
>? lib/dps/psctrlops.c
>? lib/dps/psctrlops.h
>? lib/dps/psctxtops.c
>? lib/dps/psctxtops.h
>? lib/dps/psdataops.c
>? lib/dps/psdataops.h
>? lib/dps/psfontops.c
>? lib/dps/psfontops.h
>? lib/dps/psgsttops.c
>? lib/dps/psgsttops.h
>? lib/dps/psioops.c
>? lib/dps/psioops.h
>? lib/dps/psmathops.c
>? lib/dps/psmathops.h
>? lib/dps/psmtrxops.c
>? lib/dps/psmtrxops.h
>? lib/dps/psmiscops.c
>? lib/dps/psmiscops.h
>? lib/dps/pspntops.c
>? lib/dps/pspntops.h
>? lib/dps/pspathops.c
>? lib/dps/pspathops.h
>? lib/dps/pssysops.c
>? lib/dps/pssysops.h
>? lib/dps/pswinops.c
>? lib/dps/pswinops.h
>? lib/dps/psopstack.c
>? lib/dps/psopstack.h
>? lib/dps/psXops.c
>? lib/dps/psXops.h
>? lib/dps/psl2ops.c
>? lib/dps/psl2ops.h
>? lib/dps/Makefile.dep
>? lib/dps/psops.h
>? lib/dps/dpsops.h
>? lib/dps/dps.def
>? lib/dps/cygdps-1.dll
>? lib/dpstk/Makefile
>? lib/dpstk/XDPSpwraps.c
>? lib/dpstk/XDPSpwraps.h
>? lib/dpstk/XDPSswraps.c
>? lib/dpstk/XDPSswraps.h
>? lib/dpstk/FSBwraps.c
>? lib/dpstk/FSBwraps.h
>? lib/dpstk/CSBwraps.c
>? lib/dpstk/CSBwraps.h
>? lib/dpstk/DSWwraps.c
>? lib/dpstk/DSWwraps.h
>? lib/dpstk/Makefile.dep
>? lib/dpstk/dpstk.def
>? lib/dpstk/cygdpstk-1.dll
>? lib/dpstk/dpstkXm.def
>? lib/dpstk/dpstkXm-def.cpp
>? lib/dpstk/cygdpstkXm-1.dll
>? lib/dpstk/.Makefile.swp
>? lib/dpstk/.Imakefile.swp
>? lib/expat/Makefile
>? lib/expat/Makefile.dep
>? lib/expat/expat.def
>? lib/expat/cygexpat-4.dll
>? lib/font/Makefile
>? lib/font/FreeType/Makefile
>? lib/font/FreeType/Makefile.dep
>? lib/font/FreeType/DONE
>? lib/font/Type1/Makefile
>? lib/font/Type1/Makefile.dep
>? lib/font/Type1/DONE
>? lib/font/bitmap/Makefile
>? lib/font/bitmap/Makefile.dep
>? lib/font/bitmap/DONE
>? lib/font/fc/Makefile
>? lib/font/fc/Makefile.dep
>? lib/font/fc/DONE
>? lib/font/fontfile/Makefile
>? lib/font/fontfile/Makefile.dep
>? lib/font/fontfile/DONE
>? lib/font/stubs/Makefile
>? lib/font/stubs/Makefile.dep
>? lib/font/util/Makefile
>? lib/font/util/Makefile.dep
>? lib/font/util/DONE
>? lib/fontconfig/Makefile
>? lib/fontconfig/Makefile.dep
>? lib/fontconfig/fontconfig-def.cpp
>? lib/fontconfig/fontconfig.def
>? lib/fontconfig/cygfontconfig-1.dll
>? lib/fontconfig/fonts.conf
>? lib/fontconfig/fontconfig.pc
>? lib/fontenc/Makefile
>? lib/fontenc/Makefile.dep
>? lib/fontenc/fontenc.def
>? lib/fontenc/cygfontenc-1.dll
>? lib/freetype2/Makefile
>? lib/freetype2/Makefile.dep
>? lib/freetype2/freetype.def
>? lib/freetype2/cygfreetype-9.dll
>? lib/freetype2/freetype/Makefile
>? lib/freetype2/freetype/cache/Makefile
>? lib/freetype2/freetype/config/Makefile
>? lib/freetype2/freetype/config/freetype-config
>? lib/freetype2/freetype/internal/Makefile
>? lib/freetype2/freetype/internal/services/Makefile
>? lib/lbxutil/Makefile
>? lib/lbxutil/delta/Makefile
>? lib/lbxutil/delta/Makefile.dep
>? lib/lbxutil/delta/DONE
>? lib/lbxutil/image/Makefile
>? lib/lbxutil/image/Makefile.dep
>? lib/lbxutil/image/g3states.h
>? lib/lbxutil/image/DONE
>? lib/lbxutil/lbx_zlib/Makefile
>? lib/lbxutil/lbx_zlib/Makefile.dep
>? lib/lbxutil/lbx_zlib/DONE
>? lib/oldX/Makefile
>? lib/oldX/Makefile.dep
>? lib/oldX/oldX.def
>? lib/oldX/cygoldX-6.dll
>? lib/psres/Makefile
>? lib/psres/Makefile.dep
>? lib/psres/psres.def
>? lib/psres/cygpsres-1.dll
>? lib/xkbfile/Makefile
>? lib/xkbfile/Makefile.dep
>? lib/xkbfile/xkbfile.def
>? lib/xkbfile/cygxkbfile-1.dll
>? lib/xkbui/Makefile
>? lib/xkbui/Makefile.dep
>? lib/xkbui/xkbui.def
>? lib/xkbui/cygxkbui-1.dll
>? lib/xtrans/Makefile
>? lib/xtrans/Makefile.dep
>Index: lib/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/Imakefile,v
>retrieving revision 1.5
>diff -u -r1.5 Imakefile
>--- lib/Imakefile	30 Jun 2004 20:06:53 -0000	1.5
>+++ lib/Imakefile	24 Jul 2004 23:44:07 -0000
>@@ -206,7 +206,7 @@
>              $(XTSTLIBDIR) $(FSLIBDIR) $(XKBLIBDIR) \
>              $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(EXPATBUILDDIR) \
>              $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
>-             $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \
>+             $(DPSLIBDIR) $(PSRESLIBDIR) $(DPSTKLIBDIR) $(XINERAMADIR) \
>              $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
>              $(FONTCONFIGBUILDDIR) $(XFT1LIBDIR) \
> 	     $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \
>Index: lib/dpstk/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/dpstk/Imakefile,v
>retrieving revision 1.3
>diff -u -r1.3 Imakefile
>--- lib/dpstk/Imakefile	4 Jul 2004 22:49:49 -0000	1.3
>+++ lib/dpstk/Imakefile	24 Jul 2004 23:44:08 -0000
>@@ -60,7 +60,7 @@
> includes:: $(MOTIFSRCS)
> 
> #if DoSharedLib
>-SharedLibraryTarget(dpstkXm,$(SODPSREV),$(MOTIFOBJS),.,.)
>+SharedDepLibraryTarget(dpstkXm,$(SODPSREV),$(MOTIFOBJS),$(MOTIFOBJS) $(MOTIFLIB) $(DPSTKLIB) $(PSRESLIB),.,.)
> InstallSharedLibrary(dpstkXm,$(SODPSREV),$(USRLIBDIR))
> #endif
> #if DoNormalLib

Actions: View | Splinter Review

Attachments on bug 920: 521

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.