diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2011-04-25 13:37:00 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:45:18 +0200 |
| commit | 75a4a592e5ccda30715f93563d741b83e0dcf39e (patch) | |
| tree | 502f745607e77a2c4386ad38d818ddcafe81489c /source/x/x11 | |
| parent | b76270bf9e6dd375e495fec92140a79a79415d27 (diff) | |
| download | current-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.gz | |
Slackware 13.37slackware-13.37
Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!
Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
As always, thanks to the Slackware community for testing, suggestions,
and feedback. :-)
Have fun!
Diffstat (limited to 'source/x/x11')
96 files changed, 634 insertions, 215 deletions
diff --git a/source/x/x11/build/ico b/source/x/x11/build/libX11 index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/ico +++ b/source/x/x11/build/libX11 diff --git a/source/x/x11/build/lndir b/source/x/x11/build/lndir deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/lndir +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/oclock b/source/x/x11/build/oclock deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/oclock +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/printproto b/source/x/x11/build/printproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/printproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/proxymngr b/source/x/x11/build/proxymngr deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/proxymngr +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/rendercheck b/source/x/x11/build/rendercheck deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/rendercheck +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/scripts b/source/x/x11/build/scripts deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/scripts +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/trapproto b/source/x/x11/build/trapproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/trapproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/twm b/source/x/x11/build/twm deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/twm +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/libXTrap b/source/x/x11/build/xcompmgr index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/libXTrap +++ b/source/x/x11/build/xcompmgr diff --git a/source/x/x11/build/xconsole b/source/x/x11/build/xconsole deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xconsole +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xdbedizzy b/source/x/x11/build/xdbedizzy deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xdbedizzy +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xditview b/source/x/x11/build/xditview deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xditview +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXevie b/source/x/x11/build/xf86-input-acecad index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/libXevie +++ b/source/x/x11/build/xf86-input-acecad diff --git a/source/x/x11/build/xf86-input-elographics b/source/x/x11/build/xf86-input-elographics deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-input-elographics +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-input-mutouch b/source/x/x11/build/xf86-input-mutouch deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-input-mutouch +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXp b/source/x/x11/build/xf86-input-penmount index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/libXp +++ b/source/x/x11/build/xf86-input-penmount diff --git a/source/x/x11/build/xf86-input-vmmouse b/source/x/x11/build/xf86-input-vmmouse deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-input-vmmouse +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-apm b/source/x/x11/build/xf86-video-apm deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-apm +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-ast b/source/x/x11/build/xf86-video-ast deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-ast +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xf86-video-cirrus index 0cfbf088..00750edc 100644 --- a/source/x/x11/build/xf86-video-cirrus +++ b/source/x/x11/build/xf86-video-cirrus @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/build/xf86-video-glint b/source/x/x11/build/xf86-video-glint deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-glint +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-i128 b/source/x/x11/build/xf86-video-i128 deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-i128 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-i740 b/source/x/x11/build/xf86-video-i740 index 0cfbf088..00750edc 100644 --- a/source/x/x11/build/xf86-video-i740 +++ b/source/x/x11/build/xf86-video-i740 @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64 index 0cfbf088..00750edc 100644 --- a/source/x/x11/build/xf86-video-mach64 +++ b/source/x/x11/build/xf86-video-mach64 @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/build/xf86-video-mga b/source/x/x11/build/xf86-video-mga deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-mga +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-neomagic b/source/x/x11/build/xf86-video-neomagic deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-neomagic +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXprintAppUtil b/source/x/x11/build/xf86-video-openchrome index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/libXprintAppUtil +++ b/source/x/x11/build/xf86-video-openchrome diff --git a/source/x/x11/build/xf86-video-r128 b/source/x/x11/build/xf86-video-r128 index 0cfbf088..00750edc 100644 --- a/source/x/x11/build/xf86-video-r128 +++ b/source/x/x11/build/xf86-video-r128 @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/build/libXprintUtil b/source/x/x11/build/xf86-video-radeonhd index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/libXprintUtil +++ b/source/x/x11/build/xf86-video-radeonhd diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3 index 0cfbf088..00750edc 100644 --- a/source/x/x11/build/xf86-video-s3 +++ b/source/x/x11/build/xf86-video-s3 @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge index 0cfbf088..00750edc 100644 --- a/source/x/x11/build/xf86-video-s3virge +++ b/source/x/x11/build/xf86-video-s3virge @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/build/xf86-video-savage b/source/x/x11/build/xf86-video-savage deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-savage +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-sis b/source/x/x11/build/xf86-video-sis deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-sis +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-sisusb b/source/x/x11/build/xf86-video-sisusb deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-sisusb +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-tdfx b/source/x/x11/build/xf86-video-tdfx index 0cfbf088..00750edc 100644 --- a/source/x/x11/build/xf86-video-tdfx +++ b/source/x/x11/build/xf86-video-tdfx @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/build/libxkbui b/source/x/x11/build/xf86-video-tga index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/libxkbui +++ b/source/x/x11/build/xf86-video-tga diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l index 00750edc..b8626c4c 100644 --- a/source/x/x11/build/xf86-video-v4l +++ b/source/x/x11/build/xf86-video-v4l @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa index 0cfbf088..00750edc 100644 --- a/source/x/x11/build/xf86-video-vesa +++ b/source/x/x11/build/xf86-video-vesa @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-vmware +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-voodoo +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86dga b/source/x/x11/build/xf86dga deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86dga +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86rushproto b/source/x/x11/build/xf86rushproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86rushproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xfd b/source/x/x11/build/xfd deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xfd +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xfindproxy b/source/x/x11/build/xfindproxy deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xfindproxy +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xfontsel b/source/x/x11/build/xfontsel deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xfontsel +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xfwp b/source/x/x11/build/xfwp deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xfwp +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xgc b/source/x/x11/build/xgc deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xgc +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xload b/source/x/x11/build/xload deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xload +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xlsfonts b/source/x/x11/build/xlsfonts deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xlsfonts +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xmh b/source/x/x11/build/xmh deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xmh +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xmore b/source/x/x11/build/xmore deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xmore +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xplsprinters b/source/x/x11/build/xplsprinters deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xplsprinters +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xprehashprinterlist b/source/x/x11/build/xprehashprinterlist deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xprehashprinterlist +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xsetmode b/source/x/x11/build/xsetmode deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xsetmode +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xsetpointer b/source/x/x11/build/xsetpointer deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xsetpointer +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xsm b/source/x/x11/build/xsm deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xsm +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xstdcmap b/source/x/x11/build/xstdcmap deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xstdcmap +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xtrap b/source/x/x11/build/xtrap deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xtrap +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/configure/compiz b/source/x/x11/configure/compiz index 21d8270d..aebd49a2 100644 --- a/source/x/x11/configure/compiz +++ b/source/x/x11/configure/compiz @@ -1,3 +1,4 @@ +# Use ./autogen.sh for git, or ./configure for releases: CFLAGS=$SLKCFLAGS \ CXXFLAGS=$SLKCFLAGS \ ./configure \ diff --git a/source/x/x11/configure/configure b/source/x/x11/configure/configure index eb3fd59c..0f3bccf2 100644 --- a/source/x/x11/configure/configure +++ b/source/x/x11/configure/configure @@ -7,5 +7,6 @@ CXXFLAGS=$SLKCFLAGS \ --localstatedir=/var \ --infodir=/usr/info \ --mandir=/usr/man \ + --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --disable-static \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/font-bh-ttf b/source/x/x11/configure/font-bh-ttf new file mode 100644 index 00000000..9e498859 --- /dev/null +++ b/source/x/x11/configure/font-bh-ttf @@ -0,0 +1,13 @@ +FC_CONFDIR=/etc/fonts \ +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ + --disable-static \ + --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/gccmakedep b/source/x/x11/configure/gccmakedep new file mode 100644 index 00000000..181ae81e --- /dev/null +++ b/source/x/x11/configure/gccmakedep @@ -0,0 +1,14 @@ +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --disable-static \ + --build=$ARCH-slackware-linux +# +# --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} +# diff --git a/source/x/x11/configure/libX11 b/source/x/x11/configure/libX11 index 093c6044..cf85e58d 100644 --- a/source/x/x11/configure/libX11 +++ b/source/x/x11/configure/libX11 @@ -3,10 +3,10 @@ CXXFLAGS=$SLKCFLAGS \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --sysconfdir=/etc \ --localstatedir=/var \ --infodir=/usr/info \ --mandir=/usr/man \ --disable-static \ - --with-xcb=yes \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/libXp b/source/x/x11/configure/libXp new file mode 100644 index 00000000..181ae81e --- /dev/null +++ b/source/x/x11/configure/libXp @@ -0,0 +1,14 @@ +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --disable-static \ + --build=$ARCH-slackware-linux +# +# --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} +# diff --git a/source/x/x11/configure/xf86-video-ati b/source/x/x11/configure/xf86-video-ati index ae245884..0eacb0c3 100644 --- a/source/x/x11/configure/xf86-video-ati +++ b/source/x/x11/configure/xf86-video-ati @@ -1,4 +1,4 @@ -xserver_source="/tmp/x11-build/xorg-server-1.7.5" +xserver_source="/tmp/x11-build/xorg-server-1.9.3" # Let these just fail to build. In any case, an "exit 1" # here is just plain wrong. diff --git a/source/x/x11/configure/xf86-video-nouveau b/source/x/x11/configure/xf86-video-nouveau new file mode 100644 index 00000000..e050771b --- /dev/null +++ b/source/x/x11/configure/xf86-video-nouveau @@ -0,0 +1,11 @@ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./autogen.sh \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --disable-static \ + --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-nv b/source/x/x11/configure/xf86-video-nv deleted file mode 100644 index ae245884..00000000 --- a/source/x/x11/configure/xf86-video-nv +++ /dev/null @@ -1,21 +0,0 @@ -xserver_source="/tmp/x11-build/xorg-server-1.7.5" - -# Let these just fail to build. In any case, an "exit 1" -# here is just plain wrong. -#if [ ! -d "$xserver_source" ]; then -# echo "$xserver_source does not exist, and you need it." -# exit 1 -#fi - -CFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \ -CXXFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --disable-static \ - --with-xserver-source=${xserver_source} \ - --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xorg-docs b/source/x/x11/configure/xorg-docs index 77bb98d8..ff88ae97 100644 --- a/source/x/x11/configure/xorg-docs +++ b/source/x/x11/configure/xorg-docs @@ -7,6 +7,7 @@ CXXFLAGS=$SLKCFLAGS \ --localstatedir=/var \ --infodir=/usr/info \ --mandir=/usr/man \ + --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --disable-static \ --enable-pdf=no \ --enable-ps=no \ diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server index 943797bf..cf9bd843 100644 --- a/source/x/x11/configure/xorg-server +++ b/source/x/x11/configure/xorg-server @@ -1,13 +1,15 @@ # Servers to build: BUILD_SERVERS="--enable-xorg \ + --enable-dmx \ --enable-xvfb \ --enable-xnest \ --enable-kdrive \ --enable-xephyr \ - --enable-xsdl \ - --enable-xfbdev" + --enable-xfbdev \ + --enable-config-udev \ + --disable-config-hal" -MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7.x +MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7+ # Default font paths to be used by the X server DEF_FONTPATH="/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic" @@ -26,7 +28,7 @@ CFLAGS="$SLKCFLAGS" \ --with-default-font-path="${DEF_FONTPATH}" \ --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \ --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \ - --with-os-name="Slackware 13.1" \ + --with-os-name="Slackware 13.37" \ --with-os-vendor="Slackware Linux Project" \ --with-xkb-path=/etc/X11/xkb \ --with-xkb-output=/var/lib/xkb \ diff --git a/source/x/x11/modularize b/source/x/x11/modularize index d915fd21..47da583f 100644 --- a/source/x/x11/modularize +++ b/source/x/x11/modularize @@ -169,31 +169,13 @@ xextproto xeyes xf86-input-acecad xf86-input-aiptek -xf86-input-calcomp xf86-input-citron -xf86-input-digitaledge -xf86-input-dmc -xf86-input-dynapro -xf86-input-elo2300 -xf86-input-elographics xf86-input-evdev -xf86-input-fpit -xf86-input-hyperpen -xf86-input-jamstudio xf86-input-joystick xf86-input-keyboard -xf86-input-magellan -xf86-input-magictouch -xf86-input-microtouch xf86-input-mouse -xf86-input-mutouch -xf86-input-palmax xf86-input-penmount -xf86-input-spaceorb -xf86-input-summa xf86-input-synaptics -xf86-input-tek4957 -xf86-input-ur98 xf86-input-vmmouse xf86-input-void xf86-input-wacom @@ -204,24 +186,20 @@ xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus -xf86-video-cyrix xf86-video-dummy xf86-video-fbdev xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-i810 -xf86-video-impact -xf86-video-imstt xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-neomagic -xf86-video-newport +xf86-video-nouveau xf86-video-nsc xf86-video-nv xf86-video-openchrome -xf86-video-radeonhd xf86-video-r128 xf86-video-rendition xf86-video-s3 @@ -243,7 +221,6 @@ xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa -xf86-video-vga xf86-video-vmware xf86-video-voodoo xf86-video-wsfb diff --git a/source/x/x11/noarch b/source/x/x11/noarch index 2a07c677..79eb0e56 100644 --- a/source/x/x11/noarch +++ b/source/x/x11/noarch @@ -7,7 +7,6 @@ dejavu-ttf dmxproto encodings evieext -fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi @@ -64,11 +63,9 @@ ttf-indic-fonts util-macros videoproto x11-skel -xbitmaps xcb-proto xcmiscproto xcursor-themes -xextproto xf86bigfontproto xf86dgaproto xf86driproto @@ -79,7 +76,6 @@ xineramaproto xkeyboard-config xorg-cf-files xorg-docs -xorg-sgml-doctools xproto xproxymanagementprotocol xtrans diff --git a/source/x/x11/patch/README b/source/x/x11/patch/README new file mode 100644 index 00000000..c5af64b3 --- /dev/null +++ b/source/x/x11/patch/README @@ -0,0 +1,18 @@ + +IMPORTANT! + +To fail/exit a script, use this: + +[command that fails] || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + +DO NOT USE THIS: + +[command that fails] || exit 1 + +as it will cause the parent script to exit in the wrong location and possibly +silently skip building some packages. + +Thanks, + +The Management + diff --git a/source/x/x11/patch/xcompmgr.patch b/source/x/x11/patch/xcompmgr.patch new file mode 100644 index 00000000..6097b12a --- /dev/null +++ b/source/x/x11/patch/xcompmgr.patch @@ -0,0 +1,2 @@ +zcat $CWD/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff.gz | patch -p1 --verbose \ + || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff b/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff new file mode 100644 index 00000000..a69b0704 --- /dev/null +++ b/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff @@ -0,0 +1,26 @@ +# Bug 26090 - xcompmgr and ICCCM manager spec +https://bugs.freedesktop.org/show_bug.cgi?id=26090 +https://bugs.freedesktop.org/attachment.cgi?id=32702 + +diff -u xcompmgr-1.1.5/xcompmgr.c xcompmgr.new/xcompmgr.c +--- xcompmgr-1.1.5/xcompmgr.c 2009-10-20 00:44:23.000000000 +0200 ++++ xcompmgr.new/xcompmgr.c 2010-01-17 22:44:31.261276441 +0100 +@@ -1924,6 +1924,18 @@ + + XSetSelectionOwner (dpy, a, w, 0); + ++ XClientMessageEvent ev; ++ ev.type = ClientMessage; ++ ev.window = RootWindow (dpy, scr); ++ ev.message_type = a; ++ ev.format = 32; ++ ev.data.l[0] = CurrentTime; ++ ev.data.l[1] = a; ++ ev.data.l[2] = w; ++ ev.data.l[3] = 0; ++ ev.data.l[4] = 0; ++ XSendEvent(dpy, RootWindow (dpy, scr), False, StructureNotifyMask, (XEvent*)&ev); ++ + return True; + } + diff --git a/source/x/x11/patch/xcursorgen.patch b/source/x/x11/patch/xcursorgen.patch deleted file mode 100644 index 5aa46dee..00000000 --- a/source/x/x11/patch/xcursorgen.patch +++ /dev/null @@ -1 +0,0 @@ -zcat $CWD/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff b/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff deleted file mode 100644 index ad7ae105..00000000 --- a/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff +++ /dev/null @@ -1,61 +0,0 @@ ---- ./configure.orig 2009-10-16 19:42:25.000000000 -0500 -+++ ./configure 2010-02-21 13:57:53.000000000 -0600 -@@ -5043,12 +5043,12 @@ - pkg_cv_XCURSORGEN_CFLAGS="$XCURSORGEN_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5 -- ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng14\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng14") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng12" 2>/dev/null` -+ pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng14" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -5059,12 +5059,12 @@ - pkg_cv_XCURSORGEN_LIBS="$XCURSORGEN_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5 -- ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng14\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng14") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng12" 2>/dev/null` -+ pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng14" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -5082,14 +5082,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng12" 2>&1` -+ XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng14" 2>&1` - else -- XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng12" 2>&1` -+ XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng14" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XCURSORGEN_PKG_ERRORS" >&5 - -- { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng12) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng14) were not met: - - $XCURSORGEN_PKG_ERRORS - -@@ -5100,7 +5100,7 @@ - and XCURSORGEN_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --$as_echo "$as_me: error: Package requirements (x11 xcursor libpng12) were not met: -+$as_echo "$as_me: error: Package requirements (x11 xcursor libpng14) were not met: - - $XCURSORGEN_PKG_ERRORS - diff --git a/source/x/x11/patch/xf86-input-synaptics.patch b/source/x/x11/patch/xf86-input-synaptics.patch deleted file mode 100644 index f41034c3..00000000 --- a/source/x/x11/patch/xf86-input-synaptics.patch +++ /dev/null @@ -1,4 +0,0 @@ -# Enable tap-to-click out of the box, closing one of the -# most reported bugs of the last 2 years or so. -# Thanks to Piter Punk for figuring out the proper fix! -zcat $CWD/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff b/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff deleted file mode 100644 index 2fdf4e0d..00000000 --- a/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./fdi/11-x11-synaptics.fdi.orig 2009-10-11 18:11:21.000000000 -0500 -+++ ./fdi/11-x11-synaptics.fdi 2010-04-24 12:59:37.000000000 -0500 -@@ -3,6 +3,8 @@ - <device> - <match key="info.capabilities" contains="input.touchpad"> - <merge key="input.x11_driver" type="string">synaptics</merge> -+ <!-- Enable tap click by default: --> -+ <merge key="input.x11_options.TapButton1" type="string">1</merge> - <!-- Arbitrary options can be passed to the driver using - the input.x11_options property since xorg-server-1.5. --> - <!-- EXAMPLES: diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch index 16cf61e3..e3218a03 100644 --- a/source/x/x11/patch/xorg-server.patch +++ b/source/x/x11/patch/xorg-server.patch @@ -1,2 +1,3 @@ -zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +zcat $CWD/patch/xorg-server/xorg-server.try_nouveau.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff new file mode 100644 index 00000000..74f799a1 --- /dev/null +++ b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff @@ -0,0 +1,11 @@ +--- ./hw/xfree86/common/xf86pciBus.c.orig 2010-07-01 12:17:35.000000000 -0500 ++++ ./hw/xfree86/common/xf86pciBus.c 2010-11-18 16:56:57.633003654 -0600 +@@ -1118,7 +1118,7 @@ + break; + case 0x102b: driverList[0] = "mga"; break; + case 0x10c8: driverList[0] = "neomagic"; break; +- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; ++ case 0x10de: case 0x12d2: driverList[0] = "nouveau" ; driverList[1] = "nv"; break; + case 0x1106: driverList[0] = "openchrome"; break; + case 0x1b36: driverList[0] = "qxl"; break; + case 0x1163: driverList[0] = "rendition"; break; diff --git a/source/x/x11/post-install/libSM.post-install b/source/x/x11/post-install/libSM.post-install new file mode 100644 index 00000000..6cc5edc0 --- /dev/null +++ b/source/x/x11/post-install/libSM.post-install @@ -0,0 +1 @@ +rm -f $PKG/usr/doc/libSM-${MODULAR_PACKAGE_VERSION}/*.xml diff --git a/source/x/x11/post-install/libX11.post-install b/source/x/x11/post-install/libX11.post-install new file mode 100644 index 00000000..7232b680 --- /dev/null +++ b/source/x/x11/post-install/libX11.post-install @@ -0,0 +1,2 @@ +mkdir -p $PKG/usr/share/X11 +zcat $CWD/post-install/libX11/XKeysymDB.gz > $PKG/usr/share/X11/XKeysymDB diff --git a/source/x/x11/post-install/libX11/XKeysymDB b/source/x/x11/post-install/libX11/XKeysymDB new file mode 100644 index 00000000..45d89297 --- /dev/null +++ b/source/x/x11/post-install/libX11/XKeysymDB @@ -0,0 +1,380 @@ +! Copyright 1993 Massachusetts Institute of Technology +! +! Permission to use, copy, modify, distribute, and sell this software and +! its documentation for any purpose is hereby granted without fee, provided +! that the above copyright notice appear in all copies and that both that +! copyright notice and this permission notice appear in supporting +! documentation, and that the name of M.I.T. not be used in advertising or +! publicity pertaining to distribution of the software without specific, +! written prior permission. M.I.T. makes no representations about the +! suitability of this software for any purpose. It is provided "as is" +! without express or implied warranty. +! + +hpmute_acute :100000A8 +hpmute_grave :100000A9 +hpmute_asciicircum :100000AA +hpmute_diaeresis :100000AB +hpmute_asciitilde :100000AC +hplira :100000AF +hpguilder :100000BE +hpYdiaeresis :100000EE +hpIO :100000EE +hplongminus :100000F6 +hpblock :100000FC +apLineDel :1000FF00 +apCharDel :1000FF01 +apCopy :1000FF02 +apCut :1000FF03 +apPaste :1000FF04 +apMove :1000FF05 +apGrow :1000FF06 +apCmd :1000FF07 +apShell :1000FF08 +apLeftBar :1000FF09 +apRightBar :1000FF0A +apLeftBox :1000FF0B +apRightBox :1000FF0C +apUpBox :1000FF0D +apDownBox :1000FF0E +apPop :1000FF0F +apRead :1000FF10 +apEdit :1000FF11 +apSave :1000FF12 +apExit :1000FF13 +apRepeat :1000FF14 +hpModelock1 :1000FF48 +hpModelock2 :1000FF49 +hpReset :1000FF6C +hpSystem :1000FF6D +hpUser :1000FF6E +hpClearLine :1000FF6F +hpInsertLine :1000FF70 +hpDeleteLine :1000FF71 +hpInsertChar :1000FF72 +hpDeleteChar :1000FF73 +hpBackTab :1000FF74 +hpKP_BackTab :1000FF75 +apKP_parenleft :1000FFA8 +apKP_parenright :1000FFA9 + +I2ND_FUNC_L :10004001 +I2ND_FUNC_R :10004002 +IREMOVE :10004003 +IREPEAT :10004004 +IA1 :10004101 +IA2 :10004102 +IA3 :10004103 +IA4 :10004104 +IA5 :10004105 +IA6 :10004106 +IA7 :10004107 +IA8 :10004108 +IA9 :10004109 +IA10 :1000410A +IA11 :1000410B +IA12 :1000410C +IA13 :1000410D +IA14 :1000410E +IA15 :1000410F +IB1 :10004201 +IB2 :10004202 +IB3 :10004203 +IB4 :10004204 +IB5 :10004205 +IB6 :10004206 +IB7 :10004207 +IB8 :10004208 +IB9 :10004209 +IB10 :1000420A +IB11 :1000420B +IB12 :1000420C +IB13 :1000420D +IB14 :1000420E +IB15 :1000420F +IB16 :10004210 + +DRemove :1000FF00 +Dring_accent :1000FEB0 +Dcircumflex_accent :1000FE5E +Dcedilla_accent :1000FE2C +Dacute_accent :1000FE27 +Dgrave_accent :1000FE60 +Dtilde :1000FE7E +Ddiaeresis :1000FE22 + +osfCopy :1004FF02 +osfCut :1004FF03 +osfPaste :1004FF04 +osfBackTab :1004FF07 +osfBackSpace :1004FF08 +osfClear :1004FF0B +osfEscape :1004FF1B +osfAddMode :1004FF31 +osfPrimaryPaste :1004FF32 +osfQuickPaste :1004FF33 +osfPageLeft :1004FF40 +osfPageUp :1004FF41 +osfPageDown :1004FF42 +osfPageRight :1004FF43 +osfActivate :1004FF44 +osfMenuBar :1004FF45 +osfLeft :1004FF51 +osfUp :1004FF52 +osfRight :1004FF53 +osfDown :1004FF54 +osfPrior :1004FF55 +osfNext :1004FF56 +osfEndLine :1004FF57 +osfBeginLine :1004FF58 +osfEndData :1004FF59 +osfBeginData :1004FF5A +osfPrevMenu :1004FF5B +osfNextMenu :1004FF5C +osfPrevField :1004FF5D +osfNextField :1004FF5E +osfSelect :1004FF60 +osfInsert :1004FF63 +osfUndo :1004FF65 +osfMenu :1004FF67 +osfCancel :1004FF69 +osfHelp :1004FF6A +osfSelectAll :1004FF71 +osfDeselectAll :1004FF72 +osfReselect :1004FF73 +osfExtend :1004FF74 +osfRestore :1004FF78 +osfSwitchDirection :1004FF7E +osfPriorMinor :1004FFF5 +osfNextMinor :1004FFF6 +osfRightLine :1004FFF7 +osfLeftLine :1004FFF8 +osfDelete :1004FFFF + +SunFA_Grave :1005FF00 +SunFA_Circum :1005FF01 +SunFA_Tilde :1005FF02 +SunFA_Acute :1005FF03 +SunFA_Diaeresis :1005FF04 +SunFA_Cedilla :1005FF05 +SunF36 :1005FF10 +SunF37 :1005FF11 +SunSys_Req :1005FF60 +SunProps :1005FF70 +SunFront :1005FF71 +SunCopy :1005FF72 +SunOpen :1005FF73 +SunPaste :1005FF74 +SunCut :1005FF75 +SunPowerSwitch :1005FF76 +SunAudioLowerVolume :1005FF77 +SunAudioMute :1005FF78 +SunAudioRaiseVolume :1005FF79 +SunVideoDegauss :1005FF7A +SunVideoLowerBrightness :1005FF7B +SunVideoRaiseBrightness :1005FF7C +SunPowerSwitchShift :1005FF7D + +SunCompose :FF20 +SunPageUp :FF55 +SunPageDown :FF56 +SunPrint_Screen :FF61 +SunUndo :FF65 +SunAgain :FF66 +SunFind :FF68 +SunStop :FF69 +SunAltGraph :FF7E + +WYSetup :1006FF00 + +ncdSetup :1006FF00 + +XeroxPointerButton1 :10070001 +XeroxPointerButton2 :10070002 +XeroxPointerButton3 :10070003 +XeroxPointerButton4 :10070004 +XeroxPointerButton5 :10070005 + +! The definitions here should match <X11/XF86keysym.h> +XF86ModeLock :1008FF01 +XF86MonBrightnessUp :1008FF02 +XF86MonBrightnessDown :1008FF03 +XF86KbdLightOnOff :1008FF04 +XF86KbdBrightnessUp :1008FF05 +XF86KbdBrightnessDown :1008FF06 +XF86Standby :1008FF10 +XF86AudioLowerVolume :1008FF11 +XF86AudioMute :1008FF12 +XF86AudioRaiseVolume :1008FF13 +XF86AudioPlay :1008FF14 +XF86AudioStop :1008FF15 +XF86AudioPrev :1008FF16 +XF86AudioNext :1008FF17 +XF86HomePage :1008FF18 +XF86Mail :1008FF19 +XF86Start :1008FF1A +XF86Search :1008FF1B +XF86AudioRecord :1008FF1C +XF86Calculator :1008FF1D +XF86Memo :1008FF1E +XF86ToDoList :1008FF1F +XF86Calendar :1008FF20 +XF86PowerDown :1008FF21 +XF86ContrastAdjust :1008FF22 +XF86RockerUp :1008FF23 +XF86RockerDown :1008FF24 +XF86RockerEnter :1008FF25 +XF86Back :1008FF26 +XF86Forward :1008FF27 +XF86Stop :1008FF28 +XF86Refresh :1008FF29 +XF86PowerOff :1008FF2A +XF86WakeUp :1008FF2B +XF86Eject :1008FF2C +XF86ScreenSaver :1008FF2D +XF86WWW :1008FF2E +XF86Sleep :1008FF2F +XF86Favorites :1008FF30 +XF86AudioPause :1008FF31 +XF86AudioMedia :1008FF32 +XF86MyComputer :1008FF33 +XF86VendorHome :1008FF34 +XF86LightBulb :1008FF35 +XF86Shop :1008FF36 +XF86History :1008FF37 +XF86OpenURL :1008FF38 +XF86AddFavorite :1008FF39 +XF86HotLinks :1008FF3A +XF86BrightnessAdjust :1008FF3B +XF86Finance :1008FF3C +XF86Community :1008FF3D +XF86AudioRewind :1008FF3E +XF86BackForward :1008FF3F +XF86Launch0 :1008FF40 +XF86Launch1 :1008FF41 +XF86Launch2 :1008FF42 +XF86Launch3 :1008FF43 +XF86Launch4 :1008FF44 +XF86Launch5 :1008FF45 +XF86Launch6 :1008FF46 +XF86Launch7 :1008FF47 +XF86Launch8 :1008FF48 +XF86Launch9 :1008FF49 +XF86LaunchA :1008FF4A +XF86LaunchB :1008FF4B +XF86LaunchC :1008FF4C +XF86LaunchD :1008FF4D +XF86LaunchE :1008FF4E +XF86LaunchF :1008FF4F +XF86ApplicationLeft :1008FF50 +XF86ApplicationRight :1008FF51 +XF86Book :1008FF52 +XF86CD :1008FF53 +XF86Calculater :1008FF54 +XF86Clear :1008FF55 +XF86Close :1008FF56 +XF86Copy :1008FF57 +XF86Cut :1008FF58 +XF86Display :1008FF59 +XF86DOS :1008FF5A +XF86Documents :1008FF5B +XF86Excel :1008FF5C +XF86Explorer :1008FF5D +XF86Game :1008FF5E +XF86Go :1008FF5F +XF86iTouch :1008FF60 +XF86LogOff :1008FF61 +XF86Market :1008FF62 +XF86Meeting :1008FF63 +XF86MenuKB :1008FF65 +XF86MenuPB :1008FF66 +XF86MySites :1008FF67 +XF86New :1008FF68 +XF86News :1008FF69 +XF86OfficeHome :1008FF6A +XF86Open :1008FF6B +XF86Option :1008FF6C +XF86Paste :1008FF6D +XF86Phone :1008FF6E +XF86Q :1008FF70 +XF86Reply :1008FF72 +XF86Reload :1008FF73 +XF86RotateWindows :1008FF74 +XF86RotationPB :1008FF75 +XF86RotationKB :1008FF76 +XF86Save :1008FF77 +XF86ScrollUp :1008FF78 +XF86ScrollDown :1008FF79 +XF86ScrollClick :1008FF7A +XF86Send :1008FF7B +XF86Spell :1008FF7C +XF86SplitScreen :1008FF7D +XF86Support :1008FF7E +XF86TaskPane :1008FF7F +XF86Terminal :1008FF80 +XF86Tools :1008FF81 +XF86Travel :1008FF82 +XF86UserPB :1008FF84 +XF86User1KB :1008FF85 +XF86User2KB :1008FF86 +XF86Video :1008FF87 +XF86WheelButton :1008FF88 +XF86Word :1008FF89 +XF86Xfer :1008FF8A +XF86ZoomIn :1008FF8B +XF86ZoomOut :1008FF8C +XF86Away :1008FF8D +XF86Messenger :1008FF8E +XF86WebCam :1008FF8F +XF86MailForward :1008FF90 +XF86Pictures :1008FF91 +XF86Music :1008FF92 +XF86Battery :1008FF93 +XF86Bluetooth :1008FF94 +XF86WLAN :1008FF95 +XF86UWB :1008FF96 +XF86AudioForward :1008FF97 +XF86AudioRepeat :1008FF98 +XF86AudioRandomPlay :1008FF99 +XF86Subtitle :1008FF9A +XF86AudioCycleTrack :1008FF9B +XF86CycleAngle :1008FF9C +XF86FrameBack :1008FF9D +XF86FrameForward :1008FF9E +XF86Time :1008FF9F +XF86Select :1008FFA0 +XF86View :1008FFA1 +XF86TopMenu :1008FFA2 +XF86Red :1008FFA3 +XF86Green :1008FFA4 +XF86Yellow :1008FFA5 +XF86Blue :1008FFA6 +XF86Suspend :1008FFA7 +XF86Hibernate :1008FFA8 +XF86TouchpadToggle :1008FFA9 + +! XFree86 special action keys +XF86_Switch_VT_1 :1008FE01 +XF86_Switch_VT_2 :1008FE02 +XF86_Switch_VT_3 :1008FE03 +XF86_Switch_VT_4 :1008FE04 +XF86_Switch_VT_5 :1008FE05 +XF86_Switch_VT_6 :1008FE06 +XF86_Switch_VT_7 :1008FE07 +XF86_Switch_VT_8 :1008FE08 +XF86_Switch_VT_9 :1008FE09 +XF86_Switch_VT_10 :1008FE0A +XF86_Switch_VT_11 :1008FE0B +XF86_Switch_VT_12 :1008FE0C +XF86_Ungrab :1008FE20 +XF86_ClearGrab :1008FE21 +XF86_Next_VMode :1008FE22 +XF86_Prev_VMode :1008FE23 + +usldead_acute :100000A8 +usldead_grave :100000A9 +usldead_diaeresis :100000AB +usldead_asciicircum :100000AA +usldead_asciitilde :100000AC +usldead_cedilla :1000FE2C +usldead_ring :1000FEB0 diff --git a/source/x/x11/post-install/xbitmaps.post-install b/source/x/x11/post-install/xbitmaps.post-install new file mode 100644 index 00000000..b25fb344 --- /dev/null +++ b/source/x/x11/post-install/xbitmaps.post-install @@ -0,0 +1,2 @@ +mkdir -p $PKG/usr/lib +mv $PKG/usr/share/pkgconfig $PKG/usr/lib diff --git a/source/x/x11/post-install/xdm/Xsession b/source/x/x11/post-install/xdm/Xsession index 6484b096..22fcde8f 100755 --- a/source/x/x11/post-install/xdm/Xsession +++ b/source/x/x11/post-install/xdm/Xsession @@ -10,6 +10,7 @@ # Fixes for $PATH (from Jim Diamond), GDM/KDM/XDM, 2003-02-07 volkerdi # Use absolute paths until $PATH is set, 2006-01-11 (Al's 100th :-) volkerdi # merged changes from # $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $, 2007-02-13 volkerdi +# Changed /usr/lib/X11/xinit/ paths to /etc/X11/xinit/ 2011-01-23 rworkman # redirect errors to a file in user's home directory if we can errfile="$HOME/.xsession-errors" @@ -32,8 +33,8 @@ fi userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/usr/lib/X11/xinit/.Xresources -sysmodmap=/usr/lib/X11/xinit/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps diff --git a/source/x/x11/post-install/xf86-input-synaptics.post-install b/source/x/x11/post-install/xf86-input-synaptics.post-install index 00250982..e6352cb4 100644 --- a/source/x/x11/post-install/xf86-input-synaptics.post-install +++ b/source/x/x11/post-install/xf86-input-synaptics.post-install @@ -1,6 +1,7 @@ -mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor -cat fdi/11-x11-synaptics.fdi > \ - $PKG/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi +# Overwrite the default 50-syaptics.conf with our slightly enhanced and +# better-commented version +cat $CWD/post-install/xf86-input-synaptics/50-synaptics.conf > \ + $PKG/usr/share/X11/xorg.conf.d/50-synaptics.conf mkdir -p $PKG/usr/doc/xf86-input-synaptics-$MODULAR_PACKAGE_VERSION cp -a \ diff --git a/source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf b/source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf new file mode 100644 index 00000000..09c37642 --- /dev/null +++ b/source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf @@ -0,0 +1,15 @@ +# DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN ON UPGRADES +# Copy this file to /etc/X11/xorg.conf.d/ and edit the copy +# +# Use "synclient -l" to see all available options +# Use "man synaptics" for details about what the options do +# +Section "InputClass" + Identifier "touchpad" + Driver "synaptics" + MatchDevicePath "/dev/input/event*" + MatchIsTouchpad "on" + Option "TapButton1" "1" + Option "TapButton2" "2" + Option "TapButton3" "3" +EndSection diff --git a/source/x/x11/post-install/xf86-input-wacom.post-install b/source/x/x11/post-install/xf86-input-wacom.post-install deleted file mode 100644 index 226678f4..00000000 --- a/source/x/x11/post-install/xf86-input-wacom.post-install +++ /dev/null @@ -1,4 +0,0 @@ -mv $PKG/usr/share/hal/fdi/policy/20thirdparty \ - $PKG/usr/share/hal/fdi/policy/10osvendor -mv $PKG/usr/share/hal/fdi/policy/10osvendor/wacom.fdi \ - $PKG/usr/share/hal/fdi/policy/10osvendor/11-x11-wacom.fdi diff --git a/source/x/x11/post-install/xorg-docs.post-install b/source/x/x11/post-install/xorg-docs.post-install deleted file mode 100644 index 9857acaf..00000000 --- a/source/x/x11/post-install/xorg-docs.post-install +++ /dev/null @@ -1 +0,0 @@ -rm $PKG/usr/man/man7/Xprint.7 diff --git a/source/x/x11/post-install/xorg-server.post-install b/source/x/x11/post-install/xorg-server.post-install index 0185cb70..e21a0f03 100644 --- a/source/x/x11/post-install/xorg-server.post-install +++ b/source/x/x11/post-install/xorg-server.post-install @@ -1,3 +1,52 @@ +# Create the configuration directories for xorg-server 1.9.x +mkdir -p $PKG/etc/X11/xorg.conf.d $PKG/usr/share/X11/xorg.conf.d + +# Create a sample keyboard layout +# Enable zapping by default +cat << EOF > $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout.conf +Section "InputClass" + Identifier "keyboard-all" + MatchIsKeyboard "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + Option "XkbLayout" "us" + #Option "XkbVariant" "" + Option "XkbOptions" "terminate:ctrl_alt_bksp" +EndSection + +# READ THIS FOR CUSTOM KEYBOARD INFORMATION +# +# If you want to add a custom model/layout/variant to X, you will need to COPY +# this file to /etc/X11/xorg.conf.d/ and edit that copy. After editing it to +# suit, you will need to restart X. +# +# Here's an example of the lines from above: +# +# Section "InputClass" +# Identifier "keyboard-all" +# MatchIsKeyboard "on" +# MatchDevicePath "/dev/input/event*" +# Driver "evdev" +# Option "XkbLayout" "us" +# Option "XkbVariant" "intl" +# Option "XkbOptions" "compose:rwin,terminate:ctrl_alt_bksp" +# EndSection +# +# Many desktop environments, including KDE and Xfce, have their own methods to +# configure keyboard layouts and such if you'd like to use them. +# +# If you prefer to use the "old" way of configuring keyboards (without input +# device hotplugging), then you'll need to add the following lines to the +# ServerFlags section of /etc/X11/xorg.conf: +# Option "AllowEmptyInput" "false" +# Option "AutoAddDevices" "false" +# Option "AutoEnableDevices" "false" +# Alternatively, you can break this up into separate "stubs" in the xorg.conf.d/ +# directory, but that's your call. Assuming you elect to keep a monolithic +# /etc/X11/xorg.conf file, you can now edit the Keyboard section as usual. + +EOF + # Add COPYING file: mkdir -p $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION cp -a COPYING $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION diff --git a/source/x/x11/post-install/xorg-sgml-doctools.post-install b/source/x/x11/post-install/xorg-sgml-doctools.post-install new file mode 100644 index 00000000..b25fb344 --- /dev/null +++ b/source/x/x11/post-install/xorg-sgml-doctools.post-install @@ -0,0 +1,2 @@ +mkdir -p $PKG/usr/lib +mv $PKG/usr/share/pkgconfig $PKG/usr/lib diff --git a/source/x/x11/post-install/xproto.post-install b/source/x/x11/post-install/xproto.post-install new file mode 100644 index 00000000..5a3b79b3 --- /dev/null +++ b/source/x/x11/post-install/xproto.post-install @@ -0,0 +1,2 @@ +# bloat +rm -rf $PKG/usr/doc/xproto diff --git a/source/x/x11/slack-desc/mkcfm b/source/x/x11/slack-desc/mkcfm deleted file mode 100644 index fa3a212c..00000000 --- a/source/x/x11/slack-desc/mkcfm +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -mkcfm: mkcfm -mkcfm: -mkcfm: mkcfm is part of X11. -mkcfm: -mkcfm: For more information about the X.Org Foundation (the providers of the -mkcfm: X.Org implementation of the X Window System), see their website: -mkcfm: -mkcfm: http://www.x.org -mkcfm: -mkcfm: -mkcfm: diff --git a/source/x/x11/slack-desc/xf86-video-nouveau b/source/x/x11/slack-desc/xf86-video-nouveau new file mode 100644 index 00000000..8697a60e --- /dev/null +++ b/source/x/x11/slack-desc/xf86-video-nouveau @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xf86-video-nouveau: xf86-video-nouveau +xf86-video-nouveau: +xf86-video-nouveau: xf86-video-nouveau is part of X11. +xf86-video-nouveau: +xf86-video-nouveau: For more information about the X.Org Foundation (the providers of the +xf86-video-nouveau: X.Org implementation of the X Window System), see their website: +xf86-video-nouveau: +xf86-video-nouveau: http://www.x.org +xf86-video-nouveau: +xf86-video-nouveau: +xf86-video-nouveau: diff --git a/source/x/x11/src/get-xf86-video-nouveau.sh b/source/x/x11/src/get-xf86-video-nouveau.sh new file mode 100755 index 00000000..72d3efd3 --- /dev/null +++ b/source/x/x11/src/get-xf86-video-nouveau.sh @@ -0,0 +1,22 @@ +# Pull a stable branch + patches +BRANCH=master + +rm -rf xf86-video-nouveau +git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/ + +# use master branch +#( cd xf86-video-nouveau +# git checkout $BRANCH || exit 1 +#) + +HEADISAT="$(cat xf86-video-nouveau/.git/packed-refs | grep refs/remotes/origin/$BRANCH | cut -b1-7)" +# Cleanup. We're not packing up the whole git repo. +( cd xf86-video-nouveau && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +DATE=$(date +%Y%m%d) +mv xf86-video-nouveau xf86-video-nouveau-git_${DATE}_${HEADISAT} +tar cf xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar xf86-video-nouveau-git_${DATE}_${HEADISAT} +xz -9 xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar +rm -rf xf86-video-nouveau-git_${DATE}_${HEADISAT} +echo +echo "xf86-video-nouveau branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar.xz" +echo |