X Strike Force X.Org X11 SVN commit: r126 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-05-19 22:14:23 -0500 (Thu, 19 May 2005)
New Revision: 126
Modified:
trunk/debian/changelog
trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
Log:
Make patch 099c_support_loadable_external_Xcursorlib.diff apply. See changelog.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-05-20 02:38:54 UTC (rev 125)
+++ trunk/debian/changelog 2005-05-20 03:14:23 UTC (rev 126)
@@ -81,6 +81,9 @@
- Edited 000_stolen_from_HEAD.diff (Removed Xpm fixes which were added
upstream)
- Deleted 003_linux.cf_and_xfree86.cf.diff (obsolete)
+ - Delete first hunk for linux.cf in
+ 099c_support_loadable_external_Xcursor_lib.diff because nothing in
+ this hunk is present in the file any more.
Changes by Branden Robinson:
Modified: trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2005-05-20 02:38:54 UTC (rev 125)
+++ trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2005-05-20 03:14:23 UTC (rev 126)
@@ -10,18 +10,6 @@
Not submitted upstream.
-diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
---- xc-old/config/cf/linux.cf 2004-10-27 08:40:39.015486000 +0000
-+++ xc/config/cf/linux.cf 2004-10-27 08:41:15.188986920 +0000
-@@ -228,6 +228,8 @@
- # define HasRenderLibrary YES
- # define BuildXcursorLibrary NO
- # define HasXcursorLibrary YES
-+/* Xlib needs to know the available version of Xcursor. */
-+# define SharedXcursorRev 1
- # define IconDir Concat(ProjectRoot,/lib/X11/icons)
- # define BuildXftLibrary NO
- # define HasXftLibrary YES
diff -ruN xc-old/lib/X11/Imakefile xc/lib/X11/Imakefile
--- xc-old/lib/X11/Imakefile 2004-10-27 08:40:37.114775000 +0000
+++ xc/lib/X11/Imakefile 2004-10-27 08:41:15.188986920 +0000
Reply to: