X Strike Force X.Org X11 SVN commit: r198 - trunk/debian/patches
Author: branden
Date: 2005-06-13 18:52:08 -0500 (Mon, 13 Jun 2005)
New Revision: 198
Modified:
trunk/debian/patches/060_external_XrenderXftXcursor_lib.diff
Log:
Remove parts of patch that change files no longer present in the source
tree (the Xcursor and Xft libraries, separately packaged in Debian).
Modified: trunk/debian/patches/060_external_XrenderXftXcursor_lib.diff
===================================================================
--- trunk/debian/patches/060_external_XrenderXftXcursor_lib.diff 2005-06-13 23:32:44 UTC (rev 197)
+++ trunk/debian/patches/060_external_XrenderXftXcursor_lib.diff 2005-06-13 23:52:08 UTC (rev 198)
@@ -1,4 +1,4 @@
-$Id: 060_external_XrenderXftXcursor_lib.diff 1044 2004-02-16 17:40:33Z branden $
+$Id$
patch to be able to use external Xrender/Xft/Xcursor libraries
@@ -56,30 +56,6 @@
$(WINDOWSLIBDIR) $(XEVIELIBDIR) $(XFIXESLIBDIR) $(DAMAGELIBDIR) $(COMPOSITELIBDIR)
SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
-diff -ruN xc-old/lib/Xcursor/Imakefile xc/lib/Xcursor/Imakefile
---- xc-old/lib/Xcursor/Imakefile 2004-04-23 18:43:40.000000000 +0000
-+++ xc/lib/Xcursor/Imakefile 2004-10-26 10:44:50.897424368 +0000
-@@ -46,6 +46,8 @@
-
- DEFINES=-DICONDIR=\"$(ICONDIR)\"
-
-+INCLUDES=$(XRENDERINCLUDES)
-+
- SRCS = cursor.c display.c file.c library.c xlib.c
-
- OBJS = cursor.o display.o file.o library.o xlib.o
-diff -ruN xc-old/lib/Xft/Imakefile xc/lib/Xft/Imakefile
---- xc-old/lib/Xft/Imakefile 2004-04-23 18:43:41.000000000 +0000
-+++ xc/lib/Xft/Imakefile 2004-10-26 10:45:28.161759328 +0000
-@@ -44,7 +44,7 @@
- #if HasGcc2 || HasGcc3
- WARNINGS=-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
- #endif
--INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(XBUILDINCDIR) $(WARNINGS)
-+INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(XBUILDINCDIR) $(XRENDERINCLUDES) $(WARNINGS)
- DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES) -DXFREE86_FT2
-
- XFT_REVISION=2
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
Reply to: