Author: ishikawa
Date: 2003-06-10 12:59:58 -0500 (Tue, 10 Jun 2003)
New Revision: 174
Added:
branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
branches/4.3.0/sid/debian/patches/059_external_XrenderXftXcursor_programs.diff
branches/4.3.0/sid/debian/patches/060_external_XrenderXftXcursor_lib.diff
Removed:
branches/4.3.0/sid/debian/patches/909_debian_define_xftlibs.diff
Modified:
branches/4.3.0/sid/debian/MANIFEST.alpha
branches/4.3.0/sid/debian/MANIFEST.i386
branches/4.3.0/sid/debian/MANIFEST.sparc
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
branches/4.3.0/sid/debian/rules
branches/4.3.0/sid/debian/shlibs.local
branches/4.3.0/sid/debian/xlibs-dbg.install
branches/4.3.0/sid/debian/xlibs-dbg.links
branches/4.3.0/sid/debian/xlibs-dev.install
branches/4.3.0/sid/debian/xlibs-dev.install.hurd-i386
branches/4.3.0/sid/debian/xlibs-dev.install.s390
branches/4.3.0/sid/debian/xlibs-dev.links
branches/4.3.0/sid/debian/xlibs.install
branches/4.3.0/sid/debian/xlibs.install.s390
branches/4.3.0/sid/debian/xlibs.links
branches/4.3.0/sid/debian/xlibs.shlibs
branches/4.3.0/sid/debian/xlibs.shlibs.dummy
Log:
Use external Xft2, Xrender and Xcursor
* debian/control:
- remove description about libXrender
- add Build-Depends: libxrender-dev, libxcursor-dev
* patch #003_linux.cf_and_xfree86.cf:
- add `#define Has{Xft,Render,Xcursor}Library YES'
- add `#define Build{Render,Xcursor}Library NO'
- add `#define RenderLibraryDir'
- add `#define XfftLibraryDir'
- add `#define XcursorLibraryDir'
* patch #004_imake_manpage_handling_overhaul:
- line offset adjust to adapt #003 change
* debian/xlibs.install{,.s390}, debian/xlibs.links, debian/xlibs.shlibs,
debian/xlibs-dbg.install, debian/xlibs-dbg.links,
debian/xlibs-dev.install{,hurd-i386,s390}, debian/xlibs-dev.links,
debian/shlibs.local, debian/xlibs.shlibs.dummy:
- remove libXcursor and libXrender related files
* debian/rules:
- add create Xrender and Xcursor related stuff symlink into
debian/local/exports/ at build time likes Xft
* #909_debian_define_xftlibs:
- drop (replaced by #058, #059 and #060 patches)
* #058_external_XrenderXftXcursor_X11.tmpl.diff:
- New patch to use external Xrender/Xft/Xcursor library
o add Has{Render,Xft,Xcursor}Library defines
o Some defines related {Render,Xft,Xcursor}Library are changed
to be able to use external Xrender,Xft,Xcursor libraries
(likes freetype2, expat, libz etc...)
* #059_external_XrenderXftXcursor_programs.diff
- New patch to use external Xrender/Xft/Xcursor library
adapt #A01 change for xc/programs/*/Imakefile
* #060_external_XrenderXftXcursor_lib.diff:
- New patch to use external Xrender/Xft/Xcursor library
adapt #058 change for xc/lib/*/Imakefile
* MANIFEST.{i386,sparc,alpha}:
- update(other architectures are not updated yet.)
Modified: branches/4.3.0/sid/debian/xlibs-dbg.install
==============================================================================
--- branches/4.3.0/sid/debian/xlibs-dbg.install 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/xlibs-dbg.install 2003-06-10 17:59:58 UTC (rev
174)
@@ -8,7 +8,6 @@
usr/X11R6/lib/libSM.so.6.0 usr/X11R6/lib/debug/libSM.so.6.0
usr/X11R6/lib/libX11.so.6.2 usr/X11R6/lib/debug/libX11.so.6.2
usr/X11R6/lib/libXTrap.so.6.4 usr/X11R6/lib/debug/libXTrap.so.6.4
-usr/X11R6/lib/libXcursor.so.1.0 usr/X11R6/lib/debug/libXcursor.so.1.0
usr/X11R6/lib/libXext.so.6.4 usr/X11R6/lib/debug/libXext.so.6.4
usr/X11R6/lib/libXft.so.1.1 usr/X11R6/lib/debug/libXft.so.1.1
usr/X11R6/lib/libXi.so.6.0 usr/X11R6/lib/debug/libXi.so.6.0
@@ -17,7 +16,6 @@
usr/X11R6/lib/libXp.so.6.2 usr/X11R6/lib/debug/libXp.so.6.2
usr/X11R6/lib/libXpm.so.4.11 usr/X11R6/lib/debug/libXpm.so.4.11
usr/X11R6/lib/libXrandr.so.2.0 usr/X11R6/lib/debug/libXrandr.so.2.0
-usr/X11R6/lib/libXrender.so.1.2 usr/X11R6/lib/debug/libXrender.so.1.2
usr/X11R6/lib/libXt.so.6.0 usr/X11R6/lib/debug/libXt.so.6.0
usr/X11R6/lib/libXtst.so.6.1 usr/X11R6/lib/debug/libXtst.so.6.1
usr/X11R6/lib/libxrx.so.6.3 usr/X11R6/lib/debug/libxrx.so.6.3
Added:
branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
==============================================================================
---
branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
2003-06-10 16:27:27 UTC (rev 173)
+++
branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
2003-06-10 17:59:58 UTC (rev 174)
@@ -0,0 +1,234 @@
+patch to be able to use external Xrender/Xft/Xcursor libraries
+
+ * add Has{Render,Xft,Xcursor}Library defines
+ * Some defines related {Render,Xft,Xcursor}Library are changed
+ to be able to use external Xrender,Xft,Xcursor libraries
+ (likes freetype2, expat, libz etc...)
+
+ This patch contains X11.tmpl part only (some xc/lib/*/Imakefile
+and xc/programs/*/Imakefile should adapt this change)
+
+ISHIKAWA Mutsumi <[EMAIL PROTECTED]>
+
+diff -x '*~' -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc.orig/config/cf/X11.tmpl 2003-06-04 05:16:04.000000000 +0900
++++ xc/config/cf/X11.tmpl 2003-06-04 05:12:39.000000000 +0900
+@@ -565,23 +565,29 @@
+ #ifndef BuildRender
+ #define BuildRender YES
+ #endif
++#ifndef HasRenderLibrary
++#define HasRenderLibrary NO
++#endif
+ #ifndef BuildRenderLibrary
+-#define BuildRenderLibrary !BuildServersOnly
++#define BuildRenderLibrary (!BuildServersOnly && !HasRenderLibrary)
++#endif
++#ifndef HasXftLibrary
++#define HasXftLibrary NO
+ #endif
+ #ifndef BuildXftLibrary
+-#define BuildXftLibrary BuildRenderLibrary
++#define BuildXftLibrary ((BuildRenderLibrary ||
HasRenderLibrary) && !HasXftLibrary)
+ #endif
+ #ifndef BuildXft1Library
+-#define BuildXft1Library BuildRenderLibrary
++#define BuildXft1Library (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+ #ifndef UseFontconfig
+-#define UseFontconfig BuildXftLibrary
++#define UseFontconfig (BuildXftLibrary || HasXftLibrary)
+ #endif
+ #ifndef BuildFontconfigLibrary
+ #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
+ #endif
+ #ifndef UseFreetype2
+-#define UseFreetype2 (BuildXftLibrary || BuildXft1Library ||
UseFontconfig)
++#define UseFreetype2 (BuildXftLibrary || HasXftLibrary ||
BuildXft1Library || UseFontconfig)
+ #endif
+ #ifndef HasExpat
+ #define HasExpat NO
+@@ -603,8 +609,11 @@
+ #define BuildRandRLibrary !BuildServersOnly
+ #endif
+
++#ifndef HasXcursorLibrary
++#define HasXcursorLibrary NO
++#endif
+ #ifndef BuildXcursorLibrary
+-#define BuildXcursorLibrary BuildRenderLibrary
++#define BuildXcursorLibrary ((BuildRenderLibrary || HasRenderLibrary) &&
!HasXcursorLibrary)
+ #endif
+
+ #ifndef BuildXcursorgen
+@@ -2374,6 +2383,7 @@
+ ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
+ #endif
+
++#if BuildRenderLibrary
+ XRENDERLIBSRC = $(LIBSRC)/Xrender
+ #if SharedLibXrender
+ #ifndef SharedXrenderRev
+@@ -2384,6 +2394,42 @@
+ ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
+ #endif
+
++#ifdef UseInstalled
++XRENDERINCDIR=$(INCDIR)
++#else
++XRENDERINCDIR=$(BUILDINCDIR)
++#endif
++
++XRENDERINCLUDES = -I$(XRENDERINCDIR)
++
++#else /* BuildRenderLibrary */
++
++#if HasRenderLibrary
++
++#ifndef RenderLibraryDir
++#define RenderLibraryDir /usr/X11R6
++#endif
++
++#ifndef RenderLibraryLibDir
++#define RenderLibraryLibDir RenderLibraryDir/LibDirName
++#endif
++
++#ifndef RenderLibraryIncDir
++#define RenderLibraryIncDir RenderLibraryDir/include
++#endif
++
++XRENDERDIR = RenderLibraryDir
++XRENDERLIBDIR = RenderLibraryLibDir
++XRENDERINCDIR = RenderLibraryIncDir
++XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender
++DEPXRENDERLIB =
++
++XRENDERINCLUDES = -I$(XRENDERINCDIR)
++
++#endif /* HasRenderLibrary */
++
++#endif /* else BuildRenderLibrary */
++
+ XRANDRRLIBSRC = $(LIBSRC)/Xrandr
+ #if SharedLibXrandr
+ #ifndef SharedXrandrRev
+@@ -2394,6 +2440,7 @@
+ ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
+ #endif
+
++#if BuildXcursorLibrary
+ XCURSORRLIBSRC = $(LIBSRC)/Xcursor
+ #if SharedLibXcursor
+ #ifndef SharedXcursorRev
+@@ -2404,6 +2451,41 @@
+ ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
+ #endif
+
++#ifdef UseInstalled
++XCURSORINCDIR=$(INCDIR)
++#else
++XCURSORINCDIR=$(BUILDINCDIR)
++#endif
++
++XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
++
++#else /* BuildXcursorLibrary */
++
++#if HasXcursorLibrary
++
++#ifndef XcursorLibraryDir
++#define XcursorLibraryDir /usr/X11R6
++#endif
++
++#ifndef XcursorLibraryLibDir
++#define XcursorLibraryLibDir XcursorLibraryDir/LibDirName
++#endif
++
++#ifndef XcursorLibraryIncDir
++#define XcursorLibraryIncDir XcursorLibraryDir/include
++#endif
++
++XCURSORDIR = XcursorLibraryDir
++XCURSORLIBDIR = XcursorLibraryLibDir
++XCURSORINCDIR = XcursorLibraryIncDir
++XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor
++
++XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
++
++#endif /* HasXcursorLibrary */
++
++#endif /* else BuildXcursorLibrary */
++
+ # ifndef SharedLibXfontcache
+ # define SharedLibXfontcache NO
+ # endif
+@@ -3164,6 +3246,7 @@
+ #endif
+ #endif
+
++#if BuildXftLibrary
+ #ifndef SharedLibXft
+ #define SharedLibXft HasSharedLibraries
+ #endif
+@@ -3176,6 +3259,18 @@
+ #ifndef ProfileLibXft
+ #define ProfileLibXft NO
+ #endif
++#else
++#undef SharedLibXft
++#define SharedLibXft NO
++#undef NormalLibXft
++#define NormalLibXft NO
++#undef DebugLibXft
++#define DebugLibXft NO
++#undef ProfileLibXft
++#define ProfileLibXft NO
++#endif
++
++#if BuildXftLibrary
+ XFTLIBSRC = $(LIBSRC)/Xft
+ #if SharedLibXft
+ #ifndef SharedXftRev
+@@ -3193,7 +3288,41 @@
+ #define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
+ #endif
+
+-XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
++XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
++
++#else /* BuildXftLibrary */
++
++#if HasXftLibrary
++
++#ifndef XftLibraryDir
++#define XftLibraryDir /usr/X11R6
++#endif
++
++#ifndef XftLibraryLibDir
++#define XftLibraryLibDir XftLibraryDir/LibDirName
++#endif
++
++#ifndef XftLibraryIncDir
++#define XftLibraryIncDir XftLibraryDir/include
++#endif
++
++XFTDIR = XftLibraryDir
++XFTLIBDIR = XftLibraryLibDir
++XFTINCDIR = XftLibraryIncDir
++XFTLIB = -L$(XFTLIBDIR) -lXft
++
++#ifndef XftClientDepLibs
++#define XftClientDepLibs FontconfigClientDepLibs $(DEPXRENDERLIB)
++#endif
++#ifndef XftClientLibs
++#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
++#endif
++
++XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
$(XRENDERINCLUDES)
++
++#endif /* HasXftLibrary */
++
++#endif /* else BuildXftLibrary */
+
+ #if UseFontconfig
+
Added:
branches/4.3.0/sid/debian/patches/059_external_XrenderXftXcursor_programs.diff
==============================================================================
---
branches/4.3.0/sid/debian/patches/059_external_XrenderXftXcursor_programs.diff
2003-06-10 16:27:27 UTC (rev 173)
+++
branches/4.3.0/sid/debian/patches/059_external_XrenderXftXcursor_programs.diff
2003-06-10 17:59:58 UTC (rev 174)
@@ -0,0 +1,124 @@
+patch to be able to use external Xrender/Xft/Xcursor libraries
+
+ * check HasRenderLibrary to use Render or not
+ * some INCLUDES added to be able to refer external
+ Xrender,Xft,Xcursor libraries' header
+
+ This patch contains xc/programs/*/Imakefile parts
+
+ISHIKAWA Mutsumi <[EMAIL PROTECTED]>
+
+diff -x '*~' -urN xc.orig/programs/x11perf/Imakefile
xc/programs/x11perf/Imakefile
+--- xc.orig/programs/x11perf/Imakefile 2003-06-04 05:16:04.000000000 +0900
++++ xc/programs/x11perf/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -12,13 +12,13 @@
+ #if HasShm
+ SHMDEFS = -DMITSHM
+ #endif
+-#if BuildRenderLibrary
++#if (BuildRenderLibrary || HasRenderLibrary)
+ XRENDERDEFS = -DXRENDER
+ XRENDERDEPS = $(DEPXRENDERLIB)
+ XRENDERLIBS = $(XRENDERLIB)
+ XRENDERINCS = $(XRENDERINCLUDES)
+ #endif
+-#if BuildXftLibrary
++#if (BuildXftLibrary || HasXftLibrary)
+ XFTDEFS = -DXFT
+ XFTDEPS = XftClientDepLibs $(DEPXRENDERLIB)
+ XFTLIBS = XftClientLibs $(XRENDERLIB)
+diff -x '*~' -urN xc.orig/programs/xclock/Imakefile
xc/programs/xclock/Imakefile
+--- xc.orig/programs/xclock/Imakefile 2003-06-04 05:16:04.000000000 +0900
++++ xc/programs/xclock/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -5,7 +5,7 @@
+ XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.4 2002/07/01 02:26:00 tsi
Exp $
+
+ #ifndef XClockUseRender
+-#define XClockUseRender BuildRenderLibrary
++#define XClockUseRender (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+
+ #if XClockUseRender
+diff -x '*~' -urN xc.orig/programs/xcursorgen/Imakefile
xc/programs/xcursorgen/Imakefile
+--- xc.orig/programs/xcursorgen/Imakefile 2003-06-04 02:19:50.000000000
+0900
++++ xc/programs/xcursorgen/Imakefile 2003-06-04 05:02:16.000000000 +0900
+@@ -5,7 +5,7 @@
+ SUBDIRS = redglass whiteglass handhelds
+ DEFAULT_THEME = DefaultCursorTheme
+ THEMEDIR = $(ICONDIR)/default
+- INCLUDES = $(LIBPNGINC)
++ INCLUDES = $(LIBPNGINC) $(XCURSORINCLUDES)
+ DEPLIBS = $(DEPXLIB)
+ LOCAL_LIBRARIES = $(XCURSORLIB) $(XRENDERLIB) $(XLIB) $(LIBPNGLIB) \
+ MathLibrary GzipLibrary
+diff -x '*~' -urN xc.orig/programs/xditview/Imakefile
xc/programs/xditview/Imakefile
+--- xc.orig/programs/xditview/Imakefile 2003-06-04 05:15:58.000000000
+0900
++++ xc/programs/xditview/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -7,7 +7,7 @@
+
+
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
+-#if BuildXftLibrary
++#if (BuildXftLibrary || HasXftLibrary)
+ DEPFONTLIBS = XftClientDepLibs
+ FONTLIBS = XftClientLibs
+ FONTDEFS = -DUSE_XFT
+diff -x '*~' -urN xc.orig/programs/xdpyinfo/Imakefile
xc/programs/xdpyinfo/Imakefile
+--- xc.orig/programs/xdpyinfo/Imakefile 2003-06-04 05:16:04.000000000
+0900
++++ xc/programs/xdpyinfo/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -40,7 +40,7 @@
+ XINPUTLIBS = $(XILIB)
+ #endif
+
+-#if BuildRenderLibrary
++#if (BuildRenderLibrary || HasRenderLibrary)
+ XRENDERDEFINES = -DXRENDER
+ XRENDERDEPLIBS = $(DEPXRENDERLIB)
+ XRENDERLIBS = $(XRENDERLIB)
+diff -x '*~' -urN xc.orig/programs/xfd/Imakefile xc/programs/xfd/Imakefile
+--- xc.orig/programs/xfd/Imakefile 2003-06-04 05:16:04.000000000 +0900
++++ xc/programs/xfd/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -5,7 +5,7 @@
+ XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.3 2002/07/23 01:45:41 tsi Exp $
+
+ #ifndef XFdUseRender
+-#define XFdUseRender BuildRenderLibrary
++#define XFdUseRender (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+
+ #if XFdUseRender
+diff -x '*~' -urN xc.orig/programs/xlogo/Imakefile xc/programs/xlogo/Imakefile
+--- xc.orig/programs/xlogo/Imakefile 2003-06-04 05:16:04.000000000 +0900
++++ xc/programs/xlogo/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -5,7 +5,7 @@
+ XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.3 2002/07/01 02:26:04 tsi Exp
$
+
+ #ifndef XLogoUseRender
+-#define XLogoUseRender BuildRenderLibrary
++#define XLogoUseRender (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+
+ #if XLogoUseRender
+diff -x '*~' -urN xc.orig/programs/xrandr/Imakefile
xc/programs/xrandr/Imakefile
+--- xc.orig/programs/xrandr/Imakefile 2002-09-30 08:39:47.000000000 +0900
++++ xc/programs/xrandr/Imakefile 2003-06-04 05:08:22.000000000 +0900
+@@ -2,6 +2,7 @@
+
+ DEFINES=$(RANDRDEFINES)
+ DEPLIBS=$(DEPXRANDRLIB) $(DEPXLIB)
++INCLUDES=$(XRENDERINCLUDES)
+ LOCAL_LIBRARIES=$(XRANDRLIB) $(XRENDERLIB) $(XLIB)
+
+ SRCS=xrandr.c
+diff -x '*~' -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
+--- xc.orig/programs/xterm/Imakefile 2003-06-04 05:15:58.000000000 +0900
++++ xc/programs/xterm/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -92,7 +92,7 @@
+ UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
+ UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
+ #endif
+-#if BuildXftLibrary
++#if (BuildXftLibrary || HasXftLibrary)
+ #define XRenderSupport
+ #endif
+ #ifdef XRenderSupport
Modified:
branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
2003-06-10 16:27:27 UTC (rev 173)
+++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
2003-06-10 17:59:58 UTC (rev 174)
@@ -305,7 +305,7 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -943,26 +944,6 @@
+@@ -971,26 +971,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Modified: branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
2003-06-10 16:27:27 UTC (rev 173)
+++ branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
2003-06-10 17:59:58 UTC (rev 174)
@@ -7,6 +7,8 @@
change should drop when we can build the loader server liked
against external FreeType2 library.
+Build with external Xrender, Xft and Xcursor by ISHIKAWA Mutsumi.
+
--- xc/config/cf/xfree86.cf.orig Fri Jan 3 11:55:00 2003
+++ xc/config/cf/xfree86.cf Fri Jan 3 11:55:09 2003
@@ -1952,27 +1952,33 @@
@@ -75,7 +77,7 @@
# define XF86SetupUsesStaticTcl NO
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-@@ -146,10 +152,39 @@
+@@ -146,10 +152,55 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n
xterm
# define BuildRman NO
# define BuildHtmlManPages NO
@@ -85,7 +87,7 @@
+# define BuildTrueTypeFonts NO
+# define BuildBethMarduthoFonts NO
+
-+/* We build-dep on expat, fontconfig and Xft. */
++/* We build-dep on expat, fontconfig, Xrender, Xft and Xcursor */
+# define BuildExpatLibrary NO
+# define HasExpat YES
+# define ExpatIncDirStandard YES
@@ -94,8 +96,24 @@
+# define UseFontconfig YES
+# define FontconfigIncDir /usr/include/fontconfig
+# define BuildXftLibrary NO
++# define HasXftLibrary YES
+# define BuildXft1Library YES
+# define IconDir Concat(ProjectRoot,/lib/X11/icons)
++# define BuildXcursorLibrary NO
++# define HasXcursorLibrary YES
++# define BuildRenderLibrary NO
++# define HasRenderLibrary YES
++
++# ifdef UseInstalled
++# define RenderLibraryDir /usr/X11R6
++# define XftLibraryDir /usr/X11R6
++# define XcursorLibraryDir /usr
++# else
++/* for Debian xfree86 build hack */
++# define RenderLibraryDir $(TOP)/../../debian/local/exports
++# define XftLibraryDir $(TOP)/../../debian/local/exports
++# define XcursorLibraryDir $(TOP)/../../debian/local/exports
++# endif
/* we build-depend on libfreetype6-dev (FreeType 2.x) */
# define BuildFreetype2Library NO
Added: branches/4.3.0/sid/debian/patches/060_external_XrenderXftXcursor_lib.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/060_external_XrenderXftXcursor_lib.diff
2003-06-10 16:27:27 UTC (rev 173)
+++ branches/4.3.0/sid/debian/patches/060_external_XrenderXftXcursor_lib.diff
2003-06-10 17:59:58 UTC (rev 174)
@@ -0,0 +1,122 @@
+patch to be able to use external Xrender/Xft/Xcursor libraries
+
+ * namespace conflicts in xc/lib/Imakefile fix
+ * namespace conflicts in xc/lib/Xft1/Imakefile fix
+ * check Has{Render,Xft,Xcursor}Library to use them
+ * some INCLUDES added to be able to refer external
+ Xrender,Xft,Xcursor libraries' header
+
+ This patch contains xc/lib/*/Imakefile parts
+
+ISHIKAWA Mutsumi <[EMAIL PROTECTED]>
+
+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
+@@ -34,6 +34,8 @@
+
+ DEFINES=$(ICONDIRDEFS) $(XCURSORPATHDEFS)
+
++INCLUDES=$(XRENDERINCLUDES)
++
+ SRCS = cursor.c display.c file.c library.c xlib.c
+
+ OBJS = cursor.o display.o file.o library.o xlib.o
+diff -x '*~' -urN xc.orig/lib/Xft/Imakefile xc/lib/Xft/Imakefile
+--- xc.orig/lib/Xft/Imakefile 2003-02-26 07:18:03.000000000 +0900
++++ xc/lib/Xft/Imakefile 2003-06-04 05:10:49.000000000 +0900
+@@ -43,7 +43,7 @@
+ #if HasGcc2 || HasGcc3
+ WARNINGS=-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations -Wnested-externs
+ #endif
+-INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(WARNINGS)
++INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
$(WARNINGS)
+ DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES)
+
+ XFT_REVISION=0
+diff -x '*~' -urN xc.orig/lib/Xft1/Imakefile xc/lib/Xft1/Imakefile
+--- xc.orig/lib/Xft1/Imakefile 2002-11-15 06:01:18.000000000 +0900
++++ xc/lib/Xft1/Imakefile 2003-06-04 05:00:01.000000000 +0900
+@@ -79,13 +79,13 @@
+
+ YFLAGS = -d
+
+-#ifndef XftLibDir
+-#define XftLibDir $(LIBDIR)
++#ifndef Xft1LibDir
++#define Xft1LibDir $(LIBDIR)
+ #endif
+
+-XFTLIBDIR=XftLibDir
++XFT1LIBDIR=Xft1LibDir
+
+-INCLUDES=$(FREETYPE2INCLUDES)
++INCLUDES=$(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
+ DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES)
+
+ #if UseFreetype2
+@@ -142,7 +142,7 @@
+ InstallNamedTargetRelated(install,file,$(INSTDATFLAGS),dest,file,rel)
+ #endif /* InstallNonExecFileBackup */
+
+-InstallNonExecFileRelated(XftConfig-OBSOLETE,$(XFTLIBDIR),XftConfig)
++InstallNonExecFileRelated(XftConfig-OBSOLETE,$(XFT1LIBDIR),XftConfig)
+ InstallNonExecFileRelated(XftConfig-OBSOLETE,$(CONFDIR),XftConfig)
+
+ MANSUFFIX = $(LIBMANSUFFIX)
+diff -x '*~' -urN xc.orig/lib/Xrandr/Imakefile xc/lib/Xrandr/Imakefile
+--- xc.orig/lib/Xrandr/Imakefile 2002-10-03 01:55:41.000000000 +0900
++++ xc/lib/Xrandr/Imakefile 2003-06-04 05:05:41.000000000 +0900
+@@ -21,7 +21,7 @@
+ #endif
+
+ DEFINES = $(ALLOC_DEFINES)
+- INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC)
++ INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(XRENDERINCLUDES)
+ SRCS = Xrandr.c
+ OBJS = Xrandr.o
+ LINTLIBS = $(LINTXLIB)
Deleted: branches/4.3.0/sid/debian/patches/909_debian_define_xftlibs.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/909_debian_define_xftlibs.diff
2003-06-10 16:27:27 UTC (rev 173)
+++ branches/4.3.0/sid/debian/patches/909_debian_define_xftlibs.diff
2003-06-10 17:59:58 UTC (rev 174)
@@ -1,122 +0,0 @@
-This patch defines XFTLIBS unconditionally, so we can use Xft stuff, and
-makes x11perf use $(XFTINCLUDES) instead of $(XFTINCS), always.
-
-This hack by Daniel Stone.
-
---- xc/config/cf/X11.tmpl.orig 2003-01-20 10:53:52.000000000 +1100
-+++ xc/config/cf/X11.tmpl 2003-01-20 10:55:27.000000000 +1100
-@@ -3193,7 +3193,8 @@
- #define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
- #endif
-
--XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
-+XFTLIBS=-lXft -L$(TOP)/../../debian/local/exports/lib $(FONTCONFIGLIB)
$(FREETYPE2LIB) $(EXPATLIB) $(XRENDERLIB)
-+XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
-I$(TOP)/../../debian/local/exports/include
-
- #if UseFontconfig
-
- #if BuildFontconfigLibrary
---- xc/programs/x11perf/Imakefile.orig 2003-01-20 13:51:30.000000000 +1100
-+++ xc/programs/x11perf/Imakefile 2003-01-20 13:59:32.000000000 +1100
-@@ -18,12 +18,9 @@
- XRENDERLIBS = $(XRENDERLIB)
- XRENDERINCS = $(XRENDERINCLUDES)
- #endif
--#if BuildXftLibrary
- XFTDEFS = -DXFT
- XFTDEPS = XftClientDepLibs $(DEPXRENDERLIB)
-- XFTLIBS = XftClientLibs $(XRENDERLIB)
- XFTINCS = $(XFTINCLUDES)
--#endif
- DEFINES = $(SIGNAL_DEFINES) $(SHMDEFS) $(XFTDEFS) $(XRENDERDEFS)
- INCLUDES = $(XFTINCS) $(XRENDERINCS)
- PERFLIB = X11perfcompLib
---- xc/programs/xditview/Imakefile.orig 2003-01-20 13:57:33.000000000
+1100
-+++ xc/programs/xditview/Imakefile 2003-01-20 13:58:53.000000000 +1100
-@@ -7,12 +7,10 @@
-
-
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
--#if BuildXftLibrary
- DEPFONTLIBS = XftClientDepLibs
-- FONTLIBS = XftClientLibs
-+ FONTLIBS = $(XFTLIBS)
- FONTDEFS = -DUSE_XFT
- INCLUDES = $(XFTINCLUDES)
--#endif
- #if HasMkstemp
- TEMPDEFS = -DHAS_MKSTEMP
- #endif
---- xc/programs/xterm/Imakefile.orig 2003-01-20 15:23:27.000000000 +1100
-+++ xc/programs/xterm/Imakefile 2003-01-20 15:23:51.000000000 +1100
-@@ -92,12 +92,10 @@
- UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
- UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
- #endif
--#if BuildXftLibrary
- #define XRenderSupport
--#endif
- #ifdef XRenderSupport
- XRFDEF = -DXRENDERFONT
-- XRFLIBS = XftClientLibs $(XRENDERLIB)
-+ XRFLIBS = $(XFTLIBS)
- XRFDEPLIBS = XftClientDepLibs $(DEPXRENDERLIB)
- XRFINCLUDES = $(XFTINCLUDES)
- #endif
---- xc/programs/xclock/Imakefile.orig 2003-01-21 08:07:23.000000000 +1100
-+++ xc/programs/xclock/Imakefile 2003-01-21 08:08:17.000000000 +1100
-@@ -4,14 +4,12 @@
-
- XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.4 2002/07/01 02:26:00 tsi
Exp $
-
--#ifndef XClockUseRender
--#define XClockUseRender BuildRenderLibrary
--#endif
-+#define XClockUseRender YES
-
- #if XClockUseRender
- XRENDERDEFS = -DXRENDER
- XRENDERDEPS = XftClientDepLibs $(DEPXFTLIB) $(DEPXRENDERLIB)
-- XRENDERLIBS = XftClientLibs $(XRENDERLIB) -lm
-+ XRENDERLIBS = $(XFTLIBS) $(XRENDERLIB) -lm
- XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES)
- #endif
- DEPLIBS = $(XRENDERDEPS) XkbClientDepLibs XawClientDepLibs
---- xc/programs/xfd/Imakefile.orig 2003-01-21 10:10:54.000000000 +1100
-+++ xc/programs/xfd/Imakefile 2003-01-21 10:11:07.000000000 +1100
-@@ -4,14 +4,12 @@
-
- XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.3 2002/07/23 01:45:41 tsi Exp $
-
--#ifndef XFdUseRender
--#define XFdUseRender BuildRenderLibrary
--#endif
-+#define XFdUseRender YES
-
- #if XFdUseRender
- XRENDERDEFS = -DXRENDER
- XRENDERDEPS = XftClientDepLibs $(DEPXFTLIB) $(DEPXRENDERLIB)
-- XRENDERLIBS = XftClientLibs $(XRENDERLIB) -lm
-+ XRENDERLIBS = $(XFTLIBS) $(XRENDERLIB) -lm
- XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES)
- #endif
- DEPLIBS = $(XRENDERDEPS) XawClientDepLibs XkbClientDepLibs
---- xc/programs/xlogo/Imakefile.orig Tue Jan 21 12:35:12 2003
-+++ xc/programs/xlogo/Imakefile Tue Jan 21 12:35:29 2003
-@@ -4,14 +4,12 @@
-
- XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.3 2002/07/01 02:26:04 tsi Exp
$
-
--#ifndef XLogoUseRender
--#define XLogoUseRender BuildRenderLibrary
--#endif
-+#define XLogoUseRender YES
-
- #if XLogoUseRender
- XRENDERDEFS = -DXRENDER
- XRENDERDEPS = XftClientDepLibs $(DEPXFTLIB) $(DEPXRENDERLIB)
-- XRENDERLIBS = XftClientLibs $(XRENDERLIB) -lm
-+ XRENDERLIBS = $(XFTLIBS) $(XRENDERLIB) -lm
- XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES)
- #endif
-
Modified: branches/4.3.0/sid/debian/xlibs-dev.install.hurd-i386
==============================================================================
--- branches/4.3.0/sid/debian/xlibs-dev.install.hurd-i386 2003-06-10
16:27:27 UTC (rev 173)
+++ branches/4.3.0/sid/debian/xlibs-dev.install.hurd-i386 2003-06-10
17:59:58 UTC (rev 174)
@@ -1,4 +1,3 @@
-usr/X11R6/bin/xcursor-config
usr/X11R6/include/X11/Composite.h
usr/X11R6/include/X11/CompositeP.h
usr/X11R6/include/X11/ConstrainP.h
@@ -42,7 +41,6 @@
usr/X11R6/include/X11/Xcms.h
usr/X11R6/include/X11/Xdefs.h
usr/X11R6/include/X11/Xdmcp.h
-usr/X11R6/include/X11/Xcursor/Xcursor.h
usr/X11R6/include/X11/Xfuncproto.h
usr/X11R6/include/X11/Xfuncs.h
usr/X11R6/include/X11/Xlib.h
@@ -117,7 +115,6 @@
usr/X11R6/include/X11/extensions/Xext.h
usr/X11R6/include/X11/extensions/Xinerama.h
usr/X11R6/include/X11/extensions/Xrandr.h
-usr/X11R6/include/X11/extensions/Xrender.h
usr/X11R6/include/X11/extensions/Xv.h
usr/X11R6/include/X11/extensions/XvMC.h
usr/X11R6/include/X11/extensions/XvMClib.h
@@ -204,7 +201,6 @@
usr/X11R6/lib/libXRes.a
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXau.a
-usr/X11R6/lib/libXcursor.a
usr/X11R6/lib/libXdmcp.a
usr/X11R6/lib/libXext.a
usr/X11R6/lib/libXfont.a
@@ -216,7 +212,6 @@
usr/X11R6/lib/libXp.a
usr/X11R6/lib/libXpm.a
usr/X11R6/lib/libXrandr.a
-usr/X11R6/lib/libXrender.a
usr/X11R6/lib/libXss.a
usr/X11R6/lib/libXt.a
usr/X11R6/lib/libXtst.a
@@ -858,7 +853,6 @@
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
-usr/X11R6/man/man3/Xcursor.3x
usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
usr/X11R6/man/man3/XdbeBeginIdiom.3x
usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.i386
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.i386 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/MANIFEST.i386 2003-06-10 17:59:58 UTC (rev
174)
@@ -499,7 +499,6 @@
usr/X11R6/bin/xclock
usr/X11R6/bin/xcmsdb
usr/X11R6/bin/xconsole
-usr/X11R6/bin/xcursor-config
usr/X11R6/bin/xcursorgen
usr/X11R6/bin/xcutsel
usr/X11R6/bin/xditview
@@ -714,7 +713,6 @@
usr/X11R6/include/X11/Xaw/XawImP.h
usr/X11R6/include/X11/Xaw/XawInit.h
usr/X11R6/include/X11/Xcms.h
-usr/X11R6/include/X11/Xcursor/Xcursor.h
usr/X11R6/include/X11/Xdefs.h
usr/X11R6/include/X11/Xdmcp.h
usr/X11R6/include/X11/Xfuncproto.h
@@ -889,7 +887,6 @@
usr/X11R6/include/X11/extensions/Xext.h
usr/X11R6/include/X11/extensions/Xinerama.h
usr/X11R6/include/X11/extensions/Xrandr.h
-usr/X11R6/include/X11/extensions/Xrender.h
usr/X11R6/include/X11/extensions/Xv.h
usr/X11R6/include/X11/extensions/XvMC.h
usr/X11R6/include/X11/extensions/XvMClib.h
@@ -5941,8 +5938,6 @@
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
-usr/X11R6/lib/libXcursor.a
-usr/X11R6/lib/libXcursor.so.1.0
usr/X11R6/lib/libXdmcp.a
usr/X11R6/lib/libXext.a
usr/X11R6/lib/libXext.so.6.4
@@ -5962,8 +5957,6 @@
usr/X11R6/lib/libXpm.so.4.11
usr/X11R6/lib/libXrandr.a
usr/X11R6/lib/libXrandr.so.2.0
-usr/X11R6/lib/libXrender.a
-usr/X11R6/lib/libXrender.so.1.2
usr/X11R6/lib/libXss.a
usr/X11R6/lib/libXt.a
usr/X11R6/lib/libXt.so.6.0
@@ -6131,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
@@ -6897,7 +6889,6 @@
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
-usr/X11R6/man/man3/Xcursor.3x
usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
usr/X11R6/man/man3/XdbeBeginIdiom.3x
usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
Modified: branches/4.3.0/sid/debian/xlibs.install.s390
==============================================================================
--- branches/4.3.0/sid/debian/xlibs.install.s390 2003-06-10 16:27:27 UTC
(rev 173)
+++ branches/4.3.0/sid/debian/xlibs.install.s390 2003-06-10 17:59:58 UTC
(rev 174)
@@ -2,7 +2,6 @@
usr/X11R6/lib/libSM.so.6.0
usr/X11R6/lib/libX11.so.6.2
usr/X11R6/lib/libXTrap.so.6.4
-usr/X11R6/lib/libXcursor.so.1.0
usr/X11R6/lib/libXext.so.6.4
usr/X11R6/lib/libXft.so.1.1
usr/X11R6/lib/libXi.so.6.0
@@ -11,7 +10,6 @@
usr/X11R6/lib/libXp.so.6.2
usr/X11R6/lib/libXpm.so.4.11
usr/X11R6/lib/libXrandr.so.2.0
-usr/X11R6/lib/libXrender.so.1.2
usr/X11R6/lib/libXt.so.6.0
usr/X11R6/lib/libXtst.so.6.1
usr/X11R6/lib/libXv.so.1.0
Modified: branches/4.3.0/sid/debian/changelog
==============================================================================
--- branches/4.3.0/sid/debian/changelog 2003-06-10 16:27:27 UTC (rev 173)
+++ branches/4.3.0/sid/debian/changelog 2003-06-10 17:59:58 UTC (rev 174)
@@ -7,11 +7,14 @@
keyboard away from me.
* #057_X11.tmpl_warning_fix.diff: Imake warning fix patch [ISHIKAWA Mutsumi]
- * #003_linux.cf_and_xfree86.cf.diff:
- - Always disable `FontLibSharedFreeType' for compatiblity between
- normal XFree86 server and XFree86-dbg server.
- We should drop this change, when we can build the Loader Server
- liked against external FreeType2 [ISHIKAWA Mutsimi]
+ * #003_linux.cf_and_xfree86.cf.diff: [ISHIKAWA Mutsimi]
+ - Always disable `FontLibSharedFreeType'
+
+ * Use external Xft, Xrender and Xcursor libraries [ISHIKAWA Mutsumi]
+ - patch #058, #059, #060: new;
+ - patch #909: remove (reimplemented as above patches);
+ - xlibs{,-dbg,-dev}.*, shlibs*: drop Xrender and Xcursor related entry
+ - debian/control: add Build-Depends: libxrender-dev, libxcursor-dev
* debian/control:
- Change all references to libstdc++5-dev to be
Modified: branches/4.3.0/sid/debian/control
==============================================================================
--- branches/4.3.0/sid/debian/control 2003-06-10 16:27:27 UTC (rev 173)
+++ branches/4.3.0/sid/debian/control 2003-06-10 17:59:58 UTC (rev 174)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <[EMAIL PROTECTED]>
Standards-Version: 3.5.10
-Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, m4, groff,
zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev |
libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>=
4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>>
2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 | hurd |
freebsd | netbsd | openbsd, libpng12-0-dev | libpng-dev (>= 1.2.1),
libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev,
libstdc++5-dev | libstdc++-dev
+Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, m4, groff,
zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev |
libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>=
4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>>
2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 | hurd |
freebsd | netbsd | openbsd, libpng12-0-dev | libpng-dev (>= 1.2.1),
libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev,
libxrender-dev, libxcursor-dev, libstdc++5-dev | libstdc++-dev
Package: lbxproxy
Architecture: any
@@ -739,10 +739,9 @@
- libICE, the Inter-Client Exchange extension;
- libSM, the Session Management extension;
- libXext, a collection of several commonly-used extensions;
- - libXft, a FreeType-based font rendering extension;
+ - libXft, a FreeType-based font rendering extension(old version);
- libXi, the X Input extension;
- libXp, the X Printing extension;
- - libXrender, an extension for digital image composition;
- libXrandr, the RnR (resizing and rotation for the root window) extension;
- libXTrap, an extension for capturing the server protocol and synthesizing
core input events;
Modified: branches/4.3.0/sid/debian/xlibs.shlibs.dummy
==============================================================================
--- branches/4.3.0/sid/debian/xlibs.shlibs.dummy 2003-06-10 16:27:27 UTC
(rev 173)
+++ branches/4.3.0/sid/debian/xlibs.shlibs.dummy 2003-06-10 17:59:58 UTC
(rev 174)
@@ -1,7 +1,6 @@
libICE 6
libSM 6
libX11 6
-libXcursor 1
libXext 6
libXft 1
libXi 6
@@ -9,7 +8,6 @@
libXmuu 1
libXp 6
libXpm 4
-libXrender 1
libXt 6
libXtst 6
libXTrap 6
Modified: branches/4.3.0/sid/debian/shlibs.local
==============================================================================
--- branches/4.3.0/sid/debian/shlibs.local 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/shlibs.local 2003-06-10 17:59:58 UTC (rev
174)
@@ -17,7 +17,6 @@
libXmuu 1 xlibs (>> 4.1.0)
libXp 6 xlibs (>> 4.1.0)
libXpm 4 xlibs (>> 4.1.0)
-libXrender 1 xlibs (>> 4.1.0)
libXt 6 xlibs (>> 4.1.0)
libXtst 6 xlibs (>> 4.1.0)
libXTrap 6 xlibs (>> 4.2.0)
Modified: branches/4.3.0/sid/debian/rules
==============================================================================
--- branches/4.3.0/sid/debian/rules 2003-06-10 16:27:27 UTC (rev 173)
+++ branches/4.3.0/sid/debian/rules 2003-06-10 17:59:58 UTC (rev 174)
@@ -210,10 +210,16 @@
# in -L/usr/include and other, similarly ugly, stuff (including, but
# not limited to, -I/usr/include).
mkdir -p debian/local/exports/lib
- mkdir -p debian/local/exports/include/X11
+ mkdir -p debian/local/exports/include/X11/extensions
ln -s /usr/X11R6/lib/libXft* debian/local/exports/lib
rm -f debian/local/exports/lib/libXft.so.1*
debian/local/exports/lib/libXft1*
ln -s /usr/include/X11/Xft debian/local/exports/include/X11
+ # Xrender
+ ln -s /usr/X11R6/lib/libXrender.* debian/local/exports/lib
+ ln -s /usr/include/X11/extentions/Xrender.h
debian/local/exports/include/X11/extentions
+ # Xcursor
+ ln -s /usr/lib/libXcursor.* debian/local/exports/lib
+ ln -s /usr/include/X11/Xcursor debian/local/exports/include/X11
ifndef NOT_BUILDING_X_SERVER
# create source tree for static, debuggable XFree86 server
cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xfree86-dbg
Modified: branches/4.3.0/sid/debian/xlibs-dev.install
==============================================================================
--- branches/4.3.0/sid/debian/xlibs-dev.install 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/xlibs-dev.install 2003-06-10 17:59:58 UTC (rev
174)
@@ -1,4 +1,3 @@
-usr/X11R6/bin/xcursor-config
usr/X11R6/include/X11/Composite.h
usr/X11R6/include/X11/CompositeP.h
usr/X11R6/include/X11/ConstrainP.h
@@ -42,7 +41,6 @@
usr/X11R6/include/X11/Xcms.h
usr/X11R6/include/X11/Xdefs.h
usr/X11R6/include/X11/Xdmcp.h
-usr/X11R6/include/X11/Xcursor/Xcursor.h
usr/X11R6/include/X11/Xfuncproto.h
usr/X11R6/include/X11/Xfuncs.h
usr/X11R6/include/X11/Xlib.h
@@ -117,7 +115,6 @@
usr/X11R6/include/X11/extensions/Xext.h
usr/X11R6/include/X11/extensions/Xinerama.h
usr/X11R6/include/X11/extensions/Xrandr.h
-usr/X11R6/include/X11/extensions/Xrender.h
usr/X11R6/include/X11/extensions/Xv.h
usr/X11R6/include/X11/extensions/XvMC.h
usr/X11R6/include/X11/extensions/XvMClib.h
@@ -205,7 +202,6 @@
usr/X11R6/lib/libXRes.a
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXau.a
-usr/X11R6/lib/libXcursor.a
usr/X11R6/lib/libXdmcp.a
usr/X11R6/lib/libXext.a
usr/X11R6/lib/libXfont.a
@@ -217,7 +213,6 @@
usr/X11R6/lib/libXp.a
usr/X11R6/lib/libXpm.a
usr/X11R6/lib/libXrandr.a
-usr/X11R6/lib/libXrender.a
usr/X11R6/lib/libXss.a
usr/X11R6/lib/libXt.a
usr/X11R6/lib/libXtst.a
@@ -859,7 +854,6 @@
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
-usr/X11R6/man/man3/Xcursor.3x
usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
usr/X11R6/man/man3/XdbeBeginIdiom.3x
usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
Modified: branches/4.3.0/sid/debian/xlibs.install
==============================================================================
--- branches/4.3.0/sid/debian/xlibs.install 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/xlibs.install 2003-06-10 17:59:58 UTC (rev
174)
@@ -2,7 +2,6 @@
usr/X11R6/lib/libSM.so.6.0
usr/X11R6/lib/libX11.so.6.2
usr/X11R6/lib/libXTrap.so.6.4
-usr/X11R6/lib/libXcursor.so.1.0
usr/X11R6/lib/libXext.so.6.4
usr/X11R6/lib/libXft.so.1.1
usr/X11R6/lib/libXi.so.6.0
@@ -11,7 +10,6 @@
usr/X11R6/lib/libXp.so.6.2
usr/X11R6/lib/libXpm.so.4.11
usr/X11R6/lib/libXrandr.so.2.0
-usr/X11R6/lib/libXrender.so.1.2
usr/X11R6/lib/libXt.so.6.0
usr/X11R6/lib/libXtst.so.6.1
usr/X11R6/lib/libXv.so.1.0
Modified: branches/4.3.0/sid/debian/MANIFEST.alpha
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.alpha 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/MANIFEST.alpha 2003-06-10 17:59:58 UTC (rev
174)
@@ -499,7 +499,6 @@
usr/X11R6/bin/xclock
usr/X11R6/bin/xcmsdb
usr/X11R6/bin/xconsole
-usr/X11R6/bin/xcursor-config
usr/X11R6/bin/xcursorgen
usr/X11R6/bin/xcutsel
usr/X11R6/bin/xditview
@@ -714,7 +713,6 @@
usr/X11R6/include/X11/Xaw/XawImP.h
usr/X11R6/include/X11/Xaw/XawInit.h
usr/X11R6/include/X11/Xcms.h
-usr/X11R6/include/X11/Xcursor/Xcursor.h
usr/X11R6/include/X11/Xdefs.h
usr/X11R6/include/X11/Xdmcp.h
usr/X11R6/include/X11/Xfuncproto.h
@@ -889,7 +887,6 @@
usr/X11R6/include/X11/extensions/Xext.h
usr/X11R6/include/X11/extensions/Xinerama.h
usr/X11R6/include/X11/extensions/Xrandr.h
-usr/X11R6/include/X11/extensions/Xrender.h
usr/X11R6/include/X11/extensions/Xv.h
usr/X11R6/include/X11/extensions/XvMC.h
usr/X11R6/include/X11/extensions/XvMClib.h
@@ -5940,8 +5937,6 @@
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
-usr/X11R6/lib/libXcursor.a
-usr/X11R6/lib/libXcursor.so.1.0
usr/X11R6/lib/libXdmcp.a
usr/X11R6/lib/libXext.a
usr/X11R6/lib/libXext.so.6.4
@@ -5961,8 +5956,6 @@
usr/X11R6/lib/libXpm.so.4.11
usr/X11R6/lib/libXrandr.a
usr/X11R6/lib/libXrandr.so.2.0
-usr/X11R6/lib/libXrender.a
-usr/X11R6/lib/libXrender.so.1.2
usr/X11R6/lib/libXss.a
usr/X11R6/lib/libXt.a
usr/X11R6/lib/libXt.so.6.0
@@ -6106,7 +6099,6 @@
usr/X11R6/lib/modules/linux/libfbdevhw.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
@@ -6872,7 +6864,6 @@
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
-usr/X11R6/man/man3/Xcursor.3x
usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
usr/X11R6/man/man3/XdbeBeginIdiom.3x
usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
Modified: branches/4.3.0/sid/debian/xlibs-dev.install.s390
==============================================================================
--- branches/4.3.0/sid/debian/xlibs-dev.install.s390 2003-06-10 16:27:27 UTC
(rev 173)
+++ branches/4.3.0/sid/debian/xlibs-dev.install.s390 2003-06-10 17:59:58 UTC
(rev 174)
@@ -1,4 +1,3 @@
-usr/X11R6/bin/xcursor-config
usr/X11R6/include/X11/Composite.h
usr/X11R6/include/X11/CompositeP.h
usr/X11R6/include/X11/ConstrainP.h
@@ -42,7 +41,6 @@
usr/X11R6/include/X11/Xcms.h
usr/X11R6/include/X11/Xdefs.h
usr/X11R6/include/X11/Xdmcp.h
-usr/X11R6/include/X11/Xcursor/Xcursor.h
usr/X11R6/include/X11/Xfuncproto.h
usr/X11R6/include/X11/Xfuncs.h
usr/X11R6/include/X11/Xlib.h
@@ -117,7 +115,6 @@
usr/X11R6/include/X11/extensions/Xext.h
usr/X11R6/include/X11/extensions/Xinerama.h
usr/X11R6/include/X11/extensions/Xrandr.h
-usr/X11R6/include/X11/extensions/Xrender.h
usr/X11R6/include/X11/extensions/Xv.h
usr/X11R6/include/X11/extensions/XvMC.h
usr/X11R6/include/X11/extensions/XvMClib.h
@@ -205,7 +202,6 @@
usr/X11R6/lib/libXRes.a
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXau.a
-usr/X11R6/lib/libXcursor.a
usr/X11R6/lib/libXdmcp.a
usr/X11R6/lib/libXext.a
usr/X11R6/lib/libXfont.a
@@ -217,7 +213,6 @@
usr/X11R6/lib/libXp.a
usr/X11R6/lib/libXpm.a
usr/X11R6/lib/libXrandr.a
-usr/X11R6/lib/libXrender.a
usr/X11R6/lib/libXss.a
usr/X11R6/lib/libXt.a
usr/X11R6/lib/libXtst.a
@@ -859,7 +854,6 @@
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
-usr/X11R6/man/man3/Xcursor.3x
usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
usr/X11R6/man/man3/XdbeBeginIdiom.3x
usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
Modified: branches/4.3.0/sid/debian/xlibs-dev.links
==============================================================================
--- branches/4.3.0/sid/debian/xlibs-dev.links 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/xlibs-dev.links 2003-06-10 17:59:58 UTC (rev
174)
@@ -1,7 +1,6 @@
usr/X11R6/lib/libICE.so.6 usr/X11R6/lib/libICE.so
usr/X11R6/lib/libSM.so.6 usr/X11R6/lib/libSM.so
usr/X11R6/lib/libX11.so.6 usr/X11R6/lib/libX11.so
-usr/X11R6/lib/libXcursor.so.1 usr/X11R6/lib/libXcursor.so
usr/X11R6/lib/libXext.so.6 usr/X11R6/lib/libXext.so
usr/X11R6/lib/libXi.so.6 usr/X11R6/lib/libXi.so
usr/X11R6/lib/libXmu.so.6 usr/X11R6/lib/libXmu.so
@@ -9,7 +8,6 @@
usr/X11R6/lib/libXp.so.6 usr/X11R6/lib/libXp.so
usr/X11R6/lib/libXpm.so.4 usr/X11R6/lib/libXpm.so
usr/X11R6/lib/libXrandr.so.2 usr/X11R6/lib/libXrandr.so
-usr/X11R6/lib/libXrender.so.1 usr/X11R6/lib/libXrender.so
usr/X11R6/lib/libXt.so.6 usr/X11R6/lib/libXt.so
usr/X11R6/lib/libXtst.so.6 usr/X11R6/lib/libXtst.so
usr/X11R6/lib/libXv.so.1 usr/X11R6/lib/libXv.so
Modified: branches/4.3.0/sid/debian/MANIFEST.sparc
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.sparc 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/MANIFEST.sparc 2003-06-10 17:59:58 UTC (rev
174)
@@ -498,7 +498,6 @@
usr/X11R6/bin/xclock
usr/X11R6/bin/xcmsdb
usr/X11R6/bin/xconsole
-usr/X11R6/bin/xcursor-config
usr/X11R6/bin/xcursorgen
usr/X11R6/bin/xcutsel
usr/X11R6/bin/xditview
@@ -713,7 +712,6 @@
usr/X11R6/include/X11/Xaw/XawImP.h
usr/X11R6/include/X11/Xaw/XawInit.h
usr/X11R6/include/X11/Xcms.h
-usr/X11R6/include/X11/Xcursor/Xcursor.h
usr/X11R6/include/X11/Xdefs.h
usr/X11R6/include/X11/Xdmcp.h
usr/X11R6/include/X11/Xfuncproto.h
@@ -888,7 +886,6 @@
usr/X11R6/include/X11/extensions/Xext.h
usr/X11R6/include/X11/extensions/Xinerama.h
usr/X11R6/include/X11/extensions/Xrandr.h
-usr/X11R6/include/X11/extensions/Xrender.h
usr/X11R6/include/X11/extensions/Xv.h
usr/X11R6/include/X11/extensions/XvMC.h
usr/X11R6/include/X11/extensions/XvMClib.h
@@ -5939,8 +5936,6 @@
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
-usr/X11R6/lib/libXcursor.a
-usr/X11R6/lib/libXcursor.so.1.0
usr/X11R6/lib/libXdmcp.a
usr/X11R6/lib/libXext.a
usr/X11R6/lib/libXext.so.6.4
@@ -5960,8 +5955,6 @@
usr/X11R6/lib/libXpm.so.4.11
usr/X11R6/lib/libXrandr.a
usr/X11R6/lib/libXrandr.so.2.0
-usr/X11R6/lib/libXrender.a
-usr/X11R6/lib/libXrender.so.1.2
usr/X11R6/lib/libXss.a
usr/X11R6/lib/libXt.a
usr/X11R6/lib/libXt.so.6.0
@@ -6117,7 +6110,6 @@
usr/X11R6/lib/modules/linux/libfbdevhw.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
@@ -6883,7 +6875,6 @@
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
-usr/X11R6/man/man3/Xcursor.3x
usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
usr/X11R6/man/man3/XdbeBeginIdiom.3x
usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
Modified: branches/4.3.0/sid/debian/xlibs-dbg.links
==============================================================================
--- branches/4.3.0/sid/debian/xlibs-dbg.links 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/xlibs-dbg.links 2003-06-10 17:59:58 UTC (rev
174)
@@ -7,8 +7,6 @@
usr/X11R6/lib/debug/libXmuu.so.1.0 usr/X11R6/lib/debug/libXmuu.so.1
usr/X11R6/lib/debug/libXp.so.6.2 usr/X11R6/lib/debug/libXp.so.6
usr/X11R6/lib/debug/libXpm.so.4.11 usr/X11R6/lib/debug/libXpm.so.4
-usr/X11R6/lib/debug/libXrender.so.1.0 usr/X11R6/lib/debug/libXrender.so.1
usr/X11R6/lib/debug/libXt.so.6.0 usr/X11R6/lib/debug/libXt.so.6
usr/X11R6/lib/debug/libXtst.so.6.1 usr/X11R6/lib/debug/libXtst.so.6
usr/X11R6/lib/debug/libxrx.so.6.3 usr/X11R6/lib/debug/libxrx.so.6
-usr/X11R6/lib/debug/libXcursor.so.1.0 usr/X11R6/lib/debug/libXcursor.so.1
Modified: branches/4.3.0/sid/debian/xlibs.links
==============================================================================
--- branches/4.3.0/sid/debian/xlibs.links 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/xlibs.links 2003-06-10 17:59:58 UTC (rev
174)
@@ -4,7 +4,6 @@
usr/X11R6/lib/libSM.so.6.0 usr/X11R6/lib/libSM.so.6
usr/X11R6/lib/libX11.so.6.2 usr/X11R6/lib/libX11.so.6
usr/X11R6/lib/libXTrap.so.6.4 usr/X11R6/lib/libXTrap.so.6
-usr/X11R6/lib/libXcursor.so.1.0 usr/X11R6/lib/libXcursor.so.1
usr/X11R6/lib/libXext.so.6.4 usr/X11R6/lib/libXext.so.6
usr/X11R6/lib/libXft.so.1.1 usr/X11R6/lib/libXft.so.1
usr/X11R6/lib/libXi.so.6.0 usr/X11R6/lib/libXi.so.6
@@ -13,7 +12,6 @@
usr/X11R6/lib/libXp.so.6.2 usr/X11R6/lib/libXp.so.6
usr/X11R6/lib/libXpm.so.4.11 usr/X11R6/lib/libXpm.so.4
usr/X11R6/lib/libXrandr.so.2.0 usr/X11R6/lib/libXrandr.so.2
-usr/X11R6/lib/libXrender.so.1.2 usr/X11R6/lib/libXrender.so.1
usr/X11R6/lib/libXt.so.6.0 usr/X11R6/lib/libXt.so.6
usr/X11R6/lib/libXtst.so.6.1 usr/X11R6/lib/libXtst.so.6
usr/X11R6/lib/libXv.so.1.0 usr/X11R6/lib/libXv.so.1
Modified: branches/4.3.0/sid/debian/xlibs.shlibs
==============================================================================
--- branches/4.3.0/sid/debian/xlibs.shlibs 2003-06-10 16:27:27 UTC (rev
173)
+++ branches/4.3.0/sid/debian/xlibs.shlibs 2003-06-10 17:59:58 UTC (rev
174)
@@ -1,7 +1,6 @@
libICE 6 xlibs (>> 4.1.0)
libSM 6 xlibs (>> 4.1.0)
libX11 6 xlibs (>> 4.1.0)
-libXcursor 1 xlibs (>> 4.2.99)
libXext 6 xlibs (>> 4.1.0)
libXft 1 xlibs (>> 4.1.0)
libXi 6 xlibs (>> 4.1.0)
@@ -9,7 +8,6 @@
libXmuu 1 xlibs (>> 4.1.0)
libXp 6 xlibs (>> 4.1.0)
libXpm 4 xlibs (>> 4.1.0)
-libXrender 1 xlibs (>> 4.1.0)
libXt 6 xlibs (>> 4.1.0)
libXtst 6 xlibs (>> 4.1.0)
libXTrap 6 xlibs (>> 4.2.0)
