Author: ishikawa
Date: 2003-06-03 23:47:32 -0500 (Tue, 03 Jun 2003)
New Revision: 137
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/004_imake_manpage_handling_overhaul.diff
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/800_gnu_config.diff
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/842_netbsd_NetBSD.cf_fixes.diff
Log:
update #003,#800,#842 patch to adapt #A0{1,2,3} change
update #004 patch to adapt #003 change
I can not test #800 and #842 patch, please test Hurd guy and NetBSD guy
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/842_netbsd_NetBSD.cf_fixes.diff
==============================================================================
---
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/842_netbsd_NetBSD.cf_fixes.diff
2003-06-04 00:25:31 UTC (rev 136)
+++
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/842_netbsd_NetBSD.cf_fixes.diff
2003-06-04 04:47:32 UTC (rev 137)
@@ -3,11 +3,12 @@
values for NetBSDDistribution, before these will be used (provided as a
separate patch).
-Origionally written by Joel Baker <[EMAIL PROTECTED]>.
+Origionally written by Joel Baker <[EMAIL PROTECTED]>,
+update by ISHIKAWA Mutsumi <[EMAIL PROTECTED]>
--- xc/config/cf/NetBSD.cf~ 2002-10-16 00:52:50.000000000 -0500
+++ xc/config/cf/NetBSD.cf 2002-10-16 01:00:33.000000000 -0500
-@@ -18,12 +18,109 @@
+@@ -18,12 +18,138 @@
#define OSTeenyVersion DefaultOSTeenyVersion
#endif
@@ -30,11 +31,11 @@
#ifndef OSVendor
-#define OSVendor The NetBSD Foundation, Inc.
+#define OSVendor The NetBSD Foundation, Inc.
- #endif
++#endif
+
+#ifndef NetBSDBinUtilsMajorVersion
+# define NetBSDBinUtilsMajorVersion DefaultNetBSDBinUtilsMajorVersion
-+#endif
+ #endif
+
XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
@@ -107,11 +108,40 @@
+# define BuildHtmlManPages NO
+# define ProjectManSuffix x
+
++/* We build-dep on expat, fontconfig, Xrender, Xft and Xcursor */
++# define BuildExpatLibrary NO
++# define HasExpat YES
++# define ExpatIncDirStandard YES
++# define BuildFontconfigLibrary NO
++# define HasFontconfig YES
++# define UseFontconfig YES
++# define FontconfigIncDir /usr/include/fontconfig
++# define BuildXftLibrary NO
++# define HasXftLibrary YES
++# define BuildXft1Library YES
++# define IconDir Concat(ProjectRoot,/lib/X11/icons)
++# define BuildXcursorLibrary NO
++# define HasXcursorLibrary YES
++# define BuildRenderLibrary NO
++# define HasRenderLibrary YES
++
++# ifdef UseInstalled
++# define RenderLibraryDir /usr/X11R6
++# define XftLibraryDir /usr/X11R6
++# define XcursorLibraryDir /usr
++# else
++/* for Debian xfree86 build hack */
++# define RenderLibraryDir $(TOP)/../../debian/local/exports
++# define XftLibraryDir $(TOP)/../../debian/local/exports
++# define XcursorLibraryDir $(TOP)/../../debian/local/exports
++# endif
++
+/* we build-depend on libfreetype6-dev (FreeType 2.x) */
+# define BuildFreetype2Library NO
+# define HasFreetype2 YES
+# define HasXdmAuth YES
+# define HasLatex YES
++
+# endif /* DebianMaintainer */
+#endif /* NetBSDDebian */
+
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/800_gnu_config.diff
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/800_gnu_config.diff
2003-06-04 00:25:31 UTC (rev 136)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/800_gnu_config.diff
2003-06-04 04:47:32 UTC (rev 137)
@@ -3,12 +3,13 @@
Adds Debian specific configuration to gnu.cf (mostly from linux.cf).
Original patch by Marcus Brinkmann <[EMAIL PROTECTED]>, updated by
-Robert Millan <[EMAIL PROTECTED]> and
-Daniel Stone <[EMAIL PROTECTED]>.
+Robert Millan <[EMAIL PROTECTED]>,
+Daniel Stone <[EMAIL PROTECTED]>,
+ISHIKAWA Mutsumi <[EMAIL PROTECTED]>
--- xc/config/cf/gnu.cf.orig Fri Aug 24 04:16:54 2001
+++ xc/config/cf/gnu.cf Sun Apr 13 11:19:47 2003
-@@ -18,6 +18,76 @@
+@@ -18,6 +18,93 @@
#endif
XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
@@ -36,19 +37,36 @@
+#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
+#define BuildAllSpecsDocs YES
+#define HasLatex YES
-+/* We build-dep on expat, fontconfig, freetype and Xft. */
++/* We build-dep on expat, fontconfig, freetype, Xrender, Xft and Xcursor */
+#define BuildFreetype2Library NO
+#define HasFreetype2 YES
+#define Freetype2Dir /usr
-+#define BuildExpatLibrary NO
-+#define HasExpat YES
-+#define ExpatIncDirStandard YES
-+#define BuildFontconfigLibrary NO
-+#define HasFontconfig YES
-+#define UseFontconfig YES
-+#define FontconfigIncDir /usr/include/fontconfig
-+#define BuildXftLibrary NO
-+#define BuildXft1Library YES
++#define BuildExpatLibrary NO
++#define HasExpat YES
++#define ExpatIncDirStandard YES
++#define BuildFontconfigLibrary NO
++#define HasFontconfig YES
++#define UseFontconfig YES
++#define FontconfigIncDir /usr/include/fontconfig
++#define BuildXftLibrary NO
++#define HasXftLibrary YES
++#define BuildXft1Library YES
++#define BuildXcursorLibrary NO
++#define HasXcursorLibrary YES
++#define BuildRenderLibrary NO
++#define HasRenderLibrary YES
++
++#ifdef UseInstalled
++# define RenderLibraryDir /usr/X11R6
++# define XftLibraryDir /usr/X11R6
++# define XcursorLibraryDir /usr
++#else
++/* for Debian xfree86 build hack */
++# define RenderLibraryDir $(TOP)/../../debian/local/exports
++# define XftLibraryDir $(TOP)/../../debian/local/exports
++# define XcursorLibraryDir $(TOP)/../../debian/local/exports
++#endif
++
+#define XAppLoadDir EtcX11Directory/app-defaults
+#define XFileSearchPathDefault
Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
+/* the relative symlink created by this rule causes problems for us */
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/004_imake_manpage_handling_overhaul.diff
==============================================================================
---
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/004_imake_manpage_handling_overhaul.diff
2003-06-04 00:25:31 UTC (rev 136)
+++
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/004_imake_manpage_handling_overhaul.diff
2003-06-04 04:47:32 UTC (rev 137)
@@ -305,7 +305,7 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -945,26 +946,6 @@
+@@ -956,26 +957,6 @@
# define ExtraLibraries -ldnet
#else
# define ConnectionFlags -DUNIXCONN -DTCPCONN
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff
==============================================================================
---
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff
2003-06-04 00:25:31 UTC (rev 136)
+++
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff
2003-06-04 04:47:32 UTC (rev 137)
@@ -1,8 +1,8 @@
Various Debian changes to xfree86.cf and linux.cf, including better
support for gcc flags. Forward-ported with some updates from 4.2.1.
This patch originally by Branden Robinson, forward-ported with a few
-updates by Daniel Stone. Xrender and Xcursor separation by ISHIKAWA
-Mutsumi.
+updates by Daniel Stone. Build with external Xrender and Xcursor
+by ISHIKAWA Mutsumi.
--- xc/config/cf/xfree86.cf.orig Fri Jan 3 11:55:00 2003
+++ xc/config/cf/xfree86.cf Fri Jan 3 11:55:09 2003
@@ -72,7 +72,7 @@
# define XF86SetupUsesStaticTcl NO
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-@@ -146,6 +152,28 @@
+@@ -146,6 +152,39 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
# define BuildRman NO
# define BuildHtmlManPages NO
@@ -82,7 +82,7 @@
+# define BuildTrueTypeFonts NO
+# define BuildBethMarduthoFonts NO
+
-+/* We build-dep on expat, fontconfig and Xft. */
++/* We build-dep on expat, fontconfig, Xrender, Xft and Xcursor */
+# define BuildExpatLibrary NO
+# define HasExpat YES
+# define ExpatIncDirStandard YES
@@ -91,14 +91,25 @@
+# define UseFontconfig YES
+# define FontconfigIncDir /usr/include/fontconfig
+# define BuildXftLibrary NO
-+# define HasXftLibrary YES
++# define HasXftLibrary YES
+# define BuildXft1Library YES
+# define IconDir Concat(ProjectRoot,/lib/X11/icons)
+# define BuildXcursorLibrary NO
+# define HasXcursorLibrary YES
+# define BuildRenderLibrary NO
+# define HasRenderLibrary YES
-
++
++# ifdef UseInstalled
++# define RenderLibraryDir /usr/X11R6
++# define XftLibraryDir /usr/X11R6
++# define XcursorLibraryDir /usr
++# else
++/* for Debian xfree86 build hack */
++# define RenderLibraryDir $(TOP)/../../debian/local/exports
++# define XftLibraryDir $(TOP)/../../debian/local/exports
++# define XcursorLibraryDir $(TOP)/../../debian/local/exports
++# endif
+
/* we build-depend on libfreetype6-dev (FreeType 2.x) */
# define BuildFreetype2Library NO
@@ -701,7 +714,7 @@
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
