x11: updated to 6.9.0
This commit is contained in:
Simone Rota
parent
91bf05ab49
commit
b38d120cae
782
x11/.footprint
782
x11/.footprint
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
8131cd7ea1e4566e6e05c438a93fcfe1 X11R6.8.2-src.tar.bz2
|
||||
fc2ddb4ef3449b84787a6eb868a642fb host.def
|
||||
acdfe82713d65d05c54eb38e2d9a7f7f x11-6.8.2-linux_config.patch
|
||||
32d7acc8343f729701a29342162b8cfb x11-6.8.2-xterm.patch
|
||||
52ad69832db5c36c7041f90625ed4598 X11R6.9.0-src.tar.bz2
|
||||
58deecb7f2a14acad5dd6f971ae66964 host.def
|
||||
3196b65d8c4416cad412a0c49d75c461 x11-6.9.0-linux_config.patch
|
||||
5527ad8177942a919981d4fba690879a x11-6.9.0-xterm256.patch
|
||||
05f76e7c05dcda1dcb065e2f1eeaa88f xdm
|
||||
|
||||
51
x11/Pkgfile
51
x11/Pkgfile
@ -1,34 +1,45 @@
|
||||
# Description: The Open Group X Window System
|
||||
# URL: http://xorg.freedesktop.org/wiki/
|
||||
# Maintainer: Per Lidén <per@fukt.bth.se>
|
||||
# Depends on: libpng, fontconfig, ncurses
|
||||
# Nice to have: libtxc_dxtn
|
||||
# URL: http://freedesktop.org
|
||||
# Maintainer: Brett Goulder, predatorfreak at dcaf-security dot org
|
||||
# Packager: Brett Goulder, predatorfreak at dcaf-security dot org
|
||||
# Depends on: fontconfig libpng, ncurses
|
||||
|
||||
name=x11
|
||||
version=6.8.2
|
||||
version=6.9.0
|
||||
release=1
|
||||
source=(http://xorg.freedesktop.org/X11R$version/src-single/X11R$version-src.tar.bz2 \
|
||||
$name-$version-xterm.patch $name-$version-linux_config.patch xdm host.def)
|
||||
source=(http://xorg.freedesktop.org/releases/X11R$version/src-single/X11R$version-src.tar.bz2 \
|
||||
xdm \
|
||||
host.def \
|
||||
$name-$version-linux_config.patch \
|
||||
$name-$version-xterm256.patch)
|
||||
|
||||
build() {
|
||||
cd xc
|
||||
patch -p1 < ../$name-$version-xterm.patch
|
||||
patch -p1 < ../$name-$version-linux_config.patch
|
||||
sed "s/#CFLAGS#/$CFLAGS/" ../host.def > config/cf/host.def
|
||||
patch -p1 < ../$name-$version-xterm256.patch
|
||||
sed "s/#CFLAGS#/$CFLAGS/" $SRC/host.def > config/cf/host.def
|
||||
make World
|
||||
make DESTDIR=$PKG install
|
||||
make DESTDIR=$PKG install.man
|
||||
rm -rf $PKG/usr/X11R6/lib/X11/doc \
|
||||
$PKG/usr/X11R6/src \
|
||||
$PKG/usr/include/GL \
|
||||
$PKG/usr/lib \
|
||||
$PKG/etc/rc.d
|
||||
install -D -m 755 ../xdm $PKG/etc/rc.d/xdm
|
||||
ln -s ../X11R6/include/X11 $PKG/usr/include/X11
|
||||
ln -s ../X11R6/include/GL $PKG/usr/include/GL
|
||||
touch $PKG/usr/X11R6/man/whatis
|
||||
mkdir -p $PKG/usr/lib
|
||||
install -D -m 755 $SRC/xdm $PKG/etc/rc.d/xdm
|
||||
rm -rf \
|
||||
$PKG/usr/X11R6/lib/X11/doc \
|
||||
$PKG/usr/X11R6/src \
|
||||
$PKG/usr/include/GL \
|
||||
$PKG/usr/lib
|
||||
ln -s ../../../usr/X11R6/include/X11 $PKG/usr/include/X11
|
||||
ln -s ../../../usr/X11R6/include/GL $PKG/usr/include/GL
|
||||
install -d $PKG/usr/lib
|
||||
mv $PKG/usr/X11R6/lib/pkgconfig $PKG/usr/lib
|
||||
mv $PKG/etc/{init.d,profile.d} $PKG/etc/X11
|
||||
chmod -R +w $PKG
|
||||
# Fix a bug with XDM, otherwise you may not be able to
|
||||
# type your login-info.
|
||||
sed -i 's|:0 local.*|& vt7|' $PKG/etc/X11/xdm/Xservers
|
||||
# Remove empty files.
|
||||
find $PKG -depth -type f -empty -exec rm -rf {} \;
|
||||
# Remove nonsense.
|
||||
rm -rf $PKG/etc/{init.d,profile.d,rc.d/rc*.d}
|
||||
# Odd place for a binary...
|
||||
mv $PKG/etc/X11/xdm/chooser $PKG/usr/X11R6/bin
|
||||
ln -s /usr/X11R6/bin/chooser $PKG/etc/X11/xdm/chooser
|
||||
}
|
||||
|
||||
28
x11/host.def
28
x11/host.def
@ -2,12 +2,18 @@
|
||||
* CRUX X11 configuration.
|
||||
*/
|
||||
|
||||
#define DefaultGcc2i386Opt #CFLAGS# -fno-strength-reduce
|
||||
#define DefaultGcc2AMD64Opt #CFLAGS# -fno-strength-reduce
|
||||
#define TermcapLibrary -lncurses
|
||||
#define ForceNormalLib YES
|
||||
#define SystemManDirectory /usr/man
|
||||
#define VarLibDir /var/lib
|
||||
|
||||
#define SharedLibXau YES
|
||||
|
||||
#define BuildXterm YES
|
||||
#define InstallXtermSetUID NO
|
||||
#define InstallXtermSetGID NO
|
||||
|
||||
#define HasNCurses YES
|
||||
#define HasFreetype2 YES
|
||||
#define HasFontconfig YES
|
||||
@ -23,16 +29,16 @@
|
||||
#define BuildHtmlManPages NO
|
||||
#define BuildSpecsDocs NO
|
||||
#define BuildAllSpecsDocs NO
|
||||
#define BuildIPv6 YES
|
||||
|
||||
#define BuildCyrillicFonts NO
|
||||
#define BuildArabicFonts NO
|
||||
#define BuildGreekFonts NO
|
||||
#define BuildHebrewFonts NO
|
||||
/*
|
||||
#define BuildThaiFonts NO
|
||||
#define BuildJapaneseFonts NO
|
||||
#define BuildKoreanFonts NO
|
||||
#define BuildChineseFonts NO
|
||||
*/
|
||||
#define BuildCyrillicFonts YES
|
||||
#define BuildKOI8_RFonts YES
|
||||
#define BuildArabicFonts YES
|
||||
#define BuildGreekFonts YES
|
||||
#define BuildHebrewFonts YES
|
||||
#define BuildThaiFonts YES
|
||||
#define BuildJapaneseFonts YES
|
||||
#define BuildKoreanFonts YES
|
||||
#define BuildChineseFonts YES
|
||||
|
||||
/* End of file */
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- xc/extras/drm/shared/drm.h.orig 2004-09-20 22:25:23.042737520 +0200
|
||||
+++ xc/extras/drm/shared/drm.h 2004-09-20 22:25:33.282180888 +0200
|
||||
@@ -38,7 +38,6 @@
|
||||
#define _DRM_H_
|
||||
|
||||
#if defined(__linux__)
|
||||
-#include <linux/config.h>
|
||||
#include <asm/ioctl.h> /* For _IO* macros */
|
||||
#define DRM_IOCTL_NR(n) _IOC_NR(n)
|
||||
#define DRM_IOC_VOID _IOC_NONE
|
||||
13
x11/x11-6.9.0-linux_config.patch
Normal file
13
x11/x11-6.9.0-linux_config.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff -Nru xc-old/extras/drm/shared/drm.h xc/extras/drm/shared/drm.h
|
||||
--- xc-old/extras/drm/shared/drm.h 2006-01-09 14:58:53.000000000 +0100
|
||||
+++ xc/extras/drm/shared/drm.h 2006-01-09 15:00:49.000000000 +0100
|
||||
@@ -63,9 +63,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(__linux__)
|
||||
-#if defined(__KERNEL__)
|
||||
-#include <linux/config.h>
|
||||
-#endif
|
||||
#include <asm/ioctl.h> /* For _IO* macros */
|
||||
#define DRM_IOCTL_NR(n) _IOC_NR(n)
|
||||
#define DRM_IOC_VOID _IOC_NONE
|
||||
@ -1,6 +1,7 @@
|
||||
--- xc/programs/xterm/Imakefile.orig 2004-08-13 14:57:19.000000000 +0200
|
||||
+++ xc/programs/xterm/Imakefile 2004-09-20 22:04:49.505263720 +0200
|
||||
@@ -93,7 +93,7 @@
|
||||
diff -Nru xc-old/programs/xterm/Imakefile xc/programs/xterm/Imakefile
|
||||
--- xc-old/programs/xterm/Imakefile 2006-01-09 14:59:11.000000000 +0100
|
||||
+++ xc/programs/xterm/Imakefile 2006-01-09 15:06:18.000000000 +0100
|
||||
@@ -127,7 +127,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef UTF8support
|
||||
Loading…
x
Reference in New Issue
Block a user