diff --git a/package/x11/xorg/gcc40.patch b/package/x11/xorg/gcc40.patch deleted file mode 100644 index 8000535ec..000000000 --- a/package/x11/xorg/gcc40.patch +++ /dev/null @@ -1,84 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/x11/xorg/gcc40.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -dur xc/programs/Xserver/fb/fbmmx.c src.xorg.1129808283.2035.3041395841/xc/programs/Xserver/fb/fbmmx.c ---- xc/programs/Xserver/fb/fbmmx.c 2004-07-22 21:24:50.000000000 +0200 -+++ src.xorg.1129808283.2035.3041395841/xc/programs/Xserver/fb/fbmmx.c 2005-10-20 21:26:33.000000000 +0200 -@@ -33,11 +33,28 @@ - #include "mipict.h" - #include "fbpict.h" - -+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 5) -+ -+typedef int __attribute__((mode(QI))) qi; -+typedef int __attribute__((mode(HI))) hi; -+typedef int __attribute__((mode(SI))) si; -+typedef int __attribute__((mode(DI))) di; -+ -+typedef di __attribute__((vector_size (8))) Vector1x64; -+typedef si __attribute__((vector_size (8))) Vector2x32; -+typedef hi __attribute__((vector_size (8))) Vector4x16; -+typedef qi __attribute__((vector_size (8))) Vector8x8; -+ -+# else -+ - typedef int Vector1x64 __attribute__ ((mode(DI))); - typedef int Vector2x32 __attribute__ ((mode(V2SI))); - typedef int Vector4x16 __attribute__ ((mode(V4HI))); - typedef int Vector8x8 __attribute__ ((mode(V8QI))); - -+#endif -+ -+ - typedef unsigned long long ullong; - - #define noVERBOSE -@@ -92,9 +109,21 @@ - shift (Vector1x64 v, int s) - { - if (s > 0) -+ -+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 5) -+ -+ return (Vector2x32) __builtin_ia32_psllq ((long long) v, (long long) s); -+ else if (s < 0) -+ return (Vector2x32) __builtin_ia32_psrlq ((long long) v, (long long) -s); -+ -+#else -+ - return __builtin_ia32_psllq (v, s); - else if (s < 0) - return __builtin_ia32_psrlq (v, -s); -+ -+#endif -+ - else - return v; - } ---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h~ 2004-08-03 11:38:03.000000000 +0200 -+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h 2005-11-17 12:22:21.000000000 +0100 -@@ -146,7 +146,7 @@ - extern Bool RADEONProbe - FunctionPrototype((DriverPtr, int)); - --extern SymTabRec RADEONChipsets[]; -+static SymTabRec RADEONChipsets[]; - extern PciChipsets RADEONPciChipsets[]; - - /* radeon_driver.c */ diff --git a/package/x11/xorg/no-multilib.patch b/package/x11/xorg/no-multilib.patch new file mode 100644 index 000000000..79e6ec95b --- /dev/null +++ b/package/x11/xorg/no-multilib.patch @@ -0,0 +1,11 @@ +--- xc/config/cf/linux.cf.orig 2006-03-18 20:22:58.000000000 +0000 ++++ xc/config/cf/linux.cf 2006-03-18 20:23:25.000000000 +0000 +@@ -541,7 +541,7 @@ + #define MkdirHierCmd mkdir -p + + #ifndef HaveLib64 +-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) ++# if defined (s390xArchitecture) + # define HaveLib64 YES + # else + # define HaveLib64 NO diff --git a/package/x11/xorg/startwm.patch b/package/x11/xorg/startwm.patch index b0c77322d..7c826b017 100644 --- a/package/x11/xorg/startwm.patch +++ b/package/x11/xorg/startwm.patch @@ -19,14 +19,21 @@ More flexible root application startup. Kind of ROCK Linux specific. ---- ./programs/xdm/config/Xsession.orig Sun Jan 11 04:48:32 1998 -+++ ./programs/xdm/config/Xsession Thu Dec 28 15:23:15 2000 -@@ -33,5 +33,14 @@ - if [ -r "$resources" ]; then - xrdb -load "$resources" - fi +--- ./programs/xdm/config/Xsetup_0.orig Wed Apr 27 09:20:03 1994 ++++ ./programs/xdm/config/Xsetup_0 Thu Dec 28 15:23:15 2000 +@@ -1,3 +1,4 @@ + #!/bin/sh + # $XConsortium: Xsetup_0,v 1.3 93/09/28 14:30:31 gildea Exp $ + xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail ++xsetroot -solid black +--- ./programs/xdm/config/Xsession.cpp.orig 2006-03-18 22:31:35.000000000 +0000 ++++ ./programs/xdm/config/Xsession.cpp 2006-03-18 22:33:23.000000000 +0000 +@@ -56,5 +56,14 @@ + exec `eval $XDESKTOP` + } + #endif + -+ # we need at least the PATH /opt/*/bin expansion ... ++XCOMM we need at least the PATH /opt/.../bin expansion ... + [ -f /etc/profile ] && . /etc/profile + + WINDOWMANAGER="${WINDOWMANAGER:-startkde}" @@ -34,29 +41,28 @@ More flexible root application startup. Kind of ROCK Linux specific. + [ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde" + [ "$WINDOWMANAGER" != "twm" -a -n "$(type -p ${WINDOWMANAGER%% *})" ] && exec $WINDOWMANAGER + xsetroot -solid darkcyan ; exec twm ; exec xterm - exec xsm + exec BINDIR/xsm fi ---- ./programs/xdm/config/Xsetup_0.orig Wed Apr 27 09:20:03 1994 -+++ ./programs/xdm/config/Xsetup_0 Thu Dec 28 15:23:15 2000 -@@ -1,3 +1,4 @@ - #!/bin/sh - # $XConsortium: Xsetup_0,v 1.3 93/09/28 14:30:31 gildea Exp $ - xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail -+xsetroot -solid black ---- ./programs/xinit/xinitrc.cpp.orig Wed Apr 27 09:13:07 1994 -+++ ./programs/xinit/xinitrc.cpp Thu Dec 28 15:23:15 2000 -@@ -24,10 +24,10 @@ - xmodmap $usermodmap +--- ./programs/xinit/xinitrc.cpp.orig 2006-03-18 22:36:41.000000000 +0000 ++++ ./programs/xinit/xinitrc.cpp 2006-03-18 22:38:20.000000000 +0000 +@@ -24,7 +24,7 @@ + XMODMAP $usermodmap fi -XCOMM start some nice programs +XCOMM start the window manager --twm & --xclock -geometry 50x50-1+1 & --xterm -geometry 80x50+494+51 & --xterm -geometry 80x20+494-0 & --exec xterm -geometry 80x66+0+0 -name login + #if defined(__SCO__) || defined(__UNIXWARE__) + if [ -r /etc/default/xdesktops ]; then +@@ -68,8 +68,8 @@ + + XCOMM This is the fallback case if nothing else is executed above + #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ +-TWM & +-XCLOCK -geometry 50x50-1+1 & +-XTERM -geometry 80x50+494+51 & +-XTERM -geometry 80x20+494-0 & +-exec XTERM -geometry 80x66+0+0 -name login +WINDOWMANAGER="${WINDOWMANAGER:-startkde}" +[ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session" +[ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde" diff --git a/package/x11/xorg/xorg.desc b/package/x11/xorg/xorg.desc index fb46df5de..64495add2 100644 --- a/package/x11/xorg/xorg.desc +++ b/package/x11/xorg/xorg.desc @@ -40,13 +40,13 @@ [L] OpenSource [S] Stable -[V] 6.8.2 +[V] 6.9.0 [P] X X?---5---9 110.900 [O] mga_version=4.1-1 -[O] xf_files=X11R6.8.2-src.tar.bz2 +[O] xf_files=X11R6.9.0-src.tar.bz2 -[D] 3448356598 X11R6.8.2-src.tar.bz2 http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src-single/ +[D] 2298387887 X11R6.9.0-src.tar.bz2 http://www.portal-to-web.de/pub/mirrors/x.org/X11R6.9.0/src-single/ [D] 256482595 mgadriver-4.1-1-src.tar.gz ftp://ftp.matrox.com/pub/mga/archive/linux/2004/ [D] 4094582231 mangl.tar.Z ftp://ftp.sgi.com/opengl/doc/ [D] 1558312024 manglu.tar.Z ftp://ftp.sgi.com/opengl/doc/ diff --git a/package/x11/xorg/xterm-ls.patch b/package/x11/xorg/xterm-ls.patch index 731b588d4..e99420816 100644 --- a/package/x11/xorg/xterm-ls.patch +++ b/package/x11/xorg/xterm-ls.patch @@ -1,32 +1,9 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/x11/xorg/xterm-ls.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -A new xTerm should (= must!) have a login shell. - - - Clifford, June 2000 - ---- ./programs/xterm/XTerm.ad~ 2003-11-02 05:46:48.000000000 +0100 -+++ ./programs/xterm/XTerm.ad 2003-11-19 21:49:00.000000000 +0100 -@@ -110,3 +110,7 @@ - *tek4014*font2: 8x13 - *tek4014*font3: 6x13 - *tek4014*fontSmall: 6x10 +--- ./programs/xterm/XTerm.ad.orig 2006-03-18 22:42:35.000000000 +0000 ++++ ./programs/xterm/XTerm.ad 2006-03-18 22:42:56.000000000 +0000 +@@ -183,3 +183,7 @@ + ! Set a border for the menus to make them simpler to distinguish against the + ! vt100 widget: + *SimpleMenu*borderWidth: 2 + +! A new xTerm should (= must!) have a login shell. (Clifford) +*loginShell: on