From 724b166c98bc5a9036319702d2a2217f7edf21e1 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 15 Mar 2018 21:14:06 +0100
Subject: XFCE: rename xbase.lst to x_base.lst

The order in which the squashfs modules were created should be respected
when they are re-assembled to an overlay filesystem.
The assembly is done in  lexicographical order - therefore xbase.lst
needed to be renamed to x_base.lst.

Failing to adhere to the original assembly order causes weirdness.
In my case it meant that the complete directory /usr/share/applications
as contained in xapbase.lst was invisible in the resulting overlay, causing
near-empty menus in XFCE.

Also added several packages to x_base.lst that are now part of Slackware.
---
 make_slackware_live.sh |   4 +-
 pkglists/x_base.lst    | 434 +++++++++++++++++++++++++++++++++++++++++++++++++
 pkglists/xbase.lst     | 429 ------------------------------------------------
 3 files changed, 436 insertions(+), 431 deletions(-)
 create mode 100644 pkglists/x_base.lst
 delete mode 100644 pkglists/xbase.lst

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index e989f4d..b6b0acf 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -168,11 +168,11 @@ SEQ_SLACKWARE="tagfile:a,ap,d,e,f,k,kde,kdei,l,n,t,tcl,x,xap,xfce,y pkglist:slac
 
 # Stripped-down Slackware with XFCE as the Desktop Environment:
 # - each series will become a squashfs module:
-SEQ_XFCEBASE="${MINLIST},xbase,xapbase,xfcebase"
+SEQ_XFCEBASE="${MINLIST},x_base,xapbase,xfcebase"
 
 # Stripped-down Slackware with KDE4 as the Desktop Environment:
 # - each series will become a squashfs module:
-SEQ_KDE4BASE="pkglist:${MINLIST},xbase,xapbase,kde4base"
+SEQ_KDE4BASE="pkglist:${MINLIST},x_base,xapbase,kde4base"
 
 # List of Slackware package series with Plasma5 instead of KDE 4 (full install):
 # - each will become a squashfs module:
diff --git a/pkglists/x_base.lst b/pkglists/x_base.lst
new file mode 100644
index 0000000..10650ff
--- /dev/null
+++ b/pkglists/x_base.lst
@@ -0,0 +1,434 @@
+ConsoleKit2
+GConf
+Mako
+ModemManager
+NetworkManager
+SDL2
+SDL2_gfx
+SDL2_image
+SDL2_mixer
+SDL2_net
+SDL2_ttf
+a52dec
+aalib
+adwaita-icon-theme
+alsa-lib
+alsa-oss
+alsa-plugins
+alsa-utils
+appres
+at-spi2-atk
+at-spi2-core
+atk
+audiofile
+babl
+bdftopcf
+bigreqsproto
+bluez
+boost
+cairo
+cdrtools
+cgmanager
+compositeproto
+cups
+cups-filters
+damageproto
+db48
+dbus
+dbus-glib
+dbus-python
+dejavu-fonts-ttf
+desktop-file-utils
+#djvulibre
+dmxproto
+dosfstools
+dri2proto
+dri3proto
+elfutils
+enchant
+encodings
+esound
+evieext
+exiv2
+ffmpeg
+fftw
+fixesproto
+flac
+fluidsynth
+#font-adobe-100dpi
+font-alias
+#font-bh-100dpi
+#font-bh-75dpi
+#font-bh-lucidatypewriter-100dpi
+#font-bh-lucidatypewriter-75dpi
+#font-bh-ttf
+font-bitstream-100dpi
+#font-bitstream-75dpi
+#font-bitstream-type1
+font-cursor-misc
+font-misc-misc
+font-util
+fontcacheproto
+fontconfig
+fontsproto
+fonttosfnt
+freeglut
+freetype
+fribidi
+fslsfonts
+fstobdf
+gamin
+gccmakedep
+gcr
+gd
+gdk-pixbuf2
+gegl
+giflib
+glew
+glib-networking
+glib
+glib2
+glibc-i18n
+glproto
+glu
+gmime
+gnome-keyring
+gnome-themes-standard
+gsettings-desktop-schemas
+gst-plugins-base
+gst-plugins-base0
+gst-plugins-good
+gst-plugins-good0
+gstreamer
+gstreamer0
+#gtk+
+gtk+2
+gtk+3
+gtkspell
+gvfs
+harfbuzz
+hicolor-icon-theme
+hplip
+hunspell
+iceauth
+ico
+icon-naming-utils
+icu4c
+ilmbase
+imake
+inputproto
+intel-vaapi-driver
+intltool
+ipw2100-fw
+ipw2200-fw
+iw
+jasper
+json-c
+kbproto
+keybinder
+lame
+lcms
+lcms2
+libFS
+libICE
+libSM
+libX11
+libXScrnSaver
+libXau
+libXaw
+libXaw3d
+libXcomposite
+libXcursor
+libXdamage
+libXdmcp
+libXevie
+libXext
+libXfixes
+libXfont
+libXfont2
+libXfontcache
+libXft
+libXi
+libXinerama
+libXmu
+libXp
+libXpm
+libXpresent
+libXrandr
+libXrender
+libXres
+libXt
+libXtst
+libXv
+libXvMC
+libXxf86dga
+libXxf86misc
+libXxf86vm
+libao
+libarchive
+libart_lgpl
+libasyncns
+libatasmart
+libbluray
+libcaca
+libcanberra
+libcap-ng
+libcddb
+libcdio
+libcdio-paranoia
+libcgroup
+libcroco
+libdmx
+libdrm
+libdvdnav
+libdvdread
+#liberation-fonts-ttf
+libepoxy
+libevdev
+libexif
+libfakekey
+libffi
+libfontenc
+libglade
+libgnome-keyring
+libgphoto2
+libgsf
+libical
+libidl
+libieee1284
+libimobiledevice
+libinput
+libiodbc
+libjpeg-turbo
+libmad
+libmbim
+libmng
+libmtp
+libndp
+libnih
+libnl
+libnl3
+libnotify
+libogg
+libpcap
+libpciaccess
+libplist
+libpng
+libproxy
+libpthread-stubs
+librsvg
+libqmi
+libsamplerate
+libsecret
+libsndfile
+libsoup
+libssh
+libssh2
+libtasn1
+libtheora
+libtiff
+libtirpc
+libunwind
+libusbmuxd
+libva
+libva-intel-driver
+libvdpau
+libvisual
+libvorbis
+libvpx
+libwacom
+libwebp
+libwmf
+libwnck
+libx86
+libxcb
+libxkbfile
+libxklavier
+libxshmfence
+libxml2
+libxslt
+listres
+llvm
+lm_sensors
+luit
+lzo
+makedepend
+mesa
+mkcomposecache
+mkfontdir
+mkfontscale
+motif
+mozilla-nss
+mpg123
+mtdev
+neon
+net-snmp
+nettle
+newt
+nfs-utils
+ocl-icd
+openexr
+openjpeg
+opus
+orc
+p11-kit
+pamixer
+pango
+pcre2
+pixman
+pm-utils
+poppler
+poppler-data
+presentproto
+printproto
+pulseaudio
+pycairo
+pygobject
+pygtk
+radeontool
+randrproto
+recordproto
+rendercheck
+renderproto
+resourceproto
+rgb
+rpcbind
+samba
+#sazanami-fonts-ttf
+sbc
+scrnsaverproto
+sdl
+sg3_utils
+sessreg
+setxkbmap
+shared-mime-info
+showfont
+sinhala_lklug-font-ttf
+smproxy
+speex
+speexdsp
+sqlite
+startup-notification
+svgalib
+t1lib
+talloc
+tdb
+tevent
+#tibmachuni-font-ttf
+ttf-indic-fonts
+udisks
+udisks2
+upower
+usb_modeswitch
+util-macros
+v4l-utils
+vbetool
+videoproto
+viewres
+vorbis-tools
+vte
+wavpack
+wireless-tools
+wpa_supplicant
+wqy-zenhei-font-ttf
+x11-skel
+x11perf
+xauth
+xbacklight
+xbitmaps
+xcb-proto
+xcb-util
+xcb-util-keysyms
+xclipboard
+xclock
+xcmiscproto
+xcmsdb
+xcompmgr
+xcursor-themes
+xcursorgen
+xdbedizzy
+xdm
+xdg-utils
+xdpyinfo
+xdriinfo
+xev
+xextproto
+xf86-input-acecad
+xf86-input-evdev
+xf86-input-joystick
+xf86-input-keyboard
+xf86-input-mouse
+xf86-input-penmount
+xf86-input-synaptics
+xf86-input-vmmouse
+xf86-input-void
+xf86-video-amdgpu
+xf86-video-apm
+xf86-video-ark
+xf86-video-ast
+xf86-video-ati
+xf86-video-dummy
+xf86-video-glint
+xf86-video-i128
+xf86-video-i740
+xf86-video-intel
+xf86-video-mach64
+xf86-video-mga
+xf86-video-nouveau
+xf86-video-nv
+xf86-video-openchrome
+xf86-video-r128
+xf86-video-v4l
+xf86-video-vboxvideo
+xf86-video-vesa
+xf86-video-vmware
+xf86bigfontproto
+xf86dga
+xf86dgaproto
+xf86driproto
+xf86miscproto
+xf86vidmodeproto
+xfd
+xfontsel
+xfs
+xfsinfo
+xgamma
+xgc
+xhost
+xineramaproto
+xinit
+xinput
+xkbcomp
+xkbevd
+xkbprint
+xkbutils
+xkeyboard-config
+xkill
+xlsatoms
+xlsclients
+xlsfonts
+xmessage
+xmodmap
+xorg-cf-files
+xorg-server
+xorg-server-xvfb
+xorgproto
+xpr
+xprop
+xproto
+xrandr
+xrdb
+xrefresh
+xscreensaver
+xset
+xsetroot
+xsm
+xstdcmap
+xtrans
+#xv
+xvidtune
+xvinfo
+xwd
+xwininfo
+xwud
+zd1211-firmware
diff --git a/pkglists/xbase.lst b/pkglists/xbase.lst
deleted file mode 100644
index 87f8a38..0000000
--- a/pkglists/xbase.lst
+++ /dev/null
@@ -1,429 +0,0 @@
-ConsoleKit2
-GConf
-Mako
-ModemManager
-NetworkManager
-SDL2
-SDL2_gfx
-SDL2_image
-SDL2_mixer
-SDL2_net
-SDL2_ttf
-a52dec
-aalib
-adwaita-icon-theme
-alsa-lib
-alsa-oss
-alsa-plugins
-alsa-utils
-appres
-at-spi2-atk
-at-spi2-core
-atk
-audiofile
-babl
-bdftopcf
-bigreqsproto
-bluez
-boost
-cairo
-cdrtools
-cgmanager
-compositeproto
-cups
-cups-filters
-damageproto
-db48
-dbus
-dbus-glib
-dbus-python
-dejavu-fonts-ttf
-desktop-file-utils
-#djvulibre
-dmxproto
-dosfstools
-dri2proto
-dri3proto
-elfutils
-enchant
-encodings
-esound
-evieext
-exiv2
-ffmpeg
-fftw
-fixesproto
-flac
-#font-adobe-100dpi
-font-alias
-#font-bh-100dpi
-#font-bh-75dpi
-#font-bh-lucidatypewriter-100dpi
-#font-bh-lucidatypewriter-75dpi
-#font-bh-ttf
-font-bitstream-100dpi
-#font-bitstream-75dpi
-#font-bitstream-type1
-font-cursor-misc
-font-misc-misc
-font-util
-fontcacheproto
-fontconfig
-fontsproto
-fonttosfnt
-freeglut
-freetype
-fribidi
-fslsfonts
-fstobdf
-gamin
-gccmakedep
-gcr
-gd
-gdk-pixbuf2
-gegl
-giflib
-glew
-glib-networking
-glib
-glib2
-glibc-i18n
-glproto
-glu
-gmime
-gnome-keyring
-gnome-themes-standard
-gsettings-desktop-schemas
-gst-plugins-base
-gst-plugins-base0
-gst-plugins-good
-gst-plugins-good0
-gstreamer
-gstreamer0
-#gtk+
-gtk+2
-gtk+3
-gtkspell
-gvfs
-harfbuzz
-hicolor-icon-theme
-hplip
-hunspell
-iceauth
-ico
-icon-naming-utils
-icu4c
-ilmbase
-imake
-inputproto
-intel-vaapi-driver
-intltool
-ipw2100-fw
-ipw2200-fw
-iw
-jasper
-json-c
-kbproto
-keybinder
-lame
-lcms
-lcms2
-libFS
-libICE
-libSM
-libX11
-libXScrnSaver
-libXau
-libXaw
-libXaw3d
-libXcomposite
-libXcursor
-libXdamage
-libXdmcp
-libXevie
-libXext
-libXfixes
-libXfont
-libXfont2
-libXfontcache
-libXft
-libXi
-libXinerama
-libXmu
-libXp
-libXpm
-libXpresent
-libXrandr
-libXrender
-libXres
-libXt
-libXtst
-libXv
-libXvMC
-libXxf86dga
-libXxf86misc
-libXxf86vm
-libao
-libarchive
-libart_lgpl
-libasyncns
-libatasmart
-libbluray
-libcaca
-libcanberra
-libcap-ng
-libcddb
-libcdio
-libcdio-paranoia
-libcgroup
-libcroco
-libdmx
-libdrm
-libdvdnav
-libdvdread
-#liberation-fonts-ttf
-libepoxy
-libevdev
-libexif
-libfakekey
-libffi
-libfontenc
-libglade
-libgnome-keyring
-libgphoto2
-libgsf
-libical
-libidl
-libieee1284
-libimobiledevice
-libinput
-libiodbc
-libjpeg-turbo
-libmad
-libmbim
-libmng
-libmtp
-libndp
-libnih
-libnl
-libnl3
-libnotify
-libogg
-libpcap
-libpciaccess
-libplist
-libpng
-libproxy
-libpthread-stubs
-librsvg
-libqmi
-libsamplerate
-libsecret
-libsndfile
-libsoup
-libssh
-libssh2
-libtasn1
-libtheora
-libtiff
-libtirpc
-libunwind
-libusbmuxd
-libva
-libva-intel-driver
-libvdpau
-libvisual
-libvorbis
-libvpx
-libwacom
-libwebp
-libwmf
-libwnck
-libx86
-libxcb
-libxkbfile
-libxklavier
-libxshmfence
-libxml2
-libxslt
-listres
-llvm
-lm_sensors
-luit
-lzo
-makedepend
-mesa
-mkcomposecache
-mkfontdir
-mkfontscale
-motif
-mozilla-nss
-mpg123
-mtdev
-neon
-net-snmp
-nettle
-newt
-nfs-utils
-ocl-icd
-openexr
-openjpeg
-opus
-orc
-p11-kit
-pamixer
-pango
-pcre2
-pixman
-pm-utils
-poppler
-poppler-data
-presentproto
-printproto
-pulseaudio
-pycairo
-pygobject
-pygtk
-radeontool
-randrproto
-recordproto
-rendercheck
-renderproto
-resourceproto
-rgb
-rpcbind
-samba
-#sazanami-fonts-ttf
-sbc
-scrnsaverproto
-sdl
-sg3_utils
-sessreg
-setxkbmap
-shared-mime-info
-showfont
-sinhala_lklug-font-ttf
-smproxy
-speex
-speexdsp
-sqlite
-startup-notification
-svgalib
-t1lib
-#tibmachuni-font-ttf
-ttf-indic-fonts
-udisks
-udisks2
-upower
-usb_modeswitch
-util-macros
-v4l-utils
-vbetool
-videoproto
-viewres
-vorbis-tools
-vte
-wavpack
-wireless-tools
-wpa_supplicant
-wqy-zenhei-font-ttf
-x11-skel
-x11perf
-xauth
-xbacklight
-xbitmaps
-xcb-proto
-xcb-util
-xcb-util-keysyms
-xclipboard
-xclock
-xcmiscproto
-xcmsdb
-xcompmgr
-xcursor-themes
-xcursorgen
-xdbedizzy
-xdm
-xdg-utils
-xdpyinfo
-xdriinfo
-xev
-xextproto
-xf86-input-acecad
-xf86-input-evdev
-xf86-input-joystick
-xf86-input-keyboard
-xf86-input-mouse
-xf86-input-penmount
-xf86-input-synaptics
-xf86-input-vmmouse
-xf86-input-void
-xf86-video-amdgpu
-xf86-video-apm
-xf86-video-ark
-xf86-video-ast
-xf86-video-ati
-xf86-video-dummy
-xf86-video-glint
-xf86-video-i128
-xf86-video-i740
-xf86-video-intel
-xf86-video-mach64
-xf86-video-mga
-xf86-video-nouveau
-xf86-video-nv
-xf86-video-openchrome
-xf86-video-r128
-xf86-video-v4l
-xf86-video-vboxvideo
-xf86-video-vesa
-xf86-video-vmware
-xf86bigfontproto
-xf86dga
-xf86dgaproto
-xf86driproto
-xf86miscproto
-xf86vidmodeproto
-xfd
-xfontsel
-xfs
-xfsinfo
-xgamma
-xgc
-xhost
-xineramaproto
-xinit
-xinput
-xkbcomp
-xkbevd
-xkbprint
-xkbutils
-xkeyboard-config
-xkill
-xlsatoms
-xlsclients
-xlsfonts
-xmessage
-xmodmap
-xorg-cf-files
-xorg-server
-xorg-server-xvfb
-xpr
-xprop
-xproto
-xrandr
-xrdb
-xrefresh
-xscreensaver
-xset
-xsetroot
-xsm
-xstdcmap
-xtrans
-#xv
-xvidtune
-xvinfo
-xwd
-xwininfo
-xwud
-zd1211-firmware
-- 
cgit v1.2.3