summaryrefslogtreecommitdiff
path: root/source/x/x11/post-install
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2012-09-26 01:10:42 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 22:51:55 +0200
commit9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
treeb428a16618e36ed864a8d76ea3435e19a452bf90 /source/x/x11/post-install
parent75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
downloadcurrent-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. 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. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
Diffstat (limited to 'source/x/x11/post-install')
-rw-r--r--source/x/x11/post-install/lbxproxy.post-install5
-rw-r--r--source/x/x11/post-install/libXaw3d.post-install29
-rw-r--r--source/x/x11/post-install/proxymngr.post-install5
-rw-r--r--source/x/x11/post-install/rstart.post-install5
-rw-r--r--source/x/x11/post-install/util-macros.post-install2
-rw-r--r--source/x/x11/post-install/xcb-util.post-install8
-rw-r--r--source/x/x11/post-install/xdm.post-install35
-rw-r--r--source/x/x11/post-install/xf86-input-wacom.post-install5
-rw-r--r--source/x/x11/post-install/xf86-input-wacom/60-wacom.rules6
9 files changed, 71 insertions, 29 deletions
diff --git a/source/x/x11/post-install/lbxproxy.post-install b/source/x/x11/post-install/lbxproxy.post-install
deleted file mode 100644
index 9bb11032..00000000
--- a/source/x/x11/post-install/lbxproxy.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
- mv lbxproxy $PKG/etc/X11
- ln -sf ../../../etc/X11/lbxproxy .
-)
diff --git a/source/x/x11/post-install/libXaw3d.post-install b/source/x/x11/post-install/libXaw3d.post-install
new file mode 100644
index 00000000..5b2d5bf2
--- /dev/null
+++ b/source/x/x11/post-install/libXaw3d.post-install
@@ -0,0 +1,29 @@
+
+# Copyright 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# Create some compat symlinks for older versions:
+
+( cd $PKG/usr/lib
+ ln -sf libXaw3d.so.8 libXaw3d.so.6
+ ln -sf libXaw3d.so.8 libXaw3d.so.7
+)
+
diff --git a/source/x/x11/post-install/proxymngr.post-install b/source/x/x11/post-install/proxymngr.post-install
deleted file mode 100644
index 29c647c3..00000000
--- a/source/x/x11/post-install/proxymngr.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
- mv proxymngr $PKG/etc/X11
- ln -sf ../../../etc/X11/proxymngr .
-)
diff --git a/source/x/x11/post-install/rstart.post-install b/source/x/x11/post-install/rstart.post-install
deleted file mode 100644
index d51ad34d..00000000
--- a/source/x/x11/post-install/rstart.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
- mv rstart $PKG/etc/X11
- ln -sf ../../../etc/X11/rstart .
-)
diff --git a/source/x/x11/post-install/util-macros.post-install b/source/x/x11/post-install/util-macros.post-install
deleted file mode 100644
index b25fb344..00000000
--- a/source/x/x11/post-install/util-macros.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p $PKG/usr/lib
-mv $PKG/usr/share/pkgconfig $PKG/usr/lib
diff --git a/source/x/x11/post-install/xcb-util.post-install b/source/x/x11/post-install/xcb-util.post-install
new file mode 100644
index 00000000..ac269177
--- /dev/null
+++ b/source/x/x11/post-install/xcb-util.post-install
@@ -0,0 +1,8 @@
+# The libraries libxcb-{atom,aux,event} have been merged into the
+# libxcb-util library. To maintain compatibility with existing
+# binaries, add some runtime-only compat symlinks:
+( cd $PKG/usr/lib
+ ln -sf libxcb-util.so.?.?.? libxcb-atom.so.1
+ ln -sf libxcb-util.so.?.?.? libxcb-aux.so.0
+ ln -sf libxcb-util.so.?.?.? libxcb-event.so.1
+)
diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install
index 83dcf788..73611b47 100644
--- a/source/x/x11/post-install/xdm.post-install
+++ b/source/x/x11/post-install/xdm.post-install
@@ -1,19 +1,30 @@
mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
- mv xdm $PKG/etc/X11
- ln -sf ../../../etc/X11/xdm .
-)
-mv $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsession.orig
-mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0.orig
+mv $PKG/usr/lib/X11/xdm $PKG/etc/X11
+ln -sf ../../../etc/X11/xdm $PKG/usr/lib/X11/xdm
+
+#( cd $PKG/usr/lib/X11
+# mv xdm $PKG/etc/X11
+# ln -sf ../../../etc/X11/xdm .
+#)
+
+mkdir -p $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION
+mv $PKG/etc/X11/xdm/Xsession $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsession.orig
+mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsetup_0.orig
+
cp -a $CWD/post-install/xdm/Xsession $PKG/etc/X11/xdm/Xsession
cp -a $CWD/post-install/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0
+
chown root:root $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
-chmod 755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
-( cd $PKG/etc/X11/xdm
- mv xdm-config xdm-config.new
- mv Xservers Xservers.new
- mv Xsession Xsession.new
-)
+chmod 0755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
+
+for conffile in \
+ Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \
+ GiveConsole TakeConsole chooser xdm-config ../app-defaults/Chooser ;
+do
+ mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ;
+done
+
mkdir -p $PKG/var/lib/xdm
chown root:root $PKG/var/lib/xdm
chmod 755 $PKG/var/lib/xdm
+
diff --git a/source/x/x11/post-install/xf86-input-wacom.post-install b/source/x/x11/post-install/xf86-input-wacom.post-install
new file mode 100644
index 00000000..d2b17ecc
--- /dev/null
+++ b/source/x/x11/post-install/xf86-input-wacom.post-install
@@ -0,0 +1,5 @@
+# I'm not sure we need this any more, so let's wait for a bug report
+# https://wiki.archlinux.org/index.php/Wacom_Tablet
+mkdir -p $PKG/lib/udev/rules.d
+cat $CWD/post-install/xf86-input-wacom/60-wacom.rules > \
+ $PKG/lib/udev/rules.d/60-wacom.rules
diff --git a/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules b/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules
new file mode 100644
index 00000000..59224786
--- /dev/null
+++ b/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules
@@ -0,0 +1,6 @@
+# From https://wiki.archlinux.org/index.php/Wacom_Tablet
+ACTION!="add|change", GOTO="wacom_end"
+ # Match all wacom tablets with a serial ID starting with WACf or FUJ*
+ ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+ ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+LABEL="wacom_end"