Update of /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11-system
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2786/10.4/main/finkinfo/x11-system
Modified Files:
xorg.info xorg.patch
Log Message:
looks like it builds on tiger, time to make sure I did not break 10.3 ;)
Index: xorg.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11-system/xorg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xorg.patch 17 Mar 2005 21:35:21 -0000 1.3
+++ xorg.patch 12 Apr 2005 20:21:19 -0000 1.4
@@ -1,5 +1,6 @@
+diff -uNr xc/config/cf/darwin.cf xc-new/config/cf/darwin.cf
--- xc/config/cf/darwin.cf 2004-12-14 23:53:05.000000000 -0500
-+++ xc-new/config/cf/darwin.cf 2005-03-07 15:54:30.000000000 -0500
++++ xc-new/config/cf/darwin.cf 2005-04-12 15:02:28.000000000 -0400
@@ -160,7 +160,7 @@
* The default cpp-3.3 that ships with Panther inserts spurious #pragmas,
* so we use the 3.1-based version.
@@ -9,8 +10,9 @@
# define CppCmd /usr/bin/cpp3
# define StandardCppOptions -traditional -D__GNUC__
#else
+diff -uNr xc/extras/freetype2/builds/unix/detect.mk
xc-new/extras/freetype2/builds/unix/detect.mk
--- xc/extras/freetype2/builds/unix/detect.mk 2004-04-28 06:38:58.000000000
-0400
-+++ xc-new/extras/freetype2/builds/unix/detect.mk 2005-03-07
15:53:23.000000000 -0500
++++ xc-new/extras/freetype2/builds/unix/detect.mk 2005-04-12
15:02:28.000000000 -0400
@@ -20,7 +20,8 @@
#
is_unix := $(strip $(wildcard /sbin/init) \
@@ -21,8 +23,9 @@
ifneq ($(is_unix),)
PLATFORM := unix
+diff -uNr xc/extras/freetype2/include/freetype/freetype.h
xc-new/extras/freetype2/include/freetype/freetype.h
--- xc/extras/freetype2/include/freetype/freetype.h 2004-04-28
06:38:59.000000000 -0400
-+++ xc-new/extras/freetype2/include/freetype/freetype.h 2005-03-07
15:53:24.000000000 -0500
++++ xc-new/extras/freetype2/include/freetype/freetype.h 2005-04-12
15:02:28.000000000 -0400
@@ -17,11 +17,7 @@
@@ -36,8 +39,9 @@
#endif
+diff -uNr xc/extras/freetype2/src/base/ftapi.c
xc-new/extras/freetype2/src/base/ftapi.c
--- xc/extras/freetype2/src/base/ftapi.c 2003-11-14 11:48:24.000000000
-0500
-+++ xc-new/extras/freetype2/src/base/ftapi.c 2005-03-07 15:53:23.000000000
-0500
++++ xc-new/extras/freetype2/src/base/ftapi.c 2005-04-12 15:02:28.000000000
-0400
@@ -118,4 +118,18 @@
}
@@ -57,8 +61,9 @@
+
+
/* END */
+diff -uNr xc/extras/freetype2/src/truetype/ttinterp.c
xc-new/extras/freetype2/src/truetype/ttinterp.c
--- xc/extras/freetype2/src/truetype/ttinterp.c 2004-04-28
06:39:07.000000000 -0400
-+++ xc-new/extras/freetype2/src/truetype/ttinterp.c 2005-03-07
15:53:24.000000000 -0500
++++ xc-new/extras/freetype2/src/truetype/ttinterp.c 2005-04-12
15:02:28.000000000 -0400
@@ -2474,7 +2474,7 @@
W = Vx * Vx + Vy * Vy;
@@ -86,3 +91,65 @@
{
/* We need to decrease W by a minimal amount */
if ( Vx < Vy )
+diff -uNr xc/lib/GL/apple/dri_driver.h xc-new/lib/GL/apple/dri_driver.h
+--- xc/lib/GL/apple/dri_driver.h 2004-04-23 14:43:09.000000000 -0400
++++ xc-new/lib/GL/apple/dri_driver.h 2005-04-12 15:11:22.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-07-27 16:23:58.000000000 -0400
++++ xc-new/lib/GL/apple/dri_glx.c 2005-04-12 15:07:22.000000000 -0400
+@@ -51,10 +51,10 @@
+
+ /* 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;
+
+
+ /*
+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-04-23
15:06:15.000000000 -0400
++++ xc-new/programs/Xserver/hw/darwin/darwinKeyboard.c 2005-04-12
15:02:59.000000000 -0400
+@@ -64,10 +64,10 @@
+ /* Define this to use Alt for Mode_switch. */
+ #define ALT_IS_MODE_SWITCH 1
+
+-#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 2004-04-23
15:15:17.000000000 -0400
++++ xc-new/programs/Xserver/hw/darwin/quartz/applewm.c 2005-04-12
16:05:32.000000000 -0400
+@@ -59,7 +59,7 @@
+
+ DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")
+
+-static AppleWMProcsPtr appleWMProcs;
++AppleWMProcsPtr appleWMProcs;
+
+ static int WMErrorBase;
+
Index: xorg.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11-system/xorg.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xorg.info 25 Mar 2005 19:20:59 -0000 1.6
+++ xorg.info 12 Apr 2005 20:21:18 -0000 1.7
@@ -1,6 +1,6 @@
Package: xorg
Version: 6.8.2
-Revision: 32
+Revision: 33
BuildDepends:
Depends: %N-shlibs (>= %v-%r)
Provides: xserver, x11-dev, x11, rman, libgl-dev, libgl, xft2-dev, xft2,
fontconfig1-dev, fontconfig1
@@ -35,12 +35,13 @@
Source-MD5: 8131cd7ea1e4566e6e05c438a93fcfe1
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: <<
@@ -175,7 +176,7 @@
<<
InstallScript: <<
make install install.man DESTDIR=%d
- install -c -m 644 lib/Xfixes/Xfixes.h lib/Xdamage/Xdamage.h
lib/Xcomposite/Xcomposite.h %d/usr/X11R6/include/X11/extensions/
+ install -c -m 644 lib/Xcursor/Xcursor.h lib/Xfixes/Xfixes.h
lib/Xdamage/Xdamage.h lib/Xcomposite/Xcomposite.h
%d/usr/X11R6/include/X11/extensions/
mkdir -p %d/private
mv %d/etc %d/private
rm -rf %d/private/etc/init.d
-------------------------------------------------------
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
