From 6132144336008010c94f8e46e902c756ccabb1b6 Mon Sep 17 00:00:00 2001 From: PHO Date: Sun, 15 Mar 2009 23:37:49 +0900 Subject: [PATCH] At least it builds and non-violently aborts... --- INSTALL | 3 ++ Makefile | 12 +++++- distinfo | 4 -- patches/patch-aa | 103 ----------------------------------------------- patches/patch-ab | 41 ------------------- patches/patch-ac | 19 --------- patches/patch-ad | 58 -------------------------- 7 files changed, 14 insertions(+), 226 deletions(-) delete mode 100644 patches/patch-aa delete mode 100644 patches/patch-ab delete mode 100644 patches/patch-ac delete mode 100644 patches/patch-ad diff --git a/INSTALL b/INSTALL index a6f27f8..db07398 100644 --- a/INSTALL +++ b/INSTALL @@ -6,5 +6,8 @@ case ${STAGE} in if [ ! -e "/Applications/Utilities/X11.app" ]; then ln -s "@DARWIN_X11_APP_DIR@/X11.app" "/Applications/Utilities" fi + if [ ! -e "@PREFIX@/bin/X" ]; then + ln -s "@PREFIX@/bin/Xquartz" "@PREFIX@/bin/X" + fi ;; esac diff --git a/Makefile b/Makefile index e9d4d15..1bf4d7a 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,9 @@ CONFIGURE_ARGS+= --with-apple-applications-dir=${DARWIN_X11_APP_DIR:Q} CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 +#CONFIGURE_ARGS+= CFLAGS=-g CXXFLAGS=-g + +FILES_SUBST+= PREFIX=${PREFIX} FILES_SUBST+= DARWIN_X11_APP_DIR=${DARWIN_X11_APP_DIR} DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config @@ -77,7 +80,7 @@ pre-configure: .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" -.include "../../x11/libXfont/buildlink3.mk" +.include "../../wip/libXfont/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXxf86misc/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" @@ -103,4 +106,11 @@ pre-configure: .include "../../wip/libAppleWM/buildlink3.mk" .include "../../wip/applewmproto/buildlink3.mk" +# X11.app requires xinit to be installed. +DEPENDS+= xinit-[0-9]*:../../x11/xinit + +# X11.app requires 'misc' font. +DEPENDS+= font-misc-misc-[0-9]*:../../fonts/font-misc-misc +DEPENDS+= font-alias-[0-9]*:../../fonts/font-alias + .include "../../mk/bsd.pkg.mk" diff --git a/distinfo b/distinfo index ee76146..00993d9 100644 --- a/distinfo +++ b/distinfo @@ -3,8 +3,4 @@ $NetBSD$ SHA1 (xorg-server-1.4.2-apple35.tar.bz2) = b6434d8ea3e6fbe81fea80cbbf7d82d48a1933b0 RMD160 (xorg-server-1.4.2-apple35.tar.bz2) = ec53ba78de692505ac295819bd907f60f17915b5 Size (xorg-server-1.4.2-apple35.tar.bz2) = 6217422 bytes -SHA1 (patch-aa) = 8950b3f615d717c9ce1e426dd37613a5fceb80a4 -SHA1 (patch-ab) = e653a55dfc5be642f3f898f790a140c3327e3a9e -SHA1 (patch-ac) = 535168d192f98b441629072c4e84f2e9f31eff33 -SHA1 (patch-ad) = 422f8fe5b884c73ccf38cf339a9ec8e5cfd40308 SHA1 (patch-aj) = db864b16d0674954cc68a29b23eab20962cafa7e diff --git a/patches/patch-aa b/patches/patch-aa deleted file mode 100644 index cad0f8a..0000000 --- a/patches/patch-aa +++ /dev/null @@ -1,103 +0,0 @@ -$NetBSD$ - ---- dix/atom.c.orig 2009-03-06 19:05:09.000000000 +0900 -+++ dix/atom.c -@@ -74,98 +74,6 @@ static NodePtr *nodeTable; - - void FreeAtom(NodePtr patom); - --_X_EXPORT Atom --MakeAtom(char *string, unsigned len, Bool makeit) --{ -- NodePtr * np; -- unsigned i; -- int comp; -- unsigned int fp = 0; -- -- np = &atomRoot; -- for (i = 0; i < (len+1)/2; i++) -- { -- fp = fp * 27 + string[i]; -- fp = fp * 27 + string[len - 1 - i]; -- } -- while (*np != (NodePtr) NULL) -- { -- if (fp < (*np)->fingerPrint) -- np = &((*np)->left); -- else if (fp > (*np)->fingerPrint) -- np = &((*np)->right); -- else -- { /* now start testing the strings */ -- comp = strncmp(string, (*np)->string, (int)len); -- if ((comp < 0) || ((comp == 0) && (len < strlen((*np)->string)))) -- np = &((*np)->left); -- else if (comp > 0) -- np = &((*np)->right); -- else -- return(*np)->a; -- } -- } -- if (makeit) -- { -- NodePtr nd; -- -- nd = (NodePtr) xalloc(sizeof(NodeRec)); -- if (!nd) -- return BAD_RESOURCE; -- if (lastAtom < XA_LAST_PREDEFINED) -- { -- nd->string = string; -- } -- else -- { -- nd->string = (char *) xalloc(len + 1); -- if (!nd->string) { -- xfree(nd); -- return BAD_RESOURCE; -- } -- strncpy(nd->string, string, (int)len); -- nd->string[len] = 0; -- } -- if ((lastAtom + 1) >= tableLength) { -- NodePtr *table; -- -- table = (NodePtr *) xrealloc(nodeTable, -- tableLength * (2 * sizeof(NodePtr))); -- if (!table) { -- if (nd->string != string) -- xfree(nd->string); -- xfree(nd); -- return BAD_RESOURCE; -- } -- tableLength <<= 1; -- nodeTable = table; -- } -- *np = nd; -- nd->left = nd->right = (NodePtr) NULL; -- nd->fingerPrint = fp; -- nd->a = (++lastAtom); -- *(nodeTable+lastAtom) = nd; -- return nd->a; -- } -- else -- return None; --} -- --_X_EXPORT Bool --ValidAtom(Atom atom) --{ -- return (atom != None) && (atom <= lastAtom); --} -- --_X_EXPORT char * --NameForAtom(Atom atom) --{ -- NodePtr node; -- if (atom > lastAtom) return 0; -- if ((node = nodeTable[atom]) == (NodePtr)NULL) return 0; -- return node->string; --} -- - void - AtomError(void) - { diff --git a/patches/patch-ab b/patches/patch-ab deleted file mode 100644 index 96d1287..0000000 --- a/patches/patch-ab +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD$ - ---- dix/dixutils.c.orig 2009-03-06 19:02:37.000000000 +0900 -+++ dix/dixutils.c -@@ -165,16 +165,6 @@ ISOLatin1ToLower (unsigned char source) - } - - --_X_EXPORT void --CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length) --{ -- int i; -- -- for (i = 0; i < length; i++, source++, dest++) -- *dest = ISOLatin1ToLower (*source); -- *dest = '\0'; --} -- - int - CompareISOLatin1Lowered(unsigned char *s1, int s1len, - unsigned char *s2, int s2len) -@@ -673,19 +663,6 @@ ClientSleep (ClientPtr client, ClientSle - return TRUE; - } - --Bool --ClientSignal (ClientPtr client) --{ -- SleepQueuePtr q; -- -- for (q = sleepQueue; q; q = q->next) -- if (q->client == client) -- { -- return QueueWorkProc (q->function, q->client, q->closure); -- } -- return FALSE; --} -- - _X_EXPORT void - ClientWakeup (ClientPtr client) - { diff --git a/patches/patch-ac b/patches/patch-ac deleted file mode 100644 index b180f72..0000000 --- a/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD$ - ---- dix/globals.c.orig 2009-03-06 19:03:37.000000000 +0900 -+++ dix/globals.c -@@ -79,14 +79,12 @@ PtrCtrl defaultPointerControl = { - 0}; - - _X_EXPORT ClientPtr *clients; --_X_EXPORT ClientPtr serverClient; - _X_EXPORT int currentMaxClients; /* current size of clients array */ - _X_EXPORT long maxBigRequestSize = MAX_BIG_REQUEST_SIZE; - - _X_EXPORT WindowPtr *WindowTable; - - _X_EXPORT unsigned long globalSerialNumber = 0; --_X_EXPORT unsigned long serverGeneration = 0; - - /* these next four are initialized in main.c */ - _X_EXPORT CARD32 ScreenSaverTime; diff --git a/patches/patch-ad b/patches/patch-ad deleted file mode 100644 index 961c2c4..0000000 --- a/patches/patch-ad +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD$ - ---- os/log.c.orig 2009-03-06 19:04:17.000000000 +0900 -+++ os/log.c -@@ -526,36 +526,6 @@ VAuditF(const char *f, va_list args) - } - - _X_EXPORT void --FatalError(const char *f, ...) --{ -- va_list args; -- static Bool beenhere = FALSE; -- -- if (beenhere) -- ErrorF("\nFatalError re-entered, aborting\n"); -- else -- ErrorF("\nFatal server error:\n"); -- -- va_start(args, f); -- VErrorF(f, args); -- va_end(args); -- ErrorF("\n"); --#ifdef DDXOSFATALERROR -- if (!beenhere) -- OsVendorFatalError(); --#endif --#ifdef ABORTONFATALERROR -- abort(); --#endif -- if (!beenhere) { -- beenhere = TRUE; -- AbortServer(); -- } else -- abort(); -- /*NOTREACHED*/ --} -- --_X_EXPORT void - VErrorF(const char *f, va_list args) - { - #ifdef DDXOSVERRORF -@@ -568,16 +538,6 @@ VErrorF(const char *f, va_list args) - #endif - } - --_X_EXPORT void --ErrorF(const char * f, ...) --{ -- va_list args; -- -- va_start(args, f); -- VErrorF(f, args); -- va_end(args); --} -- - /* A perror() workalike. */ - - #ifndef NEED_STRERROR -- 2.40.0