X Strike Force XFree86 SVN commit: rev 1000 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2004-02-01 14:39:32 -0500 (Sun, 01 Feb 2004)
New Revision: 1000
Added:
branches/4.3.0/sid/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
Modified:
branches/4.3.0/sid/debian/TODO
branches/4.3.0/sid/debian/changelog
Log:
Attempt again to fix the problem with Xlib not finding the Xcursor library
to dynamically open it. Dynamic loading of Xcursor by Xlib wasn't working
when an external Xcursor library was available during the build; Xlib was
being told that the name of the Xcursor object was "Xcursor.so.", because
SOXCURSORREV was only defined in xc/lib/Xcursor/Imakefile, which is not
used when an external Xcursor library is used.
Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2004-01-31 18:28:45 UTC (rev 999)
+++ branches/4.3.0/sid/debian/TODO 2004-02-01 19:39:32 UTC (rev 1000)
@@ -5,6 +5,7 @@
* Fix the freakin' Xcursor-shared-object-search in Xlib.
http://lists.debian.org/debian-x/2004/debian-x-200401/msg00475.html
+ * PATCH APPLIED, FIX NEEDS TESTING
* Investigate/forward-port the following patches from trunk:
+ 067_nonexecutable_malloced_mem.diff
+ 068_riscpc_ioport_fix.diff
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-31 18:28:45 UTC (rev 999)
+++ branches/4.3.0/sid/debian/changelog 2004-02-01 19:39:32 UTC (rev 1000)
@@ -168,8 +168,16 @@
RV280-based chipsets (and as Mobility products).
- debian/patches/099_ati_recognize_more_RV280_models.diff
- -- Branden Robinson <branden@debian.org> Tue, 27 Jan 2004 01:10:35 -0500
+ * Attempt again to fix the problem with Xlib not finding the Xcursor library
+ to dynamically open it. Dynamic loading of Xcursor by Xlib wasn't working
+ when an external Xcursor library was available during the build; Xlib was
+ being told that the name of the Xcursor object was "Xcursor.so.", because
+ SOXCURSORREV was only defined in xc/lib/Xcursor/Imakefile, which is not
+ used when an external Xcursor library is used.
+ - debian/patches/099c_support_loadable_external_Xcursor_lib.diff
+ -- Branden Robinson <branden@debian.org> Sun, 1 Feb 2004 14:36:57 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Added: branches/4.3.0/sid/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2004-01-31 18:28:45 UTC (rev 999)
+++ branches/4.3.0/sid/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2004-02-01 19:39:32 UTC (rev 1000)
@@ -0,0 +1,37 @@
+$Id$
+
+Dynamic loading of Xcursor by Xlib wasn't working when an external Xcursor
+library was available during the build; Xlib was being told that the name
+of the Xcursor object was "Xcursor.so.", because SOXCURSORREV was only
+defined in xc/lib/Xcursor/Imakefile, which is not used when an external
+Xcursor library is used.
+
+This patch by Branden Robinson.
+
+Not submitted upstream.
+
+--- xc/config/cf/linux.cf.orig 2004-02-01 14:06:04.000000000 -0500
++++ xc/config/cf/linux.cf 2004-02-01 14:07:37.000000000 -0500
+@@ -188,6 +188,8 @@
+ # define HasRenderLibrary YES
+ # define BuildXcursorLibrary NO
+ # define HasXcursorLibrary YES
++/* Xlib needs to know the available version of Xcursor. */
++# define SharedXcursorRev 1.0
+ # define IconDir Concat(ProjectRoot,/lib/X11/icons)
+ # define BuildXftLibrary NO
+ # define HasXftLibrary YES
+--- xc/lib/X11/Imakefile.orig 2004-02-01 14:07:48.000000000 -0500
++++ xc/lib/X11/Imakefile 2004-02-01 14:12:29.000000000 -0500
+@@ -110,7 +110,10 @@
+ K5INCL = Krb5Includes
+ K5DEFS = Krb5Defines
+ #endif
+-#if BuildLoadableXlibXcursor
++#ifdef SharedXcursorRev
++SOXCURSORREV = SharedXcursorRev
++#endif
++#if BuildLoadableXlibXcursor || HasXcursorLibrary
+ XCURSOR_DEFINES = -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.$(SOXCURSORREV)\"
+ #endif
+ #if NeedLibInsideFlag
Property changes on: branches/4.3.0/sid/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: