diff options
Diffstat (limited to 'source')
34 files changed, 252 insertions, 383 deletions
diff --git a/source/a/aaa_base/_aaa_base/install/doinst.sh b/source/a/aaa_base/_aaa_base/install/doinst.sh index 16f1280d..3f26c670 100644 --- a/source/a/aaa_base/_aaa_base/install/doinst.sh +++ b/source/a/aaa_base/_aaa_base/install/doinst.sh @@ -1,10 +1,8 @@ -# Invite the new admin to register their machine with the Linux Counter: -if [ ! -f var/spool/mail/root ]; then - mv var/spool/mail/root.new var/spool/mail/root -else +# Send root a welcome email unless we detect that it's there already: +if ! grep -q "Welcome to Linux (Slackware 15.0)" var/spool/mail/root 2> /dev/null ; then cat var/spool/mail/root.new >> var/spool/mail/root - rm var/spool/mail/root.new fi +rm var/spool/mail/root.new # (Starting with Slackware 8.1) note: These links are now replaced by # copies of the header files that were used to compile glibc (in the # kernel-headers package). The version number on the kernel-headers diff --git a/source/a/aaa_base/_aaa_base/var/spool/mail/root.new b/source/a/aaa_base/_aaa_base/var/spool/mail/root.new index a8b29151..073e57a7 100644 --- a/source/a/aaa_base/_aaa_base/var/spool/mail/root.new +++ b/source/a/aaa_base/_aaa_base/var/spool/mail/root.new @@ -1,67 +1,18 @@ -From root@hive64.slackware.lan Fri May 20 15:16:45 2016 -Return-Path: <root@hive64.slackware.lan> -Received: from hive64.slackware.lan (localhost [127.0.0.1]) - by hive64.slackware.lan (8.15.2/8.15.2) with ESMTP id u4KKGjAg003580 - for <root@hive64.slackware.lan>; Fri, 20 May 2016 15:16:45 -0500 -Received: (from root@localhost) - by hive64.slackware.lan (8.15.2/8.15.2/Submit) id u4KKGj0X003579 - for root; Fri, 20 May 2016 15:16:45 -0500 -From: root@hive64.slackware.lan -Message-Id: <201605202016.u4KKGj0X003579@hive64.slackware.lan> -Date: Fri, 20 May 2016 15:16:45 -0500 -To: root@hive64.slackware.lan -Subject: Register with the Linux counter project -User-Agent: Heirloom mailx 12.5 7/5/10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit - - - (Adapted from a question in the Linux-FAQ) - - How Many People Use Linux? - - Linux is freely available, and no one is required to register with - any central authority, so it is difficult to know. Several businesses - survive solely on selling and supporting Linux. Linux newsgroups are - some of the most heavily read on Usenet. Accurate numbers are hard to - come by, but the number is almost certainly in the millions. - - However, people can register as Linux users at the Linux Counter - project, which has been in existence since 1993. In August of 2012 - the project counted more than 133,000 users, but that is certainly - only a small fraction of all users. The operator of the Linux Counter - estimated over 60 million users at that time. - - To get counted, visit the Web site at: - - http://linuxcounter.net - - ...and fill in the registration form. - - The current count is posted monthly to news:comp.os.linux.misc, and - is always available from the Web site. - -From root@hive64.slackware.lan Fri May 20 15:16:49 2016 -Return-Path: <root@hive64.slackware.lan> -Received: from hive64.slackware.lan (localhost [127.0.0.1]) - by hive64.slackware.lan (8.15.2/8.15.2) with ESMTP id u4KKGnSF003585 - for <root@hive64.slackware.lan>; Fri, 20 May 2016 15:16:49 -0500 -Received: (from root@localhost) - by hive64.slackware.lan (8.15.2/8.15.2/Submit) id u4KKGnJj003584 - for root; Fri, 20 May 2016 15:16:49 -0500 -From: root@hive64.slackware.lan -Message-Id: <201605202016.u4KKGnJj003584@hive64.slackware.lan> -Date: Fri, 20 May 2016 15:16:49 -0500 -To: root@hive64.slackware.lan -Subject: Welcome to Linux (Slackware 14.2)! -User-Agent: Heirloom mailx 12.5 7/5/10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit - - -Welcome! I'm glad to see you've made it this far! :^) +From root@z-mp.slackware.lan Tue Jan 11 14:18:55 2022 +Return-Path: <root@z-mp.slackware.lan> +X-Original-To: root +Delivered-To: root@z-mp.slackware.lan +Received: by z-mp.slackware.lan (Postfix, from userid 0) + id D7F87251F63; Tue, 11 Jan 2022 14:18:36 -0600 (CST) +Date: Tue, 11 Jan 2022 14:18:36 -0600 +To: root@z-mp.slackware.lan +Subject: Welcome to Linux (Slackware 15.0)! +User-Agent: mailx v14.9.23 +Message-Id: <20220111201855.D7F87251F63@z-mp.slackware.lan> +From: root@z-mp.slackware.lan + + +Welcome! I'm glad to see you've made it this far! :^) Here are a few hints to help you navigate through the Linux operating system a little bit better. @@ -69,18 +20,18 @@ system a little bit better. Tools to help configure your system: pkgtool: Remember those screens you saw while each package was -installing? You can see all that information (and more) again. The +installing? You can see all that information (and more) again. The simplest way is to use the 'pkgtool' utility to view the package -contents. Another way is to use 'less' or a text editor to read the +contents. Another way is to use 'less' or a text editor to read the files in /var/log/packages and /var/log/scripts (this is the method I -use). The pkgtool script serves as a frontend to the command line +use). The pkgtool script serves as a frontend to the command line package tools, so it's a menu based program that will enable you to remove, install, or view packages that are currently installed on the -system. pkgtool will also allow you to re-run some of the system admin +system. pkgtool will also allow you to re-run some of the system admin scripts that you may have seen during the installation process. - Slackware's command line package tools: I use these utilities most -of the time when I have packages to install, remove, or upgrade. These + Slackware's command line package tools: I use these utilities most +of the time when I have packages to install, remove, or upgrade. These are the tools: installpkg -- Installs packages @@ -92,28 +43,28 @@ are the tools: slackpkg: For those more used to automated package management tools you might like to try slackpkg (my favorite due to its simple, -straightforward approach to keeping a machine up to date). Slackpkg -can be found in the slackware/ap directory. A search of the web will -turn up more tools as well. You should approach these cautiously, as +straightforward approach to keeping a machine up to date). Slackpkg +can be found in the slackware/ap directory. A search of the web will +turn up more tools as well. You should approach these cautiously, as Slackware is designed around the idea that the system should be a -complete installation kept updated with any official patches. This +complete installation kept updated with any official patches. This avoids the mess of dependencies that some other Linux based GNU systems -face. However, many (if not most) of these tools won't know what to do +face. However, many (if not most) of these tools won't know what to do about .new config files, or how to handle upgrading a package that has -changed to a new name. Some also think that any package with a larger +changed to a new name. Some also think that any package with a larger build number is "better", when there have been many instances that a new upstream release wasn't working properly and we had to roll back to an earlier one, and an automated upgrade tool didn't want to -"downgrade" the package. This is something upgradepkg will gladly do, +"downgrade" the package. This is something upgradepkg will gladly do, as it doesn't (as it should not) take the package's version number to -mean much of anything. Regarding automatic upgrades, there have also +mean much of anything. Regarding automatic upgrades, there have also been cases where a library upgrade caused unwanted side effects in -programs that link with it. In theory, most libraries used on the +programs that link with it. In theory, most libraries used on the system try to retain backwards compatibility, but in practice this -isn't always the case. While any issued patches should be installed to +isn't always the case. While any issued patches should be installed to keep your system secure, always remember the old adage "don't fix it if it ain't broke" when considering other upgrades and additions, -especially if they come from unofficial sources. Again, there's a lot +especially if they come from unofficial sources. Again, there's a lot of good stuff out there, but there's also some that's not so good. It's always a good idea to look packages over before you install them. This is as simple as using 'less' to view the contents so you can see @@ -123,23 +74,23 @@ extract the archive into a temporary directory to take a closer look. netconfig: netconfig is a menu based program that will help to configure your network. You will be asked several questions and given an opportunity to review your settings before the changes are -committed. More advanced settings are available by editing the +committed. More advanced settings are available by editing the /etc/rc.d/rc.inet1.conf config file directly. pppsetup: pppsetup is a menu based program that will help you to -connect to your ISP via a PPP connection. As with netconfig you are +connect to your ISP via a PPP connection. As with netconfig you are asked a series of questions and given a chance to review your settings. KDE also includes a utility for configuring PPP dialup connections. This is found in KDE's Internet menu (kppp). xwmconfig: If you have installed the X window system, you can use -xwmconfig to choose your default window manager. Running this as root +xwmconfig to choose your default window manager. Running this as root will set the system default while running it as a normal user will only -set the window manager for that user. An /etc/X11/xorg.conf config +set the window manager for that user. An /etc/X11/xorg.conf config file is no longer required to run X, but you may still use one if you -wish. An initial xorg.conf may be generated by running: X -configure +wish. An initial xorg.conf may be generated by running: X -configure For many modern drivers (such as those using Kernel Mode Setting), -X -configure no longer generates a working xorg.conf. For those drivers +X -configure no longer generates a working xorg.conf. For those drivers you could start by copying /etc/X11/xorg.conf-vesa to /etc/X11/xorg.conf and then edit this line: Driver "vesa" @@ -147,25 +98,34 @@ Change "vesa" to the name of the X driver for your chipset. liloconfig: If you are using the LILO boot loader to start your system you can use liloconfig to setup and install Lilo to the boot -drive. There's a simple installation which tries to automatically set -up LILO to boot Linux (also Windows if found). For more advanced +drive. There's a simple installation which tries to automatically set +up LILO to boot Linux (also Windows if found). For more advanced users, the expert option offers more control over the installation -process. If you have a lot of partitions, the selection menu in -'expert' mode may overflow. You'll likely then want to go to another +process. If you have a lot of partitions, the selection menu in +'expert' mode may overflow. You'll likely then want to go to another console and find the partition you want with 'fdisk -l | less', and then go back and enter it (proving that you are, indeed, an expert). + eliloconfig: If you are using the elilo boot loader to start your +system that uses UEFI BIOS, then eliloconfig is used to copy the kernel +(and the initrd if one is found) to the EFI System Partition, as well as +to add a menu entry for Slackware to the EFI Boot Menu. After upgrading +to a new kernel, use "geninitrd" to create an updated initrd, and then +use eliloconfig to copy the kernel and initrd to the EFI System Partition. +If you've already added a menu entry for Slackware you do not need to do +it again, and indeed probably should not to avoid extra wear on the nvram +used to store EFI data. Other configuration files: The majority of system configuration files can be found in and below -the /etc directory. Most system configuration is done by editing these -files with a text editor such as 'vi', "nano", or 'joe'. If you're not +the /etc directory. Most system configuration is done by editing these +files with a text editor such as 'vi', "nano", or 'joe'. If you're not sure which files you need to edit to configure a given package, use 'less' or 'pkgtool' to see what files are installed by the package paying special attention to any files placed in /etc or that end with the suffix .new (these are usually moved into place if there's not -already a configuration file with the same name). After upgrading a +already a configuration file with the same name). After upgrading a package, if a .new config file is put in place you'll have to decide whether to delete the .new, move it over the existing config file (losing any custom configuration information in the old file), or make @@ -178,16 +138,16 @@ Hardware, network, and kernel issues: If you've got hardware such as a CD-ROM drive or Ethernet card that doesn't seem to work with Linux, it's possible that the kernel you're -using doesn't contain the needed support. In that case, you can do one +using doesn't contain the needed support. In that case, you can do one of two things: - 1. Load the support with kernel modules. This is probably the - simplest way to handle the situation. Just edit + 1. Load the support with kernel modules. This is probably the + simplest way to handle the situation. Just edit /etc/rc.d/rc.modules so that it loads the modules you need. 2. Recompile your kernel, including the needed driver(s). However, recompiling your kernel is an extreme measure that can be -both difficult and dangerous to the stability of your system. If you +both difficult and dangerous to the stability of your system. If you decide to go that route, either be sure you know the potential pitfalls or seek guidance from someone experienced with kernel configuration, compilation, and installation. @@ -196,32 +156,32 @@ compilation, and installation. with udev if the hardware is present in the system, unless the modules are not udev-capable yet, or they are blacklisted in a file in /etc/modprobe.d/ (local config files) or /lib/modprobe.d/ (config files -that ship with the system). If the module for the driver you need is +that ship with the system). If the module for the driver you need is blacklisted, copy the appropriate file from /lib/modprobe.d/ to /etc/modprobe.d/ and then comment out the line that blacklists the module -by putting # at the beginning. Files found in /etc/modprobe.d/ will +by putting # at the beginning. Files found in /etc/modprobe.d/ will override those found in /lib/modprobe.d/ and will not be overwritten by -upgrades. If that doesn't fix the issue, check with "lsmod" to make sure -that the module is loading correctly. If not, try loading it in the +upgrades. If that doesn't fix the issue, check with "lsmod" to make sure +that the module is loading correctly. If not, try loading it in the /etc/rc.d/rc.modules file. If you're on a standalone LAN without a nameserver, make sure you don't have a nameserver line in /etc/resolv.conf, or you may experience delays with many network commands as they attempt to query the bogus -nameserver. Most people these days will have a nameserver, or be able -to access one via their router/gateway. Most DHCP servers will tell +nameserver. Most people these days will have a nameserver, or be able +to access one via their router/gateway. Most DHCP servers will tell dhcpcd what it needs to know in order to set up your /etc/resolv.conf automatically. Want to run NFS? You'll need to install the rpcbind and nfs-utils -packages. Then, edit your /etc/exports to allow NFS access. (see 'man -exports' for examples). Finally, set rc.rpc and rc.nfsd executable: +packages. Then, edit your /etc/exports to allow NFS access. (see 'man +exports' for examples). Finally, set rc.rpc and rc.nfsd executable: chmod 755 /etc/rc.d/rc.rpc chmod 755 /etc/rc.d/rc.nfsd To start the NFS server, either reboot or execute the two rc files. The kernel is now set up with the CONFIG_SCSI_MULTI_LUNS option -to scan for new "SCSI" devices automatically. However, if that fails +to scan for new "SCSI" devices automatically. However, if that fails to work after inserting a digital media card, or plugging in a new USB or IEEE1394 (Firewire) device, you may need to run the following command before it becomes available as a mountable device: @@ -262,7 +222,7 @@ that CUPS will start at boot: This local "website" may also be reached using the CUPS configuration menu choice within a desktop environment such as KDE. - See the extensive docs in /usr/doc/cups for more details. If you + See the extensive docs in /usr/doc/cups for more details. If you don't see your exact printer model when adding a new printer, often one that's "close" will do the trick. @@ -272,24 +232,24 @@ Users who plan to print (or scan) need to be members of the "lp" group. Mouse support: Only very ancient mice will need any special treatment in order to -get basic support, and with GPM cut and paste on the console. Most -will work with the "ps2" or "imps2" protocols. If you should happen to +get basic support, and with GPM cut and paste on the console. Most +will work with the "ps2" or "imps2" protocols. If you should happen to have one of the ancient mice that is not a serial, PS/2, or USB mouse then you'll probably have to load a kernel module in order to get it to -work. At this point in time, a busmouse is rare. These days, most +work. At this point in time, a busmouse is rare. These days, most mice are PS/2 (with a 6 pin round plug) or USB, or occasionally serial -(with a 9 pin trapezoidal plug). These kinds of mice don't require any +(with a 9 pin trapezoidal plug). These kinds of mice don't require any special setup as the system should detect and activate them -automatically. If you think your mouse might need a special driver (if +automatically. If you think your mouse might need a special driver (if it's not working), read the comments in /etc/rc.d/rc.modules to see -which one is needed, and edit the file to load it at boot time. It's +which one is needed, and edit the file to load it at boot time. It's also possible that the /dev/mouse link may need to be changed to point -to the proper mouse device. Or, compile a new kernel with built in +to the proper mouse device. Or, compile a new kernel with built in support for your mouse and install that. Using the lsmod command, you can see if the psmouse module is loaded. If so, you're using the psmouse module for a PS/2-like mouse (including -most touchpads). If you need to adjust the mouse protocol, make a copy +most touchpads). If you need to adjust the mouse protocol, make a copy of the config file, and then edit that: cp /lib/modprobe.d/psmouse.conf /etc/modprobe.d/psmouse.conf @@ -301,38 +261,38 @@ switch, or to properly enable tap-to-click with a touchpad. Network support: - Of course, you're going to want to get your machine online. If you + Of course, you're going to want to get your machine online. If you have a router supporting DHCP you're probably already on by now. -Otherwise, 'netconfig' will give you a simple network connection. To +Otherwise, 'netconfig' will give you a simple network connection. To get your machine on the net, you'll need to install packages from the -N (network) series. If you aren't sure which ones you'll need, the -easiest thing is to just install them all. Network services will not +N (network) series. If you aren't sure which ones you'll need, the +easiest thing is to just install them all. Network services will not run unless activated by making the startup scripts in /etc/rc.d/ -executable, so it doesn't hurt to have them installed. Your machine +executable, so it doesn't hurt to have them installed. Your machine should be configured at least with loopback using the "netconfig" -utility. If you are using a modem, make sure the serial port your +utility. If you are using a modem, make sure the serial port your modem uses is correctly configured, and then use 'pppsetup' to configure -the dialup process. Additional documentation on pppsetup can be found -in /usr/doc/pppsetup-*/. DSL/Cable users who need to use PPPoE (PPP +the dialup process. Additional documentation on pppsetup can be found +in /usr/doc/pppsetup-*/. DSL/Cable users who need to use PPPoE (PPP over Ethernet) should see the docs in /usr/doc/rp-pppoe-3.12/. If you will be using wireless (or even a wired interface), you might -want to let NetworkManager handle your network connections. This is +want to let NetworkManager handle your network connections. This is a choice during the initial installation, but may also be selected later by rerunning netconfig, or by setting the startup script -to executable (chmod 755 /etc/rc.d/rc.networkmanager). When Network +to executable (chmod 755 /etc/rc.d/rc.networkmanager). When Network Manager is used to handle connections, a nice interface is provided to scan for wireless access points and make changes to the network -configuration. This interface runs automatically with KDE or Xfce. -In fluxbox, the nm-applet program will need to be launched. Other +configuration. This interface runs automatically with KDE or Xfce. +In fluxbox, the nm-applet program will need to be launched. Other window managers lack a system tray to display nm-applet, so for those you might want to look at wicd in /extra, which also provides a nice -GUI tool for connecting to wireless (or wired) networks. For window +GUI tool for connecting to wireless (or wired) networks. For window managers that do not provide a tray for running programs, start -"wicd-client" to make changes. With NetworkManager or wicd, it's +"wicd-client" to make changes. With NetworkManager or wicd, it's a good idea to remove any existing network configuration in -/etc/rc.d/rc.inet1.conf first. This can be done by running netconfig -and setting the machine to use loopback. Then, if you're using +/etc/rc.d/rc.inet1.conf first. This can be done by running netconfig +and setting the machine to use loopback. Then, if you're using NetworkManager run it a second time and select NetworkManager. If you need to set up your Linux machine as a router for other systems, @@ -340,7 +300,7 @@ you'll want to set up the interfaces in /etc/rc.d/rc.inet1.conf, and set up NAT support with something like this in /etc/rc.d/rc.firewall, and then make rc.firewall executable. -# Delete and flush. Default table is "filter". +# Delete and flush. Default table is "filter". # Others like "nat" must be explicitly stated. iptables --flush # Flush all the rules in filter and nat tables @@ -355,16 +315,23 @@ echo "Enabling ip_forwarding..." echo 1 > /proc/sys/net/ipv4/ip_forward It's possible to expand (or reduce ;-) this script for just about any -firewall needed. See "man iptables" for lots of information. +firewall needed. See "man iptables" for lots of information. F: FAQ series, and the HOWTO documentation collection: If you installed the F series, you find detailed documentation on -many common Linux tasks in /usr/doc/Linux-HOWTOs. Each of these -instructional files covers a particular Linux task. They cover most +many common Linux tasks in /usr/doc/Linux-HOWTOs. Each of these +instructional files covers a particular Linux task. They cover most system administration tasks in a lot more detail than this little email -does. +does. At this point the majority of these have been unmaintained for +years and are largely obsolete, but in spite of this there are still +good hints to be found. In general a search engine will be your best +bet for finding additional information. Or, visit the Slackware forum +on Linux Questions and you'll find a helpful community who can answer +your questions (or perhaps even I'll answer you there): + +https://www.linuxquestions.org/questions/slackware-14/ There is also a collection of Linux related FAQs (lists of Frequently Asked Questions with answers) /usr/doc/Linux-FAQs. diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild index a0544430..2632153d 100755 --- a/source/a/aaa_base/aaa_base.SlackBuild +++ b/source/a/aaa_base/aaa_base.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2018, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_base VERSION=15.0 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild index b23dad63..8b421da6 100755 --- a/source/a/aaa_libraries/aaa_libraries.SlackBuild +++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_libraries VERSION=${VERSION:-15.0} -BUILD=${BUILD:-12} +BUILD=${BUILD:-13} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/eudev/eudev.SlackBuild b/source/a/eudev/eudev.SlackBuild index f663e0b1..89f1a708 100755 --- a/source/a/eudev/eudev.SlackBuild +++ b/source/a/eudev/eudev.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=eudev VERSION=${VERSION:-$(echo eudev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -79,6 +79,13 @@ zcat $CWD/eudev.ignore_bind_unbind_events.diff.gz | patch -p1 --verbose || exit # Don't require groups that we don't need: zcat $CWD/eudev.no.renderD.no.kvm.diff.gz | patch -p1 --verbose || exit 1 +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi ./configure \ --prefix=/usr \ --with-rootprefix=/ \ @@ -153,7 +160,7 @@ chmod 0755 $PKG/lib/udev/* mkdir -p $PKG/usr/doc/eudev-$VERSION cp -a \ - COPYING* README* TODO \ + BUILD* CONTRIBUTING* COPYING* LEGACY* NOTES* README* TODO* \ $PKG/usr/doc/eudev-$VERSION # Compress and fix manpage symlinks: diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 6710d141..b2251ed9 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,6 @@ +Wed Jan 12 19:45:11 UTC 2022 + Added "nvme" command-line utility. Thanks to peake. ++--------------------------+ Wed Dec 15 04:07:42 UTC 2021 /sbin/probe: Discover MMC storage devices using lsblk. Thanks to Stuart Winter. diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index aa271f70..82b0f776 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -912,6 +912,7 @@ ap/ddrescue \ ap/dmidecode \ ap/lsscsi \ ap/neofetch \ +ap/nvme-cli \ ap/terminus-font \ d/gcc \ d/gcc-g++ \ @@ -1160,6 +1161,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRSBIN} \ chpasswd \ dnsmasq \ ntpdate \ + nvme \ parted \ partprobe \ partx \ @@ -2256,6 +2258,7 @@ if [ -d usr/man ]; then man1/lzip.1.bz2 \ man1/plzip.1.bz2 \ man1/neofetch.1.bz2 \ + man1/nvme.1.bz2 \ ; do mkdir -p man/$(dirname $manpage) cp -a man.full/$manpage man/$manpage diff --git a/source/k/kernel-configs/config-generic-5.15.13 b/source/k/kernel-configs/config-generic-5.15.14 index 5d9351b8..bac8579a 100644 --- a/source/k/kernel-configs/config-generic-5.15.13 +++ b/source/k/kernel-configs/config-generic-5.15.14 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.13 Kernel Configuration +# Linux/x86 5.15.14 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-5.15.13.x64 b/source/k/kernel-configs/config-generic-5.15.14.x64 index 939b7f83..a3296157 100644 --- a/source/k/kernel-configs/config-generic-5.15.13.x64 +++ b/source/k/kernel-configs/config-generic-5.15.14.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.13 Kernel Configuration +# Linux/x86 5.15.14 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -2089,7 +2089,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m # # PCI controller drivers # -CONFIG_VMD=m +CONFIG_VMD=y CONFIG_PCI_HYPERV_INTERFACE=m # diff --git a/source/k/kernel-configs/config-generic-smp-5.15.13-smp b/source/k/kernel-configs/config-generic-smp-5.15.14-smp index 34de843b..198612e3 100644 --- a/source/k/kernel-configs/config-generic-smp-5.15.13-smp +++ b/source/k/kernel-configs/config-generic-smp-5.15.14-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.13 Kernel Configuration +# Linux/x86 5.15.14 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.15.13 b/source/k/kernel-configs/config-huge-5.15.14 index 62d96eb0..4f9581a4 100644 --- a/source/k/kernel-configs/config-huge-5.15.13 +++ b/source/k/kernel-configs/config-huge-5.15.14 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.13 Kernel Configuration +# Linux/x86 5.15.14 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.15.13.x64 b/source/k/kernel-configs/config-huge-5.15.14.x64 index 043a627e..a92d07c8 100644 --- a/source/k/kernel-configs/config-huge-5.15.13.x64 +++ b/source/k/kernel-configs/config-huge-5.15.14.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.13 Kernel Configuration +# Linux/x86 5.15.14 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -2089,7 +2089,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m # # PCI controller drivers # -CONFIG_VMD=m +CONFIG_VMD=y CONFIG_PCI_HYPERV_INTERFACE=m # diff --git a/source/k/kernel-configs/config-huge-smp-5.15.13-smp b/source/k/kernel-configs/config-huge-smp-5.15.14-smp index dd288ab0..f502ed3d 100644 --- a/source/k/kernel-configs/config-huge-smp-5.15.13-smp +++ b/source/k/kernel-configs/config-huge-smp-5.15.14-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.13 Kernel Configuration +# Linux/x86 5.15.14 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/kde/kde/build/breeze-icons b/source/kde/kde/build/breeze-icons index 0cfbf088..d00491fd 100644 --- a/source/kde/kde/build/breeze-icons +++ b/source/kde/kde/build/breeze-icons @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index 0cfbf088..d00491fd 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace index d00491fd..0cfbf088 100644 --- a/source/kde/kde/build/plasma-workspace +++ b/source/kde/kde/build/plasma-workspace @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/breeze-icons.patch b/source/kde/kde/patch/breeze-icons.patch deleted file mode 100644 index 24df893f..00000000 --- a/source/kde/kde/patch/breeze-icons.patch +++ /dev/null @@ -1,2 +0,0 @@ -cat $CWD/patch/breeze-icons/05f11af435edc57650d0221ed8a74ecfb997e576.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -cat $CWD/patch/breeze-icons/08bf45db9b883b4201ac3cbb666821472f17ad97.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/breeze-icons/05f11af435edc57650d0221ed8a74ecfb997e576.patch b/source/kde/kde/patch/breeze-icons/05f11af435edc57650d0221ed8a74ecfb997e576.patch deleted file mode 100644 index 30bc17dd..00000000 --- a/source/kde/kde/patch/breeze-icons/05f11af435edc57650d0221ed8a74ecfb997e576.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 05f11af435edc57650d0221ed8a74ecfb997e576 Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann <cullmann@kde.org> -Date: Mon, 6 Dec 2021 18:12:46 +0000 -Subject: [PATCH] improve installation of light fallback icons - -icon install works now like this: - -* collect all light icons -* install them just for light theme - -* install dark icons -* install all missing ones from light theme we collected before ---- - icons-dark/CMakeLists.txt | 45 +++++++++++---------------------------- - icons/CMakeLists.txt | 18 ++++++---------- - 2 files changed, 20 insertions(+), 43 deletions(-) - -diff --git a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt -index 40590a8b..ab582c13 100644 ---- a/icons-dark/CMakeLists.txt -+++ b/icons-dark/CMakeLists.txt -@@ -4,10 +4,6 @@ endif() - - ########### install files ############### - --set(breeze_icon_dark_dirs -- actions animations applets apps devices emblems -- mimetypes places status) -- - set(BREEZE_INSTALL_DIR ${KDE_INSTALL_FULL_ICONDIR}/breeze-dark) - - if(WITH_ICON_GENERATION) -@@ -26,36 +22,21 @@ if(NOT WIN32) - endif() - - if(NOT SKIP_INSTALL_ICONS) -- # In order to ensure the dark icons are copied over the light icons which -- # are installed into the dark theme for BUG:444095, we need to execute the -- # copy command ourselves rather than using CMake's internal copy mechanism -- # used by the normal install command, so we use CODE mode of install to -- # execute_process and print an appropriate status message. -- # See https://bugs.kde.org/show_bug.cgi?id=445489 -- set(COPY_CMD "cp -a") -- set(XCOPY_ARGS "") -- if(WIN32) -- set(COPY_CMD "xcopy") -- set(XCOPY_ARGS "/q /e /y") -- endif(WIN32) -- install(CODE "cmake_policy(VERSION 3.6) -- foreach(CAT_DIR ${breeze_icon_dark_dirs}) -- execute_process(COMMAND ${COPY_CMD} \${CAT_DIR} \$ENV{DESTDIR}${BREEZE_INSTALL_DIR} ${XCOPY_ARGS} ERROR_QUIET WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -- endforeach() -- file(GLOB_RECURSE ICON_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} LIST_DIRECTORIES false ${CMAKE_CURRENT_SOURCE_DIR}/*.svg) -- foreach(ICON_FILE IN LISTS ICON_FILES) -- message(STATUS \"Installing: \$ENV{DESTDIR}${BREEZE_INSTALL_DIR}/\${ICON_FILE}\") -- endforeach()") -+ file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg") -+ foreach (icon_file ${icon_files}) -+ install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) -+ endforeach() -+ -+ # install for all missing icons the light icons as fallback -+ foreach (icon_file ${BREEZE_LIGHT_ICONS}) -+ if (NOT ${icon_file} IN_LIST icon_files) -+ install(FILES ${CMAKE_SOURCE_DIR}/icons/${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) -+ endif() -+ endforeach() -+ - install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR}) - if(WITH_ICON_GENERATION) -- install(CODE "cmake_policy(VERSION 3.6) -- foreach(GEN_DIR ${breeze_icon_dark_dirs}) -- execute_process(COMMAND ${COPY_CMD} \${GEN_DIR} \$ENV{DESTDIR}${BREEZE_INSTALL_DIR} ${XCOPY_ARGS} ERROR_QUIET WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated) -- endforeach() -- file(GLOB_RECURSE ICON_FILES RELATIVE ${CMAKE_CURRENT_BINARY_DIR}/generated LIST_DIRECTORIES false ${CMAKE_CURRENT_BINARY_DIR}/generated/*.svg) -- foreach(ICON_FILE IN LISTS ICON_FILES) -- message(STATUS \"Installing: \$ENV{DESTDIR}${BREEZE_INSTALL_DIR}/\${ICON_FILE}\") -- endforeach()") -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR}) - endif() - endif() - -diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt -index 220b81e9..8f31db4a 100644 ---- a/icons/CMakeLists.txt -+++ b/icons/CMakeLists.txt -@@ -4,10 +4,6 @@ endif() - - ########### install files ############### - --set(breeze_icon_dirs -- actions animations applets apps categories preferences devices emblems -- emotes mimetypes places status) -- - set(BREEZE_INSTALL_DIR ${KDE_INSTALL_FULL_ICONDIR}/breeze) - - if(WITH_ICON_GENERATION) -@@ -26,17 +22,17 @@ if(NOT WIN32) - endif() - - if(NOT SKIP_INSTALL_ICONS) -- install(DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR}) -+ # collect all our icons we need to install, will be used by dark icon set as fallback icons if not there, too -+ file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg") -+ set(BREEZE_LIGHT_ICONS ${icon_files} PARENT_SCOPE) -+ foreach (icon_file ${icon_files}) -+ install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) -+ endforeach() -+ - install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR}) - if(WITH_ICON_GENERATION) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR}) - endif() -- -- # Install the colored icon sizes into breeze-dark theme as well, to ensure -- # that icons are available on alternate environments which do not support -- # colorized symbolic icons which are not named as "-symbolic" -- # NOTE: icons-dark will install /some/ files over top of these -- install(DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR}-dark) - endif() - - gtk_update_icon_cache(${BREEZE_INSTALL_DIR}) --- -GitLab - diff --git a/source/kde/kde/patch/breeze-icons/08bf45db9b883b4201ac3cbb666821472f17ad97.patch b/source/kde/kde/patch/breeze-icons/08bf45db9b883b4201ac3cbb666821472f17ad97.patch deleted file mode 100644 index b294711e..00000000 --- a/source/kde/kde/patch/breeze-icons/08bf45db9b883b4201ac3cbb666821472f17ad97.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 08bf45db9b883b4201ac3cbb666821472f17ad97 Mon Sep 17 00:00:00 2001 -From: Rodney Dawes <dobey.pwns@gmail.com> -Date: Mon, 6 Dec 2021 15:13:22 -0500 -Subject: [PATCH] Include "*@*" in the icon_files list for installation - -As some of the directories of the theme are symlinks for scaled sizes -we need to include them in the list of files to install as well. ---- - icons-dark/CMakeLists.txt | 2 +- - icons/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt -index ab582c13..6ceddc5c 100644 ---- a/icons-dark/CMakeLists.txt -+++ b/icons-dark/CMakeLists.txt -@@ -22,7 +22,7 @@ if(NOT WIN32) - endif() - - if(NOT SKIP_INSTALL_ICONS) -- file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg") -+ file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg" "${CMAKE_CURRENT_SOURCE_DIR}/*@*") - foreach (icon_file ${icon_files}) - install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) - endforeach() -diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt -index 8f31db4a..b48852eb 100644 ---- a/icons/CMakeLists.txt -+++ b/icons/CMakeLists.txt -@@ -23,7 +23,7 @@ endif() - - if(NOT SKIP_INSTALL_ICONS) - # collect all our icons we need to install, will be used by dark icon set as fallback icons if not there, too -- file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg") -+ file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg" "${CMAKE_CURRENT_SOURCE_DIR}/*@*") - set(BREEZE_LIGHT_ICONS ${icon_files} PARENT_SCOPE) - foreach (icon_file ${icon_files}) - install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) --- -GitLab - diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch index 1b7ec654..d6d7d971 100644 --- a/source/kde/kde/patch/plasma-workspace.patch +++ b/source/kde/kde/patch/plasma-workspace.patch @@ -1,2 +1,4 @@ # [PATCH] Revert "No icons on the desktop by default": cat $CWD/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/plasma-workspace/70d23b89.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-workspace/70d23b89.patch b/source/kde/kde/patch/plasma-workspace/70d23b89.patch new file mode 100644 index 00000000..2d9c2a0f --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/70d23b89.patch @@ -0,0 +1,52 @@ +From 70d23b891e95bc6911389773f320a4406a12bd87 Mon Sep 17 00:00:00 2001 +From: Lufan Zhong <lufanzhong@gmail.com> +Date: Sun, 26 Dec 2021 19:33:09 +0000 +Subject: [PATCH] runners/shell: Port from KToolInvocation::invokeTerminal to + KTerminalLauncherJob + +kinit is being deprecated; this change will allow it to open a terminal and execute +commands normally without kinit being present. + +BUG: 437131 +FIXED-IN: 5.24 +--- + runners/shell/shellrunner.cpp | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/runners/shell/shellrunner.cpp b/runners/shell/shellrunner.cpp +index 03b54e1f1..be4058acf 100644 +--- a/runners/shell/shellrunner.cpp ++++ b/runners/shell/shellrunner.cpp +@@ -12,8 +12,9 @@ + #include <KLocalizedString> + #include <KNotificationJobUiDelegate> + #include <KShell> +-#include <KToolInvocation> ++#include <KTerminalLauncherJob> + #include <QAction> ++#include <QProcessEnvironment> + #include <QRegularExpression> + #include <QStandardPaths> + +@@ -62,7 +63,17 @@ void ShellRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryM + { + if (match.selectedAction()) { + const QVariantList data = match.data().toList(); +- KToolInvocation::invokeTerminal(data.at(0).toString(), data.at(1).toStringList()); ++ const QStringList list = data.at(1).toStringList(); ++ QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); ++ for (const auto& str : list) ++ { ++ const int pos = str.indexOf('='); ++ env.insert(str.left(pos), str.mid(pos+1)); ++ } ++ auto job = new KTerminalLauncherJob(data.at(0).toString()); ++ job->setProcessEnvironment(env); ++ job->setUiDelegate(new KNotificationJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled)); ++ job->start(); + return; + } + +-- +GitLab + diff --git a/source/kde/kde/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch b/source/kde/kde/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch new file mode 100644 index 00000000..4c30b8de --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch @@ -0,0 +1,38 @@ +From 926f864756e5586f38574c166abdb5befa3dc771 Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Wed, 8 Dec 2021 13:08:43 +0000 +Subject: [PATCH] [libtaskmanager] Increase buffer for pipewire format + negotiation + +Libtaskmanager's buffer for spa_builder is too small on certain +configurations. Because podBuilder->state.offset is never reset, the +buffer space can run out when EGL returns a long list of dma_buf +modifiers, causing PipeWire negotiation to fail. + +An example is when EGL returns 20 modifiers. There are 6 formats defined +in pipewiresourcestream.cpp, for each format it will construct 2 frames, +one with 21*8=168 bytes long of modifiers. The modifier lists for all +frames will be 6*168=1008 bytes (only 16 bytes left of 1024 bytes), let +alone other frames. + +BUG: 446061 +--- + libtaskmanager/declarative/pipewiresourcestream.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libtaskmanager/declarative/pipewiresourcestream.cpp b/libtaskmanager/declarative/pipewiresourcestream.cpp +index a6713ae76..f1d3032a5 100644 +--- a/libtaskmanager/declarative/pipewiresourcestream.cpp ++++ b/libtaskmanager/declarative/pipewiresourcestream.cpp +@@ -260,7 +260,7 @@ bool PipeWireSourceStream::createStream(uint nodeid) + pwNodeId = nodeid; + pw_stream_add_listener(pwStream, &streamListener, &pwStreamEvents, this); + +- uint8_t buffer[1024]; ++ uint8_t buffer[4096]; + spa_pod_builder podBuilder = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); + + const QVector<spa_video_format> formats = +-- +GitLab + diff --git a/source/l/SDL2/SDL2.SlackBuild b/source/l/SDL2/SDL2.SlackBuild index ae64b727..60deeadb 100755 --- a/source/l/SDL2/SDL2.SlackBuild +++ b/source/l/SDL2/SDL2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2017, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2017, 2018, 2019, 2020, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -88,9 +88,6 @@ find . \ # Fix video-opengles1 build failure: zcat $CWD/SDL2-2.0.9-khrplatform.patch.gz | patch -p1 --verbose || exit 1 -# Fix build against wayland-1.20.0: -zcat $CWD/e2ade2bfc46d915cd306c63c830b81d800b2575f.patch.gz | patch -p1 --verbose || exit 1 - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/SDL2/e2ade2bfc46d915cd306c63c830b81d800b2575f.patch b/source/l/SDL2/e2ade2bfc46d915cd306c63c830b81d800b2575f.patch deleted file mode 100644 index 8d80735c..00000000 --- a/source/l/SDL2/e2ade2bfc46d915cd306c63c830b81d800b2575f.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e2ade2bfc46d915cd306c63c830b81d800b2575f Mon Sep 17 00:00:00 2001 -From: David Redondo <kde@david-redondo.de> -Date: Fri, 10 Dec 2021 16:22:34 +0100 -Subject: [PATCH] Fix build against wayland 1.20 - -Fixes #5088 ---- - src/video/wayland/SDL_waylanddyn.h | 2 ++ - src/video/wayland/SDL_waylandsym.h | 4 ++++ - 2 files changed, 6 insertions(+) - -diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h -index 13b0884d076..2268555604a 100644 ---- a/src/video/wayland/SDL_waylanddyn.h -+++ b/src/video/wayland/SDL_waylanddyn.h -@@ -95,6 +95,8 @@ void SDL_WAYLAND_UnloadSymbols(void); - #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) - #define wl_proxy_set_tag (*WAYLAND_wl_proxy_set_tag) - #define wl_proxy_get_tag (*WAYLAND_wl_proxy_get_tag) -+#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags) -+#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags) - - #define wl_seat_interface (*WAYLAND_wl_seat_interface) - #define wl_surface_interface (*WAYLAND_wl_surface_interface) -diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h -index d6e6a761d39..32e47d26e2d 100644 ---- a/src/video/wayland/SDL_waylandsym.h -+++ b/src/video/wayland/SDL_waylandsym.h -@@ -84,6 +84,10 @@ SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_18) - SDL_WAYLAND_SYM(void, wl_proxy_set_tag, (struct wl_proxy *, const char * const *)) - SDL_WAYLAND_SYM(const char * const *, wl_proxy_get_tag, (struct wl_proxy *)) - -+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20) -+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...)) -+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args)) -+ - SDL_WAYLAND_INTERFACE(wl_seat_interface) - SDL_WAYLAND_INTERFACE(wl_surface_interface) - SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) - diff --git a/source/l/SDL2_ttf/SDL2_ttf.SlackBuild b/source/l/SDL2_ttf/SDL2_ttf.SlackBuild index cef83772..44eb94c1 100755 --- a/source/l/SDL2_ttf/SDL2_ttf.SlackBuild +++ b/source/l/SDL2_ttf/SDL2_ttf.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=SDL2_ttf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -94,6 +94,8 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --disable-static \ --disable-dependency-tracking \ + --enable-harfbuzz-builtin=no \ + --enable-freetype-builtin=no \ --build=$ARCH-slackware-linux || exit 1 # Build and install: diff --git a/source/l/libsigsegv/libsigsegv.SlackBuild b/source/l/libsigsegv/libsigsegv.SlackBuild index e09c4615..6038b82d 100755 --- a/source/l/libsigsegv/libsigsegv.SlackBuild +++ b/source/l/libsigsegv/libsigsegv.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libsigsegv VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/python-urllib3/python-urllib3.SlackBuild b/source/l/python-urllib3/python-urllib3.SlackBuild index f0c983ef..1de922a4 100755 --- a/source/l/python-urllib3/python-urllib3.SlackBuild +++ b/source/l/python-urllib3/python-urllib3.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-urllib3 VERSION=${VERSION:-$(echo urllib3-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} SRCNAM=urllib3 diff --git a/source/n/getmail/getmail.SlackBuild b/source/n/getmail/getmail.SlackBuild index 47daff25..1830c241 100755 --- a/source/n/getmail/getmail.SlackBuild +++ b/source/n/getmail/getmail.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=getmail VERSION=${VERSION:-$(echo getmail6-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/metamail/metamail.SlackBuild b/source/n/metamail/metamail.SlackBuild index 5003ff4c..2697163a 100755 --- a/source/n/metamail/metamail.SlackBuild +++ b/source/n/metamail/metamail.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2009, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2009, 2018, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=metamail VERSION=2.7 -BUILD=${BUILD:-9} +BUILD=${BUILD:-10} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -90,6 +90,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix misnamed man page: +mv man/mmencode.1 man/mimencode.1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/n/mtr/mtr.SlackBuild b/source/n/mtr/mtr.SlackBuild index eae3175c..3c9c6da6 100755 --- a/source/n/mtr/mtr.SlackBuild +++ b/source/n/mtr/mtr.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mtr VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog index 51d321af..cdd7abd9 100644 --- a/source/x/FTBFSlog +++ b/source/x/FTBFSlog @@ -1,3 +1,8 @@ +Tue Jan 11 05:21:01 UTC 2022 + fcitx: Fix build by double quoting $SLKCFLAGS. + fcitx-configtool: Fix build by double quoting $SLKCFLAGS. + Thanks to ponce and nobodino. ++--------------------------+ Tue Apr 6 18:07:59 UTC 2021 fcitx: Remove -fPIC to fix build (it uses it anyway). Thanks to nobodino. fcitx-configtool: Remove -fPIC to fix build. Thanks to nobodino. diff --git a/source/x/fcitx-configtool/fcitx-configtool.SlackBuild b/source/x/fcitx-configtool/fcitx-configtool.SlackBuild index 1452ecb0..afbc128a 100755 --- a/source/x/fcitx-configtool/fcitx-configtool.SlackBuild +++ b/source/x/fcitx-configtool/fcitx-configtool.SlackBuild @@ -90,8 +90,8 @@ mkdir build cd build cmake \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ - -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ + -DCMAKE_C_FLAGS:STRING="${SLKCFLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ .. diff --git a/source/x/fcitx/fcitx.SlackBuild b/source/x/fcitx/fcitx.SlackBuild index ddbcc2c9..5750f7f3 100755 --- a/source/x/fcitx/fcitx.SlackBuild +++ b/source/x/fcitx/fcitx.SlackBuild @@ -95,8 +95,8 @@ zcat $CWD/fcitx-autostart.patch.gz | patch -p0 --verbose -d data/script/ mkdir build cd build cmake \ - -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ + -DCMAKE_C_FLAGS:STRING="${SLKCFLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ diff --git a/source/xap/freerdp/freerdp.SlackBuild b/source/xap/freerdp/freerdp.SlackBuild index 3be6d183..2a6ee333 100755 --- a/source/xap/freerdp/freerdp.SlackBuild +++ b/source/xap/freerdp/freerdp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=freerdp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |