X Strike Force SVN commit: rev 136 - in people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split: . patches
Author: ishikawa
Date: 2003-06-03 19:25:31 -0500 (Tue, 03 Jun 2003)
New Revision: 136
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/MANIFEST.i386
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A03_external_XrenderXftXcursor_lib.diff
Log:
update MANIFEST.i386
update #A03 patch (to fix namespace conflicts in xc/lib/Imakefile)
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A03_external_XrenderXftXcursor_lib.diff
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A03_external_XrenderXftXcursor_lib.diff 2003-06-03 21:09:37 UTC (rev 135)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A03_external_XrenderXftXcursor_lib.diff 2003-06-04 00:25:31 UTC (rev 136)
@@ -1,3 +1,47 @@
+diff -x '*~' -urN xc.orig/lib/Imakefile xc/lib/Imakefile
+--- xc.orig/lib/Imakefile 2003-02-21 14:31:24.000000000 +0900
++++ xc/lib/Imakefile 2003-06-04 06:18:08.000000000 +0900
+@@ -102,7 +102,7 @@
+ #endif
+
+ #if BuildRenderLibrary
+-RENDERLIBDIR = Xrender
++RENDERLIBBUILDDIR = Xrender
+ #endif
+
+ #if BuildExpatLibrary
+@@ -118,7 +118,7 @@
+ #endif
+
+ #if BuildXftLibrary
+-XFTLIBDIR = Xft
++XFTBUILDDIR = Xft
+ #endif
+
+ #if BuildXft1Library
+@@ -130,7 +130,7 @@
+ #endif
+
+ #if BuildXcursorLibrary
+-XCURSORLIBDIR = Xcursor
++XCURSORBUILDDIR = Xcursor
+ #endif
+
+ #if BuildXTrapLibrary
+@@ -209,10 +209,10 @@
+ $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(XPRINTLIBDIR) \
+ $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
+ $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \
+- $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
++ $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBBUILDDIR) $(FREETYPE2BUILDDIR) \
+ $(LIBXML2BUILDDIR) $(EXPATBUILDDIR) $(FONTCONFIGBUILDDIR) \
+- $(XFT1LIBDIR) $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \
+- $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR)
++ $(XFT1LIBDIR) $(XFTBUILDDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \
++ $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORBUILDDIR)
+
+ SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
+ $(FONTCACHELIBDIR)
diff -x '*~' -urN xc.orig/lib/Xcursor/Imakefile xc/lib/Xcursor/Imakefile
--- xc.orig/lib/Xcursor/Imakefile 2003-06-04 02:19:50.000000000 +0900
+++ xc/lib/Xcursor/Imakefile 2003-06-04 05:00:17.000000000 +0900
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/MANIFEST.i386
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/MANIFEST.i386 2003-06-03 21:09:37 UTC (rev 135)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/MANIFEST.i386 2003-06-04 00:25:31 UTC (rev 136)
@@ -6124,7 +6124,6 @@
usr/X11R6/lib/modules/linux/libint10.a
usr/X11R6/lib/modules/v10002d.uc
usr/X11R6/lib/modules/v20002d.uc
-usr/X11R6/lib/pkgconfig/xcursor.pc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
Reply to: