This integrates the remainder of 0000_backport_from_upstream.diff into
000_stolen_from_HEAD.diff.
Combined with a "rm" and "svn rm" of 0000_backport_from_upstream.diff, of
course, which I haven't included here.
Intended to apply after the previous ones.
--- 000_stolen_from_HEAD.diff 2005-06-07 20:26:29.218500169 -0400
+++ 000_stolen_from_HEAD.diff.newest 2005-06-07 20:41:34.446848946 -0400
@@ -5,6 +5,15 @@
Diffs from CVS may have hunks that change only RCS/CVS keyword lines
elided so that they apply cleanly.
+2005-03-06 Branden Robinson <[EMAIL PROTECTED]>
+
+ * xc/config/cf/linux.cf [@ 1.24]
+ Shut up (tons of) Imake warnings on Debian systems by testing for
+ variable being defined before testing its value. (Presumably the
+ fallback definition of NothingOutsideProjectRoot in Imake.tmpl was
+ intended to prevent this, but it apparently is not in effect yet
+ when linux.cf is parsed.)
+
[???]
* config/cf/linux.cf: [@ 1.23]
* config/cf/xorg.cf: [@ 1.45]
@@ -69,9 +78,35 @@
xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c @ 1.4
Bug #2004: Make DDC delay slightly longer. (Thomas J. Moore)
-diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
---- xc.orig/config/cf/linux.cf 2005-03-29 00:50:32.412972192 +1000
-+++ xc/config/cf/linux.cf 2005-03-29 00:52:27.671450240 +1000
+Index: xc/config/cf/linux.cf
+===================================================================
+--- xc/config/cf/linux.cf (revision 150)
++++ xc/config/cf/linux.cf (working copy)
+@@ -95,13 +95,13 @@
+ XCOMM binutils: (LinuxBinUtilsMajorVersion)
+
+ #if LinuxDistribution == LinuxDebian
+-# if !NothingOutsideProjectRoot
++# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
+ # define SystemManDirectory /usr/share/man
+ # endif
+ # define HasPam YES
+ /* un-comment this when it is un-broken */
+ /* # define JoystickSupport YES */
+-# if !NothingOutsideProjectRoot
++# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
+ # define XAppLoadDir EtcX11Directory/app-defaults
+ # define XFileSearchPathDefault
Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
+ /* the relative symlink created by this rule causes problems for us */
+@@ -112,7 +112,7 @@
+ # define InstallAppDefaultsLong(file,class) @@\
+
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
+ # endif /* InstallAppDefFiles */
+-# endif /* !NothingOutsideProjectRoot */
++# endif /* !defined(NotingOutsideProjectRoot) || !NothingOutsideProjectRoot */
+ # define SharedLibXdmGreet NO
+ # define LinkGLToUsrInclude NO
+ # define LinkGLToUsrLib NO
@@ -136,8 +136,8 @@
*/
--
This space intentionally left blank.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
