X Strike Force XOrg SVN commit: r104 - in xorg-lib-x11/trunk/debian: . patches
Author: fabbione
Date: 2004-10-24 00:25:45 -0500 (Sun, 24 Oct 2004)
New Revision: 104
Added:
xorg-lib-x11/trunk/debian/patches/916_debian_install_extra_headers.diff
Modified:
xorg-lib-x11/trunk/debian/CHANGESETS
xorg-lib-x11/trunk/debian/MANIFEST.any
xorg-lib-x11/trunk/debian/libx11-dev.install
Log:
* Install extra header files required by libxext:
+ Add 916_debian_install_extra_headers.diff.
+ Update MANIFEST.any and libx11-dev.install.
Modified: xorg-lib-x11/trunk/debian/CHANGESETS
===================================================================
--- xorg-lib-x11/trunk/debian/CHANGESETS 2004-10-24 04:45:47 UTC (rev 103)
+++ xorg-lib-x11/trunk/debian/CHANGESETS 2004-10-24 05:25:45 UTC (rev 104)
@@ -11,4 +11,9 @@
* Import initial debian/* files
97
+* Install extra header files required by libxext:
+ + Add 916_debian_install_extra_headers.diff.
+ + Update MANIFEST.any and libx11-dev.install.
+ 104
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-lib-x11/trunk/debian/MANIFEST.any
===================================================================
--- xorg-lib-x11/trunk/debian/MANIFEST.any 2004-10-24 04:45:47 UTC (rev 103)
+++ xorg-lib-x11/trunk/debian/MANIFEST.any 2004-10-24 05:25:45 UTC (rev 104)
@@ -1,3 +1,4 @@
+usr/X11R6/include/X11/ImUtil.h
usr/X11R6/include/X11/XKBlib.h
usr/X11R6/include/X11/Xcms.h
usr/X11R6/include/X11/Xlib.h
@@ -6,6 +7,7 @@
usr/X11R6/include/X11/Xresource.h
usr/X11R6/include/X11/Xutil.h
usr/X11R6/include/X11/cursorfont.h
+usr/X11R6/include/X11/region.h
usr/X11R6/lib/X11/XErrorDB
usr/X11R6/lib/X11/XKeysymDB
usr/X11R6/lib/X11/Xcms.txt
Modified: xorg-lib-x11/trunk/debian/libx11-dev.install
===================================================================
--- xorg-lib-x11/trunk/debian/libx11-dev.install 2004-10-24 04:45:47 UTC (rev 103)
+++ xorg-lib-x11/trunk/debian/libx11-dev.install 2004-10-24 05:25:45 UTC (rev 104)
@@ -1,3 +1,4 @@
+usr/X11R6/include/X11/ImUtil.h
usr/X11R6/include/X11/XKBlib.h
usr/X11R6/include/X11/Xcms.h
usr/X11R6/include/X11/Xlib.h
@@ -6,6 +7,7 @@
usr/X11R6/include/X11/Xresource.h
usr/X11R6/include/X11/Xutil.h
usr/X11R6/include/X11/cursorfont.h
+usr/X11R6/include/X11/region.h
usr/X11R6/lib/libX11.a
usr/X11R6/lib/libX11.so
usr/share/lintian/overrides/libx11-dev
Added: xorg-lib-x11/trunk/debian/patches/916_debian_install_extra_headers.diff
===================================================================
--- xorg-lib-x11/trunk/debian/patches/916_debian_install_extra_headers.diff 2004-10-24 04:45:47 UTC (rev 103)
+++ xorg-lib-x11/trunk/debian/patches/916_debian_install_extra_headers.diff 2004-10-24 05:25:45 UTC (rev 104)
@@ -0,0 +1,21 @@
+$Id$
+
+This patch install 2 extra header files required to compile libxext.
+They circular build depends on each other. Installing these headers
+will partially break the loop.
+libx11 still requires include/extensions/ from libxext.
+
+This patch by Fabio M. Di Nitto.
+
+diff -ruN xc-old/lib/X11/Imakefile xc/lib/X11/Imakefile
+--- xc-old/lib/X11/Imakefile 2004-10-24 05:00:55.153127000 +0000
++++ xc/lib/X11/Imakefile 2004-10-24 05:01:24.484668248 +0000
+@@ -8,7 +8,7 @@
+
+
+ HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
+- Xcms.h Xlocale.h XKBlib.h
++ Xcms.h Xlocale.h XKBlib.h region.h ImUtil.h
+
+ #if BuildServersOnly && !XWinServer && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer
+ all::
Property changes on: xorg-lib-x11/trunk/debian/patches/916_debian_install_extra_headers.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: