Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11-system
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20996/10.3/stable/main/finkinfo/x11-system
Modified Files:
xfree86.info xfree86.patch
Log Message:
new xfree86 with better conflicts/replaces and moved to stable
Index: xfree86.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11-system/xfree86.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xfree86.patch 3 Dec 2003 13:50:10 -0000 1.2
+++ xfree86.patch 15 Sep 2004 17:17:34 -0000 1.3
@@ -1,277 +1,3 @@
---- ../xc/config/cf/darwin.cf Fri Nov 21 00:55:04 2003
-+++ ./config/cf/darwin.cf Sun Nov 23 08:17:03 2003
-@@ -163,8 +163,8 @@
- #endif
-
- /* we have a gcc compatible compiler, but its not called gcc */
--#define CcCmd /usr/bin/cc
--#define CplusplusCmd /usr/bin/c++
-+#define CcCmd gcc-3.3
-+#define CplusplusCmd g++-3.3
-
- /* default flags to pass to cc */
- #ifndef DefaultCCOptions
---- programs/Xserver/Imakefile 7 Nov 2003 13:45:26 -0000 3.295
-+++ programs/Xserver/Imakefile 23 Nov 2003 06:47:00 -0000 3.296
-@@ -2,7 +2,7 @@
- /*
- * Server Master Makefile
- */
--XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.295 2003/11/07 13:45:26 tsi Exp $
-+XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey Exp
$
-
- #ifndef InstallXserverSetUID
- #define InstallXserverSetUID NO
-@@ -1287,8 +1287,8 @@
- XPRLIBS = $(QUARTZDIR)/xpr/LibraryTargetName(xpr) $(ROOTLESSLIB)
-
- BundleProgramTarget(xpr,XDarwinApp,$(XPRDIRS),$(QUARTZDIR)/xpr/xprScreen.o, \
-- $(XPRLIBS),-framework ApplicationServices $(XPLUGINLIB), \
-- $(XDARWINAPPDIR)/Resources)
-+ $(XPRLIBS),-framework ApplicationServices \
-+ $(XPLUGINLIB),$(XDARWINAPPDIR)/Resources)
- #endif
-
- CRDIRS = $(QUARTZDIR)/cr $(ROOTLESSDIR) $(ROOTLESSDIR)/safeAlpha
-@@ -1296,7 +1296,7 @@
-
- BundleProgramTarget(cr,XDarwinApp,$(CRDIRS),$(QUARTZDIR)/cr/crScreen.o, \
- $(CRLIBS),-framework ApplicationServices -framework Cocoa \
-- -framework Carbon -ObjC, $(XDARWINAPPDIR)/Resources)
-+ -framework Carbon -ObjC,$(XDARWINAPPDIR)/Resources)
-
- FSDIRS = $(QUARTZDIR)/fullscreen $(SHADOWDIR)
- FSLIBS = $(QUARTZDIR)/fullscreen/LibraryTargetName(fullscreen) $(SHADOW)
-@@ -1310,13 +1310,13 @@
- * (installed in their own bundles inside XDarwin's)
- */
- BundleProgramTarget(glxAGL,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \
-- GL/apple/libAGLcore.a,-framework AGL -framework OpenGL, \
-- $(XDARWINAPPDIR)/Resources)
-+ GL/apple/libAGLcore.a, \
-+ -framework AGL -framework OpenGL,$(XDARWINAPPDIR)/Resources)
-
- #if BuildAppleDRI
- BundleProgramTarget(glxCGL,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \
-- GL/apple/libCGLcore.a,-framework OpenGL $(XPLUGINLIB), \
-- $(XDARWINAPPDIR)/Resources)
-+ GL/apple/libCGLcore.a, \
-+ -framework OpenGL $(XPLUGINLIB),$(XDARWINAPPDIR)/Resources)
- #endif
-
- BundleProgramTarget(glxMesa,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \
---- programs/Xserver/hw/darwin/darwin.c 15 Nov 2003 00:07:09 -0000 1.55
-+++ programs/Xserver/hw/darwin/darwin.c 24 Nov 2003 05:39:01 -0000 1.56
-@@ -29,7 +29,7 @@
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
--/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09
torrey Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01
torrey Exp $ */
-
- #include "X.h"
- #include "Xproto.h"
-@@ -518,9 +518,7 @@
- darwinKeyboard = AddInputDevice(DarwinKeybdProc, TRUE);
- RegisterKeyboardDevice( darwinKeyboard );
-
-- if (serverGeneration == 1) {
-- DarwinEQInit( (DevicePtr)darwinKeyboard, (DevicePtr)darwinPointer );
-- }
-+ DarwinEQInit( (DevicePtr)darwinKeyboard, (DevicePtr)darwinPointer );
-
- DarwinModeInitInput(argc, argv);
- }
---- programs/Xserver/hw/darwin/quartz/XServer.h 14 Nov 2003 20:27:58 -0000
1.15
-+++ programs/Xserver/hw/darwin/quartz/XServer.h 24 Nov 2003 05:39:01 -0000
1.17
-@@ -29,7 +29,7 @@
- * sale, use or other dealings in this Software without prior written
- * authorization.
- */
--/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.15 2003/11/14
20:27:58 torrey Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.17 2003/11/24
05:39:01 torrey Exp $ */
-
- #define BOOL xBOOL
- #include "Xproto.h"
-@@ -46,6 +46,7 @@
- BOOL rootlessMenuBarVisible;
- BOOL queueShowServer;
- BOOL quitWithoutQuery;
-+ BOOL pendingAppQuitReply;
- UInt32 mouseState;
- BOOL sendServerEvents;
- BOOL x11Active;
-@@ -90,7 +91,7 @@
- - (void)sendShowHide:(BOOL)show;
- - (void)clientProcessDone:(int)clientStatus;
- - (void)activateX11:(BOOL)state;
--- (void)windowBecameKey:(NSWindow *)window;
-+- (void)windowBecameKey:(NSNotification *)notification;
- - (void)setX11WindowList:(NSArray *)list;
- - (void)setX11WindowCheck:(NSNumber *)nn;
-
---- programs/Xserver/hw/darwin/quartz/XServer.m 14 Nov 2003 20:27:58 -0000
1.17
-+++ programs/Xserver/hw/darwin/quartz/XServer.m 24 Nov 2003 05:39:01 -0000
1.19
-@@ -34,7 +34,7 @@
- * sale, use or other dealings in this Software without prior written
- * authorization.
- */
--/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.17 2003/11/14
20:27:58 torrey Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.19 2003/11/24
05:39:01 torrey Exp $ */
-
- #include "quartzCommon.h"
-
-@@ -126,6 +126,7 @@
- rootlessMenuBarVisible = YES;
- queueShowServer = YES;
- quartzServerQuitting = NO;
-+ pendingAppQuitReply = NO;
- mouseState = 0;
-
- // set up a port to safely send messages to main thread from server thread
-@@ -141,11 +142,6 @@
- [[NSRunLoop currentRunLoop] addPort:signalPort
- forMode:NSModalPanelRunLoopMode];
-
-- [[NSNotificationCenter defaultCenter] addObserver:self
-- selector:@selector(windowBecameKey:)
-- name:NSWindowDidBecomeKeyNotification
-- object:nil];
--
- return self;
- }
-
-@@ -191,6 +187,7 @@
- // At this point the X server is either running or starting.
- if (serverState == server_Starting) {
- // Quit will be queued later when server is running
-+ pendingAppQuitReply = YES;
- return NSTerminateLater;
- } else if (serverState == server_Running) {
- [self quitServer];
-@@ -490,6 +487,15 @@
- if (![self loadDisplayBundle])
- [NSApp terminate:nil];
-
-+ // In rootless mode register to receive notification of key window changes
-+ if (quartzRootless) {
-+ [[NSNotificationCenter defaultCenter]
-+ addObserver:self
-+ selector:@selector(windowBecameKey:)
-+ name:NSWindowDidBecomeKeyNotification
-+ object:nil];
-+ }
-+
- // Start the X server thread
- serverState = server_Starting;
- [NSThread detachNewThreadSelector:@selector(run) toTarget:self
-@@ -537,7 +543,7 @@
-
- // Finish starting the X server thread
- // This includes anything that must be done after the X server is
--// ready to process events.
-+// ready to process events after the first or subsequent generations.
- - (void)finishStartX
- {
- sendServerEvents = YES;
-@@ -551,7 +557,8 @@
-
- if (quartzServerQuitting) {
- [self quitServer];
-- [NSApp replyToApplicationShouldTerminate:YES];
-+ if (pendingAppQuitReply)
-+ [NSApp replyToApplicationShouldTerminate:YES];
- return;
- }
-
-@@ -1001,21 +1008,6 @@
- // This field should be filled in for every event
- xe->u.keyButtonPointer.time = GetTimeInMillis();
-
--#if 0
-- // FIXME: Really?
-- if (quartzRootless &&
-- (ev->type == NSLeftMouseDown || ev->type == NSLeftMouseUp ||
-- (ev->type == NSSystemDefined && ev->data.compound.subType == 7)))
-- {
-- // mouse button event - send mouseMoved to this position too
-- // X gets confused if it gets a click that isn't at the last
-- // reported mouse position.
-- xEvent moveEvent = *ev;
-- xe.u.u.type = NSMouseMoved;
-- [self sendXEvent:&moveEvent];
-- }
--#endif
--
- DarwinEQEnqueue(xe);
- }
-
-@@ -1194,8 +1186,10 @@
- }
-
- // Some NSWindow became the key window
--- (void)windowBecameKey:(NSWindow *)window
-+- (void)windowBecameKey:(NSNotification *)notification
- {
-+ NSWindow *window = [notification object];
-+
- if (quartzProcs->IsX11Window(window, [window windowNumber])) {
- if (!x11Active)
- [self activateX11:YES];
---- programs/Xserver/hw/darwin/quartz/quartz.c 12 Nov 2003 20:21:51 -0000 1.13
-+++ programs/Xserver/hw/darwin/quartz/quartz.c 24 Nov 2003 05:39:02 -0000 1.14
-@@ -29,7 +29,7 @@
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
--/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.13 2003/11/12
20:21:51 torrey Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.14 2003/11/24
05:39:02 torrey Exp $ */
-
- #include "quartzCommon.h"
- #include "quartz.h"
-@@ -156,9 +156,7 @@
- int argc,
- char **argv )
- {
-- if (serverGeneration == 1) {
-- QuartzMessageMainThread(kQuartzServerStarted, NULL, 0);
-- }
-+ QuartzMessageMainThread(kQuartzServerStarted, NULL, 0);
-
- // Do final display mode specific initialization before handling events
- if (quartzProcs->InitInput)
---- programs/Xserver/hw/darwin/quartz/cr/crFrame.m 13 Nov 2003 20:26:31 -0000
1.5
-+++ programs/Xserver/hw/darwin/quartz/cr/crFrame.m 23 Nov 2003 06:06:29 -0000
1.6
-@@ -27,7 +27,7 @@
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
--/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.5 2003/11/13
20:26:31 torrey Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.6 2003/11/23
06:06:29 torrey Exp $ */
-
- #include "quartzCommon.h"
- #include "cr.h"
-@@ -163,9 +163,19 @@
- {
- CRWindowPtr crWinPtr = (CRWindowPtr) wid;
- NSRect bounds = NSMakeRect(newX, NSHeight([[NSScreen mainScreen] frame]) -
-- newY - newH, newW, newH);
-+ newY - newH, newW, newH);
-+ Rect qdRect;
-
- [crWinPtr->window setFrame:bounds display:NO];
-+
-+ // CR does not handle gravity properly, so we need to damage the whole
-+ // window. (This won't work with ROOTLESS_TRACK_DAMAGE.)
-+ qdRect.left = 0;
-+ qdRect.top = 0;
-+ qdRect.right = newW;
-+ qdRect.bottom = newH;
-+
-+ QDAddRectToDirtyRegion(crWinPtr->port, &qdRect);
- }
-
-
--- /dev/null Mon Nov 24 14:07:23 2003
+++ include/Xplugin.h Mon Nov 24 14:06:58 2003
@@ -0,0 +1,589 @@
Index: xfree86.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11-system/xfree86.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xfree86.info 3 Dec 2003 13:50:10 -0000 1.3
+++ xfree86.info 15 Sep 2004 17:17:34 -0000 1.4
@@ -1,13 +1,25 @@
Package: xfree86
-Version: 4.3.99.16
-Revision: 2
+Version: 4.4.0
+Revision: 12
Depends: %N-shlibs (>= %v-%r)
-Replaces: x11
-Provides: xserver, x11-dev, x11, rman, libgl-dev, libgl, xfree86-base-threaded,
xfree86-rootless-threaded, xft2-dev, xft2, fontconfig1-dev, fontconfig1
-Conflicts: xfree86-base, xfree86-base-threaded, xfree86-rootless,
xfree86-rootless-threaded, system-xfree86, xfree86
+Provides: xserver, x11-dev, x11, rman, libgl-dev, libgl, xft2-dev, xft2,
fontconfig1-dev, fontconfig1
+Conflicts: xfree86-base, xfree86-base-threaded, xfree86-rootless,
xfree86-rootless-threaded, xorg, system-xfree86, xfree86
+Replaces: xfree86-base, xfree86-base-threaded, xfree86-rootless,
xfree86-rootless-threaded, xorg, system-xfree86, xfree86
GCC: 3.3
-Source: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/XFree86-%v.tar.bz2
-Source-MD5: 9060c02f9e07620b8595e4d3da77a4b3
+Source: ftp://ftp.xfree86.org/pub/XFree86/%v/source/XFree86-%v-src-1.tgz
+Source-MD5: 97cea3d9e1197dde32ca34e3b6086469
+Source2: ftp://ftp.xfree86.org/pub/XFree86/%v/source/XFree86-%v-src-2.tgz
+Source2-MD5: b9b6c74a03e314569e01d5fd4ff59523
+Source3: ftp://ftp.xfree86.org/pub/XFree86/%v/source/XFree86-%v-src-3.tgz
+Source3-MD5: 703404f48d3a15f58389a879d47c769d
+Source4: ftp://ftp.xfree86.org/pub/XFree86/%v/source/XFree86-%v-src-4.tgz
+Source4-MD5: 5d1792f5c154c7462c6aef39c7853b3b
+Source5: ftp://ftp.xfree86.org/pub/XFree86/%v/source/XFree86-%v-src-5.tgz
+Source5-MD5: 5c37f028efc6d54a9c725e333f9cc8ae
+Source6: ftp://ftp.xfree86.org/pub/XFree86/%v/source/XFree86-%v-src-6.tgz
+Source6-MD5: d1e12c33e9756d5143004a69f2cdac81
+Source7: ftp://ftp.xfree86.org/pub/XFree86/%v/source/XFree86-%v-src-7.tgz
+Source7-MD5: 947a34279a0ca2da2f300719c583845e
SourceDirectory: xc
PatchScript: <<
echo '#define ExtraIncDir %p/include' > config/cf/host.def
@@ -30,8 +42,9 @@
<<
SplitOff: <<
Package: %N-shlibs
- Conflicts: xfree86-base-shlibs, xfree86-base-threaded-shlibs,
xfree86-rootless-shlibs, xfree86-rootless-threaded-shlibs, system-xfree86,
xfree86-shlibs
- Provides: libgl-shlibs, xfree86-base-threaded-shlibs,
xfree86-rootless-threaded-shlibs, x11-shlibs, xft1-shlibs, xft2-shlibs,
fontconfig1-shlibs
+ Conflicts: xfree86-base-shlibs, xfree86-base-threaded-shlibs,
xfree86-rootless-shlibs, xfree86-rootless-threaded-shlibs, xorg-shlibs,
system-xfree86, xfree86-shlibs
+ Replaces: xfree86-base-shlibs, xfree86-base-threaded-shlibs,
xfree86-rootless-shlibs, xfree86-rootless-threaded-shlibs, xorg-shlibs,
system-xfree86, xfree86-shlibs
+ Provides: libgl-shlibs, x11-shlibs, xft1-shlibs, xft2-shlibs, fontconfig1-shlibs
Files: <<
/usr/X11R6/lib/libAppleWM.*.dylib
/usr/X11R6/lib/libFS.*.dylib
@@ -90,6 +103,7 @@
/usr/X11R6/lib/libXcursor.1.dylib 1.0.0 xfree86 (>= 4.3.0-13) | system-xfree86 (>=
2:4.3-1)
/usr/X11R6/lib/libXext.6.dylib 6.4.0 xfree86 (>= 4.3.0-13) | system-xfree86 (>=
2:4.3-1)
/usr/X11R6/lib/libXfont.1.dylib 1.5.0 %n (>= 4.3.99.15-1)
+ /usr/X11R6/lib/libXfontcache.1.dylib 1.2.0 %n (>= 4.3.99.902-1)
/usr/X11R6/lib/libXft.1.dylib 1.1.0 xfree86 (>= 4.3.0-13) | system-xfree86 (>=
2:4.3-1)
/usr/X11R6/lib/libXft.2.dylib 2.1.0 %n (>= 4.3.99.15-1)
/usr/X11R6/lib/libXi.6.dylib 6.0.0 xfree86 (>= 4.3.0-13) | system-xfree86 (>=
2:4.3-1)
@@ -106,7 +120,7 @@
/usr/X11R6/lib/libXv.1.dylib 1.0.0 xfree86 (>= 4.3.0-13) | system-xfree86 (>=
2:4.3-1)
/usr/X11R6/lib/libXvMC.1.dylib 1.0.0 %n (>= 4.3.99.15-1)
/usr/X11R6/lib/libXxf86misc.1.dylib 1.1.0 %n (>= 4.3.99.15-1)
- /usr/X11R6/lib/lib/libXxf86vm.1.dylib 1.0.0 %n (>= 4.3.99.15-1)
+ /usr/X11R6/lib/libXxf86vm.1.dylib 1.0.0 %n (>= 4.3.99.15-1)
/usr/X11R6/lib/libdps.1.dylib 1.0.0 xfree86 (>= 4.3.0-13) | system-xfree86 (>=
2:4.3-1)
/usr/X11R6/lib/libdpstk.1.dylib 1.0.0 xfree86 (>= 4.3.0-13) | system-xfree86 (>=
2:4.3-1)
/usr/X11R6/lib/libexpat.0.dylib 0.4.0 %n (>= 4.3.99.15-1)
@@ -215,14 +229,58 @@
Instead, please install the xfree86-upgrade package and run the shell
script "upgrade-xfree86".
-------------------------------------------------------------------------
+
+Copyright (C) 1994-2004 The XFree86 Project, Inc.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution,
+ and in the same place and form as other copyright, license and
+ disclaimer information.
+
+3. The end-user documentation included with the redistribution, if any,
+ must include the following acknowledgment: "This product includes
+ software developed by The XFree86 Project, Inc
+ (http://www.xfree86.org/) and its contributors", in the same place
+ and form as other third-party acknowledgments. Alternately, this
+ acknowledgment may appear in the software itself, in the same form
+ and location as other such third-party acknowledgments.
+
+4. Except as contained in this notice, the name of The XFree86 Project,
+ Inc shall not be used in advertising or otherwise to promote the
+ sale, use or other dealings in this Software without prior written
+ authorization from The XFree86 Project, Inc.
+-------------------------------------------------------------------------
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
<<
DescPackaging: <<
WARNING: This package will not honor the prefix you installed Fink
in. It will always install into /usr/X11R6. This is by design. The
preinst script checks to make sure it doesn't overwrite existing
files.
-
-Based on the XFree86 package.
<<
License: BSD
Homepage: http://www.xfree86.org/
-------------------------------------------------------
This SF.Net email is sponsored by: thawte's Crypto Challenge Vl
Crack the code and win a Sony DCRHC40 MiniDV Digital Handycam
Camcorder. More prizes in the weekly Lunch Hour Challenge.
Sign up NOW http://ad.doubleclick.net/clk;10740251;10262165;m
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
