Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

5 files changed, 75 insertions, 24 deletions

diff --git a/source/x/x11/post-install/libxcb.post-install b/source/x/x11/post-install/libxcb.post-install
index 76ac40c0..ebaacfd8 100644
--- a/source/x/x11/post-install/libxcb.post-install
+++ b/source/x/x11/post-install/libxcb.post-install
@@ -31,22 +31,3 @@ rm -rf $PKG/usr/share/doc/libxcb
 rmdir $PKG/usr/share/doc
 rmdir $PKG/usr/share
 
-# Older versions of libxcb shipped a poorly libtooled .la file that caused
-# the now-gone libxcb-xlib.so module to be incorrectly linked with many
-# binaries and libraries, and cause the module to be listed (again,
-# incorrectly) in a lot of .la files.  Rather than breaking a large amount
-# of existing X programs, we will use this simple trick to allow old binaries
-# to keep running, and new things to compile even if a bogus .la file
-# referencing libxcb-xlib is in the development environment.
-#
-# References to libxcb-xlib will go away as things are recompiled in the
-# future (we've eliminated any remaining references in Slackware itself).
-#
-# It's like letting a sliver work out instead of cutting off the finger.
-
-( cd $PKG/usr/lib
-  ln -sf libxcb.so.1 libxcb-xlib.so.0
-  ln -sf libxcb-xlib.so.0 libxcb-xlib.so
-  ln -sf libxcb.la libxcb-xlib.la
-)
-
diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install
index a8889970..8410a8fa 100644
--- a/source/x/x11/post-install/xdm.post-install
+++ b/source/x/x11/post-install/xdm.post-install
@@ -29,6 +29,15 @@ do
   #mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ;
 done
 
+# Change default auth type:
+cat << EOF >> $PKG/etc/X11/xdm/xdm-config.new
+
+! In xdm-config, default to MIT-MAGIC-COOKIE-1 authorization as
+! the XDM-AUTHORIZATION-1 method (which is the default otherwise) is
+! mostly broken (i.e. with SDL2 apps):
+DisplayManager.*.authName:      MIT-MAGIC-COOKIE-1
+EOF
+
 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-libinput.post-install b/source/x/x11/post-install/xf86-input-libinput.post-install
index baeffe2e..b267c28f 100644
--- a/source/x/x11/post-install/xf86-input-libinput.post-install
+++ b/source/x/x11/post-install/xf86-input-libinput.post-install
@@ -1,4 +1,49 @@
-# Add default configuration file:
-mkdir -p $PKG/usr/share/X11/xorg.conf.d
-cp -a conf/99-libinput.conf $PKG/usr/share/X11/xorg.conf.d/
+# 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/91-keyboard-layout-libinput.conf
+Section "InputClass"
+	Identifier "libinput keyboard catchall"
+	MatchIsKeyboard "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "libinput"
+	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 "libinput keyboard catchall"
+#	MatchIsKeyboard "on"
+#	MatchDevicePath "/dev/input/event*"
+#	Driver "libinput"
+#	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
 
diff --git a/source/x/x11/post-install/xorg-server.post-install b/source/x/x11/post-install/xorg-server.post-install
index e21a0f03..dd9e2096 100644
--- a/source/x/x11/post-install/xorg-server.post-install
+++ b/source/x/x11/post-install/xorg-server.post-install
@@ -3,7 +3,7 @@ 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
+cat << EOF > $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout-evdev.conf
 Section "InputClass"
 	Identifier "keyboard-all"
 	MatchIsKeyboard "on"
@@ -47,6 +47,17 @@ EndSection
 
 EOF
 
+## Nope, we will not include 91-keyboard-layout-libinput.conf in the
+## xorg-server package.  It is better to put it into the xf86-input-libinput
+## package so that if that driver is removed, then X.Org will fall back to
+## using evdev.  Perhaps we'll revisit this arrangement when evdev is a little
+## bit more obsolete.  :-)
+##
+#sed -e 's,Identifier "keyboard-all",Identifier "libinput keyboard catchall",g' \
+#    -e 's,Driver "evdev",Driver "libinput",g' \
+#    $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout-evdev.conf > \
+#    $PKG/usr/share/X11/xorg.conf.d/91-keyboard-layout-libinput.conf
+
 # Add COPYING file:
 mkdir -p $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION
 cp -a COPYING $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION
@@ -57,7 +68,7 @@ rmdir $PKG/var
 
 # While I hate to have X11 take over another generic-sounding
 # piece of prime filesystem real estate, this symlink will
-# direct (for now) proprietary X drivers into the corrent
+# direct (for now) proprietary X drivers into the correct
 # location:
 
 ( cd $PKG/usr/lib
diff --git a/source/x/x11/post-install/xorgproto.post-install b/source/x/x11/post-install/xorgproto.post-install
new file mode 100644
index 00000000..7a3fa975
--- /dev/null
+++ b/source/x/x11/post-install/xorgproto.post-install
@@ -0,0 +1,5 @@
+# These all have the arch specific library path in them, so usr/share is not
+# the right place to keep them:
+mkdir -p $PKG/usr/lib
+mv $PKG/usr/share/pkgconfig $PKG/usr/lib
+rmdir $PKG/usr/share 2> /dev/null