[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: rev 737 - in branches/4.3.0/sid/debian: . patches



Author: branden
Date: 2003-10-30 22:35:36 -0500 (Thu, 30 Oct 2003)
New Revision: 737

Added:
   branches/4.3.0/sid/debian/patches/099a_improve_search_for_libXcursor.diff
Modified:
   branches/4.3.0/sid/debian/changelog
Log:
Patch Xlib (CrGlCur.c) to search harder for an Xcursor library.  Not
everybody has symlinks on their system for compile-time linking of objects
with libXcursor.  Attempt to find "libXcursor.so.1" first, then (per the
existing code), fall back to "libXcursor.so" and finally "libXcursor".
(Closes: #204358)

- debian/patches/099a_improve_search_for_libXcursor.diff


Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog	2003-10-28 22:59:03 UTC (rev 736)
+++ branches/4.3.0/sid/debian/changelog	2003-10-31 03:35:36 UTC (rev 737)
@@ -52,8 +52,15 @@
     - debian/xlibs-data.prerm.in
     - debian/xlibs.preinst.in
 
- -- Branden Robinson <branden@debian.org>  Mon, 27 Oct 2003 18:47:24 -0500
+  * Patch Xlib (CrGlCur.c) to search harder for an Xcursor library.  Not
+    everybody has symlinks on their system for compile-time linking of objects
+    with libXcursor.  Attempt to find "libXcursor.so.1" first, then (per the
+    existing code), fall back to "libXcursor.so" and finally "libXcursor".
+    (Closes: #204358)
+    - debian/patches/099a_improve_search_for_libXcursor.diff
 
+ -- Branden Robinson <branden@debian.org>  Thu, 30 Oct 2003 17:54:29 -0500
+
 xfree86 (4.3.0-0pre1v4) experimental; urgency=low
 
   * Add missing symbolic links for libXTrap. [ISHIKAWA Mutsumi]
@@ -2397,14 +2404,14 @@
       Matthias Scheler) (Matthieu Herrb)
     + Fix crash in the TextWidget reported by Hans Wilmer. The bug is fixed in
       the TextAction.c patch (actually it was fixed in head, but I forgot to
-      update the 4.2 branch, that is what most people are using).  Also synced
+      update the 4.2 branch, that is what most people are using).  Also synced
       some other bug fixes only in CVS head.  (Paulo Cesar Pereira de Andrade)
 
   * patch #002: resynced with xf-4_2-branch updates
   * patch #024: new; fix for hangs upon VT switch back to XFree86 on Rage128
     and Radeon cards due to failure to set and reset PCI busmastering properly
     (thanks, Michel Dänzer) (Closes: #163359)
-  * patch #026: new; patch from Steven Davies to implement double-buffering
+  * patch #026: new; patch from Steven Davies to implement double-buffering
     support for the XVideo extension in the tdfx driver; he wanted testers, so
     I'm sticking this code in to test it.  Welcome to Debian unstable!
 

Added: branches/4.3.0/sid/debian/patches/099a_improve_search_for_libXcursor.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/099a_improve_search_for_libXcursor.diff	2003-10-28 22:59:03 UTC (rev 736)
+++ branches/4.3.0/sid/debian/patches/099a_improve_search_for_libXcursor.diff	2003-10-31 03:35:36 UTC (rev 737)
@@ -0,0 +1,19 @@
+$Id$
+
+Not everybody has symlinks on their system for compile-time linking of
+objects with libXcursor.  Attempt to find libXcursor.so.1 first, then (per
+the existing code), fall back to libXcursor.so and finally libXcursor.
+
+This patch by Branden Robinson.  Not submitted upstream yet.
+
+--- xc/lib/X11/CrGlCur.c~	2003-10-30 17:43:58.000000000 -0500
++++ xc/lib/X11/CrGlCur.c	2003-10-30 17:45:51.000000000 -0500
+@@ -45,7 +45,7 @@
+ #endif
+ 
+ #ifndef LIBXCURSOR
+-#define LIBXCURSOR "libXcursor.so"
++#define LIBXCURSOR "libXcursor.so.1"
+ #endif
+ 
+ static char libraryName[] = LIBXCURSOR;


Property changes on: branches/4.3.0/sid/debian/patches/099a_improve_search_for_libXcursor.diff
___________________________________________________________________
Name: svn:keywords
   + Id



Reply to: