Author: branden
Date: 2005-06-16 02:25:44 -0500 (Thu, 16 Jun 2005)
New Revision: 225
Modified:
trunk/debian/changelog
trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
Log:
Do for the Xcomposite, Xdamage, and Xfixes libraries what was just done for
Xevie, because I ignored the voice in the back of my mind that said, "if
the bug appears in one place, you should grep to see if it occurs in other
places too."
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-16 00:21:30 UTC (rev 224)
+++ trunk/debian/changelog 2005-06-16 07:25:44 UTC (rev 225)
@@ -176,19 +176,19 @@
the headers if they're not being "built". Resync patches #004, #099c,
and #600.
- * Update patch #058 to give Xevie its own copy of the config-subst script,
- instead of hard-coding a within-tree path to the copy in the Xcursor
- library. (I don't know what the point of directing Xevie over to
- Xcursor's copy was -- there were already four identical copies of
- config-subst in X.Org 6.8.2 anyway, so this decision didn't help matters
- much. :) ) Update Xevie's Imakefile to look for config-subst in the
- current working directory instead of ../Xcursor.
+ * Update patch #058 to give Xcomposite, Xdamage, Xevie, and Xfixes their own
+ copies of the config-subst script, instead of hard-coding a within-tree
+ path to the copy in the Xcursor library. (I don't know what the point of
+ directing these Imakefiles over to Xcursor's copy was -- there were
+ already four identical copies of config-subst in X.Org 6.8.2 anyway, so
+ this decision didn't help matters much. :) ) Update the Imakefiles to look
+ for config-subst in the current working directory instead of ../Xcursor.
* Stop removing the debian/local/xlibmesa-drm-source directory in
debian/rules's clean target, as nothing creates it, and nothing has since
xfree86 4.3.0-0pre1v3.
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 15 Jun 2005 19:19:22 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 16 Jun 2005 02:06:29 -0500
xfree86 (4.3.0.dfsg.1-14) unstable; urgency=high
Modified:
trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
===================================================================
--- trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
2005-06-16 00:21:30 UTC (rev 224)
+++ trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
2005-06-16 07:25:44 UTC (rev 225)
@@ -19,15 +19,15 @@
and Xrender build directories from system directories where those
libraries may be found (already installed).
-xc/lib/Xevie/Imakefile:
-xc/lib/Xevie/config-subst:
-* Give Xevie its own copy of the config-subst script, instead of
- hard-coding a within-tree path to the copy in the Xcursor library.
- (I don't know what the point of directing Xevie over to Xcursor's copy
- was -- there were already four identical copies of config-subst in X.Org
- 6.8.2 anyway, so this decision didn't help matters much. :) ) Update
- Xevie's Imakefile to look for config-subst in the current working
- directory instead of ../Xcursor.
+xc/lib/{Xcomposite,Xdamage,Xevie,Xfixes}/Imakefile:
+xc/lib/{Xcomposite,Xdamage,Xevie,Xfixes}/config-subst:
+* Give Xcomposite, Xdamage, Xevie, and Xfixes their own copies of the
+ config-subst script, instead of hard-coding a within-tree path to the
+ copy in the Xcursor library. (I don't know what the point of directing
+ these Imakefiles over to Xcursor's copy was -- there were already four
+ identical copies of config-subst in X.Org 6.8.2 anyway, so this decision
+ didn't help matters much. :) ) Update the Imakefiles to look for
+ config-subst in the current working directory instead of ../Xcursor.
xc/lib/Xft1/Imakefile:
* Give Xft1 its own Imake variable names, distinct from Xft, to
@@ -343,6 +343,58 @@
$(WINDOWSLIBDIR) $(XEVIELIBDIR) $(XFIXESLIBDIR) $(DAMAGELIBDIR)
$(COMPOSITELIBDIR)
SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
+diff -urN xc~/lib/Xcomposite/Imakefile xc/lib/Xcomposite/Imakefile
+--- xc~/lib/Xcomposite/Imakefile 2005-02-28 12:35:18.000000000 -0500
++++ xc/lib/Xcomposite/Imakefile 2005-06-16 02:03:10.412769962 -0500
+@@ -59,7 +59,7 @@
+
+ xcomposite.pc: xcomposite.pc.in
+ RemoveFile($@)
+- sh ../Xcursor/config-subst $(SUBSTVARS) < xcomposite.pc.in > $@
++ sh config-subst $(SUBSTVARS) < xcomposite.pc.in > $@
+
+ InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig)
+
+diff -urN xc~/lib/Xcomposite/config-subst xc/lib/Xcomposite/config-subst
+--- xc~/lib/Xcomposite/config-subst 1969-12-31 19:00:00.000000000 -0500
++++ xc/lib/Xcomposite/config-subst 2005-06-16 02:02:12.198432925 -0500
+@@ -0,0 +1,10 @@
++#!/bin/sh
++script=config-subst.$$
++trap "rm $script" 0
++rm -f $script
++for i in ${1+"$@"}; do
++ var="`echo "$i" | sed 's/=.*$//'`"
++ val="`echo "$i" | sed 's/^[^=]*=//'`"
++ echo "s;@$var@;$val;" >> $script
++done
++sed -f $script
+diff -urN xc~/lib/Xdamage/Imakefile xc/lib/Xdamage/Imakefile
+--- xc~/lib/Xdamage/Imakefile 2005-02-28 12:35:18.000000000 -0500
++++ xc/lib/Xdamage/Imakefile 2005-06-16 02:03:14.860872124 -0500
+@@ -59,7 +59,7 @@
+
+ xdamage.pc: xdamage.pc.in
+ RemoveFile($@)
+- sh ../Xcursor/config-subst $(SUBSTVARS) < xdamage.pc.in > $@
++ sh config-subst $(SUBSTVARS) < xdamage.pc.in > $@
+
+ InstallNonExecFile(xdamage.pc,$(USRLIBDIR)/pkgconfig)
+
+diff -urN xc~/lib/Xdamage/config-subst xc/lib/Xdamage/config-subst
+--- xc~/lib/Xdamage/config-subst 1969-12-31 19:00:00.000000000 -0500
++++ xc/lib/Xdamage/config-subst 2005-06-16 02:02:12.201432994 -0500
+@@ -0,0 +1,10 @@
++#!/bin/sh
++script=config-subst.$$
++trap "rm $script" 0
++rm -f $script
++for i in ${1+"$@"}; do
++ var="`echo "$i" | sed 's/=.*$//'`"
++ val="`echo "$i" | sed 's/^[^=]*=//'`"
++ echo "s;@$var@;$val;" >> $script
++done
++sed -f $script
diff -urN xc/lib/Xevie~/Imakefile xc/lib/Xevie/Imakefile
--- xc/lib/Xevie~/Imakefile 2005-02-28 12:35:18.000000000 -0500
+++ xc/lib/Xevie/Imakefile 2005-06-15 16:28:51.601337553 -0500
@@ -369,6 +421,32 @@
+ echo "s;@$var@;$val;" >> $script
+done
+sed -f $script
+diff -urN xc~/lib/Xfixes/Imakefile xc/lib/Xfixes/Imakefile
+--- xc~/lib/Xfixes/Imakefile 2005-02-28 12:35:18.000000000 -0500
++++ xc/lib/Xfixes/Imakefile 2005-06-16 02:03:19.922988388 -0500
+@@ -66,7 +66,7 @@
+
+ xfixes.pc: xfixes.pc.in
+ RemoveFile($@)
+- sh ../Xcursor/config-subst $(SUBSTVARS) < xfixes.pc.in > $@
++ sh config-subst $(SUBSTVARS) < xfixes.pc.in > $@
+
+ InstallNonExecFile(xfixes.pc,$(USRLIBDIR)/pkgconfig)
+
+diff -urN xc~/lib/Xfixes/config-subst xc/lib/Xfixes/config-subst
+--- xc~/lib/Xfixes/config-subst 1969-12-31 19:00:00.000000000 -0500
++++ xc/lib/Xfixes/config-subst 2005-06-16 02:02:12.208433155 -0500
+@@ -0,0 +1,10 @@
++#!/bin/sh
++script=config-subst.$$
++trap "rm $script" 0
++rm -f $script
++for i in ${1+"$@"}; do
++ var="`echo "$i" | sed 's/=.*$//'`"
++ val="`echo "$i" | sed 's/^[^=]*=//'`"
++ echo "s;@$var@;$val;" >> $script
++done
++sed -f $script
diff -ruN xc-old/lib/Xft1/Imakefile xc/lib/Xft1/Imakefile
--- xc-old/lib/Xft1/Imakefile 2004-04-23 18:43:44.000000000 +0000
+++ xc/lib/Xft1/Imakefile 2004-10-26 10:46:37.519215392 +0000
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
