diff options
author | Andrew Bevitt <cyfred@gentoo.org> | 2004-01-27 12:09:14 +0000 |
---|---|---|
committer | Andrew Bevitt <cyfred@gentoo.org> | 2004-01-27 12:09:14 +0000 |
commit | a18d7593643136393c927bd8ca2cd3f33edce2e7 (patch) | |
tree | 51736d540e82adf698c1f06801515eaaa3b93ce3 /x11-base/xfree | |
parent | Updating XFree86 ebuilds to fix arch problems with synpatics, and remove need... (diff) | |
download | gentoo-2-a18d7593643136393c927bd8ca2cd3f33edce2e7.tar.gz gentoo-2-a18d7593643136393c927bd8ca2cd3f33edce2e7.tar.bz2 gentoo-2-a18d7593643136393c927bd8ca2cd3f33edce2e7.zip |
Removing xfree-4.2.1-r2 files from portage tree, to suit move to tarball
Diffstat (limited to 'x11-base/xfree')
31 files changed, 0 insertions, 1491 deletions
diff --git a/x11-base/xfree/files/4.2.1-patches/018_all_4.2.0-ati-radeon-misc-bugfixes.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/018_all_4.2.0-ati-radeon-misc-bugfixes.patch.bz2 Binary files differdeleted file mode 100644 index 35f5963736b4..000000000000 --- a/x11-base/xfree/files/4.2.1-patches/018_all_4.2.0-ati-radeon-misc-bugfixes.patch.bz2 +++ /dev/null diff --git a/x11-base/xfree/files/4.2.1-patches/019_all_4.2.0-ati-radeon-pci-drm-enable.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/019_all_4.2.0-ati-radeon-pci-drm-enable.patch.bz2 Binary files differdeleted file mode 100644 index afcc318f1030..000000000000 --- a/x11-base/xfree/files/4.2.1-patches/019_all_4.2.0-ati-radeon-pci-drm-enable.patch.bz2 +++ /dev/null diff --git a/x11-base/xfree/files/4.2.1-patches/020_all_4.2.1-libICE-remove-stupid-delay.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/020_all_4.2.1-libICE-remove-stupid-delay.patch.bz2 Binary files differdeleted file mode 100644 index 3788272cf3b3..000000000000 --- a/x11-base/xfree/files/4.2.1-patches/020_all_4.2.1-libICE-remove-stupid-delay.patch.bz2 +++ /dev/null diff --git a/x11-base/xfree/files/4.2.1-patches/021_all_4.1.0-xtt.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/021_all_4.1.0-xtt.patch.bz2 Binary files differdeleted file mode 100644 index 74c83738401b..000000000000 --- a/x11-base/xfree/files/4.2.1-patches/021_all_4.1.0-xtt.patch.bz2 +++ /dev/null diff --git a/x11-base/xfree/files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2 Binary files differdeleted file mode 100644 index 784d0bc2101e..000000000000 --- a/x11-base/xfree/files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2 +++ /dev/null diff --git a/x11-base/xfree/files/4.2.1-patches/080_all_4.2.1-mit-shm-security.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/080_all_4.2.1-mit-shm-security.patch.bz2 Binary files differdeleted file mode 100644 index e219eac54ed9..000000000000 --- a/x11-base/xfree/files/4.2.1-patches/080_all_4.2.1-mit-shm-security.patch.bz2 +++ /dev/null diff --git a/x11-base/xfree/files/4.2.1-patches/094_all_4.2.1-Xft1-Imake-config.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/094_all_4.2.1-Xft1-Imake-config.patch.bz2 Binary files differdeleted file mode 100644 index 0bbd40be8933..000000000000 --- a/x11-base/xfree/files/4.2.1-patches/094_all_4.2.1-Xft1-Imake-config.patch.bz2 +++ /dev/null diff --git a/x11-base/xfree/files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 b/x11-base/xfree/files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 Binary files differdeleted file mode 100644 index be0b4d64ffe9..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 +++ /dev/null diff --git a/x11-base/xfree/files/4.2.1-r2/10xfree b/x11-base/xfree/files/4.2.1-r2/10xfree deleted file mode 100644 index 4dba95e6bd68..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/10xfree +++ /dev/null @@ -1,7 +0,0 @@ -PATH=/usr/X11R6/bin -ROOTPATH=/usr/X11R6/bin -LDPATH=/usr/X11R6/lib -MANPATH=/usr/X11R6/man -INFODIR=/usr/X11R6/info -XINITRC=/etc/X11/xinit/xinitrc -CONFIG_PROTECT=/usr/X11R6/lib/X11/xkb diff --git a/x11-base/xfree/files/4.2.1-r2/Sessions/Xsession b/x11-base/xfree/files/4.2.1-r2/Sessions/Xsession deleted file mode 100644 index c86ccee19ff3..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/Sessions/Xsession +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh -# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ - -case $# in -1) - case $1 in - failsafe) - exec xterm -geometry 80x24-0-0 - ;; - esac -esac - -# redirect errors to a file in user's home directory if we can -for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -do - if ( cp /dev/null "$errfile" 2> /dev/null ) - then - chmod 600 "$errfile" - exec > "$errfile" 2>&1 - break - fi -done - -# clean up after xbanner -if which freetemp 2> /dev/null ; then - freetemp -fi - -startup=$HOME/.xsession - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -userxkbmap=$HOME/.Xkbmap - -sysresources=/etc/X11/Xresources -sysmodmap=/etc/X11/Xmodmap -sysxkbmap=/etc/X11/Xkbmap - -rh6sysresources=/etc/X11/xinit/Xresources -rh6sysmodmap=/etc/X11/xinit/Xmodmap - - -# merge in defaults -if [ -f "$rh6sysresources" ]; then - xrdb -merge "$rh6sysresources" -fi - -if [ -f "$sysresources" ]; then - xrdb -merge "$sysresources" -fi - -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi - -# merge in keymaps -if [ -f "$sysxkbmap" ]; then - setxkbmap `cat "$sysxkbmap"` - XKB_IN_USE=yes -fi - -if [ -f "$userxkbmap" ]; then - setxkbmap `cat "$userxkbmap"` - XKB_IN_USE=yes -fi - -# -# Eeek, this seems like too much magic here -# -if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then - if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then - xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` - if [ -n "$xkbsymbols" ]; then - setxkbmap -symbols "$xkbsymbols" - XKB_IN_USE=yes - fi - fi -fi - -# xkb and xmodmap don't play nice together -if [ -z "$XKB_IN_USE" ]; then - if [ -f "$rh6sysmodmap" ]; then - xmodmap "$rh6sysmodmap" - fi - - if [ -f "$sysmodmap" ]; then - xmodmap "$sysmodmap" - fi - - if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" - fi -fi - -unset XKB_IN_USE - -if [ -x "$startup" ]; then - exec "$startup" -elif [ -x "$HOME/.Xclients" ]; then - exec "$HOME/.Xclients" -elif [ -x /etc/X11/xinit/Xclients ]; then - exec /etc/X11/xinit/Xclients -elif [ -x /etc/X11/Xclients ]; then - exec /etc/X11/Xclients -else - exec xsm -fi diff --git a/x11-base/xfree/files/4.2.1-r2/XftConfig b/x11-base/xfree/files/4.2.1-r2/XftConfig deleted file mode 100644 index 352757a1ce64..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/XftConfig +++ /dev/null @@ -1,239 +0,0 @@ -# -# XftConfig -# -# Use with Type1 and TrueType fonts -# - -# Note that each application scans all these directories -# during startup, so you may want to disable some to -# get better speed. - -# Standard XFree86 Type 1 fonts -dir "/usr/X11R6/lib/X11/fonts/Type1" -# TTF fonts -dir "/usr/X11R6/lib/X11/fonts/truetype" -dir "/usr/X11R6/lib/X11/fonts/TrueType" -dir "/usr/X11R6/lib/X11/fonts/TTF" -# User installed fonts -dir "/opt/ttfonts" -# URW fonts -dir "/usr/share/fonts/default/Type1" -# Localized Truetype fonts -dir "/usr/share/fonts/truetype" -dir "/usr/share/fonts/ttf/western" -dir "/usr/share/fonts/ttf/big5" -dir "/usr/share/fonts/ttf/gb2312" -dir "/usr/share/fonts/ttf/japanese" -dir "/usr/share/fonts/ttf/korean" -dir "/usr/share/fonts/ttf/armenian" -dir "/usr/share/fonts/ttf/decoratives" -dir "/usr/share/fonts/ttf/thai" -# don't yet exist, but i hope to include some day a package for them (Pablo) -dir "/usr/share/fonts/ttf/cyrillic" -dir "/usr/share/fonts/ttf/viet" -dir "/usr/share/fonts/ttf/ethiopic" -dir "/usr/share/fonts/ttf/georgian" -dir "/usr/share/fonts/ttf/arabic" -dir "/usr/share/fonts/ttf/hebrew" -dir "/usr/share/fonts/ttf/unicode" -# AbiSuite comes with URW fonts as well -dir "/usr/share/AbiSuite/fonts" - -# -# alias 'fixed' for 'mono' -# -match any family == "fixed" edit family =+ "mono"; - -# -# Check users config file -# -includeif "~/.xftconfig" - -# -# Substitute TrueType fonts for Type1 versions -# -match any family == "Times" edit family =+ "Times New Roman"; -match any family == "Helvetica" edit family =+ "Verdana"; -match any family == "Courier" edit family =+ "Courier New"; - -# -# Use TrueType fonts for defaults -# -match any family == "serif" edit family += "Times New Roman"; -match any family == "sans" edit family += "Arial"; -match any family == "sans" edit family += "Verdana"; - -# -# Use monotype.com (andale) face where possible -# -match - any family == "mono" - all slant == roman - all weight < bold -edit - family += "monotype.com"; -# -# otherwise, use courier -# -match any family == "mono" edit family += "Courier New"; -match any family == "mono" edit family += "Courier"; - -# -# Alias between XLFD families and font file family name, prefer local fonts -# -match any family == "Charter" edit family += "Bitstream Charter"; -match any family == "Bitstream Charter" edit family =+ "Charter"; - -match any family == "Lucidux Serif" edit family += "LuciduxSerif"; -match any family == "LuciduxSerif" edit family =+ "Lucidux Serif"; - -match any family == "Lucidux Sans" edit family += "LuciduxSans"; -match any family == "LuciduxSans" edit family =+ "Lucidux Sans"; - -match any family == "Lucidux Mono" edit family += "LuciduxMono"; -match any family == "LuciduxMono" edit family =+ "Lucidux Mono"; - -# -# TrueType font aliases -# -match any family == "Comic Sans" edit family += "Comic Sans MS"; -match any family == "Comic Sans MS" edit family =+ "Comic Sans"; -match any family == "Trebuchet" edit family += "Trebuchet MS"; -match any family == "Trebuchet MS" edit family =+ "Trebuchet"; -match any family == "Monotype" edit family =+ "Monotype.com"; -match any family == "Andale Mono" edit family += "Monotype.com"; -match any family == "Monotype.com" edit family =+ "Andale Mono"; - -# modifications from Laurent Culioli -match - any family == "webdings" - edit antialias = false; - encoding += "glyphs-fontspecific"; -match - any family == "wingdings" - edit antialias = false; - encoding += "glyphs-fontspecific"; - -# extra aliases -- pablo - -# a nice default for sans serif (same as used in yudit) -match any family == "sans" edit family =+ "Arial"; -match any family == "sans" edit family =+ "MS Gothic"; -match any family == "sans" edit family =+ "Gulim"; -match any family == "sans" edit family =+ "Baekmuk unigulir"; -match any family == "sans" edit family =+ "Lucida Sans Unicode"; -match any family == "sans" edit family =+ "Tahoma"; -match any family == "sans" edit family =+ "BPG UTF8 M"; -match any family == "sans" edit family =+ "GF Zemen Unicode"; -match any family == "sans" edit family =+ "MS Mincho"; -match any family == "sans" edit family =+ "Pigiarniq"; -match any family == "sans" edit family =+ "Urdu Naqsh Nastalique"; -match any family == "sans" edit family =+ "Ballymun RO"; -# a nice monospaced one -match any family == "mono" edit family =+ "Lucida Console"; -# korean -match any family == "Gulim" edit family =+ "Baekmuk unigulir"; -match any family == "Batang" edit family =+ "Ubatang"; -match any family == "sans" edit family =+ "Gulim"; -match any family == "serif" edit family =+ "Batang"; -match any family == "mono" edit family =+ "Gulim"; -# chinese gb2312 -match any family == "Kaiti" edit family =+ "AR PL KaitiM GB"; -match any family == "Sungti" edit family =+ "AR PL SungtiL GB"; -match any family == "sans" edit family =+ "Sungti"; -match any family == "serif" edit family =+ "Sungti"; -# chinese big5 -match any family == "Kaiti" edit family =+ "AR PL KaitiM Big5"; -match any family == "Mingti" edit family =+ "AR PL Mingti2L Big5"; -match any family == "sans" edit family =+ "Mingti"; -match any family == "serif" edit family =+ "Mingti"; -# thai -match any family == "sans" edit family =+ "Norasi"; -match any family == "serif" edit family =+ "Norasi"; -# armenian -match any family == "Helvetica" edit family =+ "ArmNet Helvetica"; -match any family == "sans" edit family =+ "ArmNet Helvetica"; -match any family == "serif" edit family =+ "ArmNet Helvetica"; -# indic -match any family == "Raghindi" edit family =+ "Raghu"; -match any family == "sans" edit family =+ "Raghindi"; -match any family == "serif" edit family =+ "Raghindi"; - -# -# If the Microsoft Web Fonts are not installed, we have to find a -# replacement -# - -# these come with Sun JDK 1.3 -match any family == "Verdana" edit family =+ "Lucida Sans"; -match any family == "Times New Roman" edit family =+ "Lucida Bright"; -match any family == "Courier New" edit family =+ "Lucida Sans Typewriter"; - -# OpenOffice 6 -match any family == "Verdana" edit family =+ "Lucida Sans Tur"; -match any family == "Times New Roman" edit family =+ "Lucida Bright Tur"; -match any family == "Courier New" edit family =+ "Lucida Sans Typewriter Tur"; - -# ttfonts from RH7 -match any family == "Verdana" edit family =+ "Helmet"; - -# URW fonts -match any family == "Verdana" edit family =+ "Nimbus Sans L"; -match any family == "Times New Roman" edit family =+ "Nimbus Roman No9 L"; -match any family == "Courier New" edit family =+ "Nimbus Mono L"; - -# western fonts -match any family == "Verdana" edit family =+ "Blue Highway"; - -# XFree86 default fonts -match any family == "Verdana" edit family =+ "LuciduxSans"; -match any family == "Times New Roman" edit family =+ "LuciduxSerif"; - - -# last ressort defaults -match any family == "Courier" edit family =+ "mono"; - -match any family == "Helvetica" edit family =+ "sans"; -match any family == "Arial" edit family =+ "sans"; - -match any family == "serif" edit family =+ "sans"; -match any family == "Times" edit family =+ "serif"; - -# Aditions from Danny Tholen - -match - any family == "symbol" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "Standard Symbols L" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "dingbats" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - - -match - any family == "Cursor" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "StarBats" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "StarMath" -edit - antialias = false; - encoding += "glyphs-fontspecific"; diff --git a/x11-base/xfree/files/4.2.1-r2/Xsession b/x11-base/xfree/files/4.2.1-r2/Xsession deleted file mode 100644 index ffeef4c87420..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/Xsession +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash --login -# -# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $ - -# redirect errors to a file in user's home directory if we can -for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -do - if ( cp /dev/null "$errfile" 2> /dev/null ) - then - chmod 600 "$errfile" - exec > "$errfile" 2>&1 - break - fi -done - -# handle KDM -if [ -n "$1" ]; then - export XSESSION="$1" -fi - -xinitdir=/usr/X11R6/lib/X11/xinit -startup=$HOME/.xsession -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=$xinitdir/.Xresources -sysmodmap=$xinitdir/.Xmodmap - -# First run the system default. Because KDE uses this -# to switch sessions, we MUST first check the system -# default, and then ~/.xsession. If the user Do not -# want this, he should override XSESSION, or at least -# clear it. -if [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -# If not defined, try the user's ~/.xsession -elif [ -s "$startup" ]; then - - # merge in defaults and keymaps - - if [ -f $sysresources ]; then - xrdb -merge $sysresources - fi - - if [ -f $sysmodmap ]; then - xmodmap $sysmodmap - fi - - if [ -f $userresources ]; then - xrdb -merge $userresources - fi - - if [ -f $usermodmap ]; then - xmodmap $usermodmap - fi - - if [ -x "$startup" ]; then - exec "$startup" - else - exec /bin/sh "$startup" - fi -# Lastly, xsm as failsafe -else - if [ -r "$userresources" ]; then - xrdb -load "$userresources" - fi - exec xsm -fi - diff --git a/x11-base/xfree/files/4.2.1-r2/Xsetup_0 b/x11-base/xfree/files/4.2.1-r2/Xsetup_0 deleted file mode 100644 index 2022592bb146..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/Xsetup_0 +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail - -# get KDEDIR value (only) and run kdmdesktop from there -eval "`grep KDEDIR /etc/profile.env`" -[ -n "$KDEDIR" ] && ${KDEDIR}/bin/kdmdesktop - -# --- Gentoo --- -# create list of sessions for kdm -sessions="SessionTypes=" -for x in `ls /etc/X11/Sessions` -do - sessions="${sessions}${x}," -done -echo sessions: $sessions - -# update all kdmrcs located; tries some pretty much impossible locations -# to make sure we get 'em all -source /etc/make.conf -for dir in /usr/kde/* /usr $KDEDIR $KDE2DIR $KDE3DIR $KDE2LIBSDIR $KDE3LIBSDIR -do - - echo "Changing kdmrc in $dir" - cd ${dir}/share/config/kdm || continue - - cp kdmrc kdmrc.orig - sed -e "/SessionTypes=/c\ -${sessions}" kdmrc.orig > kdmrc - rm kdmrc.orig - -done diff --git a/x11-base/xfree/files/4.2.1-r2/chooser.sh b/x11-base/xfree/files/4.2.1-r2/chooser.sh deleted file mode 100644 index 2bdba67b77bd..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/chooser.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.1-r2/chooser.sh,v 1.1 2002/12/05 22:35:11 azarah Exp $ - -# If $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf -if [ -z "${XSESSION}" ] -then - [ -f /etc/conf.d/basic ] && source /etc/conf.d/basic - [ -f /etc/rc.conf ] && source /etc/rc.conf -fi - -# Find a match for $XSESSION in /etc/X11/Sessions -GENTOO_SESSION="" -for x in /etc/X11/Sessions/* -do - if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \ - = "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ] - then - GENTOO_SESSION=${x} - break - fi -done - -GENTOO_EXEC="" - -if [ -n "${XSESSION}" ]; then - if [ -f /etc/X11/Sessions/${XSESSION} ]; then - if [ -x /etc/X11/Sessions/${XSESSION} ]; then - GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}" - else - GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}" - fi - elif [ -n "${GENTOO_SESSION}" ]; then - if [ -x "${GENTOO_SESSION}" ]; then - GENTOO_EXEC="${GENTOO_SESSION}" - else - GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}" - fi - else - x="" - y="" - - for x in "${XSESSION}" \ - "`echo ${XSESSION} | awk '{ print toupper($1) }'`" \ - "`echo ${XSESSION} | awk '{ print tolower($1) }'`" - do - # Fall through ... - if [ -x "`which ${x} 2>/dev/null`" ]; then - GENTOO_EXEC="`which ${x} 2>/dev/null`" - break - fi - done - - # If all else fail, run twm - GENTOO_EXEC="/usr/X11R6/bin/twm" - fi -fi - -echo "${GENTOO_EXEC}" - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.2.1-r2/lib/libGL.la b/x11-base/xfree/files/4.2.1-r2/lib/libGL.la deleted file mode 100644 index 8566b67d4c3d..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/lib/libGL.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.1.2 libGL.so.1 libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGL. -current=3 -age=2 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/lib/opengl/xfree/lib' diff --git a/x11-base/xfree/files/4.2.1-r2/lib/libGLU.la b/x11-base/xfree/files/4.2.1-r2/lib/libGLU.la deleted file mode 100644 index 86b6432cf5db..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/lib/libGLU.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGLU.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGLU.so.1' - -# Names of this library. -library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGLU. -current=4 -age=3 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/lib' diff --git a/x11-base/xfree/files/4.2.1-r2/lib/libOSMesa.la b/x11-base/xfree/files/4.2.1-r2/lib/libOSMesa.la deleted file mode 100644 index 56a72ed91f02..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/lib/libOSMesa.la +++ /dev/null @@ -1,32 +0,0 @@ -# libOSMesa.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libOSMesa.so.3' - -# Names of this library. -library_names='libOSMesa.so.3.3 libOSMesa.so.3 libOSMesa.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libOSMesa. -current=4 -age=3 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/X11R6/lib' diff --git a/x11-base/xfree/files/4.2.1-r2/site.def b/x11-base/xfree/files/4.2.1-r2/site.def deleted file mode 100644 index 0ff2342e1053..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/site.def +++ /dev/null @@ -1,111 +0,0 @@ -/* Use buildin zlib to try and fix segfaults. Bug #4777 */ -#define HasZlib NO -#define HasPam YES -#define HasPamMisc YES -#define HasNCurses YES -#define HasLibCrypt YES -#define HasTk NO -#define HasTcl NO -#define FSUseSyslog YES - -#define LocalThreads YES -#define ThreadedX YES -#define HasPosixThreads YES -#define HasThreadSafeAPI YES - -#define HasGcc2ForCplusplus YES - -#define BuildXinerama YES -#define BuildXineramaLibrary YES - -/* Do not change, as it can break things like gdm */ -#define SharedLibXau YES -/* Needed for 104_all_4.2.1-fix-shared-libXau-link.v2.patch.bz2 */ - -#define HasFreetype2 YES -#define UseFreetype2 YES -#define Freetype2LibDir /usr/lib -/* #define BuildFreetype2Library YES */ -/* #define UseFontconfig YES */ -/* #define HasFontconfig YES */ -/* #define SharedLibXft1 YES */ - -#define BuildFonts YES -/* #define BuildCyrillicFonts YES */ - -#define BuildXF86MiscExt YES -#define BuildXInputExt YES -#define BuildXKB YES -#define BuildDBE YES -#define BuildScreenSaverExt YES -#define BuildRman YES -#define BuildHtmlManPages NO -#define BuildAllSpecsDocs NO -#define BuildSpecsDocs NO - -#define BuildXF86DRI YES -/* #define BuildXF86DRM YES */ -#define HasAgpGart YES -#define BuildGLXLibrary YES -#define BuildGlxExt YES -/* #define GlxUseSGISI YES */ -#define BuildGLULibrary YES -#define SharedLibGLU YES -#define NormalLibGLU YES -#define BuildXvExt YES -#define BuildXF86DGA YES -#define BuildRender YES - -/* Need this to build libs with -fPIC */ -#undef StaticNeedsPicForShared -#undef BuildLibGlxWithoutPIC -#define StaticNeedsPicForShared YES -#define BuildLibGlxWithoutPIC NO - -/* Broken in 4.x */ -#define JoystickSupport NO - -#define DoLoadableServer YES - -#define BuildRECORD YES - -#define UseXserverWrapper YES -#define UseMatroxHal NO - -#define UseConfDirForXkb NO -/* #define UseConfDirForAppDefaults NO */ - -#undef DefaultUserPath -#define DefaultUserPath /usr/local/bin:/bin:/usr/bin -#undef DefaultSystemPath -#define DefaultSystemPath /usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin - -#define AdmDir /var/log -#define LbxproxyDir /etc/X11/lbxproxy -#define ProxyManagerDir /etc/X11/proxymngr -#define ServerConfigDir /etc/X11/xserver -#define XdmDir /etc/X11/xdm -#define XConfigDir /etc/X11 -#define XinitDir /etc/X11/xinit - -/* BOTH XIE and PEX were deprecated in XFree86 4.1.0 and are now obsolete */ -#define BuildPhigs NO -#define BuildPexExt NO -#define BuildPexLib NO -#define BuildXIE NO -#define BuildXIElib NO - -/* required for Lokis Erics Ultimate Solitaire */ -#define UseInternalMalloc NO -#define ForceNormalLib YES -#define SharedLibXxf86vm YES -#define SharedLibXxf86dga YES -#define SharedLibXxf86misc YES -#define SharedLibXv YES - -/* binutils-2.9 */ -#define LinuxBinUtilsMajorVersion 29 -/* glibc-2.2 (6.2 because glibc is considered libc-6) */ -#define LinuxCLibMajorVersion 6 -#define LinuxClibMinorVersion 2 - diff --git a/x11-base/xfree/files/4.2.1-r2/startDM.sh b/x11-base/xfree/files/4.2.1-r2/startDM.sh deleted file mode 100644 index 855d7e7d2a1e..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/startDM.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.1-r2/startDM.sh,v 1.3 2002/12/26 03:29:41 azarah Exp $ - -source /etc/init.d/functions.sh - -# We need to source /etc/profile for stuff like $LANG to work -# bug #10190. -source /etc/profile - -# Great new Gnome2 feature, AA -# We enable this by default -export GDK_USE_XFT=1 - -if [ -e ${svcdir}/options/xdm/service ] -then - retval=0 - EXE="`cat ${svcdir}/options/xdm/service`" - - /sbin/start-stop-daemon --start --quiet --exec ${EXE} - retval=$? - sleep 5 - - if [ "${retval}" -ne 0 ] - then - # there was a error running the DM - einfo "ERROR: could not start the Display Manager..." - # make sure we do not have a misbehaving DM - killall -9 ${EXE##*/} - fi -fi - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.2.1-r2/xdm.pamd b/x11-base/xfree/files/4.2.1-r2/xdm.pamd deleted file mode 100644 index 1d2e081625f1..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/xdm.pamd +++ /dev/null @@ -1,7 +0,0 @@ -#%PAM-1.0 -auth required /lib/security/pam_stack.so service=system-auth -auth required /lib/security/pam_nologin.so -account required /lib/security/pam_stack.so service=system-auth -password required /lib/security/pam_stack.so service=system-auth -session required /lib/security/pam_stack.so service=system-auth -session optional /lib/security/pam_console.so diff --git a/x11-base/xfree/files/4.2.1-r2/xdm.start b/x11-base/xfree/files/4.2.1-r2/xdm.start deleted file mode 100644 index e00a9bf1b61c..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/xdm.start +++ /dev/null @@ -1,109 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.1-r2/xdm.start,v 1.5 2003/10/21 06:10:43 vapier Exp $ - -# This is here to serve as a note to myself, and future developers. -# -# Any Display manager (gdm,kdm,xdm) have the following problem: if -# it is started before any getty, and no vt is specified, it will -# usually run on vt2. When the getty on vt2 then starts, and the -# DM is already started, the getty will take control of the keyboard, -# leaving us with a "dead" keyboard. -# -# Resolution: add the following line to /etc/inittab -# -# x:a:once:/etc/X11/startDM.sh -# -# and have /etc/X11/startDM.sh start the DM in daemon mode if -# a lock is present (with the info of what DM should be started), -# else just fall through. -# -# How this basically works, is the "a" runlevel is a additional -# runlevel that you can use to fork processes with init, but the -# runlevel never gets changed to this runlevel. Along with the "a" -# runlevel, the "once" key word means that startDM.sh will only be -# run when we specify it to run, thus eliminating respawning -# startDM.sh when "xdm" is not added to the default runleve, as was -# done previously. -# -# This script then just calls "tellinit a", and init will run -# /etc/X11/startDM.sh after the current runlevel completes (this -# script should only be added to the actual runlevel the user is -# using). -# -# Martin Schlemmer -# aka Azarah -# 04 March 2002 - - -# Start X Font Server before X -depend() { - use xfs hotplug -} - -setup_dm() { - source /etc/profile.env - export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH}" - - case "$(echo ${DISPLAYMANAGER} | awk '{ print toupper($1) }')" in - KDM|KDE|KDE2|KDE3) - EXE="$(which kdm)" - ;; - ENTRANCE*) - EXE="$(which entranced)" - ;; - GDM|GNOME) - EXE=/usr/bin/gdm - ;; - *) - EXE=/usr/X11R6/bin/xdm - ;; - esac - - test ! -x "${EXE}" && EXE=/usr/X11R6/bin/xdm - - SERVICE="${EXE##*/}" -} - -start() { - setup_dm - - ebegin "Setting up ${SERVICE}" - #save the prefered DM - save_options "service" "${EXE}" - #tell init to run /etc/X11/startDM.sh after current - #runlevel is finished (should *not* be in the "boot" - # runlevel). - /sbin/telinit a &>/dev/null - eend 0 -} - -stop() { - local retval=0 - local curvt="$(fgconsole)" - local myexe="$(get_options "service")" - local myservice="${myexe##*/}" - - ebegin "Stopping ${myservice}" - rm -f ${svcdir}/options/xdm/service - - if [ "$(ps -A | grep -e "${myservice}")" ] - then - start-stop-daemon --stop --quiet \ - --exe ${myexe} &>/dev/null - - retval=$? - else - retval=1 - fi - - #switch back to original vt - chvt "${curvt}" &>/dev/null - eend ${retval} "Error stopping ${myservice}." - - return ${retval} -} - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.2.1-r2/xfs.conf.d b/x11-base/xfree/files/4.2.1-r2/xfs.conf.d deleted file mode 100644 index 352050e89920..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/xfs.conf.d +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.1-r2/xfs.conf.d,v 1.1 2002/12/05 22:35:11 azarah Exp $ - -# Config file for /etc/init.d/xfs - - -# Port for xfs to listen on. Default is set to "-1", meaning -# it will only listen on unix sockets, and not tcp ports. If -# you however want it to listen on tcp, remember to comment -# "nolisten = tcp" in /etc/X11/fs/config. - -XFS_PORT="-1" - - -# If this is set to "yes", then the xfs rc-script will -# scan all the font directories in /etc/X11/fs/config for -# changes, and if any, will add the required files. This -# may take a while on very old boxes, so set it to "no" -# if it takes too long for you. - -SETUP_FONTDIRS="yes" - diff --git a/x11-base/xfree/files/4.2.1-r2/xfs.config b/x11-base/xfree/files/4.2.1-r2/xfs.config deleted file mode 100644 index e594a25183eb..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/xfs.config +++ /dev/null @@ -1,53 +0,0 @@ -# -# X Font Server configuration file -# - -# allow a max of 4 clients to connect to this font server -#client-limit = 4 - -# no tcp, use sockets! -no-listen = tcp - -# when a font server reaches its limit, start up a new one -clone-self = on - -# alternate font servers for clients to use -#alternate-servers = foo:7101,bar:7102 - -# where to look for fonts -# Some of these are commented out, i.e. the TrueType and Type1 -# directories in /usr/share, because they aren't forced to be -# installed alongside X. -# -catalogue = /usr/X11R6/lib/X11/fonts/75dpi, - /usr/X11R6/lib/X11/fonts/100dpi, - /usr/X11R6/lib/X11/fonts/misc, - /usr/X11R6/lib/X11/fonts/Type1, - /usr/X11R6/lib/X11/fonts/Speedo, - /usr/X11R6/lib/X11/fonts/CID, - /usr/X11R6/lib/X11/fonts/util, - /usr/X11R6/lib/X11/fonts/local, - /usr/X11R6/lib/X11/fonts/Speedo, - /usr/X11R6/lib/X11/fonts/truetype, - /usr/X11R6/lib/X11/fonts/TTF, - /usr/X11R6/lib/X11/fonts/cyrillic, - /usr/X11R6/lib/X11/fonts/freefont, - /usr/X11R6/lib/X11/fonts/sharefont, - /usr/share/fonts/default/Type1, - /usr/share/fonts/ttf/decoratives, - /usr/share/fonts/ttf/western - -# in 12 points, decipoints -default-point-size = 120 - -# 100 x 100 and 75 x 75 -default-resolutions = 75,75,100,100 - -# how to log errors -use-syslog = on - -# font cache control, specified in KB -cache-hi-mark = 2048 -cache-low-mark = 1433 -cache-balance = 70 - diff --git a/x11-base/xfree/files/4.2.1-r2/xfs.start b/x11-base/xfree/files/4.2.1-r2/xfs.start deleted file mode 100644 index c31bd7c98a2d..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/xfs.start +++ /dev/null @@ -1,290 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.1-r2/xfs.start,v 1.3 2003/02/14 23:30:10 vapier Exp $ - -#NB: Config is in /etc/conf.d/xfs - - -depend() { - use logger -} - -check_config() { - if [ -z "${XFS_PORT}" ] - then - eerror "Please set \$XFS_PORT in /etc/conf.d/xfs!" - return 1 - fi - return 0 -} - -# Return 0 on change, or 1 on no change, or if dir do not exist -check_changed() { - local x="" - local fontlist="" - - # If the dir do not exist, e - if [ ! -d $1 ] - then - return 1 - fi - - # Create a list of all non known config files in the font dir - fontlist="$(find $1/ -type f -maxdepth 1 | \ - gawk '$0 !~ /fonts\..*$|^.*\.dir$|XftCache/ {print}')" - - if [ ! -f $1/fonts.list ] - then - if [ -n "${fontlist}" ] - then - # No list file exist, so create it and return 0 to add - # this font dir as a candidate for updating... - echo "${fontlist}" > $1/fonts.list - - return 0 - fi - else - local retval=1 - - # All the fonts was removed, so cleanup - if [ -z "${fontlist}" ] - then - for x in $1/fonts.* $1/encodings.dir $1/XftCache - do - if [ -f ${x} ] - then - rm -f ${x} - fi - done - - return 1 - fi - - # Check that no files was added or removed.... - if [ "$(cat $1/fonts.list | md5sum)" != "$(echo "${fontlist}" | md5sum)" ] - then - retval=0 - fi - - # Check that no files was updated.... - if [ "${retval}" -ne 0 ] - then - local changed_list="" - -# It should be more consistant if we consider a change to fonts.scale, or -# encodings.dir files as a need for an update as well ... -# changed_list="$(find $1/ -type f -cnewer $1/fonts.dir | \ -# gawk '$0 !~ /fonts\..*$|^.*\.dir$|XftCache/ {print}')" - changed_list="$(find $1/ -type f -cnewer $1/fonts.dir | \ - gawk '$0 !~ /fonts\.(list|cache-1)$|XftCache/ {print}')" - - if [ -n "${changed_list}" ] - then - retval=0 - fi - fi - - # OK, something changed, so recreate fonts.list and add as candidate - # for updating... - if [ "${retval}" -eq 0 ] - then - echo "${fontlist}" > $1/fonts.list - - return 0 - fi - fi - - return 1 -} - -# This is a function to extract font dirs from -# the xfs config file (/etc/X11/fs/config). -get_fontdir_list() { - [ ! -r /etc/X11/fs/config ] && return 0 - - gawk ' - BEGIN { - - while((getline xfsconf_data < ("/etc/X11/fs/config")) > 0) { - - # Strip any comments - if (xfsconf_data !~ /^[[:space:]]*#/) { - - # Dont bother if its a blank line - if (xfsconf_data == "") continue - - # If we have a line that contain 'catalogue=', we - # should be where the list of font dirs are - if (xfsconf_data ~ /catalogue[[:space:]]*=/) - DO_WRITE = 1 - - # Ok, we got our que, so start - if (DO_WRITE) { - - # Strip any leading spaces and tabs - sub(/^[[:space:]]*/, "", xfsconf_data) - # Strip the 'catalogue=' part - sub(/catalogue[[:space:]]*=[[:space:]]*/, "", xfsconf_data) - - # The last font dir will not have a ',', so this will - # be the last line we read ... - if (xfsconf_data !~ /,$/) { - - DO_WRITE = 0 - DONE = 1 - } - - # Strip the ending ',' ... - sub(/,$/, "", xfsconf_data) - - # If we have a valid font path, print it - if (xfsconf_data != "") { - - have_dup = 0 - - # Check for duplicates ... - for (x in DIRLIST) - if (DIRLIST[x] == xfsconf_data) { - - have_dup = 1 - break - } - - if (!have_dup) { - print xfsconf_data - DIRLIST[++i] = xfsconf_data - } - } - } - - # No need to continue reading the file ... - if (DONE) break - } - } - - close("/etc/X11/fs/config") - }' - - return 0 -} - -# This is the main beast for setting up the font dirs -setup_font_dirs() { - local x="" - local pending_fontdirs="" - local changed="no" - - umask 022 - - if [ ! -x /usr/X11R6/bin/mkfontdir -o ! -x /usr/X11R6/bin/ttmkfdir ] - then - ewarn "Could not find the mkfontdir or ttmkfdir binaries!" - return 0 - fi - - if [ ! -d /usr/X11R6/lib/X11/fonts/encodings ] - then - ewarn "Encodings directory are missing!" - ewarn "Please restore /usr/X11R6/lib/X11/fonts/encodings ..." - return 0 - fi - - # Generate the encodings.dir ... - /usr/X11R6/bin/mkfontdir -n \ - -e /usr/X11R6/lib/X11/fonts/encodings \ - -e /usr/X11R6/lib/X11/fonts/encodings/large \ - -- /usr/X11R6/lib/X11/fonts/encodings - - ebegin "Scanning font directories" - for x in $(get_fontdir_list) - do - if test -d ${x} && check_changed ${x} - then - if [ -z "${pending_fontdirs}" ] - then - pending_fontdirs="${x}" - else - pending_fontdirs="${pending_fontdirs} ${x}" - fi - fi - done - eend 0 - - if [ -n "${pending_fontdirs}" ] - then - ebegin "Indexing font directories" - for x in ${pending_fontdirs} - do - ebegin " ${x}" - - # Only generate .scale files if there are truetype fonts present ... - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] - then - /usr/X11R6/bin/ttmkfdir -x 2 \ - -e /usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ - -o ${x}/fonts.scale -d ${x} > /dev/null - fi - - # Now generate fonts.dir files ... - if [ "${x/encodings}" = "${x}" ] - then - /usr/X11R6/bin/mkfontdir \ - -e /usr/X11R6/lib/X11/fonts/encodings \ - -e /usr/X11R6/lib/X11/fonts/encodings/large \ - -- ${x} > /dev/null - fi - - if [ "${x/encodings}" = "${x}" -a -x /usr/X11R6/bin/xftcache ] && \ - [ -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] - then - # xftcache is broken, but run it anyhow ... - /usr/X11R6/bin/xftcache ${x} &> /dev/null - fi - eend 0 - - changed="yes" - done - fi - - # While we at it, update fontconfig's cache as well - if [ -x /usr/bin/fc-cache -a "${changed}" = "yes" ] - then - ebegin "Updating FC cache" - HOME="/root" /usr/bin/fc-cache -f - eend 0 - fi -} - -start() { - check_config || return 1 - - if [ "${SETUP_FONTDIRS}" = "yes" ] - then - setup_font_dirs - fi - - ebegin "Starting X Font Server" - if [ "`grep -e "^xfs:" /etc/passwd`" ] ; then - start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \ - -- -daemon -config /etc/X11/fs/config \ - -droppriv -user xfs -port ${XFS_PORT} 1>&2 - else - start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \ - -- -daemon -config /etc/X11/fs/config \ - -port ${XFS_PORT} 1>&2 - fi - eend $? -} - -stop() { - ebegin "Stopping X Font Server" - start-stop-daemon --stop --quiet --exec /usr/X11R6/bin/xfs 1>&2 - rm -rf /tmp/.font-unix - eend $? -} - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.2.1-r2/xft-quality.diff b/x11-base/xfree/files/4.2.1-r2/xft-quality.diff deleted file mode 100644 index fa0d6e395fff..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/xft-quality.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN Xft.orig/xftfreetype.c Xft/xftfreetype.c ---- Xft.orig/xftfreetype.c Thu Dec 13 10:26:00 2001 -+++ Xft/xftfreetype.c Wed Mar 6 00:23:19 2002 -@@ -236,7 +236,7 @@ - if (_XftFontDebug() & XFT_DBG_GLYPH) - printf ("Set face size to %d (%d)\n", - (int) (size >> 6), (int) size); -- if (FT_Set_Char_Size (face, size, size, 0, 0)) -+ if (FT_Set_Char_Size (face, size, size, 69, 72)) - return False; - f->size = size; - } -diff -urN Xft.orig/xftglyphs.c Xft/xftglyphs.c ---- Xft.orig/xftglyphs.c Sat Nov 17 01:22:45 2001 -+++ Xft/xftglyphs.c Wed Mar 6 00:23:19 2002 -@@ -124,7 +124,7 @@ - } - else - glyphindex = (FT_UInt) charcode; -- error = FT_Load_Glyph (font->face, glyphindex, FT_LOAD_NO_BITMAP); -+ error = FT_Load_Glyph (font->face, glyphindex, FT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING); - if (error) - continue; - diff --git a/x11-base/xfree/files/4.2.1-r2/xinitrc b/x11-base/xfree/files/4.2.1-r2/xinitrc deleted file mode 100644 index 53cde32559d2..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/xinitrc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -xinitdir=/usr/X11R6/lib/X11/xinit -sysresources=$xinitdir/.Xresources -sysmodmap=$xinitdir/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# First try ~/.xinitrc -if [ -f "$HOME/.xinitrc" ]; then - XINITRC="$HOME/.xinitrc" - exec /bin/sh "$HOME/.xinitrc" -# If not present, try the system default -elif [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -# Failsafe -else - # start some nice programs - twm & - xclock -geometry 50x50-1+1 & - xterm -geometry 80x50+494+51 & - xterm -geometry 80x20+494-0 & - exec xterm -geometry 80x66+0+0 -name login -fi diff --git a/x11-base/xfree/files/4.2.1-r2/xserver.pamd b/x11-base/xfree/files/4.2.1-r2/xserver.pamd deleted file mode 100644 index 7ff11c4329e2..000000000000 --- a/x11-base/xfree/files/4.2.1-r2/xserver.pamd +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 - -auth sufficient /lib/security/pam_rootok.so -# Next line you need console ownership to be able to start X -#auth required /lib/security/pam_console.so -auth required /lib/security/pam_permit.so - -account required /lib/security/pam_permit.so diff --git a/x11-base/xfree/files/XFree86-4.2.1-Xft11-Imakefile.patch b/x11-base/xfree/files/XFree86-4.2.1-Xft11-Imakefile.patch deleted file mode 100644 index 5e9692dba2ea..000000000000 --- a/x11-base/xfree/files/XFree86-4.2.1-Xft11-Imakefile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xc/lib/Xft/Imakefile.orig 2002-10-01 19:57:18.000000000 +0200 -+++ xc/lib/Xft/Imakefile 2002-10-01 19:57:42.000000000 +0200 -@@ -73,7 +73,8 @@ - #define LibName Xft - #define SoRev SOXFT1REV --#define LibHeaders NO -+#define LibHeaders YES --#define NoSoSymlink -+#define IncSubdir X11 -+#define IncSubSubdir Xft - - #include <Threads.tmpl> - diff --git a/x11-base/xfree/files/XFree86-4.2.1-Xft11-hack.patch b/x11-base/xfree/files/XFree86-4.2.1-Xft11-hack.patch deleted file mode 100644 index e0d8f8f09d11..000000000000 --- a/x11-base/xfree/files/XFree86-4.2.1-Xft11-hack.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- xc/lib/Xft/Xft.h.orig 2002-10-02 00:40:59.000000000 +0200 -+++ xc/lib/Xft/Xft.h 2002-10-02 00:35:07.000000000 +0200 -@@ -108,6 +108,51 @@ - - typedef FcValue XftValue; - -+/* -+ * Unfortunately Xft-1.1 is not 100% compadible with -+ * Xft-1.0, as it do not define its internal workings -+ * publically. We thus add this tempory hack until -+ * pango and co change to work with this without -+ * patching. -+ * -+ * The following is taken from fcint.h from the -+ * fontconfig package. -+ * -+ * <azarah@gentoo.org> (02 Oct 2002) -+ * -+ */ -+ -+#undef FcValueBinding -+#undef FcValueList -+#undef FcPatternElt -+#undef FcPattern -+ -+typedef enum _FcValueBinding { -+ FcValueBindingWeak, FcValueBindingStrong -+} FcValueBinding; -+ -+typedef struct _FcValueList { -+ struct _FcValueList *next; -+ FcValue value; -+ FcValueBinding binding; -+} FcValueList; -+ -+typedef struct _FcPatternElt { -+ const char *object; -+ FcValueList *values; -+} FcPatternElt; -+ -+ -+struct _FcPattern { -+ int num; -+ int size; -+ FcPatternElt *elts; -+ int ref; -+}; -+ -+/* -+ * End of Gentoo hack -+ */ - - typedef FcPattern XftPattern; - diff --git a/x11-base/xfree/files/xfree-4.2.x-home_end-keys.patch b/x11-base/xfree/files/xfree-4.2.x-home_end-keys.patch deleted file mode 100644 index f6e81777c47a..000000000000 --- a/x11-base/xfree/files/xfree-4.2.x-home_end-keys.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xc/programs/xterm/XTerm.ad.home_end 2003-02-16 23:28:57.000000000 +0200 -+++ xc/programs/xterm/XTerm.ad 2003-02-16 23:29:07.000000000 +0200 -@@ -150,8 +150,6 @@ - !events generated by the wheel - *VT100.translations: #override \ - <Key>Delete: string(0x1b) string("[3~") \n\ -- <Key>Home: string(0x1b) string("[1~") \n\ -- <Key>End: string(0x1b) string("[4~") \n\ - ~@Num_Lock <Key>KP_Home: string(0x1b) string("[1~") \n\ - ~@Num_Lock <Key>KP_End: string(0x1b) string("[4~") \n\ - Shift <Key>F1: string(0x1b) string("[23~") \n\ diff --git a/x11-base/xfree/files/xfree-4.2.x.-bison.fixes.patch b/x11-base/xfree/files/xfree-4.2.x.-bison.fixes.patch deleted file mode 100644 index 1410681cf33c..000000000000 --- a/x11-base/xfree/files/xfree-4.2.x.-bison.fixes.patch +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################## -$Id: xfree-4.2.x.-bison.fixes.patch,v 1.1 2002/12/05 22:35:11 azarah Exp $ -################################################################################## - - XFREE86 PATCH REPORT - ==================== - -Xfree86-Release: 4.2.x -Patch-ID: xc-giffordj-001 - -Bug-Reported-by: giffordj@linkline.com -Assisted by : akim@epita.fr (Bison Support) -Patch by : giffordj@linkline.com - -Bug-Description: Bison errors in xftgram.y gram.y xkbparse.y - -Compiling Xfree86 4.2.0 and 4.2.1 with Bison 1.50 will give the following -errors. parse error, unexpected ":", expecting ";" or "|" and stops -processing. This patch corrects this error. - -In gram.y another error exists stating type clash(`'`num') on default action -and stops processing. This patch corrects this error. - -In xkbparse.y another error exist stating parse error, unexpect "|". This -patch also corrects this error. - -Patch: - -diff -uNr xc.orig/lib/Xft/xftgram.y xc/lib/Xft/xftgram.y ---- xc.orig/lib/Xft/xftgram.y 2001-05-16 03:32:54.000000000 -0700 -+++ xc/lib/Xft/xftgram.y 2002-10-11 14:00:14.000000000 -0700 -@@ -165,6 +165,7 @@ - matrix.yx = $4; - matrix.__REALLY_YY__ = $5; - } -+ ; - number : INTEGER - { $$ = (double) $1; } - | DOUBLE -diff -uNr xc.orig/programs/twm/gram.y xc/programs/twm/gram.y ---- xc.orig/programs/twm/gram.y 2001-12-14 12:01:07.000000000 -0800 -+++ xc/programs/twm/gram.y 2002-10-11 14:00:14.000000000 -0700 -@@ -458,7 +458,7 @@ - ParseError = 1; - } - } -- win_color_list -+ win_color_list {/* No action. */;} - | CKEYWORD string { if (!do_color_keyword ($1, color, - $2)) { - twmrc_error_prefix(); -@@ -654,6 +654,8 @@ - RemoveDQuote(ptr); - $$ = ptr; - } -+ ; -+ - number : NUMBER { $$ = $1; } - ; - -diff -uNr xc.orig/programs/xkbcomp/xkbparse.y xc/programs/xkbcomp/xkbparse.y ---- xc.orig/programs/xkbcomp/xkbparse.y 2001-01-17 15:45:45.000000000 -0800 -+++ xc/programs/xkbcomp/xkbparse.y 2002-10-11 14:01:05.000000000 -0700 -@@ -448,7 +448,6 @@ - - ShapeDecl : SHAPE String OBRACE OutlineList CBRACE SEMI - { $$= ShapeDeclCreate($2,(OutlineDef *)&$4->common); } -- ; - | SHAPE String OBRACE CoordList CBRACE SEMI - { - OutlineDef *outlines; -@@ -511,7 +510,7 @@ - { - $$= (OverlayKeyDef *) - AppendStmt(&$1->common,&$3->common); -- }; -+ } - | OverlayKey - { $$= $1; } - ; -diff -uNr xc.orig/programs/xkbevd/cfgparse.y xc/programs/xkbevd/cfgparse.y ---- xc.orig/programs/xkbevd/cfgparse.y 2001-01-17 15:46:07.000000000 -0800 -+++ xc/programs/xkbevd/cfgparse.y 2002-10-11 14:00:14.000000000 -0700 -@@ -173,6 +173,7 @@ - | SHELL { $$ = ShellAction; } - | SOUND { $$ = SoundAction; } - | { $$ = UnknownAction; } -+ ; - - OptNameSpec : NameSpec { $$= $1; } - | { $$= NULL; } |