Update of /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11-system
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13862/10.3/main/finkinfo/x11-system
Modified Files:
xfree86.info xfree86.patch
Log Message:
builds and appears to run
Index: xfree86.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11-system/xfree86.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- xfree86.patch 18 Mar 2005 20:31:33 -0000 1.12
+++ xfree86.patch 13 Apr 2005 20:38:35 -0000 1.13
@@ -1,76 +1,62 @@
---- xc/extras/freetype2/builds/unix/detect.mk Mon Apr 26 11:40:03 2004
-+++ xc-new/extras/freetype2/builds/unix/detect.mk Fri Mar 18 11:13:14 2005
-@@ -20,7 +20,8 @@
- #
- is_unix := $(strip $(wildcard /sbin/init) \
- $(wildcard /usr/sbin/init) \
-- $(wildcard /hurd/auth))
-+ $(wildcard /hurd/auth) \
-+ $(wildcard /sbin/launchd))
- ifneq ($(is_unix),)
-
- PLATFORM := unix
---- xc/extras/freetype2/include/freetype/freetype.h Mon Apr 26 11:40:13 2004
-+++ xc-new/extras/freetype2/include/freetype/freetype.h Fri Mar 18
11:13:14 2005
-@@ -17,11 +17,7 @@
+diff -uNr xc/lib/GL/apple/dri_driver.h xc-new/lib/GL/apple/dri_driver.h
+--- xc/lib/GL/apple/dri_driver.h 2003-10-30 21:22:12.000000000 -0500
++++ xc-new/lib/GL/apple/dri_driver.h 2005-04-12 16:14:49.000000000 -0400
+@@ -40,6 +40,12 @@
+ #include "Xthreads.h"
+ #include <CoreGraphics/CoreGraphics.h>
+ #include <OpenGL/OpenGL.h>
++
++#ifndef GL_TYPEDEFS_2_0
++#define GL_TYPEDEFS_2_0
++ typedef char GLchar;
++#endif
++
+ #include <OpenGL/CGLContext.h>
+ #ifdef GLX_DIRECT_RENDERING
+diff -uNr xc/lib/GL/apple/dri_glx.c xc-new/lib/GL/apple/dri_glx.c
+--- xc/lib/GL/apple/dri_glx.c 2004-12-10 12:47:24.000000000 -0500
++++ xc-new/lib/GL/apple/dri_glx.c 2005-04-12 16:15:21.000000000 -0400
+@@ -51,10 +51,10 @@
- #ifndef FT_FREETYPE_H
--#error "`ft2build.h' hasn't been included yet!"
--#error "Please always use macros to include FreeType header files."
--#error "Example:"
--#error " #include <ft2build.h>"
--#error " #include FT_FREETYPE_H"
-+#include <ft2build.h>
- #endif
+ /* Apple OpenGL "driver" information. */
+ static const char *__driDriverName = "apple";
+-static const char __driConfigOptions[] = "";
+-static const int __driDriverMajor = 1;
+-static const int __driDriverMinor = 0;
+-static const int __driDriverPatch = 0;
++const char __driConfigOptions[] = "";
++const int __driDriverMajor = 1;
++const int __driDriverMinor = 0;
++const int __driDriverPatch = 0;
---- xc/extras/freetype2/src/base/ftapi.c Mon Feb 28 18:19:13 2005
-+++ xc-new/extras/freetype2/src/base/ftapi.c Fri Mar 18 13:54:19 2005
-@@ -161,5 +161,17 @@
- FT_Stream_ExitFrame( stream );
- }
-
-+ FT_BASE_DEF( FT_Short )
-+ FT_Get_Short( FT_Stream stream )
-+ {
-+ return FT_GET_SHORT();
-+ }
-+
-+
-+ FT_BASE_DEF( FT_Long )
-+ FT_Get_Long( FT_Stream stream )
-+ {
-+ return FT_GET_LONG();
-+ }
+ /*
+diff -uNr xc/programs/Xserver/hw/darwin/darwinKeyboard.c
xc-new/programs/Xserver/hw/darwin/darwinKeyboard.c
+--- xc/programs/Xserver/hw/darwin/darwinKeyboard.c 2004-03-31
19:05:22.000000000 -0500
++++ xc-new/programs/Xserver/hw/darwin/darwinKeyboard.c 2005-04-12
16:15:34.000000000 -0400
+@@ -64,10 +64,10 @@
+ /* Define this to use Alt for Mode_switch. */
+ #define ALT_IS_MODE_SWITCH 1
- /* END */
---- xc/extras/freetype2/src/truetype/ttinterp.c Mon Apr 26 11:40:59 2004
-+++ xc-new/extras/freetype2/src/truetype/ttinterp.c Fri Mar 18 11:13:14 2005
-@@ -2474,7 +2474,7 @@
- W = Vx * Vx + Vy * Vy;
+-#include <drivers/event_status_driver.h>
+-#include <IOKit/hidsystem/ev_keymap.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <drivers/event_status_driver.h>
++#include <IOKit/hidsystem/ev_keymap.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+ #include <architecture/byte_order.h> // For the NXSwap*
+diff -uNr xc/programs/Xserver/hw/darwin/quartz/applewm.c
xc-new/programs/Xserver/hw/darwin/quartz/applewm.c
+--- xc/programs/Xserver/hw/darwin/quartz/applewm.c 2003-11-11
18:48:41.000000000 -0500
++++ xc-new/programs/Xserver/hw/darwin/quartz/applewm.c 2005-04-12
16:15:47.000000000 -0400
+@@ -59,7 +59,7 @@
- /* Now, we want that Sqrt( W ) = 0x4000 */
-- /* Or 0x1000000 <= W < 0x1004000 */
-+ /* Or 0x10000000 <= W < 0x10004000 */
+ DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")
- if ( Vx < 0 )
- {
-@@ -2492,7 +2492,7 @@
- else
- S2 = FALSE;
+-static AppleWMProcsPtr appleWMProcs;
++AppleWMProcsPtr appleWMProcs;
-- while ( W < 0x1000000L )
-+ while ( W < 0x10000000L )
- {
- /* We need to increase W by a minimal amount */
- if ( Vx < Vy )
-@@ -2503,7 +2503,7 @@
- W = Vx * Vx + Vy * Vy;
- }
+ static int WMErrorBase;
-- while ( W >= 0x1004000L )
-+ while ( W >= 0x10004000L )
- {
- /* We need to decrease W by a minimal amount */
- if ( Vx < Vy )
Index: xfree86.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11-system/xfree86.info,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- xfree86.info 21 Mar 2005 14:13:10 -0000 1.26
+++ xfree86.info 13 Apr 2005 20:38:35 -0000 1.27
@@ -1,6 +1,6 @@
Package: xfree86
Version: 4.5.0
-Revision: 11
+Revision: 12
BuildDepends: gcc3.1
Depends: %N-shlibs (>= %v-%r)
Provides: xserver, x11-dev, x11, rman, libgl-dev, libgl, xft2-dev, xft2,
fontconfig1-dev, fontconfig1
@@ -53,12 +53,13 @@
Source7-MD5: 06105cbefbeefc69747829caa1acdb41
SourceDirectory: xc
PatchScript: <<
- echo '#define ExtraIncDir %p/include' > config/cf/host.def
- echo '#define EtcX11Directory ProjectRoot/etc' >> config/cf/host.def
- echo '#define CcCmd gcc' >> config/cf/host.def
- echo '#define CplusplusCmd g++' >> config/cf/host.def
- echo '#define BuildFontCache YES' >> config/cf/host.def
- echo '#define HasFreetype2 NO' >> config/cf/host.def
+ echo '#define ExtraIncDir %p/include' > config/cf/host.def
+ echo '#define EtcX11Directory ProjectRoot/etc' >> config/cf/host.def
+ echo '#define CcCmd gcc' >> config/cf/host.def
+ echo '#define CplusplusCmd g++' >> config/cf/host.def
+ echo '#define BuildFontCache YES' >> config/cf/host.def
+ echo '#define HasFreetype2 NO' >> config/cf/host.def
+ echo '#define InstallCmd /usr/bin/install' >> config/cf/host.def
patch -p1 < %a/%n.patch
<<
CompileScript: <<
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
