From 14094b8867a3f7e7e1012a29da49d5b2cce683d5 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 19 Jan 2023 21:07:32 +0000 Subject: Thu Jan 19 21:07:32 UTC 2023 a/pkgtools-15.1-noarch-4.txz: Rebuilt. makepkg: also let xz decide how many threads to use on ARM platforms aarch64 and riscv64. Thanks to Stuart Winter. installpkg: fix reversed test for if a --threads option was given. It appears that it's been wrong for years but since xz didn't support threaded decompression yet it wasn't noticed. a/xz-5.4.1-x86_64-2.txz: Rebuilt. Reduce default verbosity from V_WARNING to V_ERROR to avoid sending non-fatal memory usage information to stderr. kde/plasma-wayland-protocols-1.10.0-x86_64-1.txz: Upgraded. l/exiv2-0.27.6-x86_64-1.txz: Upgraded. l/tdb-1.4.8-x86_64-1.txz: Upgraded. x/igt-gpu-tools-1.27.1-x86_64-1.txz: Upgraded. x/libX11-1.8.3-x86_64-2.txz: Rebuilt. [PATCH] Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11 Thanks to marav. --- ChangeLog.rss | 30 ++- ChangeLog.txt | 18 ++ FILELIST.TXT | 157 ++++++++-------- recompress.sh | 2 + source/a/pkgtools/pkgtools.SlackBuild | 2 +- source/a/pkgtools/scripts/installpkg | 4 +- source/a/pkgtools/scripts/makepkg | 6 +- source/a/xz/xz.SlackBuild | 7 +- source/a/xz/xz.default.verbosity.V_ERROR.diff | 11 ++ source/installer/ChangeLog.txt | 9 + source/installer/build_installer.sh | 57 +++++- .../installer/sources/bricktick/fetch-bricktick.sh | 52 ++++++ source/x/x11/build/libX11 | 2 +- source/x/x11/patch/libX11.patch | 1 + .../eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch | 205 +++++++++++++++++++++ 15 files changed, 474 insertions(+), 89 deletions(-) create mode 100644 source/a/xz/xz.default.verbosity.V_ERROR.diff create mode 100755 source/installer/sources/bricktick/fetch-bricktick.sh create mode 100644 source/x/x11/patch/libX11.patch create mode 100644 source/x/x11/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch diff --git a/ChangeLog.rss b/ChangeLog.rss index 0318482f6..32b43441f 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,35 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Thu, 19 Jan 2023 00:40:12 GMT - Thu, 19 Jan 2023 01:39:11 GMT + Thu, 19 Jan 2023 21:07:32 GMT + Thu, 19 Jan 2023 21:32:36 GMT maintain_current_git.sh v 1.17 + + Thu, 19 Jan 2023 21:07:32 GMT + Thu, 19 Jan 2023 21:07:32 GMT + https://git.slackware.nl/current/tag/?h=20230119210732 + 20230119210732 + + +a/pkgtools-15.1-noarch-4.txz: Rebuilt. + makepkg: also let xz decide how many threads to use on ARM platforms aarch64 + and riscv64. Thanks to Stuart Winter. + installpkg: fix reversed test for if a --threads option was given. It appears + that it's been wrong for years but since xz didn't support threaded + decompression yet it wasn't noticed. +a/xz-5.4.1-x86_64-2.txz: Rebuilt. + Reduce default verbosity from V_WARNING to V_ERROR to avoid sending non-fatal + memory usage information to stderr. +kde/plasma-wayland-protocols-1.10.0-x86_64-1.txz: Upgraded. +l/exiv2-0.27.6-x86_64-1.txz: Upgraded. +l/tdb-1.4.8-x86_64-1.txz: Upgraded. +x/igt-gpu-tools-1.27.1-x86_64-1.txz: Upgraded. +x/libX11-1.8.3-x86_64-2.txz: Rebuilt. + [PATCH] Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11 + Thanks to marav. + ]]> + + Thu, 19 Jan 2023 00:40:12 GMT Thu, 19 Jan 2023 00:40:12 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index ca424d28c..8cf9106ff 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,21 @@ +Thu Jan 19 21:07:32 UTC 2023 +a/pkgtools-15.1-noarch-4.txz: Rebuilt. + makepkg: also let xz decide how many threads to use on ARM platforms aarch64 + and riscv64. Thanks to Stuart Winter. + installpkg: fix reversed test for if a --threads option was given. It appears + that it's been wrong for years but since xz didn't support threaded + decompression yet it wasn't noticed. +a/xz-5.4.1-x86_64-2.txz: Rebuilt. + Reduce default verbosity from V_WARNING to V_ERROR to avoid sending non-fatal + memory usage information to stderr. +kde/plasma-wayland-protocols-1.10.0-x86_64-1.txz: Upgraded. +l/exiv2-0.27.6-x86_64-1.txz: Upgraded. +l/tdb-1.4.8-x86_64-1.txz: Upgraded. +x/igt-gpu-tools-1.27.1-x86_64-1.txz: Upgraded. +x/libX11-1.8.3-x86_64-2.txz: Rebuilt. + [PATCH] Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11 + Thanks to marav. ++--------------------------+ Thu Jan 19 00:40:12 UTC 2023 a/kernel-firmware-20230117_7e4f0ed-noarch-1.txz: Upgraded. a/kernel-generic-6.1.7-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 530255204..c53dbcd3c 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Thu Jan 19 00:48:20 UTC 2023 +Thu Jan 19 21:10:41 UTC 2023 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2023-01-19 00:40 . +drwxr-xr-x 12 root root 4096 2023-01-19 21:07 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1107153 2023-01-18 06:20 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-01-18 06:20 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1107148 2023-01-19 00:48 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-01-19 00:48 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 470798 2023-01-19 00:40 ./ChangeLog.txt +-rw-r--r-- 1 root root 471669 2023-01-19 21:07 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2023-01-19 00:39 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2023-01-19 00:39 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1441592 2023-01-18 06:20 ./FILELIST.TXT +-rw-r--r-- 1 root root 1441587 2023-01-19 00:48 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 861656 2023-01-19 00:47 ./PACKAGES.TXT +-rw-r--r-- 1 root root 861660 2023-01-19 21:10 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 3623 2023-01-19 00:28 ./README.initrd -rw-r--r-- 1 root root 34162 2022-01-30 20:35 ./README_CRYPT.TXT @@ -746,13 +746,13 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches -rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT -drwxr-xr-x 17 root root 4096 2023-01-19 00:48 ./slackware64 --rw-r--r-- 1 root root 336256 2023-01-19 00:48 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-01-19 00:48 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 417033 2023-01-19 00:47 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4324420 2023-01-19 00:47 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2023-01-19 21:10 ./slackware64 +-rw-r--r-- 1 root root 336268 2023-01-19 21:10 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-01-19 21:10 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 417045 2023-01-19 21:09 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4318860 2023-01-19 21:09 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 32768 2023-01-19 00:46 ./slackware64/a +drwxr-xr-x 2 root root 32768 2023-01-19 21:09 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt -rw-r--r-- 1 root root 10720 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz.asc @@ -1027,9 +1027,9 @@ drwxr-xr-x 2 root root 32768 2023-01-19 00:46 ./slackware64/a -rw-r--r-- 1 root root 450 2022-09-06 18:11 ./slackware64/a/pcmciautils-018-x86_64-5.txt -rw-r--r-- 1 root root 31360 2022-09-06 18:11 ./slackware64/a/pcmciautils-018-x86_64-5.txz -rw-r--r-- 1 root root 163 2022-09-06 18:11 ./slackware64/a/pcmciautils-018-x86_64-5.txz.asc --rw-r--r-- 1 root root 672 2023-01-19 00:13 ./slackware64/a/pkgtools-15.1-noarch-3.txt --rw-r--r-- 1 root root 197620 2023-01-19 00:13 ./slackware64/a/pkgtools-15.1-noarch-3.txz --rw-r--r-- 1 root root 163 2023-01-19 00:13 ./slackware64/a/pkgtools-15.1-noarch-3.txz.asc +-rw-r--r-- 1 root root 672 2023-01-19 20:11 ./slackware64/a/pkgtools-15.1-noarch-4.txt +-rw-r--r-- 1 root root 197604 2023-01-19 20:11 ./slackware64/a/pkgtools-15.1-noarch-4.txz +-rw-r--r-- 1 root root 163 2023-01-19 20:11 ./slackware64/a/pkgtools-15.1-noarch-4.txz.asc -rw-r--r-- 1 root root 523 2022-01-28 20:32 ./slackware64/a/plzip-1.10-x86_64-1.txt -rw-r--r-- 1 root root 62592 2022-01-28 20:32 ./slackware64/a/plzip-1.10-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-28 20:32 ./slackware64/a/plzip-1.10-x86_64-1.txz.asc @@ -1127,9 +1127,9 @@ drwxr-xr-x 2 root root 32768 2023-01-19 00:46 ./slackware64/a -rw-r--r-- 1 root root 494 2022-10-26 22:10 ./slackware64/a/xfsprogs-5.13.0-x86_64-4.txt -rw-r--r-- 1 root root 1015588 2022-10-26 22:10 ./slackware64/a/xfsprogs-5.13.0-x86_64-4.txz -rw-r--r-- 1 root root 163 2022-10-26 22:10 ./slackware64/a/xfsprogs-5.13.0-x86_64-4.txz.asc --rw-r--r-- 1 root root 489 2023-01-11 20:21 ./slackware64/a/xz-5.4.1-x86_64-1.txt --rw-r--r-- 1 root root 527508 2023-01-11 20:21 ./slackware64/a/xz-5.4.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-01-11 20:21 ./slackware64/a/xz-5.4.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 489 2023-01-19 20:13 ./slackware64/a/xz-5.4.1-x86_64-2.txt +-rw-r--r-- 1 root root 527688 2023-01-19 20:13 ./slackware64/a/xz-5.4.1-x86_64-2.txz +-rw-r--r-- 1 root root 163 2023-01-19 20:13 ./slackware64/a/xz-5.4.1-x86_64-2.txz.asc -rw-r--r-- 1 root root 540 2021-02-13 11:21 ./slackware64/a/zerofree-1.1.1-x86_64-3.txt -rw-r--r-- 1 root root 6964 2021-02-13 11:21 ./slackware64/a/zerofree-1.1.1-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 11:21 ./slackware64/a/zerofree-1.1.1-x86_64-3.txz.asc @@ -1649,7 +1649,7 @@ drwxr-xr-x 2 root root 4096 2023-01-19 00:46 ./slackware64/k -rw-r--r-- 1 root root 1169 2023-01-19 00:29 ./slackware64/k/maketag -rw-r--r-- 1 root root 1169 2023-01-19 00:29 ./slackware64/k/maketag.ez -rw-r--r-- 1 root root 18 2023-01-19 00:29 ./slackware64/k/tagfile -drwxr-xr-x 2 root root 86016 2023-01-19 00:47 ./slackware64/kde +drwxr-xr-x 2 root root 86016 2023-01-19 21:09 ./slackware64/kde -rw-r--r-- 1 root root 382 2023-01-05 21:24 ./slackware64/kde/akonadi-22.12.1-x86_64-1.txt -rw-r--r-- 1 root root 2569272 2023-01-05 21:24 ./slackware64/kde/akonadi-22.12.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-01-05 21:24 ./slackware64/kde/akonadi-22.12.1-x86_64-1.txz.asc @@ -2677,9 +2677,9 @@ drwxr-xr-x 2 root root 86016 2023-01-19 00:47 ./slackware64/kde -rw-r--r-- 1 root root 452 2023-01-03 22:23 ./slackware64/kde/plasma-vault-5.26.5-x86_64-1.txt -rw-r--r-- 1 root root 320196 2023-01-03 22:23 ./slackware64/kde/plasma-vault-5.26.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-01-03 22:23 ./slackware64/kde/plasma-vault-5.26.5-x86_64-1.txz.asc --rw-r--r-- 1 root root 424 2023-01-18 18:16 ./slackware64/kde/plasma-wayland-protocols-1.10-x86_64-1.txt --rw-r--r-- 1 root root 42860 2023-01-18 18:16 ./slackware64/kde/plasma-wayland-protocols-1.10-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-01-18 18:16 ./slackware64/kde/plasma-wayland-protocols-1.10-x86_64-1.txz.asc +-rw-r--r-- 1 root root 424 2023-01-19 20:46 ./slackware64/kde/plasma-wayland-protocols-1.10.0-x86_64-1.txt +-rw-r--r-- 1 root root 42872 2023-01-19 20:46 ./slackware64/kde/plasma-wayland-protocols-1.10.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-01-19 20:46 ./slackware64/kde/plasma-wayland-protocols-1.10.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 378 2023-01-03 22:16 ./slackware64/kde/plasma-workspace-5.26.5-x86_64-1.txt -rw-r--r-- 1 root root 19061792 2023-01-03 22:16 ./slackware64/kde/plasma-workspace-5.26.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-01-03 22:16 ./slackware64/kde/plasma-workspace-5.26.5-x86_64-1.txz.asc @@ -2774,7 +2774,7 @@ drwxr-xr-x 2 root root 86016 2023-01-19 00:47 ./slackware64/kde -rw-r--r-- 1 root root 517 2023-01-05 22:52 ./slackware64/kde/zanshin-22.12.1-x86_64-1.txt -rw-r--r-- 1 root root 683740 2023-01-05 22:52 ./slackware64/kde/zanshin-22.12.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-01-05 22:52 ./slackware64/kde/zanshin-22.12.1-x86_64-1.txz.asc -drwxr-xr-x 2 root root 86016 2023-01-15 01:06 ./slackware64/l +drwxr-xr-x 2 root root 86016 2023-01-19 21:09 ./slackware64/l -rw-r--r-- 1 root root 329 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txt -rw-r--r-- 1 root root 928144 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz -rw-r--r-- 1 root root 163 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz.asc @@ -2946,9 +2946,9 @@ drwxr-xr-x 2 root root 86016 2023-01-15 01:06 ./slackware64/l -rw-r--r-- 1 root root 572 2022-06-23 04:37 ./slackware64/l/espeak-ng-1.51.1-x86_64-1.txt -rw-r--r-- 1 root root 4457992 2022-06-23 04:37 ./slackware64/l/espeak-ng-1.51.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-06-23 04:37 ./slackware64/l/espeak-ng-1.51.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 257 2021-10-23 04:43 ./slackware64/l/exiv2-0.27.5-x86_64-1.txt --rw-r--r-- 1 root root 1827568 2021-10-23 04:43 ./slackware64/l/exiv2-0.27.5-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-10-23 04:43 ./slackware64/l/exiv2-0.27.5-x86_64-1.txz.asc +-rw-r--r-- 1 root root 257 2023-01-19 20:49 ./slackware64/l/exiv2-0.27.6-x86_64-1.txt +-rw-r--r-- 1 root root 1939972 2023-01-19 20:49 ./slackware64/l/exiv2-0.27.6-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-01-19 20:49 ./slackware64/l/exiv2-0.27.6-x86_64-1.txz.asc -rw-r--r-- 1 root root 301 2022-10-25 17:58 ./slackware64/l/expat-2.5.0-x86_64-1.txt -rw-r--r-- 1 root root 126892 2022-10-25 17:58 ./slackware64/l/expat-2.5.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-10-25 17:58 ./slackware64/l/expat-2.5.0-x86_64-1.txz.asc @@ -3908,9 +3908,9 @@ drwxr-xr-x 2 root root 86016 2023-01-15 01:06 ./slackware64/l -rw-r--r-- 1 root root 539 2021-02-13 09:02 ./slackware64/l/tango-icon-theme-extras-0.1.0-noarch-4.txt -rw-r--r-- 1 root root 52376 2021-02-13 09:02 ./slackware64/l/tango-icon-theme-extras-0.1.0-noarch-4.txz -rw-r--r-- 1 root root 163 2021-02-13 09:02 ./slackware64/l/tango-icon-theme-extras-0.1.0-noarch-4.txz.asc --rw-r--r-- 1 root root 305 2022-06-15 17:54 ./slackware64/l/tdb-1.4.7-x86_64-1.txt --rw-r--r-- 1 root root 73276 2022-06-15 17:54 ./slackware64/l/tdb-1.4.7-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-06-15 17:54 ./slackware64/l/tdb-1.4.7-x86_64-1.txz.asc +-rw-r--r-- 1 root root 305 2023-01-19 20:55 ./slackware64/l/tdb-1.4.8-x86_64-1.txt +-rw-r--r-- 1 root root 73372 2023-01-19 20:55 ./slackware64/l/tdb-1.4.8-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-01-19 20:55 ./slackware64/l/tdb-1.4.8-x86_64-1.txz.asc -rw-r--r-- 1 root root 269 2022-07-27 18:57 ./slackware64/l/tevent-0.13.0-x86_64-1.txt -rw-r--r-- 1 root root 116368 2022-07-27 18:57 ./slackware64/l/tevent-0.13.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-07-27 18:57 ./slackware64/l/tevent-0.13.0-x86_64-1.txz.asc @@ -4454,7 +4454,7 @@ drwxr-xr-x 2 root root 4096 2022-11-23 19:54 ./slackware64/tcl -rw-r--r-- 1 root root 227 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txt -rw-r--r-- 1 root root 1802760 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txz.asc -drwxr-xr-x 2 root root 65536 2023-01-18 06:18 ./slackware64/x +drwxr-xr-x 2 root root 65536 2023-01-19 21:09 ./slackware64/x -rw-r--r-- 1 root root 440 2022-12-09 18:23 ./slackware64/x/OpenCC-1.1.6-x86_64-1.txt -rw-r--r-- 1 root root 677084 2022-12-09 18:23 ./slackware64/x/OpenCC-1.1.6-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-12-09 18:23 ./slackware64/x/OpenCC-1.1.6-x86_64-1.txz.asc @@ -4698,9 +4698,9 @@ drwxr-xr-x 2 root root 65536 2023-01-18 06:18 ./slackware64/x -rw-r--r-- 1 root root 306 2022-09-01 01:55 ./slackware64/x/ico-1.0.6-x86_64-1.txt -rw-r--r-- 1 root root 26280 2022-09-01 01:55 ./slackware64/x/ico-1.0.6-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-09-01 01:55 ./slackware64/x/ico-1.0.6-x86_64-1.txz.asc --rw-r--r-- 1 root root 411 2023-01-17 21:16 ./slackware64/x/igt-gpu-tools-1.27-x86_64-1.txt --rw-r--r-- 1 root root 2304028 2023-01-17 21:16 ./slackware64/x/igt-gpu-tools-1.27-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-01-17 21:16 ./slackware64/x/igt-gpu-tools-1.27-x86_64-1.txz.asc +-rw-r--r-- 1 root root 411 2023-01-19 19:42 ./slackware64/x/igt-gpu-tools-1.27.1-x86_64-1.txt +-rw-r--r-- 1 root root 2314008 2023-01-19 19:42 ./slackware64/x/igt-gpu-tools-1.27.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-01-19 19:42 ./slackware64/x/igt-gpu-tools-1.27.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 297 2022-10-19 19:09 ./slackware64/x/imake-1.0.9-x86_64-1.txt -rw-r--r-- 1 root root 43856 2022-10-19 19:09 ./slackware64/x/imake-1.0.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-10-19 19:09 ./slackware64/x/imake-1.0.9-x86_64-1.txz.asc @@ -4718,9 +4718,9 @@ drwxr-xr-x 2 root root 65536 2023-01-18 06:18 ./slackware64/x -rw-r--r-- 1 root root 288 2022-12-20 04:27 ./slackware64/x/libSM-1.2.4-x86_64-1.txt -rw-r--r-- 1 root root 76736 2022-12-20 04:27 ./slackware64/x/libSM-1.2.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-12-20 04:27 ./slackware64/x/libSM-1.2.4-x86_64-1.txz.asc --rw-r--r-- 1 root root 305 2022-12-16 04:32 ./slackware64/x/libX11-1.8.3-x86_64-1.txt --rw-r--r-- 1 root root 2612668 2022-12-16 04:32 ./slackware64/x/libX11-1.8.3-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-12-16 04:32 ./slackware64/x/libX11-1.8.3-x86_64-1.txz.asc +-rw-r--r-- 1 root root 305 2023-01-19 20:09 ./slackware64/x/libX11-1.8.3-x86_64-2.txt +-rw-r--r-- 1 root root 2614104 2023-01-19 20:09 ./slackware64/x/libX11-1.8.3-x86_64-2.txz +-rw-r--r-- 1 root root 163 2023-01-19 20:09 ./slackware64/x/libX11-1.8.3-x86_64-2.txz.asc -rw-r--r-- 1 root root 405 2022-12-05 02:29 ./slackware64/x/libXScrnSaver-1.2.4-x86_64-1.txt -rw-r--r-- 1 root root 26564 2022-12-05 02:29 ./slackware64/x/libXScrnSaver-1.2.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-12-05 02:29 ./slackware64/x/libXScrnSaver-1.2.4-x86_64-1.txz.asc @@ -5594,13 +5594,13 @@ drwxr-xr-x 2 root root 4096 2021-02-15 19:33 ./slackware64/y -rw-r--r-- 1 root root 1486956 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2023-01-19 00:48 ./source --rw-r--r-- 1 root root 594837 2023-01-19 00:48 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-01-19 00:48 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 827400 2023-01-19 00:48 ./source/FILE_LIST --rw-r--r-- 1 root root 24083577 2023-01-19 00:48 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2023-01-19 21:10 ./source +-rw-r--r-- 1 root root 595268 2023-01-19 21:10 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-01-19 21:10 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 828069 2023-01-19 21:10 ./source/FILE_LIST +-rw-r--r-- 1 root root 24082732 2023-01-19 21:10 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT -drwxr-xr-x 123 root root 4096 2022-10-07 02:22 ./source/a +drwxr-xr-x 123 root root 4096 2023-01-19 20:13 ./source/a -rw-r--r-- 1 root root 234 2022-10-16 18:39 ./source/a/FTBFSlog drwxr-xr-x 2 root root 4096 2022-02-15 18:15 ./source/a/aaa_base -rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./source/a/aaa_base/_aaa_base.tar.gz @@ -6398,12 +6398,12 @@ drwxr-xr-x 2 root root 4096 2019-10-04 06:20 ./source/a/pkgtools/manpages -rw-r--r-- 1 root root 2518 2021-04-19 18:25 ./source/a/pkgtools/manpages/pkgtool.8 -rw-r--r-- 1 root root 4049 2020-04-01 22:09 ./source/a/pkgtools/manpages/removepkg.8 -rw-r--r-- 1 root root 2962 2018-06-08 19:56 ./source/a/pkgtools/manpages/upgradepkg.8 --rwxr-xr-x 1 root root 3753 2023-01-18 21:15 ./source/a/pkgtools/pkgtools.SlackBuild -drwxr-xr-x 2 root root 4096 2021-02-16 21:37 ./source/a/pkgtools/scripts +-rwxr-xr-x 1 root root 3753 2023-01-19 01:44 ./source/a/pkgtools/pkgtools.SlackBuild +drwxr-xr-x 2 root root 4096 2023-01-19 20:11 ./source/a/pkgtools/scripts -rw-r--r-- 1 root root 3610 2021-04-24 18:44 ./source/a/pkgtools/scripts/explodepkg --rw-r--r-- 1 root root 28845 2023-01-18 23:50 ./source/a/pkgtools/scripts/installpkg +-rw-r--r-- 1 root root 28841 2023-01-19 01:44 ./source/a/pkgtools/scripts/installpkg -rw-r--r-- 1 root root 13674 2021-04-24 18:44 ./source/a/pkgtools/scripts/makebootdisk --rw-r--r-- 1 root root 16179 2023-01-19 00:13 ./source/a/pkgtools/scripts/makepkg +-rw-r--r-- 1 root root 16119 2023-01-19 20:11 ./source/a/pkgtools/scripts/makepkg -rw-r--r-- 1 root root 4714 2021-04-24 18:44 ./source/a/pkgtools/scripts/pkgdiff -rw-r--r-- 1 root root 21940 2021-04-24 18:45 ./source/a/pkgtools/scripts/pkgtool -rw-r--r-- 1 root root 17094 2022-09-06 18:47 ./source/a/pkgtools/scripts/removepkg @@ -6690,11 +6690,12 @@ drwxr-xr-x 2 root root 4096 2022-10-26 19:08 ./source/a/xfsprogs -rw-r--r-- 1 root root 1301112 2021-08-20 19:10 ./source/a/xfsprogs/xfsprogs-5.13.0.tar.xz -rwxr-xr-x 1 root root 4903 2022-10-26 19:08 ./source/a/xfsprogs/xfsprogs.SlackBuild -rw-r--r-- 1 root root 42 2017-09-27 22:21 ./source/a/xfsprogs/xfsprogs.url -drwxr-xr-x 2 root root 4096 2023-01-11 20:21 ./source/a/xz +drwxr-xr-x 2 root root 4096 2023-01-19 19:53 ./source/a/xz -rw-r--r-- 1 root root 939 2020-03-18 18:04 ./source/a/xz/slack-desc -rw-r--r-- 1 root root 1485272 2023-01-11 17:27 ./source/a/xz/xz-5.4.1.tar.xz -rw-r--r-- 1 root root 566 2023-01-11 17:19 ./source/a/xz/xz-5.4.1.tar.xz.sig --rwxr-xr-x 1 root root 5178 2022-08-13 19:04 ./source/a/xz/xz.SlackBuild +-rwxr-xr-x 1 root root 5469 2023-01-19 19:54 ./source/a/xz/xz.SlackBuild +-rw-r--r-- 1 root root 253 2023-01-19 19:53 ./source/a/xz/xz.default.verbosity.V_ERROR.diff.gz drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/a/zerofree -rw-r--r-- 1 root root 996 2020-01-31 20:02 ./source/a/zerofree/slack-desc -rw-r--r-- 1 root root 6044 2019-07-27 17:28 ./source/a/zerofree/sparsify.c @@ -7771,14 +7772,17 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/e/emacspeak drwxr-xr-x 2 root root 4096 2018-02-27 06:13 ./source/f -rw-r--r-- 1 root root 960 2018-02-27 06:13 ./source/f/slack-desc.linux-faqs -rw-r--r-- 1 root root 801 2018-02-27 06:13 ./source/f/slack-desc.linux-howtos -drwxr-xr-x 3 root root 4096 2022-09-06 18:27 ./source/installer --rw-r--r-- 1 root root 43302 2023-01-18 20:30 ./source/installer/ChangeLog.txt +drwxr-xr-x 3 root root 4096 2023-01-19 20:42 ./source/installer +-rw-r--r-- 1 root root 43832 2023-01-19 20:44 ./source/installer/ChangeLog.txt -rw-r--r-- 1 root root 6849 2018-03-11 00:53 ./source/installer/README --rwxr-xr-x 1 root root 77623 2022-10-13 12:34 ./source/installer/build_installer.sh +-rwxr-xr-x 1 root root 79166 2023-01-19 20:39 ./source/installer/build_installer.sh -rwxr-xr-x 1 root root 2252 2022-09-06 18:27 ./source/installer/installer.SlackBuild -rw-r--r-- 1 root root 1376 2020-02-29 06:16 ./source/installer/module-blacklist -rwxr-xr-x 1 root root 5289 2022-09-06 18:27 ./source/installer/repack_installer.SlackBuild -drwxr-xr-x 9 root root 4096 2022-02-05 19:34 ./source/installer/sources +drwxr-xr-x 10 root root 4096 2023-01-19 20:30 ./source/installer/sources +drwxr-xr-x 2 root root 4096 2023-01-19 20:29 ./source/installer/sources/bricktick +-rw-r--r-- 1 root root 10453 2020-02-08 22:18 ./source/installer/sources/bricktick/bricktick-20200208_d462e38.tar.lz +-rwxr-xr-x 1 root root 2077 2023-01-19 20:29 ./source/installer/sources/bricktick/fetch-bricktick.sh drwxr-xr-x 2 root root 4096 2021-01-17 20:07 ./source/installer/sources/busybox -rw-r--r-- 1 root root 2444679 2021-01-01 13:27 ./source/installer/sources/busybox/busybox-1.32.1.tar.bz2 -rw-r--r-- 1 root root 121 2021-01-01 13:27 ./source/installer/sources/busybox/busybox-1.32.1.tar.bz2.sig @@ -9627,15 +9631,15 @@ drwxr-xr-x 2 root root 4096 2023-01-14 18:03 ./source/kde/kde/src/framewo -rw-r--r-- 1 root root 1413028 2023-01-07 11:34 ./source/kde/kde/src/frameworks/threadweaver-5.102.0.tar.xz -rw-r--r-- 1 root root 488 2023-01-07 11:34 ./source/kde/kde/src/frameworks/threadweaver-5.102.0.tar.xz.sig drwxr-xr-x 2 root root 12288 2023-01-03 22:03 ./source/kde/kde/src/plasma -drwxr-xr-x 2 root root 4096 2023-01-18 18:15 ./source/kde/kde/src/plasma-extra +drwxr-xr-x 2 root root 4096 2023-01-19 20:45 ./source/kde/kde/src/plasma-extra -rwxr-xr-x 1 root root 2071 2020-07-12 21:54 ./source/kde/kde/src/plasma-extra/fetch-wacomtablet.sh -rw-r--r-- 1 root root 13424 2019-12-07 18:49 ./source/kde/kde/src/plasma-extra/kpeoplevcard-0.1.tar.xz -rw-r--r-- 1 root root 488 2019-12-07 18:49 ./source/kde/kde/src/plasma-extra/kpeoplevcard-0.1.tar.xz.sig -rw-r--r-- 1 root root 1022684 2022-12-02 18:07 ./source/kde/kde/src/plasma-extra/latte-dock-0.10.9.tar.xz -rw-r--r-- 1 root root 833 2022-12-02 18:07 ./source/kde/kde/src/plasma-extra/latte-dock-0.10.9.tar.xz.sig -rw-r--r-- 1 root root 161700 2015-12-24 15:38 ./source/kde/kde/src/plasma-extra/oxygen-fonts-5.4.3.tar.xz --rw-r--r-- 1 root root 43268 2023-01-18 16:29 ./source/kde/kde/src/plasma-extra/plasma-wayland-protocols-1.10.tar.xz --rw-r--r-- 1 root root 488 2023-01-18 16:29 ./source/kde/kde/src/plasma-extra/plasma-wayland-protocols-1.10.tar.xz.sig +-rw-r--r-- 1 root root 43268 2023-01-19 13:06 ./source/kde/kde/src/plasma-extra/plasma-wayland-protocols-1.10.0.tar.xz +-rw-r--r-- 1 root root 488 2023-01-19 13:06 ./source/kde/kde/src/plasma-extra/plasma-wayland-protocols-1.10.0.tar.xz.sig -rw-r--r-- 1 root root 34148 2021-05-27 13:20 ./source/kde/kde/src/plasma-extra/pulseaudio-qt-1.3.tar.xz -rw-r--r-- 1 root root 488 2021-05-27 13:20 ./source/kde/kde/src/plasma-extra/pulseaudio-qt-1.3.tar.xz.sig -rw-r--r-- 1 root root 3406056 2020-11-03 09:57 ./source/kde/kde/src/plasma-extra/sddm-0.19.0.tar.xz @@ -10068,8 +10072,8 @@ drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/l/espeak-ng -rwxr-xr-x 1 root root 3905 2022-09-06 18:27 ./source/l/espeak-ng/espeak-ng.SlackBuild -rw-r--r-- 1 root root 39 2020-07-29 01:37 ./source/l/espeak-ng/espeak-ng.url -rw-r--r-- 1 root root 1063 2020-07-29 02:35 ./source/l/espeak-ng/slack-desc -drwxr-xr-x 2 root root 4096 2021-10-23 04:43 ./source/l/exiv2 --rw-r--r-- 1 root root 1757050 2021-10-21 17:01 ./source/l/exiv2/exiv2-0.27.5-Source.tar.lz +drwxr-xr-x 2 root root 4096 2023-01-19 20:49 ./source/l/exiv2 +-rw-r--r-- 1 root root 1757545 2023-01-19 10:36 ./source/l/exiv2/exiv2-0.27.6-Source.tar.lz -rwxr-xr-x 1 root root 4434 2021-06-16 18:00 ./source/l/exiv2/exiv2.SlackBuild -rwxr-xr-x 1 root root 1897 2020-09-29 00:01 ./source/l/exiv2/paredown.sh -rw-r--r-- 1 root root 710 2019-11-10 03:11 ./source/l/exiv2/slack-desc @@ -11861,10 +11865,10 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/tango-icon-theme- -rw-r--r-- 1 root root 991 2018-06-24 19:29 ./source/l/tango-icon-theme/slack-desc -rw-r--r-- 1 root root 1104057 2009-02-26 03:21 ./source/l/tango-icon-theme/tango-icon-theme-0.8.90.tar.lz -rwxr-xr-x 1 root root 2447 2021-02-13 05:32 ./source/l/tango-icon-theme/tango-icon-theme.SlackBuild -drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/l/tdb +drwxr-xr-x 2 root root 4096 2023-01-19 20:54 ./source/l/tdb -rw-r--r-- 1 root root 756 2018-02-27 06:44 ./source/l/tdb/slack-desc --rw-r--r-- 1 root root 488 2022-06-09 04:25 ./source/l/tdb/tdb-1.4.7.tar.asc --rw-r--r-- 1 root root 741714 2022-06-09 04:25 ./source/l/tdb/tdb-1.4.7.tar.gz +-rw-r--r-- 1 root root 488 2023-01-18 17:38 ./source/l/tdb/tdb-1.4.8.tar.asc +-rw-r--r-- 1 root root 545291 2023-01-18 17:38 ./source/l/tdb/tdb-1.4.8.tar.lz -rwxr-xr-x 1 root root 4516 2022-09-06 18:27 ./source/l/tdb/tdb.SlackBuild drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/l/tevent -rw-r--r-- 1 root root 723 2018-02-27 06:12 ./source/l/tevent/slack-desc @@ -11933,10 +11937,10 @@ drwxr-xr-x 156 root root 4096 2022-11-26 20:18 ./source/n drwxr-xr-x 2 root root 4096 2022-11-21 20:13 ./source/n/ModemManager -rw-r--r-- 1 root root 2589020 2022-09-09 20:59 ./source/n/ModemManager/ModemManager-1.18.12.tar.xz -rw-r--r-- 1 root root 833 2022-09-09 20:59 ./source/n/ModemManager/ModemManager-1.18.12.tar.xz.asc --rwxr-xr-x 1 root root 4002 2022-11-21 20:13 ./source/n/ModemManager/ModemManager.SlackBuild --rw-r--r-- 1 root root 444 2013-09-22 21:10 ./source/n/ModemManager/WeDoNotHaveSystemD.patch.gz --rw-r--r-- 1 root root 817 2018-09-24 19:21 ./source/n/ModemManager/slack-desc -drwxr-xr-x 4 root root 4096 2023-01-11 19:17 ./source/n/NetworkManager +-rwxr-xr-x 1 root root 4002 2022-11-21 20:13 ./source/n/ModemManager/ModemManager.SlackBuild +-rw-r--r-- 1 root root 444 2013-09-22 21:10 ./source/n/ModemManager/WeDoNotHaveSystemD.patch.gz +-rw-r--r-- 1 root root 817 2018-09-24 19:21 ./source/n/ModemManager/slack-desc +drwxr-xr-x 4 root root 4096 2023-01-11 19:17 ./source/n/NetworkManager -rw-r--r-- 1 root root 189 2015-01-02 05:15 ./source/n/NetworkManager/10-org.freedesktop.NetworkManager.rules -rw-r--r-- 1 root root 6595772 2023-01-11 11:09 ./source/n/NetworkManager/NetworkManager-1.40.10.tar.xz -rwxr-xr-x 1 root root 7100 2022-11-21 20:13 ./source/n/NetworkManager/NetworkManager.SlackBuild @@ -13669,7 +13673,7 @@ drwxr-xr-x 2 root root 12288 2022-08-27 16:19 ./source/x/x11/build -rw-r--r-- 1 root root 2 2022-08-27 16:19 ./source/x/x11/build/libFS -rw-r--r-- 1 root root 2 2022-12-04 19:52 ./source/x/x11/build/libICE -rw-r--r-- 1 root root 2 2022-12-20 04:27 ./source/x/x11/build/libSM --rw-r--r-- 1 root root 2 2021-05-18 18:30 ./source/x/x11/build/libX11 +-rw-r--r-- 1 root root 2 2023-01-19 20:07 ./source/x/x11/build/libX11 -rw-r--r-- 1 root root 2 2022-12-05 02:29 ./source/x/x11/build/libXScrnSaver -rw-r--r-- 1 root root 2 2022-08-27 16:19 ./source/x/x11/build/libXau -rw-r--r-- 1 root root 2 2021-03-27 18:05 ./source/x/x11/build/libXaw @@ -13974,8 +13978,11 @@ drwxr-xr-x 2 root root 4096 2015-04-21 02:59 ./source/x/x11/makepkg -rw-r--r-- 1 root root 3518 2022-08-08 20:45 ./source/x/x11/modularize -rw-r--r-- 1 root root 1189 2018-05-03 12:16 ./source/x/x11/noarch -rw-r--r-- 1 root root 1052 2022-10-15 19:55 ./source/x/x11/package-blacklist -drwxr-xr-x 15 root root 4096 2023-01-17 21:14 ./source/x/x11/patch +drwxr-xr-x 16 root root 4096 2023-01-19 20:07 ./source/x/x11/patch -rw-r--r-- 1 root root 326 2010-11-13 18:39 ./source/x/x11/patch/README +drwxr-xr-x 2 root root 4096 2023-01-19 20:06 ./source/x/x11/patch/libX11 +-rw-r--r-- 1 root root 174 2023-01-19 20:07 ./source/x/x11/patch/libX11.patch +-rw-r--r-- 1 root root 1807 2023-01-19 20:06 ./source/x/x11/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch.gz drwxr-xr-x 2 root root 4096 2014-07-14 23:09 ./source/x/x11/patch/luit -rw-r--r-- 1 root root 170 2014-07-14 23:09 ./source/x/x11/patch/luit.patch -rw-r--r-- 1 root root 596 2014-07-14 23:22 ./source/x/x11/patch/luit/luit_use_system_extensions.diff.gz @@ -14402,7 +14409,7 @@ drwxr-xr-x 2 root root 12288 2022-05-21 04:31 ./source/x/x11/slack-desc -rw-r--r-- 1 root root 702 2012-04-08 02:21 ./source/x/x11/slack-desc/xwininfo -rw-r--r-- 1 root root 668 2012-04-07 23:42 ./source/x/x11/slack-desc/xwud drwxr-xr-x 12 root root 4096 2023-01-17 21:17 ./source/x/x11/src -drwxr-xr-x 2 root root 4096 2023-01-17 21:13 ./source/x/x11/src/app +drwxr-xr-x 2 root root 4096 2023-01-19 19:41 ./source/x/x11/src/app -rw-r--r-- 1 root root 118972 2022-04-03 18:57 ./source/x/x11/src/app/appres-1.0.6.tar.xz -rw-r--r-- 1 root root 109956 2013-01-15 05:23 ./source/x/x11/src/app/beforelight-1.0.5.tar.xz -rw-r--r-- 1 root root 163560 2022-04-30 20:26 ./source/x/x11/src/app/bitmap-1.1.0.tar.xz @@ -14412,7 +14419,7 @@ drwxr-xr-x 2 root root 4096 2023-01-17 21:13 ./source/x/x11/src/app -rw-r--r-- 1 root root 122432 2022-10-06 01:44 ./source/x/x11/src/app/fstobdf-1.0.7.tar.xz -rw-r--r-- 1 root root 130724 2022-04-03 18:47 ./source/x/x11/src/app/iceauth-1.0.9.tar.xz -rw-r--r-- 1 root root 130032 2022-08-31 00:17 ./source/x/x11/src/app/ico-1.0.6.tar.xz --rw-r--r-- 1 root root 2319216 2023-01-12 15:20 ./source/x/x11/src/app/igt-gpu-tools-1.27.tar.xz +-rw-r--r-- 1 root root 2321940 2023-01-18 17:57 ./source/x/x11/src/app/igt-gpu-tools-1.27.1.tar.xz -rw-r--r-- 1 root root 119596 2022-04-03 19:09 ./source/x/x11/src/app/listres-1.0.5.tar.xz -rw-r--r-- 1 root root 128468 2012-03-23 04:25 ./source/x/x11/src/app/luit-1.1.1.tar.xz -rw-r--r-- 1 root root 119260 2022-04-03 19:17 ./source/x/x11/src/app/mkcomposecache-1.2.2.tar.xz @@ -15238,12 +15245,12 @@ drwxr-xr-x 2 root root 4096 2023-01-05 19:15 ./source/xfce/xfce4-taskmanag -rw-r--r-- 1 root root 928 2018-02-27 06:13 ./source/xfce/xfce4-taskmanager/slack-desc -rw-r--r-- 1 root root 352947 2022-12-16 09:36 ./source/xfce/xfce4-taskmanager/xfce4-taskmanager-1.5.5.tar.lz -rwxr-xr-x 1 root root 3595 2021-02-15 20:34 ./source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild --rw-r--r-- 1 root root 51 2011-11-28 03:16 ./source/xfce/xfce4-taskmanager/xfce4-taskmanager.url -drwxr-xr-x 2 root root 4096 2022-08-27 16:40 ./source/xfce/xfce4-terminal --rw-r--r-- 1 root root 905 2018-02-27 06:13 ./source/xfce/xfce4-terminal/slack-desc --rw-r--r-- 1 root root 875295 2022-05-22 09:22 ./source/xfce/xfce4-terminal/xfce4-terminal-1.0.4.tar.lz --rwxr-xr-x 1 root root 4058 2022-08-27 16:40 ./source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild --rw-r--r-- 1 root root 52 2022-08-27 16:40 ./source/xfce/xfce4-terminal/xfce4-terminal.url +-rw-r--r-- 1 root root 51 2011-11-28 03:16 ./source/xfce/xfce4-taskmanager/xfce4-taskmanager.url +drwxr-xr-x 2 root root 4096 2022-08-27 16:40 ./source/xfce/xfce4-terminal +-rw-r--r-- 1 root root 905 2018-02-27 06:13 ./source/xfce/xfce4-terminal/slack-desc +-rw-r--r-- 1 root root 875295 2022-05-22 09:22 ./source/xfce/xfce4-terminal/xfce4-terminal-1.0.4.tar.lz +-rwxr-xr-x 1 root root 4058 2022-08-27 16:40 ./source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild +-rw-r--r-- 1 root root 52 2022-08-27 16:40 ./source/xfce/xfce4-terminal/xfce4-terminal.url drwxr-xr-x 2 root root 4096 2022-12-17 20:50 ./source/xfce/xfce4-weather-plugin -rw-r--r-- 1 root root 837 2018-02-27 06:13 ./source/xfce/xfce4-weather-plugin/slack-desc -rw-r--r-- 1 root root 2769985 2021-02-11 21:22 ./source/xfce/xfce4-weather-plugin/xfce4-weather-plugin-0.11.0.tar.lz diff --git a/recompress.sh b/recompress.sh index dcf9c4249..f385eaf1a 100755 --- a/recompress.sh +++ b/recompress.sh @@ -228,6 +228,7 @@ gzip ./source/a/logrotate/logrotate.cron gzip ./source/a/logrotate/logrotate.slackware.diff gzip ./source/a/logrotate/logrotate.conf gzip ./source/a/logrotate/doinst.sh +gzip ./source/a/xz/xz.default.verbosity.V_ERROR.diff gzip ./source/a/libcgroup/libcgroup.conf.diff gzip ./source/a/libcgroup/libcgroup.init.diff gzip ./source/a/libcgroup/libcgroup.loop.diff @@ -1150,6 +1151,7 @@ gzip ./source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff gzip ./source/x/x11/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch gzip ./source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff gzip ./source/x/x11/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch +gzip ./source/x/x11/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch gzip ./source/x/fcitx5/doinst.sh gzip ./source/x/ibus/NamesList.txt gzip ./source/x/ibus/Blocks.txt diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index 67058d409..ab2f57334 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.1 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index 64791afc6..c5c6ee2af 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -360,7 +360,7 @@ if [ "$MODE" = "warn" ]; then fi ;; 'txz' ) - if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then + if [ "$XZ_THREADS_FORCED" = "yes" ]; then packagecompression="xz --threads=${THREADS}" else # Let xz determine how many threads to use: @@ -449,7 +449,7 @@ for package in $* ; do fi ;; 'txz' ) - if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then + if [ "$XZ_THREADS_FORCED" = "yes" ]; then packagecompression="xz --threads=${THREADS}" else # Let xz determine how many threads to use: diff --git a/source/a/pkgtools/scripts/makepkg b/source/a/pkgtools/scripts/makepkg index 72746fa84..7ddf5dbd4 100644 --- a/source/a/pkgtools/scripts/makepkg +++ b/source/a/pkgtools/scripts/makepkg @@ -251,8 +251,7 @@ elif [ ! "$(basename $PACKAGE_NAME .tar.lzma)" = "$PACKAGE_NAME" ]; then elif [ ! "$(basename $PACKAGE_NAME .txz)" = "$PACKAGE_NAME" ]; then EXTENSION="txz" if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then - # TODO: Add ARM 64-bit $ARCHes to this test: - if [ "$(uname -m)" = "x86_64" ]; then + if [[ "$(uname -m)" =~ (x86_64|aarch64|riscv64) ]]; then # Allow xz to determine how many threads to use: COMPRESSOR="xz ${COMPRESS_OPTION} --threads=0 -c" else @@ -269,8 +268,7 @@ elif [ ! "$(basename $PACKAGE_NAME .txz)" = "$PACKAGE_NAME" ]; then elif [ ! "$(basename $PACKAGE_NAME .tar.xz)" = "$PACKAGE_NAME" ]; then EXTENSION="tar.xz" if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then - # TODO: Add ARM 64-bit $ARCHes to this test: - if [ "$(uname -m)" = "x86_64" ]; then + if [[ "$(uname -m)" =~ (x86_64|aarch64|riscv64) ]]; then # Allow xz to determine how many threads to use: COMPRESSOR="xz ${COMPRESS_OPTION} --threads=0 -c" else diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild index c23d2d2b0..5a3284a79 100755 --- a/source/a/xz/xz.SlackBuild +++ b/source/a/xz/xz.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xz VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -89,6 +89,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Change default verbosity from V_WARNING to V_ERROR to prevent spamming +# the screen with messages concerning steps that xz it taking to reduce +# memory use (these aren't indicating any sort of failure, so...) +zcat $CWD/xz.default.verbosity.V_ERROR.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/a/xz/xz.default.verbosity.V_ERROR.diff b/source/a/xz/xz.default.verbosity.V_ERROR.diff new file mode 100644 index 000000000..c6c3aef45 --- /dev/null +++ b/source/a/xz/xz.default.verbosity.V_ERROR.diff @@ -0,0 +1,11 @@ +--- ./src/xz/message.c.orig 2023-01-11 10:51:42.000000000 -0600 ++++ ./src/xz/message.c 2023-01-19 13:52:39.484987693 -0600 +@@ -22,7 +22,7 @@ + static unsigned int files_total; + + /// Verbosity level +-static enum message_verbosity verbosity = V_WARNING; ++static enum message_verbosity verbosity = V_ERROR; + + /// Filename which we will print with the verbose messages + static const char *filename; diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index a1f932521..584bb9bd0 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,12 @@ +Thu Jan 19 20:44:24 UTC 2023 + build_installer.sh: Switch /bin/dd from BusyBox's implementation to + Coreutils', which offers a richer feature set. For example, the command line + parameter 'status=progress' provides realtime visibility of critical metrics + (transfer speed, ETA, % complete). This helps when working with the storage, + where the installer is used as an preparation and test environment. + Thanks to Stuart Winter. + Added "bricktick", an ncurses based game (why not, it's only 31K) ++--------------------------+ Wed Jan 18 20:30:13 UTC 2023 /usr/lib/setup/INS-all-in-one: Added. This detects the AiO (All in One Offline) partition labeled 'SLKins_aio-pkgs' diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 0ded4adb1..80f4ca658 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -108,6 +108,7 @@ case $ARCH in # The firmware we include by default is only for x86, but ADD_NETFIRMWARE=1 # we'll probably want to include some at some stage. For now supply -nf to this script. ADD_NANO=1 + ADD_BRICKTICK=1 ;; x86_64) ADD_NETMODS=1 @@ -124,6 +125,7 @@ case $ARCH in VERBOSE=1 ADD_NETFIRMWARE=1 # Include the network card firmware ADD_NANO=1 + ADD_BRICKTICK=1 ;; i586) ADD_NETMODS=1 @@ -140,6 +142,7 @@ case $ARCH in VERBOSE=1 ADD_NETFIRMWARE=1 # Include the network card firmware ADD_NANO=1 + ADD_BRICKTICK=1 ;; *) ADD_NETMODS=1 # add network modules @@ -155,6 +158,7 @@ case $ARCH in VERBOSE=1 # show a lot of additional output ADD_NETFIRMWARE=1 # Include the network card firmware ADD_NANO=1 + ADD_BRICKTICK=1 ;; esac @@ -235,6 +239,10 @@ while [ ! -z "$1" ]; do ADD_NETMODS=1 shift ;; + -nb|--no-bricktick) + ADD_BRICKTICK=0 + shift + ;; -nc|--no-compressmods) COMPRESS_MODS=0 shift @@ -670,9 +678,9 @@ make $SILENTMAKE $NUMJOBS CFLAGS="$SLKCFLAGS" || exit 1 make $SILENTMAKE $NUMJOBS install || exit 1 cd _install -# Since Slackware 's installer uses the 'date' from coreutils, and 'zcat' -# script from gzip, we delete the busybox symlinks: -rm -f${VERBOSE1} bin/date bin/zcat +# Since Slackware's installer uses the 'date' and 'dd' from coreutils, +# and the 'zcat' script from gzip, we delete the busybox symlinks: +rm -f${VERBOSE1} bin/{date,dd,zcat} # Likewise, we will remove the 'fdisk' applet which overwrites our shell script: rm -f${VERBOSE1} sbin/fdisk @@ -829,6 +837,43 @@ fi } +############### Build bricktick ################################################ + +build_bricktick() +{ +echo "--- Building bricktick ncurses game ---" +# Extract source: +cd $TMP +if [ -d $CWD/sources/bricktick ]; then + echo "--- Using _your_ bricktick sources (not those in the Slacktree) ---" + BRICKTICKPATH=$CWD/sources/bricktick +elif [ -d $SRCDIR/sources/bricktick ]; then + echo "--- Using _your_ bricktick sources (not those in the Slacktree) ---" + BRICKTICKPATH=$SRCDIR/sources/bricktick +else + # Use the bricktick sources from the Slackware tree. + BRICKTICKPATH=$SLACKROOT/source/installer/bricktick +fi +[ ! -d $BRICKTICKPATH ] && ( echo "No directory '$BRICKTICKPATH'" ; exit 1 ) +BRICKTICKPKG=$(ls -1 $BRICKTICKPATH/bricktick-*.tar.?z | head -1) +BRICKTICKVER=$(echo $BRICKTICKPKG | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +tar x${VERBOSE2}f $BRICKTICKPKG + +echo "--- Compiling BRICKTICK version '$BRICKTICKVER' ---" +cd bricktick* || exit 1 +chown -R root:root . +chmod -R u+w,go+r-w,a-s . + +# Build: +make $NUMJOBS || make || exit 1 + +# Install into installer's filesystem: +mkdir -p $PKG/$ARCH-installer-filesystem/usr/bin +cp -a bricktick $PKG/$ARCH-installer-filesystem/usr/bin/bricktick +strip --strip-unneeded $PKG/$ARCH-installer-filesystem/usr/bin/bricktick + +} + ############### Build dnsmasq ################################################## build_dnsmasq() @@ -1015,6 +1060,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_BIN} \ cp \ cut \ date \ + dd \ dialog \ dircolors \ findmnt \ @@ -2380,6 +2426,11 @@ else build_nano fi + # Are we adding the bricktick game? + if [ $ADD_BRICKTICK -eq 1 ]; then + build_bricktick + fi + # Are we adding network modules? if [ $ADD_NETMODS -eq 1 ]; then add_netmods diff --git a/source/installer/sources/bricktick/fetch-bricktick.sh b/source/installer/sources/bricktick/fetch-bricktick.sh new file mode 100755 index 000000000..15a8e2b14 --- /dev/null +++ b/source/installer/sources/bricktick/fetch-bricktick.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# Copyright 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, 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. + + +PKGNAM=bricktick + +# Pull a stable branch + patches +BRANCH=${1:-master} + +# Clear download area: +rm -rf ${PKGNAM} + +# Clone repository: +git clone https://github.com/Subsentient/${PKGNAM} + +# checkout $BRANCH: +( cd ${PKGNAM} + git checkout $BRANCH || exit 1 +) + +HEADISAT="$( cd ${PKGNAM} && git log -1 --format=%h )" +DATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%Y%m%d )" +LONGDATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%c )" +# Cleanup. We're not packing up the whole git repo. +( cd ${PKGNAM} && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv ${PKGNAM} ${PKGNAM}-${DATE}_${HEADISAT} +tar cf ${PKGNAM}-${DATE}_${HEADISAT}.tar ${PKGNAM}-${DATE}_${HEADISAT} +plzip -9 -f ${PKGNAM}-${DATE}_${HEADISAT}.tar +rm -rf ${PKGNAM}-${DATE}_${HEADISAT} +touch -d "$LONGDATE" ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz +echo +echo "${PKGNAM} branch $BRANCH with HEAD at $HEADISAT packaged as ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz" +echo diff --git a/source/x/x11/build/libX11 b/source/x/x11/build/libX11 index d00491fd7..0cfbf0888 100644 --- a/source/x/x11/build/libX11 +++ b/source/x/x11/build/libX11 @@ -1 +1 @@ -1 +2 diff --git a/source/x/x11/patch/libX11.patch b/source/x/x11/patch/libX11.patch new file mode 100644 index 000000000..4ba7a9dda --- /dev/null +++ b/source/x/x11/patch/libX11.patch @@ -0,0 +1 @@ +zcat $CWD/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch.gz | patch -p1 --backup --suffix=.orig || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch b/source/x/x11/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch new file mode 100644 index 000000000..badc4e5eb --- /dev/null +++ b/source/x/x11/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch @@ -0,0 +1,205 @@ +From eb1c272ab5230d548077b9f59aca4b3457c3a8f8 Mon Sep 17 00:00:00 2001 +From: GaryOderNichts +Date: Sat, 17 Dec 2022 16:28:40 +0100 +Subject: [PATCH] Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11 + +--- + include/X11/Xlibint.h | 9 +++++- + src/ChkIfEv.c | 5 +++- + src/IfEvent.c | 5 +++- + src/PeekIfEv.c | 5 +++- + src/locking.c | 65 +++++++++---------------------------------- + 5 files changed, 33 insertions(+), 56 deletions(-) + +diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h +index e20c4833..50099b43 100644 +--- a/include/X11/Xlibint.h ++++ b/include/X11/Xlibint.h +@@ -43,6 +43,10 @@ from The Open Group. + #include /* to declare xEvent */ + #include /* for configured options like XTHREADS */ + ++#ifdef XTHREADS ++#include ++#endif ++ + /* The Xlib structs are full of implicit padding to properly align members. + We can't clean that up without breaking ABI, so tell clang not to bother + complaining about it. */ +@@ -207,7 +211,10 @@ struct _XDisplay + + XIOErrorExitHandler exit_handler; + void *exit_handler_data; +- CARD32 in_ifevent; ++ CARD32 in_ifevent; ++#ifdef XTHREADS ++ xthread_t ifevent_thread; ++#endif + }; + + #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n) +diff --git a/src/ChkIfEv.c b/src/ChkIfEv.c +index b32c2d3e..66636696 100644 +--- a/src/ChkIfEv.c ++++ b/src/ChkIfEv.c +@@ -49,8 +49,11 @@ Bool XCheckIfEvent ( + unsigned long qe_serial = 0; + int n; /* time through count */ + +- dpy->in_ifevent++; + LockDisplay(dpy); ++#ifdef XTHREADS ++ dpy->ifevent_thread = xthread_self(); ++#endif ++ dpy->in_ifevent++; + prev = NULL; + for (n = 3; --n >= 0;) { + for (qelt = prev ? prev->next : dpy->head; +diff --git a/src/IfEvent.c b/src/IfEvent.c +index 54c37f00..35c592e3 100644 +--- a/src/IfEvent.c ++++ b/src/IfEvent.c +@@ -48,8 +48,11 @@ XIfEvent ( + register _XQEvent *qelt, *prev; + unsigned long qe_serial = 0; + +- dpy->in_ifevent++; + LockDisplay(dpy); ++#ifdef XTHREADS ++ dpy->ifevent_thread = xthread_self(); ++#endif ++ dpy->in_ifevent++; + prev = NULL; + while (1) { + for (qelt = prev ? prev->next : dpy->head; +diff --git a/src/PeekIfEv.c b/src/PeekIfEv.c +index 68c028b7..754749a7 100644 +--- a/src/PeekIfEv.c ++++ b/src/PeekIfEv.c +@@ -49,8 +49,11 @@ XPeekIfEvent ( + register _XQEvent *prev, *qelt; + unsigned long qe_serial = 0; + +- dpy->in_ifevent++; + LockDisplay(dpy); ++#ifdef XTHREADS ++ dpy->ifevent_thread = xthread_self(); ++#endif ++ dpy->in_ifevent++; + prev = NULL; + while (1) { + for (qelt = prev ? prev->next : dpy->head; +diff --git a/src/locking.c b/src/locking.c +index c550603e..3625bd27 100644 +--- a/src/locking.c ++++ b/src/locking.c +@@ -240,7 +240,9 @@ static void _XUnlockDisplay( + if (lock_hist_loc >= LOCK_HIST_SIZE) + lock_hist_loc = 0; + #endif /* XTHREADS_WARN */ +- xmutex_unlock(dpy->lock->mutex); ++ ++ if (dpy->in_ifevent == 0 || !xthread_equal(dpy->ifevent_thread, xthread_self())) ++ xmutex_unlock(dpy->lock->mutex); + } + + +@@ -453,63 +455,24 @@ static void _XDisplayLockWait( + } + + static void _XLockDisplay( +- Display *dpy +- XTHREADS_FILE_LINE_ARGS +- ); +- +-static void _XIfEventLockDisplay( + Display *dpy + XTHREADS_FILE_LINE_ARGS + ) + { +- /* assert(dpy->in_ifevent); */ +-} ++ struct _XErrorThreadInfo *ti; + +-static void _XInternalLockDisplay( +- Display *dpy, +- Bool wskip +- XTHREADS_FILE_LINE_ARGS +- ); ++ if (dpy->in_ifevent && xthread_equal(dpy->ifevent_thread, xthread_self())) ++ return; + +-static void _XIfEventInternalLockDisplay( +- Display *dpy, +- Bool wskip +- XTHREADS_FILE_LINE_ARGS +- ) +-{ +- /* assert(dpy->in_ifevent); */ +-} +- +-static void _XIfEventUnlockDisplay( +- Display *dpy +- XTHREADS_FILE_LINE_ARGS +- ) +-{ +- if (dpy->in_ifevent == 0) { +- dpy->lock_fns->lock_display = _XLockDisplay; +- dpy->lock_fns->unlock_display = _XUnlockDisplay; +- dpy->lock->internal_lock_display = _XInternalLockDisplay; +- UnlockDisplay(dpy); +- } else +- return; +-} +- +-static void _XLockDisplay( +- Display *dpy +- XTHREADS_FILE_LINE_ARGS +- ) +-{ +-#ifdef XTHREADS +- struct _XErrorThreadInfo *ti; +-#endif + #ifdef XTHREADS_WARN + _XLockDisplayWarn(dpy, file, line); + #else + xmutex_lock(dpy->lock->mutex); + #endif ++ + if (dpy->lock->locking_level > 0) +- _XDisplayLockWait(dpy); +-#ifdef XTHREADS ++ _XDisplayLockWait(dpy); ++ + /* + * Skip the two function calls below which may generate requests + * when LockDisplay is called from within _XError. +@@ -517,14 +480,9 @@ static void _XLockDisplay( + for (ti = dpy->error_threads; ti; ti = ti->next) + if (ti->error_thread == xthread_self()) + return; +-#endif ++ + _XIDHandler(dpy); + _XSeqSyncFunction(dpy); +- if (dpy->in_ifevent) { +- dpy->lock_fns->lock_display = _XIfEventLockDisplay; +- dpy->lock_fns->unlock_display = _XIfEventUnlockDisplay; +- dpy->lock->internal_lock_display = _XIfEventInternalLockDisplay; +- } + } + + /* +@@ -537,6 +495,9 @@ static void _XInternalLockDisplay( + XTHREADS_FILE_LINE_ARGS + ) + { ++ if (dpy->in_ifevent && xthread_equal(dpy->ifevent_thread, xthread_self())) ++ return; ++ + #ifdef XTHREADS_WARN + _XLockDisplayWarn(dpy, file, line); + #else +-- +GitLab + -- cgit v1.2.3