summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-04-21 02:45:06 +0000
committer Eric Hameleers <alien@slackware.com>2020-04-21 08:59:53 +0200
commit72b3c9e90fc0aaa9889f6be69da37f506cabeba2 (patch)
treea352ce07c0e6d2ee838fb9d34ad0d2010bc402d8
parenta4a9ee5efe6ec1f8cc7c5fd48c5df766fc74f3f3 (diff)
downloadcurrent-20200421024506.tar.gz
current-20200421024506.tar.xz
Tue Apr 21 02:45:06 UTC 202020200421024506
d/python-2.7.17-x86_64-2.txz: Removed. d/python2-2.7.18-x86_64-1.txz: Added. OK, I know a few people got excited seeing python-2 removed in the previous entry, but it's just being renamed to python2 for consistency with the python3 package. It's DOA though, and is the final release of the already EOL python 2 branch (a "commemorative" release as they say in the announcement). l/M2Crypto-0.35.2-x86_64-3.txz: Rebuilt. Added python3 modules. Thanks to sombragris and ponce. l/harfbuzz-2.6.5-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_7-x86_64-1.txz: Upgraded. l/libuv-1.37.0-x86_64-1.txz: Upgraded. l/libyaml-0.2.4-x86_64-1.txz: Upgraded. l/oniguruma-6.9.5-x86_64-1.txz: Upgraded. x/pixman-0.40.0-x86_64-1.txz: Upgraded.
-rw-r--r--ChangeLog.rss28
-rw-r--r--ChangeLog.txt16
-rw-r--r--FILELIST.TXT160
-rwxr-xr-xrecompress.sh7
-rw-r--r--slackware64/d/maketag6
-rw-r--r--slackware64/d/maketag.ez6
-rw-r--r--slackware64/d/tagfile2
-rw-r--r--source/d/python/slack-desc19
-rw-r--r--source/d/python2/python.no-static-library.diff (renamed from source/d/python/python.no-static-library.diff)0
-rw-r--r--source/d/python2/python.readline.set_pre_input_hook.diff (renamed from source/d/python/python.readline.set_pre_input_hook.diff)0
-rw-r--r--source/d/python2/python.url (renamed from source/d/python/python.url)0
-rw-r--r--source/d/python2/python.x86_64.diff (renamed from source/d/python/python.x86_64.diff)0
-rwxr-xr-xsource/d/python2/python2.SlackBuild (renamed from source/d/python/python.SlackBuild)34
-rw-r--r--source/d/python2/slack-desc19
-rwxr-xr-xsource/l/M2Crypto/M2Crypto.SlackBuild14
-rw-r--r--source/l/harfbuzz/harfbuzz.url1
-rw-r--r--source/l/harfbuzz/slack-desc2
-rw-r--r--source/l/libuv/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch484
-rwxr-xr-xsource/l/libuv/libuv.SlackBuild5
-rwxr-xr-xsource/l/oniguruma/oniguruma.SlackBuild8
-rw-r--r--source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff647
21 files changed, 667 insertions, 791 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index 9cc95f71..cbc6766f 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,34 @@
<description>Tracking Slackware development in git.</description>
<language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
- <pubDate>Sun, 19 Apr 2020 21:06:43 GMT</pubDate>
- <lastBuildDate>Mon, 20 Apr 2020 06:59:46 GMT</lastBuildDate>
+ <pubDate>Tue, 21 Apr 2020 02:45:06 GMT</pubDate>
+ <lastBuildDate>Tue, 21 Apr 2020 06:59:47 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.11</generator>
<item>
+ <title>Tue, 21 Apr 2020 02:45:06 GMT</title>
+ <pubDate>Tue, 21 Apr 2020 02:45:06 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20200421024506</link>
+ <guid isPermaLink="false">20200421024506</guid>
+ <description>
+ <![CDATA[<pre>
+d/python-2.7.17-x86_64-2.txz: Removed.
+d/python2-2.7.18-x86_64-1.txz: Added.
+ OK, I know a few people got excited seeing python-2 removed in the previous
+ entry, but it's just being renamed to python2 for consistency with the
+ python3 package. It's DOA though, and is the final release of the already EOL
+ python 2 branch (a "commemorative" release as they say in the announcement).
+l/M2Crypto-0.35.2-x86_64-3.txz: Rebuilt.
+ Added python3 modules. Thanks to sombragris and ponce.
+l/harfbuzz-2.6.5-x86_64-1.txz: Upgraded.
+l/imagemagick-7.0.10_7-x86_64-1.txz: Upgraded.
+l/libuv-1.37.0-x86_64-1.txz: Upgraded.
+l/libyaml-0.2.4-x86_64-1.txz: Upgraded.
+l/oniguruma-6.9.5-x86_64-1.txz: Upgraded.
+x/pixman-0.40.0-x86_64-1.txz: Upgraded.
+ </pre>]]>
+ </description>
+ </item>
+ <item>
<title>Sun, 19 Apr 2020 21:06:43 GMT</title>
<pubDate>Sun, 19 Apr 2020 21:06:43 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20200419210643</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 694b8fa5..9ca46086 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,19 @@
+Tue Apr 21 02:45:06 UTC 2020
+d/python-2.7.17-x86_64-2.txz: Removed.
+d/python2-2.7.18-x86_64-1.txz: Added.
+ OK, I know a few people got excited seeing python-2 removed in the previous
+ entry, but it's just being renamed to python2 for consistency with the
+ python3 package. It's DOA though, and is the final release of the already EOL
+ python 2 branch (a "commemorative" release as they say in the announcement).
+l/M2Crypto-0.35.2-x86_64-3.txz: Rebuilt.
+ Added python3 modules. Thanks to sombragris and ponce.
+l/harfbuzz-2.6.5-x86_64-1.txz: Upgraded.
+l/imagemagick-7.0.10_7-x86_64-1.txz: Upgraded.
+l/libuv-1.37.0-x86_64-1.txz: Upgraded.
+l/libyaml-0.2.4-x86_64-1.txz: Upgraded.
+l/oniguruma-6.9.5-x86_64-1.txz: Upgraded.
+x/pixman-0.40.0-x86_64-1.txz: Upgraded.
++--------------------------+
Sun Apr 19 21:06:43 UTC 2020
l/neon-0.31.1-x86_64-1.txz: Upgraded.
n/postfix-3.5.1-x86_64-1.txz: Upgraded.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 384577ac..34f4b5c4 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Sun Apr 19 21:18:16 UTC 2020
+Tue Apr 21 03:05:05 UTC 2020
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 2020-04-19 21:06 .
+drwxr-xr-x 12 root root 4096 2020-04-21 02:56 .
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
-rw-r--r-- 1 root root 14975 2020-02-08 21:06 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 961966 2020-04-17 21:52 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2020-04-17 21:52 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 961946 2020-04-21 02:56 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2020-04-21 02:56 ./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 856225 2020-04-19 21:06 ./ChangeLog.txt
+-rw-r--r-- 1 root root 857026 2020-04-21 02:45 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2020-04-17 21:38 ./EFI/BOOT
-rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2020-04-17 21:38 ./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 1263937 2020-04-17 21:51 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1263918 2020-04-21 02:56 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 746310 2020-04-19 21:16 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 746341 2020-04-21 02:54 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
-rw-r--r-- 1 root root 3629 2020-04-17 21:14 ./README.initrd
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
@@ -833,11 +833,11 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches
-rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT
-drwxr-xr-x 18 root root 4096 2020-04-19 21:16 ./slackware64
--rw-r--r-- 1 root root 295329 2020-04-19 21:16 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2020-04-19 21:16 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 367763 2020-04-19 21:13 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 3803979 2020-04-19 21:14 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2020-04-21 02:54 ./slackware64
+-rw-r--r-- 1 root root 295332 2020-04-21 02:54 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2020-04-21 02:54 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 367766 2020-04-21 02:51 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 3812139 2020-04-21 02:52 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
drwxr-xr-x 2 root root 28672 2020-04-17 21:47 ./slackware64/a
-rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt
@@ -1445,7 +1445,7 @@ drwxr-xr-x 2 root root 20480 2020-04-17 04:19 ./slackware64/ap
-rw-r--r-- 1 root root 506 2020-02-16 18:00 ./slackware64/ap/zsh-5.8-x86_64-1.txt
-rw-r--r-- 1 root root 3053312 2020-02-16 18:00 ./slackware64/ap/zsh-5.8-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-02-16 18:00 ./slackware64/ap/zsh-5.8-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 20480 2020-04-17 21:47 ./slackware64/d
+drwxr-xr-x 2 root root 20480 2020-04-21 02:51 ./slackware64/d
-rw-r--r-- 1 root root 360 2020-04-03 04:19 ./slackware64/d/Cython-0.29.16-x86_64-1.txt
-rw-r--r-- 1 root root 3297132 2020-04-03 04:19 ./slackware64/d/Cython-0.29.16-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-04-03 04:19 ./slackware64/d/Cython-0.29.16-x86_64-1.txz.asc
@@ -1562,8 +1562,8 @@ drwxr-xr-x 2 root root 20480 2020-04-17 21:47 ./slackware64/d
-rw-r--r-- 1 root root 466 2020-01-16 19:17 ./slackware64/d/make-4.2.1-x86_64-5.txt
-rw-r--r-- 1 root root 481700 2020-01-16 19:17 ./slackware64/d/make-4.2.1-x86_64-5.txz
-rw-r--r-- 1 root root 163 2020-01-16 19:17 ./slackware64/d/make-4.2.1-x86_64-5.txz.asc
--rw-r--r-- 1 root root 5084 2019-11-17 21:55 ./slackware64/d/maketag
--rw-r--r-- 1 root root 5084 2019-11-17 21:55 ./slackware64/d/maketag.ez
+-rw-r--r-- 1 root root 5091 2020-04-21 02:41 ./slackware64/d/maketag
+-rw-r--r-- 1 root root 5091 2020-04-21 02:41 ./slackware64/d/maketag.ez
-rw-r--r-- 1 root root 659 2020-04-03 04:13 ./slackware64/d/mercurial-5.3.2-x86_64-1.txt
-rw-r--r-- 1 root root 4330988 2020-04-03 04:13 ./slackware64/d/mercurial-5.3.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-04-03 04:13 ./slackware64/d/mercurial-5.3.2-x86_64-1.txz.asc
@@ -1600,15 +1600,15 @@ drwxr-xr-x 2 root root 20480 2020-04-17 21:47 ./slackware64/d
-rw-r--r-- 1 root root 337 2018-04-13 14:04 ./slackware64/d/pmake-1.111-x86_64-5.txt
-rw-r--r-- 1 root root 120924 2018-04-13 14:04 ./slackware64/d/pmake-1.111-x86_64-5.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:04 ./slackware64/d/pmake-1.111-x86_64-5.txz.asc
--rw-r--r-- 1 root root 436 2019-12-20 19:53 ./slackware64/d/python-2.7.17-x86_64-2.txt
--rw-r--r-- 1 root root 13030944 2019-12-20 19:53 ./slackware64/d/python-2.7.17-x86_64-2.txz
--rw-r--r-- 1 root root 163 2019-12-20 19:53 ./slackware64/d/python-2.7.17-x86_64-2.txz.asc
-rw-r--r-- 1 root root 270 2020-01-25 18:35 ./slackware64/d/python-pip-20.0.2-x86_64-1.txt
-rw-r--r-- 1 root root 2244872 2020-01-25 18:35 ./slackware64/d/python-pip-20.0.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-01-25 18:35 ./slackware64/d/python-pip-20.0.2-x86_64-1.txz.asc
-rw-r--r-- 1 root root 562 2020-03-08 19:09 ./slackware64/d/python-setuptools-45.3.0-x86_64-1.txt
-rw-r--r-- 1 root root 691832 2020-03-08 19:09 ./slackware64/d/python-setuptools-45.3.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-03-08 19:09 ./slackware64/d/python-setuptools-45.3.0-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 484 2020-04-20 19:24 ./slackware64/d/python2-2.7.18-x86_64-1.txt
+-rw-r--r-- 1 root root 13035508 2020-04-20 19:24 ./slackware64/d/python2-2.7.18-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-04-20 19:24 ./slackware64/d/python2-2.7.18-x86_64-1.txz.asc
-rw-r--r-- 1 root root 663 2020-02-27 19:59 ./slackware64/d/python3-3.8.2-x86_64-1.txt
-rw-r--r-- 1 root root 17291724 2020-02-27 19:59 ./slackware64/d/python3-3.8.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-02-27 19:59 ./slackware64/d/python3-3.8.2-x86_64-1.txz.asc
@@ -1639,7 +1639,7 @@ drwxr-xr-x 2 root root 20480 2020-04-17 21:47 ./slackware64/d
-rw-r--r-- 1 root root 559 2019-08-22 18:16 ./slackware64/d/swig-4.0.1-x86_64-1.txt
-rw-r--r-- 1 root root 2673116 2019-08-22 18:16 ./slackware64/d/swig-4.0.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-08-22 18:16 ./slackware64/d/swig-4.0.1-x86_64-1.txz.asc
--rw-r--r-- 1 root root 750 2019-11-17 21:55 ./slackware64/d/tagfile
+-rw-r--r-- 1 root root 751 2020-04-21 02:41 ./slackware64/d/tagfile
-rw-r--r-- 1 root root 394 2020-04-06 17:14 ./slackware64/d/vala-0.48.3-x86_64-1.txt
-rw-r--r-- 1 root root 2204904 2020-04-06 17:14 ./slackware64/d/vala-0.48.3-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-04-06 17:14 ./slackware64/d/vala-0.48.3-x86_64-1.txz.asc
@@ -2516,7 +2516,7 @@ drwxr-xr-x 2 root root 20480 2016-03-10 03:11 ./slackware64/kdei
-rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag
-rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag.ez
-rw-r--r-- 1 root root 1500 2018-03-01 07:54 ./slackware64/kdei/tagfile
-drwxr-xr-x 2 root root 69632 2020-04-19 21:13 ./slackware64/l
+drwxr-xr-x 2 root root 69632 2020-04-21 02:51 ./slackware64/l
-rw-r--r-- 1 root root 338 2020-02-15 20:39 ./slackware64/l/ConsoleKit2-1.2.1-x86_64-3.txt
-rw-r--r-- 1 root root 191012 2020-02-15 20:39 ./slackware64/l/ConsoleKit2-1.2.1-x86_64-3.txz
-rw-r--r-- 1 root root 163 2020-02-15 20:39 ./slackware64/l/ConsoleKit2-1.2.1-x86_64-3.txz.asc
@@ -2526,9 +2526,9 @@ drwxr-xr-x 2 root root 69632 2020-04-19 21:13 ./slackware64/l
-rw-r--r-- 1 root root 333 2018-06-11 17:52 ./slackware64/l/LibRaw-0.18.12-x86_64-1.txt
-rw-r--r-- 1 root root 366988 2018-06-11 17:52 ./slackware64/l/LibRaw-0.18.12-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-06-11 17:52 ./slackware64/l/LibRaw-0.18.12-x86_64-1.txz.asc
--rw-r--r-- 1 root root 569 2019-07-12 18:38 ./slackware64/l/M2Crypto-0.35.2-x86_64-2.txt
--rw-r--r-- 1 root root 731408 2019-07-12 18:38 ./slackware64/l/M2Crypto-0.35.2-x86_64-2.txz
--rw-r--r-- 1 root root 163 2019-07-12 18:38 ./slackware64/l/M2Crypto-0.35.2-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 569 2020-04-21 02:05 ./slackware64/l/M2Crypto-0.35.2-x86_64-3.txt
+-rw-r--r-- 1 root root 880892 2020-04-21 02:05 ./slackware64/l/M2Crypto-0.35.2-x86_64-3.txz
+-rw-r--r-- 1 root root 163 2020-04-21 02:05 ./slackware64/l/M2Crypto-0.35.2-x86_64-3.txz.asc
-rw-r--r-- 1 root root 477 2020-03-02 03:26 ./slackware64/l/Mako-1.1.2-x86_64-1.txt
-rw-r--r-- 1 root root 161172 2020-03-02 03:26 ./slackware64/l/Mako-1.1.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-03-02 03:26 ./slackware64/l/Mako-1.1.2-x86_64-1.txz.asc
@@ -2829,9 +2829,9 @@ drwxr-xr-x 2 root root 69632 2020-04-19 21:13 ./slackware64/l
-rw-r--r-- 1 root root 428 2020-03-27 19:23 ./slackware64/l/gvfs-1.44.1-x86_64-1.txt
-rw-r--r-- 1 root root 1038888 2020-03-27 19:23 ./slackware64/l/gvfs-1.44.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-03-27 19:23 ./slackware64/l/gvfs-1.44.1-x86_64-1.txz.asc
--rw-r--r-- 1 root root 258 2019-10-30 18:51 ./slackware64/l/harfbuzz-2.6.4-x86_64-1.txt
--rw-r--r-- 1 root root 832732 2019-10-30 18:51 ./slackware64/l/harfbuzz-2.6.4-x86_64-1.txz
--rw-r--r-- 1 root root 163 2019-10-30 18:51 ./slackware64/l/harfbuzz-2.6.4-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 225 2020-04-20 19:21 ./slackware64/l/harfbuzz-2.6.5-x86_64-1.txt
+-rw-r--r-- 1 root root 865812 2020-04-20 19:21 ./slackware64/l/harfbuzz-2.6.5-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-04-20 19:21 ./slackware64/l/harfbuzz-2.6.5-x86_64-1.txz.asc
-rw-r--r-- 1 root root 506 2018-04-13 14:49 ./slackware64/l/hicolor-icon-theme-0.17-noarch-2.txt
-rw-r--r-- 1 root root 14164 2018-04-13 14:49 ./slackware64/l/hicolor-icon-theme-0.17-noarch-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:49 ./slackware64/l/hicolor-icon-theme-0.17-noarch-2.txz.asc
@@ -2853,9 +2853,9 @@ drwxr-xr-x 2 root root 69632 2020-04-19 21:13 ./slackware64/l
-rw-r--r-- 1 root root 370 2018-04-17 07:49 ./slackware64/l/ilmbase-2.2.0-x86_64-2.txt
-rw-r--r-- 1 root root 138092 2018-04-17 07:49 ./slackware64/l/ilmbase-2.2.0-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-17 07:49 ./slackware64/l/ilmbase-2.2.0-x86_64-2.txz.asc
--rw-r--r-- 1 root root 537 2020-04-07 18:13 ./slackware64/l/imagemagick-7.0.10_6-x86_64-1.txt
--rw-r--r-- 1 root root 7823904 2020-04-07 18:13 ./slackware64/l/imagemagick-7.0.10_6-x86_64-1.txz
--rw-r--r-- 1 root root 163 2020-04-07 18:13 ./slackware64/l/imagemagick-7.0.10_6-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 537 2020-04-20 19:26 ./slackware64/l/imagemagick-7.0.10_7-x86_64-1.txt
+-rw-r--r-- 1 root root 7824496 2020-04-20 19:26 ./slackware64/l/imagemagick-7.0.10_7-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-04-20 19:26 ./slackware64/l/imagemagick-7.0.10_7-x86_64-1.txz.asc
-rwxr-xr-x 1 root root 2897 2009-06-24 22:06 ./slackware64/l/install-packages
-rw-r--r-- 1 root root 446 2006-09-18 10:41 ./slackware64/l/install.end
-rw-r--r-- 1 root root 417 2020-01-24 20:00 ./slackware64/l/isl-0.22.1-x86_64-1.txt
@@ -3149,9 +3149,9 @@ drwxr-xr-x 2 root root 69632 2020-04-19 21:13 ./slackware64/l
-rw-r--r-- 1 root root 321 2019-01-31 22:58 ./slackware64/l/libusbmuxd-20190118_c75605d-x86_64-1.txt
-rw-r--r-- 1 root root 30512 2019-01-31 22:58 ./slackware64/l/libusbmuxd-20190118_c75605d-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-01-31 22:58 ./slackware64/l/libusbmuxd-20190118_c75605d-x86_64-1.txz.asc
--rw-r--r-- 1 root root 214 2020-04-17 18:24 ./slackware64/l/libuv-1.36.0-x86_64-2.txt
--rw-r--r-- 1 root root 112680 2020-04-17 18:24 ./slackware64/l/libuv-1.36.0-x86_64-2.txz
--rw-r--r-- 1 root root 163 2020-04-17 18:24 ./slackware64/l/libuv-1.36.0-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 214 2020-04-20 19:35 ./slackware64/l/libuv-1.37.0-x86_64-1.txt
+-rw-r--r-- 1 root root 113632 2020-04-20 19:35 ./slackware64/l/libuv-1.37.0-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-04-20 19:35 ./slackware64/l/libuv-1.37.0-x86_64-1.txz.asc
-rw-r--r-- 1 root root 316 2019-10-06 19:13 ./slackware64/l/libvisio-0.1.7-x86_64-2.txt
-rw-r--r-- 1 root root 633176 2019-10-06 19:13 ./slackware64/l/libvisio-0.1.7-x86_64-2.txz
-rw-r--r-- 1 root root 163 2019-10-06 19:13 ./slackware64/l/libvisio-0.1.7-x86_64-2.txz.asc
@@ -3197,9 +3197,9 @@ drwxr-xr-x 2 root root 69632 2020-04-19 21:13 ./slackware64/l
-rw-r--r-- 1 root root 219 2019-10-31 17:17 ./slackware64/l/libxslt-1.1.34-x86_64-1.txt
-rw-r--r-- 1 root root 370936 2019-10-31 17:17 ./slackware64/l/libxslt-1.1.34-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-10-31 17:17 ./slackware64/l/libxslt-1.1.34-x86_64-1.txz.asc
--rw-r--r-- 1 root root 287 2020-04-12 19:44 ./slackware64/l/libyaml-0.2.3-x86_64-1.txt
--rw-r--r-- 1 root root 57520 2020-04-12 19:44 ./slackware64/l/libyaml-0.2.3-x86_64-1.txz
--rw-r--r-- 1 root root 163 2020-04-12 19:44 ./slackware64/l/libyaml-0.2.3-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 287 2020-04-20 19:39 ./slackware64/l/libyaml-0.2.4-x86_64-1.txt
+-rw-r--r-- 1 root root 57324 2020-04-20 19:39 ./slackware64/l/libyaml-0.2.4-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-04-20 19:39 ./slackware64/l/libyaml-0.2.4-x86_64-1.txz.asc
-rw-r--r-- 1 root root 426 2020-02-03 19:48 ./slackware64/l/libzip-1.6.1-x86_64-1.txt
-rw-r--r-- 1 root root 219364 2020-02-03 19:48 ./slackware64/l/libzip-1.6.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-02-03 19:48 ./slackware64/l/libzip-1.6.1-x86_64-1.txz.asc
@@ -3247,9 +3247,9 @@ drwxr-xr-x 2 root root 69632 2020-04-19 21:13 ./slackware64/l
-rw-r--r-- 1 root root 411 2018-04-13 15:09 ./slackware64/l/ocl-icd-2.2.12-x86_64-2.txt
-rw-r--r-- 1 root root 30916 2018-04-13 15:09 ./slackware64/l/ocl-icd-2.2.12-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:09 ./slackware64/l/ocl-icd-2.2.12-x86_64-2.txz.asc
--rw-r--r-- 1 root root 459 2019-12-01 18:26 ./slackware64/l/oniguruma-6.9.4-x86_64-1.txt
--rw-r--r-- 1 root root 216072 2019-12-01 18:26 ./slackware64/l/oniguruma-6.9.4-x86_64-1.txz
--rw-r--r-- 1 root root 163 2019-12-01 18:26 ./slackware64/l/oniguruma-6.9.4-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 459 2020-04-20 19:41 ./slackware64/l/oniguruma-6.9.5-x86_64-1.txt
+-rw-r--r-- 1 root root 218408 2020-04-20 19:41 ./slackware64/l/oniguruma-6.9.5-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-04-20 19:41 ./slackware64/l/oniguruma-6.9.5-x86_64-1.txz.asc
-rw-r--r-- 1 root root 463 2020-02-16 05:22 ./slackware64/l/openal-soft-1.20.1-x86_64-1.txt
-rw-r--r-- 1 root root 748300 2020-02-16 05:22 ./slackware64/l/openal-soft-1.20.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-02-16 05:22 ./slackware64/l/openal-soft-1.20.1-x86_64-1.txz.asc
@@ -4007,7 +4007,7 @@ drwxr-xr-x 2 root root 4096 2020-04-05 21:10 ./slackware64/tcl
-rw-r--r-- 1 root root 227 2019-11-22 21:51 ./slackware64/tcl/tk-8.6.10-x86_64-1.txt
-rw-r--r-- 1 root root 1780348 2019-11-22 21:51 ./slackware64/tcl/tk-8.6.10-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-11-22 21:51 ./slackware64/tcl/tk-8.6.10-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 65536 2020-04-14 22:45 ./slackware64/x
+drwxr-xr-x 2 root root 65536 2020-04-21 02:51 ./slackware64/x
-rw-r--r-- 1 root root 257 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txt
-rw-r--r-- 1 root root 5074404 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz.asc
@@ -4390,9 +4390,9 @@ drwxr-xr-x 2 root root 65536 2020-04-14 22:45 ./slackware64/x
-rw-r--r-- 1 root root 222 2018-04-13 06:03 ./slackware64/x/oclock-1.0.4-x86_64-2.txt
-rw-r--r-- 1 root root 21468 2018-04-13 06:03 ./slackware64/x/oclock-1.0.4-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 06:03 ./slackware64/x/oclock-1.0.4-x86_64-2.txz.asc
--rw-r--r-- 1 root root 366 2019-04-10 21:09 ./slackware64/x/pixman-0.38.4-x86_64-1.txt
--rw-r--r-- 1 root root 237276 2019-04-10 21:09 ./slackware64/x/pixman-0.38.4-x86_64-1.txz
--rw-r--r-- 1 root root 163 2019-04-10 21:09 ./slackware64/x/pixman-0.38.4-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 366 2020-04-20 20:09 ./slackware64/x/pixman-0.40.0-x86_64-1.txt
+-rw-r--r-- 1 root root 241684 2020-04-20 20:09 ./slackware64/x/pixman-0.40.0-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-04-20 20:09 ./slackware64/x/pixman-0.40.0-x86_64-1.txz.asc
-rw-r--r-- 1 root root 235 2019-12-30 07:09 ./slackware64/x/pyxdg-0.26-x86_64-2.txt
-rw-r--r-- 1 root root 112356 2019-12-30 07:09 ./slackware64/x/pyxdg-0.26-x86_64-2.txz
-rw-r--r-- 1 root root 163 2019-12-30 07:09 ./slackware64/x/pyxdg-0.26-x86_64-2.txz.asc
@@ -5117,11 +5117,11 @@ drwxr-xr-x 2 root root 4096 2019-02-17 23:51 ./slackware64/y
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez
-rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile
-drwxr-xr-x 19 root root 4096 2020-04-19 21:18 ./source
--rw-r--r-- 1 root root 487139 2020-04-19 21:18 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2020-04-19 21:18 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 686887 2020-04-19 21:17 ./source/FILE_LIST
--rw-r--r-- 1 root root 20655197 2020-04-19 21:17 ./source/MANIFEST.bz2
+drwxr-xr-x 19 root root 4096 2020-04-21 03:05 ./source
+-rw-r--r-- 1 root root 487116 2020-04-21 03:05 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2020-04-21 03:05 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 686865 2020-04-21 03:04 ./source/FILE_LIST
+-rw-r--r-- 1 root root 20649420 2020-04-21 03:04 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
drwxr-xr-x 112 root root 4096 2020-04-01 23:41 ./source/a
-rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./source/a/FTBFSlog
@@ -6695,7 +6695,7 @@ drwxr-xr-x 2 root root 4096 2020-02-16 17:57 ./source/ap/zsh
-rwxr-xr-x 1 root root 4352 2020-02-16 17:58 ./source/ap/zsh/zsh.SlackBuild
-rw-r--r-- 1 root root 23 2018-09-14 17:50 ./source/ap/zsh/zsh.url
-rwxr-xr-x 1 root root 11975 2020-02-19 20:57 ./source/buildlist-from-changelog.sh
-drwxr-xr-x 58 root root 4096 2020-03-29 21:06 ./source/d
+drwxr-xr-x 58 root root 4096 2020-04-21 02:12 ./source/d
drwxr-xr-x 2 root root 4096 2020-04-03 04:15 ./source/d/Cython
-rw-r--r-- 1 root root 1595709 2020-03-24 15:35 ./source/d/Cython/Cython-0.29.16.tar.lz
-rwxr-xr-x 1 root root 2740 2020-02-15 18:48 ./source/d/Cython/Cython.SlackBuild
@@ -6987,7 +6987,6 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/d/pmake
-rw-r--r-- 1 root root 38071 2007-02-09 20:45 ./source/d/pmake/pmake.txt.gz
-rw-r--r-- 1 root root 26675 2005-07-07 09:32 ./source/d/pmake/pmake_1.111-1.diff.gz
-rw-r--r-- 1 root root 790 2018-02-27 06:49 ./source/d/pmake/slack-desc
-drwxr-xr-x 2 root root 4096 2019-12-20 19:34 ./source/d/python
drwxr-xr-x 2 root root 4096 2020-01-25 18:35 ./source/d/python-pip
-rw-r--r-- 1 root root 1022891 2020-01-24 14:50 ./source/d/python-pip/pip-20.0.2.tar.lz
-rw-r--r-- 1 root root 33 2018-03-29 06:10 ./source/d/python-pip/pip.url
@@ -6998,15 +6997,16 @@ drwxr-xr-x 2 root root 4096 2020-03-08 19:09 ./source/d/python-setuptools
-rw-r--r-- 1 root root 40 2017-11-28 22:11 ./source/d/python-setuptools/python-setuptools.url
-rw-r--r-- 1 root root 462424 2020-03-07 20:00 ./source/d/python-setuptools/setuptools-45.3.0.tar.lz
-rw-r--r-- 1 root root 1059 2018-02-27 06:13 ./source/d/python-setuptools/slack-desc
--rw-r--r-- 1 root root 12855568 2019-10-19 19:00 ./source/d/python/Python-2.7.17.tar.xz
--rw-r--r-- 1 root root 833 2019-10-19 19:00 ./source/d/python/Python-2.7.17.tar.xz.asc
--rw-r--r-- 1 root root 1624111 2019-10-19 19:00 ./source/d/python/python-2.7.17-docs-text.tar.bz2
--rwxr-xr-x 1 root root 5710 2019-12-20 19:34 ./source/d/python/python.SlackBuild
--rw-r--r-- 1 root root 798 2012-05-09 18:38 ./source/d/python/python.no-static-library.diff.gz
--rw-r--r-- 1 root root 325 2009-06-09 19:23 ./source/d/python/python.readline.set_pre_input_hook.diff.gz
--rw-r--r-- 1 root root 34 2019-03-03 19:49 ./source/d/python/python.url
--rw-r--r-- 1 root root 1867 2016-12-28 19:19 ./source/d/python/python.x86_64.diff.gz
--rw-r--r-- 1 root root 890 2018-02-27 06:13 ./source/d/python/slack-desc
+drwxr-xr-x 2 root root 4096 2020-04-20 19:11 ./source/d/python2
+-rw-r--r-- 1 root root 12854736 2020-04-19 21:50 ./source/d/python2/Python-2.7.18.tar.xz
+-rw-r--r-- 1 root root 833 2020-04-19 21:50 ./source/d/python2/Python-2.7.18.tar.xz.asc
+-rw-r--r-- 1 root root 1631043 2020-04-19 21:53 ./source/d/python2/python-2.7.18-docs-text.tar.bz2
+-rw-r--r-- 1 root root 798 2012-05-09 18:38 ./source/d/python2/python.no-static-library.diff.gz
+-rw-r--r-- 1 root root 325 2009-06-09 19:23 ./source/d/python2/python.readline.set_pre_input_hook.diff.gz
+-rw-r--r-- 1 root root 34 2019-03-03 19:49 ./source/d/python2/python.url
+-rw-r--r-- 1 root root 1867 2016-12-28 19:19 ./source/d/python2/python.x86_64.diff.gz
+-rwxr-xr-x 1 root root 5723 2020-04-20 19:22 ./source/d/python2/python2.SlackBuild
+-rw-r--r-- 1 root root 939 2020-04-20 19:09 ./source/d/python2/slack-desc
drwxr-xr-x 2 root root 4096 2020-02-27 19:55 ./source/d/python3
-rw-r--r-- 1 root root 17869888 2020-02-25 11:35 ./source/d/python3/Python-3.8.2.tar.xz
-rw-r--r-- 1 root root 833 2020-02-25 11:35 ./source/d/python3/Python-3.8.2.tar.xz.asc
@@ -8335,12 +8335,12 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/LibRaw
-rw-r--r-- 1 root root 31961 2018-02-24 11:20 ./source/l/LibRaw/LibRaw-demosaic-pack-GPL3-0.18.8.tar.lz
-rwxr-xr-x 1 root root 4350 2019-09-29 23:48 ./source/l/LibRaw/LibRaw.SlackBuild
-rw-r--r-- 1 root root 819 2018-02-27 06:12 ./source/l/LibRaw/slack-desc
-drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/M2Crypto
+drwxr-xr-x 2 root root 4096 2020-04-21 02:03 ./source/l/M2Crypto
-rw-r--r-- 1 root root 707832 2019-06-10 11:55 ./source/l/M2Crypto/M2Crypto-0.35.2.tar.xz
--rwxr-xr-x 1 root root 3603 2019-09-29 23:48 ./source/l/M2Crypto/M2Crypto.SlackBuild
+-rwxr-xr-x 1 root root 3707 2020-04-21 02:05 ./source/l/M2Crypto/M2Crypto.SlackBuild
-rw-r--r-- 1 root root 38 2018-09-24 19:27 ./source/l/M2Crypto/M2Crypto.url
-rw-r--r-- 1 root root 1024 2018-02-27 06:12 ./source/l/M2Crypto/slack-desc
--rw-r--r-- 1 root root 46760 2019-06-19 22:31 ./source/l/M2Crypto/typing-3.7.4.tar.xz
+-rw-r--r-- 1 root root 47032 2020-02-26 17:43 ./source/l/M2Crypto/typing-3.7.4.1.tar.xz
-rw-r--r-- 1 root root 36 2018-09-24 19:28 ./source/l/M2Crypto/typing.url
drwxr-xr-x 2 root root 4096 2020-03-02 03:26 ./source/l/Mako
-rw-r--r-- 1 root root 339767 2020-03-01 17:39 ./source/l/Mako/Mako-1.1.2.tar.lz
@@ -8913,10 +8913,11 @@ drwxr-xr-x 2 root root 4096 2020-03-27 19:23 ./source/l/gvfs
-rw-r--r-- 1 root root 1222040 2020-03-27 13:32 ./source/l/gvfs/gvfs-1.44.1.tar.xz
-rwxr-xr-x 1 root root 4848 2019-09-29 23:48 ./source/l/gvfs/gvfs.SlackBuild
-rw-r--r-- 1 root root 882 2018-02-27 06:12 ./source/l/gvfs/slack-desc
-drwxr-xr-x 2 root root 4096 2019-10-30 18:50 ./source/l/harfbuzz
--rw-r--r-- 1 root root 5967468 2019-10-29 19:56 ./source/l/harfbuzz/harfbuzz-2.6.4.tar.xz
+drwxr-xr-x 2 root root 4096 2020-04-20 19:20 ./source/l/harfbuzz
+-rw-r--r-- 1 root root 8510596 2020-04-17 20:03 ./source/l/harfbuzz/harfbuzz-2.6.5.tar.xz
-rwxr-xr-x 1 root root 3918 2019-10-29 19:13 ./source/l/harfbuzz/harfbuzz.SlackBuild
--rw-r--r-- 1 root root 746 2018-06-21 20:28 ./source/l/harfbuzz/slack-desc
+-rw-r--r-- 1 root root 46 2020-04-20 19:19 ./source/l/harfbuzz/harfbuzz.url
+-rw-r--r-- 1 root root 713 2020-04-20 19:20 ./source/l/harfbuzz/slack-desc
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/hicolor-icon-theme
-rw-r--r-- 1 root root 580 2012-07-18 19:52 ./source/l/hicolor-icon-theme/doinst.sh.gz
-rw-r--r-- 1 root root 53016 2017-08-31 06:57 ./source/l/hicolor-icon-theme/hicolor-icon-theme-0.17.tar.xz
@@ -8959,9 +8960,9 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/ilmbase
-rw-r--r-- 1 root root 326876 2014-11-29 16:17 ./source/l/ilmbase/ilmbase-2.2.0.tar.xz
-rwxr-xr-x 1 root root 3609 2019-09-29 23:48 ./source/l/ilmbase/ilmbase.SlackBuild
-rw-r--r-- 1 root root 825 2018-02-27 06:12 ./source/l/ilmbase/slack-desc
-drwxr-xr-x 2 root root 4096 2020-04-07 18:08 ./source/l/imagemagick
--rw-r--r-- 1 root root 9650989 2020-04-06 17:14 ./source/l/imagemagick/ImageMagick-7.0.10-6.tar.lz
--rw-r--r-- 1 root root 836 2020-04-07 00:12 ./source/l/imagemagick/ImageMagick-7.0.10-6.tar.lz.asc
+drwxr-xr-x 2 root root 4096 2020-04-20 19:22 ./source/l/imagemagick
+-rw-r--r-- 1 root root 9649308 2020-04-19 22:04 ./source/l/imagemagick/ImageMagick-7.0.10-7.tar.lz
+-rw-r--r-- 1 root root 836 2020-04-20 11:43 ./source/l/imagemagick/ImageMagick-7.0.10-7.tar.lz.asc
-rw-r--r-- 1 root root 309 2016-05-17 04:08 ./source/l/imagemagick/doinst.sh.gz
-rwxr-xr-x 1 root root 7092 2019-09-29 23:48 ./source/l/imagemagick/imagemagick.SlackBuild
-rw-r--r-- 1 root root 512 2017-07-18 01:14 ./source/l/imagemagick/policy.xml.diff.gz
@@ -9406,10 +9407,9 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/libusbmuxd
-rw-r--r-- 1 root root 33848 2019-01-31 20:24 ./source/l/libusbmuxd/libusbmuxd-20190118_c75605d.tar.xz
-rwxr-xr-x 1 root root 4057 2019-09-29 23:48 ./source/l/libusbmuxd/libusbmuxd.SlackBuild
-rw-r--r-- 1 root root 779 2018-02-27 06:12 ./source/l/libusbmuxd/slack-desc
-drwxr-xr-x 2 root root 4096 2020-04-17 18:23 ./source/l/libuv
--rw-r--r-- 1 root root 1019464 2020-04-15 16:31 ./source/l/libuv/libuv-v1.36.0.tar.lz
--rw-r--r-- 1 root root 5212 2020-04-17 18:22 ./source/l/libuv/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch.gz
--rwxr-xr-x 1 root root 4431 2020-04-17 18:23 ./source/l/libuv/libuv.SlackBuild
+drwxr-xr-x 2 root root 4096 2020-04-20 19:34 ./source/l/libuv
+-rw-r--r-- 1 root root 1019654 2020-04-19 16:16 ./source/l/libuv/libuv-v1.37.0.tar.lz
+-rwxr-xr-x 1 root root 4289 2020-04-20 19:34 ./source/l/libuv/libuv.SlackBuild
-rw-r--r-- 1 root root 28 2020-02-20 19:27 ./source/l/libuv/libuv.url
-rw-r--r-- 1 root root 667 2020-02-20 19:34 ./source/l/libuv/slack-desc
drwxr-xr-x 2 root root 4096 2019-10-06 18:49 ./source/l/libvisio
@@ -9505,8 +9505,8 @@ drwxr-xr-x 2 root root 4096 2019-10-31 17:16 ./source/l/libxslt
-rw-r--r-- 1 root root 30 2019-10-31 17:09 ./source/l/libxslt/libxslt.url
-rw-r--r-- 1 root root 231 2017-09-25 18:40 ./source/l/libxslt/libxslt.xsltMaxDepth.diff.gz
-rw-r--r-- 1 root root 674 2018-02-27 06:12 ./source/l/libxslt/slack-desc
-drwxr-xr-x 2 root root 4096 2020-04-12 19:41 ./source/l/libyaml
--rw-r--r-- 1 root root 63963 2020-04-11 17:08 ./source/l/libyaml/libyaml-0.2.3.tar.lz
+drwxr-xr-x 2 root root 4096 2020-04-20 19:39 ./source/l/libyaml
+-rw-r--r-- 1 root root 64171 2020-04-19 11:15 ./source/l/libyaml/libyaml-0.2.4.tar.lz
-rwxr-xr-x 1 root root 3954 2020-04-12 19:44 ./source/l/libyaml/libyaml.SlackBuild
-rw-r--r-- 1 root root 31 2011-07-31 18:46 ./source/l/libyaml/libyaml.url
-rw-r--r-- 1 root root 742 2018-02-27 06:12 ./source/l/libyaml/slack-desc
@@ -9637,9 +9637,9 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/ocl-icd
-rw-r--r-- 1 root root 285714 2017-11-29 08:49 ./source/l/ocl-icd/ocl-icd-2.2.12.tar.lz
-rwxr-xr-x 1 root root 3871 2019-09-29 23:48 ./source/l/ocl-icd/ocl-icd.SlackBuild
-rw-r--r-- 1 root root 898 2018-02-27 06:12 ./source/l/ocl-icd/slack-desc
-drwxr-xr-x 2 root root 4096 2019-12-01 18:25 ./source/l/oniguruma
--rw-r--r-- 1 root root 544871 2019-11-29 04:38 ./source/l/oniguruma/onig-6.9.4.tar.lz
--rwxr-xr-x 1 root root 4087 2019-12-01 18:26 ./source/l/oniguruma/oniguruma.SlackBuild
+drwxr-xr-x 2 root root 4096 2020-04-20 19:40 ./source/l/oniguruma
+-rw-r--r-- 1 root root 372474 2020-04-12 09:00 ./source/l/oniguruma/oniguruma-6.9.5.tar.lz
+-rwxr-xr-x 1 root root 4159 2020-04-20 19:41 ./source/l/oniguruma/oniguruma.SlackBuild
-rw-r--r-- 1 root root 916 2019-12-01 18:11 ./source/l/oniguruma/slack-desc
drwxr-xr-x 2 root root 4096 2020-02-16 05:22 ./source/l/openal-soft
-rw-r--r-- 1 root root 275 2020-02-12 22:38 ./source/l/openal-soft/doinst.sh.gz
@@ -12000,7 +12000,7 @@ drwxr-xr-x 2 root root 4096 2014-07-14 23:09 ./source/x/x11/patch/luit
-rw-r--r-- 1 root root 596 2014-07-14 23:22 ./source/x/x11/patch/luit/luit_use_system_extensions.diff.gz
drwxr-xr-x 2 root root 4096 2019-04-08 20:07 ./source/x/x11/patch/pixman
-rw-r--r-- 1 root root 173 2018-11-21 22:34 ./source/x/x11/patch/pixman.patch
--rw-r--r-- 1 root root 3700 2019-04-08 20:07 ./source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff.gz
+-rw-r--r-- 1 root root 5513 2020-04-20 20:08 ./source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff.gz
drwxr-xr-x 2 root root 4096 2018-08-27 18:45 ./source/x/x11/patch/xauth
-rw-r--r-- 1 root root 240 2018-08-27 18:48 ./source/x/x11/patch/xauth.patch
-rw-r--r-- 1 root root 849 2018-08-27 18:44 ./source/x/x11/patch/xauth/xauth.bc78aa61cfbddaa27dee275f639ba40de6981b17.patch.gz
@@ -12422,7 +12422,7 @@ drwxr-xr-x 2 root root 12288 2020-02-19 20:30 ./source/x/x11/slack-desc
-rw-r--r-- 1 root root 716 2012-04-08 02:21 ./source/x/x11/slack-desc/xwd
-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 2020-02-23 17:48 ./source/x/x11/src
+drwxr-xr-x 12 root root 4096 2020-04-20 19:46 ./source/x/x11/src
drwxr-xr-x 2 root root 4096 2020-03-20 16:57 ./source/x/x11/src/app
-rw-r--r-- 1 root root 115464 2018-03-05 03:32 ./source/x/x11/src/app/appres-1.0.5.tar.xz
-rw-r--r-- 1 root root 139452 2017-11-07 19:12 ./source/x/x11/src/app/bdftopcf-1.1.tar.xz
@@ -12612,7 +12612,7 @@ drwxr-xr-x 2 root root 4096 2019-08-26 18:09 ./source/x/x11/src/font
-rwxr-xr-x 1 root root 2048 2018-06-30 22:12 ./source/x/x11/src/get-xf86-video-savage.sh
-rwxr-xr-x 1 root root 2006 2018-06-30 22:12 ./source/x/x11/src/get-xf86-video-sis.sh
-rwxr-xr-x 1 root root 2006 2018-07-03 17:40 ./source/x/x11/src/get-xf86-video-v4l.sh
-drwxr-xr-x 2 root root 4096 2020-02-23 17:51 ./source/x/x11/src/lib
+drwxr-xr-x 2 root root 4096 2020-04-20 19:46 ./source/x/x11/src/lib
-rw-r--r-- 1 root root 280640 2019-03-10 22:43 ./source/x/x11/src/lib/libFS-1.0.8.tar.xz
-rw-r--r-- 1 root root 325932 2019-07-14 17:45 ./source/x/x11/src/lib/libICE-1.0.10.tar.xz
-rw-r--r-- 1 root root 300712 2018-10-10 15:05 ./source/x/x11/src/lib/libSM-1.2.3.tar.xz
@@ -12653,7 +12653,7 @@ drwxr-xr-x 2 root root 4096 2020-02-23 17:51 ./source/x/x11/src/lib
-rw-r--r-- 1 root root 439404 2020-02-22 20:51 ./source/x/x11/src/lib/libxcb-1.14.tar.xz
-rw-r--r-- 1 root root 302836 2019-03-16 18:36 ./source/x/x11/src/lib/libxkbfile-1.1.0.tar.xz
-rw-r--r-- 1 root root 250612 2018-02-26 17:27 ./source/x/x11/src/lib/libxshmfence-1.3.tar.xz
--rw-r--r-- 1 root root 624168 2019-04-10 17:22 ./source/x/x11/src/lib/pixman-0.38.4.tar.xz
+-rw-r--r-- 1 root root 634752 2020-04-19 21:56 ./source/x/x11/src/lib/pixman-0.40.0.tar.xz
-rw-r--r-- 1 root root 169464 2019-03-16 21:30 ./source/x/x11/src/lib/xtrans-1.4.0.tar.xz
drwxr-xr-x 2 root root 4096 2020-04-14 19:19 ./source/x/x11/src/proto
-rw-r--r-- 1 root root 143384 2020-02-22 20:17 ./source/x/x11/src/proto/xcb-proto-1.14.tar.xz
diff --git a/recompress.sh b/recompress.sh
index 8ae9b509..5bc179ab 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -75,12 +75,12 @@ gzip ./source/d/automake/doinst.sh
gzip ./source/d/intltool/no-guess-builddir.diff
gzip ./source/d/intltool/intltool-0.51.0-perl-5.22.patch
gzip ./source/d/m4/m4.glibc228.diff
-gzip ./source/d/python/python.readline.set_pre_input_hook.diff
-gzip ./source/d/python/python.no-static-library.diff
-gzip ./source/d/python/python.x86_64.diff
gzip ./source/d/distcc/doinst.sh
gzip ./source/d/libtool/libtool.no.moved.warning.diff
gzip ./source/d/libtool/doinst.sh
+gzip ./source/d/python2/python.readline.set_pre_input_hook.diff
+gzip ./source/d/python2/python.no-static-library.diff
+gzip ./source/d/python2/python.x86_64.diff
gzip ./source/d/pkg-config/doinst.sh
gzip ./source/d/make/b552b05251980f693c729e251f93f5225b400714.patch
gzip ./source/d/make/make.glibc-2.27.glob.diff
@@ -987,7 +987,6 @@ gzip ./source/l/taglib-extras/taglib-extras-1.0.1-version.patch
gzip ./source/l/taglib-extras/taglib-extras-1.0.1-taglib_ver.patch
gzip ./source/l/taglib-extras/taglib-extras-0.1-multilib-1.patch
gzip ./source/l/gstreamer0/gstreamer-0.10.36-bison3.patch
-gzip ./source/l/libuv/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch
gzip ./source/l/esound/esound-0.2.38-drain.patch
gzip ./source/l/esound/esound-0.2.41-libm.patch
gzip ./source/l/esound/remove-confusing-spew.patch
diff --git a/slackware64/d/maketag b/slackware64/d/maketag
index 43f68442..e4c8d396 100644
--- a/slackware64/d/maketag
+++ b/slackware64/d/maketag
@@ -61,9 +61,9 @@ done." 22 72 12 \
"perl" "Larry Wall's systems language" "on" \
"pkg-config" "A tool for managing library information" "on" \
"pmake" "Parallel make from BSD" "on" \
-"python" "An interpreted object-oriented language" "on" \
"python-pip" "tool for installing Python packages" "on" \
"python-setuptools" "Enhancements to Python distutils" "on" \
+"python2" "An interpreted object-oriented language, v2" "on" \
"python3" "An interpreted object-oriented language, v3" "on" \
"rcs" "GNU revision control system" "on" \
"re2c" "regular expressions to C/C++ conversion tool" "on" \
@@ -81,7 +81,7 @@ if [ $? = 1 -o $? = 255 ]; then
rm -f $TMP/SeTpkgs
> $TMP/SeTnewtag
for pkg in \
-Cython autoconf automake binutils bison ccache check clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-brig gcc-g++ gcc-gdc gcc-gfortran gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile help2man icecream indent intltool kernel-headers libtool llvm m4 make mercurial meson nasm ninja opencl-headers oprofile p2c parallel patchelf perl pkg-config pmake python python-pip python-setuptools python3 rcs re2c ruby rust scons slacktrack strace subversion swig vala yasm \
+Cython autoconf automake binutils bison ccache check clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-brig gcc-g++ gcc-gdc gcc-gfortran gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile help2man icecream indent intltool kernel-headers libtool llvm m4 make mercurial meson nasm ninja opencl-headers oprofile p2c parallel patchelf perl pkg-config pmake python-pip python-setuptools python2 python3 rcs re2c ruby rust scons slacktrack strace subversion swig vala yasm \
; do
echo "$pkg: SKP" >> $TMP/SeTnewtag
done
@@ -89,7 +89,7 @@ Cython autoconf automake binutils bison ccache check clisp cmake cscope cvs dev8
fi
cat /dev/null > $TMP/SeTnewtag
for PACKAGE in \
-Cython autoconf automake binutils bison ccache check clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-brig gcc-g++ gcc-gdc gcc-gfortran gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile help2man icecream indent intltool kernel-headers libtool llvm m4 make mercurial meson nasm ninja opencl-headers oprofile p2c parallel patchelf perl pkg-config pmake python python-pip python-setuptools python3 rcs re2c ruby rust scons slacktrack strace subversion swig vala yasm \
+Cython autoconf automake binutils bison ccache check clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-brig gcc-g++ gcc-gdc gcc-gfortran gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile help2man icecream indent intltool kernel-headers libtool llvm m4 make mercurial meson nasm ninja opencl-headers oprofile p2c parallel patchelf perl pkg-config pmake python-pip python-setuptools python2 python3 rcs re2c ruby rust scons slacktrack strace subversion swig vala yasm \
; do
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/d/maketag.ez b/slackware64/d/maketag.ez
index 43f68442..e4c8d396 100644
--- a/slackware64/d/maketag.ez
+++ b/slackware64/d/maketag.ez
@@ -61,9 +61,9 @@ done." 22 72 12 \
"perl" "Larry Wall's systems language" "on" \
"pkg-config" "A tool for managing library information" "on" \
"pmake" "Parallel make from BSD" "on" \
-"python" "An interpreted object-oriented language" "on" \
"python-pip" "tool for installing Python packages" "on" \
"python-setuptools" "Enhancements to Python distutils" "on" \
+"python2" "An interpreted object-oriented language, v2" "on" \
"python3" "An interpreted object-oriented language, v3" "on" \
"rcs" "GNU revision control system" "on" \
"re2c" "regular expressions to C/C++ conversion tool" "on" \
@@ -81,7 +81,7 @@ if [ $? = 1 -o $? = 255 ]; then
rm -f $TMP/SeTpkgs
> $TMP/SeTnewtag
for pkg in \
-Cython autoconf automake binutils bison ccache check clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-brig gcc-g++ gcc-gdc gcc-gfortran gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile help2man icecream indent intltool kernel-headers libtool llvm m4 make mercurial meson nasm ninja opencl-headers oprofile p2c parallel patchelf perl pkg-config pmake python python-pip python-setuptools python3 rcs re2c ruby rust scons slacktrack strace subversion swig vala yasm \
+Cython autoconf automake binutils bison ccache check clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-brig gcc-g++ gcc-gdc gcc-gfortran gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile help2man icecream indent intltool kernel-headers libtool llvm m4 make mercurial meson nasm ninja opencl-headers oprofile p2c parallel patchelf perl pkg-config pmake python-pip python-setuptools python2 python3 rcs re2c ruby rust scons slacktrack strace subversion swig vala yasm \
; do
echo "$pkg: SKP" >> $TMP/SeTnewtag
done
@@ -89,7 +89,7 @@ Cython autoconf automake binutils bison ccache check clisp cmake cscope cvs dev8
fi
cat /dev/null > $TMP/SeTnewtag
for PACKAGE in \
-Cython autoconf automake binutils bison ccache check clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-brig gcc-g++ gcc-gdc gcc-gfortran gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile help2man icecream indent intltool kernel-headers libtool llvm m4 make mercurial meson nasm ninja opencl-headers oprofile p2c parallel patchelf perl pkg-config pmake python python-pip python-setuptools python3 rcs re2c ruby rust scons slacktrack strace subversion swig vala yasm \
+Cython autoconf automake binutils bison ccache check clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-brig gcc-g++ gcc-gdc gcc-gfortran gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile help2man icecream indent intltool kernel-headers libtool llvm m4 make mercurial meson nasm ninja opencl-headers oprofile p2c parallel patchelf perl pkg-config pmake python-pip python-setuptools python2 python3 rcs re2c ruby rust scons slacktrack strace subversion swig vala yasm \
; do
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/d/tagfile b/slackware64/d/tagfile
index 8414e7cf..1a496519 100644
--- a/slackware64/d/tagfile
+++ b/slackware64/d/tagfile
@@ -48,9 +48,9 @@ patchelf:REC
perl:REC
pkg-config:REC
pmake:REC
-python:REC
python-pip:REC
python-setuptools:REC
+python2:REC
python3:REC
rcs:REC
re2c:REC
diff --git a/source/d/python/slack-desc b/source/d/python/slack-desc
deleted file mode 100644
index d7db551f..00000000
--- a/source/d/python/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-python: python (object-oriented interpreted programming language)
-python:
-python: Python is an interpreted, interactive, object-oriented programming
-python: language that combines remarkable power with very clear syntax.
-python: Python's basic power can be extended with your own modules written in
-python: C or C++. Python is also adaptable as an extension language for
-python: existing applications.
-python:
-python:
-python:
-python:
diff --git a/source/d/python/python.no-static-library.diff b/source/d/python2/python.no-static-library.diff
index 96209897..96209897 100644
--- a/source/d/python/python.no-static-library.diff
+++ b/source/d/python2/python.no-static-library.diff
diff --git a/source/d/python/python.readline.set_pre_input_hook.diff b/source/d/python2/python.readline.set_pre_input_hook.diff
index 8af4b4be..8af4b4be 100644
--- a/source/d/python/python.readline.set_pre_input_hook.diff
+++ b/source/d/python2/python.readline.set_pre_input_hook.diff
diff --git a/source/d/python/python.url b/source/d/python2/python.url
index 8738d0b1..8738d0b1 100644
--- a/source/d/python/python.url
+++ b/source/d/python2/python.url
diff --git a/source/d/python/python.x86_64.diff b/source/d/python2/python.x86_64.diff
index 55cdf499..55cdf499 100644
--- a/source/d/python/python.x86_64.diff
+++ b/source/d/python2/python.x86_64.diff
diff --git a/source/d/python/python.SlackBuild b/source/d/python2/python2.SlackBuild
index e4cee053..b4698415 100755
--- a/source/d/python/python.SlackBuild
+++ b/source/d/python2/python2.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2012, 2013, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012, 2013, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,11 @@
cd $(dirname $0) ; CWD=$(pwd)
-PKGNAM=python
+PKGNAM=python2
SRCNAM=Python
VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . )
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -68,9 +68,9 @@ elif [ "$ARCH" = "armel" ]; then
fi
# Location for Python site-packages:
-SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages
+SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages
# same as above without $PKG
-TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages
+TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages
cd $TMP
rm -rf $SRCNAM-$VERSION
@@ -101,7 +101,7 @@ sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
- --docdir=/usr/doc/python-$VERSION \
+ --docdir=/usr/doc/python2-$VERSION \
--with-threads \
--enable-ipv6 \
--enable-shared \
@@ -115,16 +115,16 @@ make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
# Install some python-demo files:
-mkdir -p $PKG/usr/doc/python-$VERSION
-cp -a Demo $PKG/usr/doc/python-$VERSION
+mkdir -p $PKG/usr/doc/python2-$VERSION
+cp -a Demo $PKG/usr/doc/python2-$VERSION
# We'll install the python-tools under site-packages:
mkdir -p $SITEPK
cp -a Tools/* $SITEPK
-mkdir -p $PKG/usr/doc/python-$VERSION
-mv $SITEPK/README $PKG/usr/doc/python-$VERSION/README.python-tools
-( cd $PKG/usr/doc/python-$VERSION
+mkdir -p $PKG/usr/doc/python2-$VERSION
+mv $SITEPK/README $PKG/usr/doc/python2-$VERSION/README.python-tools
+( cd $PKG/usr/doc/python2-$VERSION
ln -sf $TOOLSDIR Tools
)
@@ -137,12 +137,12 @@ mkdir -p $PKG/usr/bin
)
# Install docs:
-mkdir -p $PKG/usr/doc/python-$VERSION/Documentation
-cp -a README LICENSE $PKG/usr/doc/python-$VERSION
-cp -a Misc $PKG/usr/doc/python-$VERSION
+mkdir -p $PKG/usr/doc/python2-$VERSION/Documentation
+cp -a README LICENSE $PKG/usr/doc/python2-$VERSION
+cp -a Misc $PKG/usr/doc/python2-$VERSION
tar xf $CWD/python-$VERSION-docs-text.tar.?z*
-mv python-${VERSION}-docs-text/* $PKG/usr/doc/python-$VERSION/Documentation
-chown -R root:root $PKG/usr/doc/python-$VERSION
+mv python-${VERSION}-docs-text/* $PKG/usr/doc/python2-$VERSION/Documentation
+chown -R root:root $PKG/usr/doc/python2-$VERSION
# Fix possible incorrect permissions:
( cd $PKG
@@ -179,5 +179,5 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $TMP/python-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/python2-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/d/python2/slack-desc b/source/d/python2/slack-desc
new file mode 100644
index 00000000..05d05ac1
--- /dev/null
+++ b/source/d/python2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+python2: python2 (object-oriented interpreted programming language, v2)
+python2:
+python2: Python is an interpreted, interactive, object-oriented programming
+python2: language that combines remarkable power with very clear syntax.
+python2: Python's basic power can be extended with your own modules written in
+python2: C or C++. Python is also adaptable as an extension language for
+python2: existing applications.
+python2:
+python2: Homepage: http://www.python.org
+python2:
+python2:
diff --git a/source/l/M2Crypto/M2Crypto.SlackBuild b/source/l/M2Crypto/M2Crypto.SlackBuild
index 28a7a45e..0491c1b7 100755
--- a/source/l/M2Crypto/M2Crypto.SlackBuild
+++ b/source/l/M2Crypto/M2Crypto.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=M2Crypto
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -62,6 +62,7 @@ find . \
-exec chmod 644 {} \+
python setup.py install --root=$PKG || exit 1
+python3 setup.py install --root=$PKG || exit 1
mkdir -p $PKG/usr/doc/M2Crypto-$VERSION
cp -a \
@@ -70,9 +71,9 @@ cp -a \
# Embed required dep typing module:
cd $TMP
-rm -rf typing-3.7.4
-tar xvf $CWD/typing-3.7.4.tar.xz || exit 1
-cd typing-3.7.4 || exit 1
+rm -rf typing-3.7.4.1
+tar xvf $CWD/typing-3.7.4.1.tar.xz || exit 1
+cd typing-3.7.4.1 || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -80,10 +81,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
python setup.py install --root=$PKG || exit 1
-mkdir -p $PKG/usr/doc/typing-3.7.4
+python3 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/typing-3.7.4.1
cp -a \
CHANGES INSTALL* LICENCE* PKG-INFO README* doc/* \
- $PKG/usr/doc/typing-3.7.4
+ $PKG/usr/doc/typing-3.7.4.1
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
diff --git a/source/l/harfbuzz/harfbuzz.url b/source/l/harfbuzz/harfbuzz.url
new file mode 100644
index 00000000..29ce27a5
--- /dev/null
+++ b/source/l/harfbuzz/harfbuzz.url
@@ -0,0 +1 @@
+https://github.com/harfbuzz/harfbuzz/releases
diff --git a/source/l/harfbuzz/slack-desc b/source/l/harfbuzz/slack-desc
index 9ede2a02..798e33bf 100644
--- a/source/l/harfbuzz/slack-desc
+++ b/source/l/harfbuzz/slack-desc
@@ -10,7 +10,7 @@ harfbuzz: harfbuzz (OpenType text shaping engine)
harfbuzz:
harfbuzz: HarfBuzz is an OpenType text shaping engine.
harfbuzz:
-harfbuzz: Homepage: http://www.freedesktop.org/software/harfbuzz/release
+harfbuzz: Homepage: http://harfbuzz.org
harfbuzz:
harfbuzz:
harfbuzz:
diff --git a/source/l/libuv/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch b/source/l/libuv/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch
deleted file mode 100644
index f0dae9cb..00000000
--- a/source/l/libuv/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch
+++ /dev/null
@@ -1,484 +0,0 @@
-From 977be04762b9bda29a88d39bb3e2cb7c44b2ad22 Mon Sep 17 00:00:00 2001
-From: Ben Noordhuis <info@bnoordhuis.nl>
-Date: Thu, 16 Apr 2020 09:59:03 +0200
-Subject: [PATCH] Revert "freebsd,linux: add recvmmsg() + sendmmsg() udp
- implementation"
-
-This reverts commit 3d7136639a39db46bc4a9074922559a564e49514.
-This reverts commit d9cd7d437d6bcea56355b6e0ef215aa64687d7a1.
-
-The first reverted commit is the sendmmsg/recvmmsg support, the second
-one a fix-up to deliver datagrams in order. The second commit has been
-implicated in causing bind9 to crash on freebsd.
-
-A quick review of the code suggests that downstream code written against
-pre-v1.35.0 libuv can't safely deal with multi-datagram support because
-they are unaware of the `UV_UDP_MMSG_CHUNK` flag and what that implies
-for buffer management, hence I'm moving to revert it.
-
-The `UV_UDP_MMSG_CHUNK` flag remains part of `uv_udp_flags` for
-API/ABI backwards compatibility reasons but it is no longer used.
-
-Fixes: https://github.com/libuv/libuv/issues/2791
-Refs: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245653
----
- docs/src/udp.rst | 18 +---
- include/uv.h | 5 +-
- src/unix/freebsd.c | 25 -----
- src/unix/internal.h | 24 -----
- src/unix/linux-syscalls.c | 1 -
- src/unix/linux-syscalls.h | 14 +++
- src/unix/udp.c | 207 +-------------------------------------
- 7 files changed, 22 insertions(+), 272 deletions(-)
-
-diff --git a/docs/src/udp.rst b/docs/src/udp.rst
-index 786a28b030..53b1fea493 100644
---- a/docs/src/udp.rst
-+++ b/docs/src/udp.rst
-@@ -42,11 +42,6 @@ Data types
- * any traffic, in effect "stealing" the port from the previous listener.
- */
- UV_UDP_REUSEADDR = 4
-- /*
-- * Indicates that the message was received by recvmmsg, so the buffer provided
-- * must not be freed by the recv_cb callback.
-- */
-- UV_UDP_MMSG_CHUNK = 8
- };
-
- .. c:type:: void (*uv_udp_send_cb)(uv_udp_send_t* req, int status)
-@@ -67,18 +62,13 @@ Data types
- * `buf`: :c:type:`uv_buf_t` with the received data.
- * `addr`: ``struct sockaddr*`` containing the address of the sender.
- Can be NULL. Valid for the duration of the callback only.
-- * `flags`: One or more or'ed UV_UDP_* constants.
-+ * `flags`: One or more or'ed UV_UDP_* constants. Right now only
-+ ``UV_UDP_PARTIAL`` is used.
-
- The callee is responsible for freeing the buffer, libuv does not reuse it.
- The buffer may be a null buffer (where `buf->base` == NULL and `buf->len` == 0)
- on error.
-
-- When using :man:`recvmmsg(2)`, chunks will have the `UV_UDP_MMSG_CHUNK` flag set,
-- those must not be freed. There will be a final callback with `nread` set to 0,
-- `addr` set to NULL and the buffer pointing at the initially allocated data with
-- the `UV_UDP_MMSG_CHUNK` flag cleared. This is a good chance for the callee to
-- free the provided buffer.
--
- .. note::
- The receive callback will be called with `nread` == 0 and `addr` == NULL when there is
- nothing to read, and with `nread` == 0 and `addr` != NULL when an empty UDP packet is
-@@ -376,10 +366,6 @@ API
-
- :returns: 0 on success, or an error code < 0 on failure.
-
-- .. versionchanged:: 1.35.0 added support for :man:`recvmmsg(2)` on supported platforms).
-- The use of this feature requires a buffer larger than
-- 2 * 64KB to be passed to `alloc_cb`.
--
- .. c:function:: int uv_udp_recv_stop(uv_udp_t* handle)
-
- Stop listening for incoming datagrams.
-diff --git a/include/uv.h b/include/uv.h
-index 2e8072fdae..dd8c8a40b0 100644
---- a/include/uv.h
-+++ b/include/uv.h
-@@ -1,4 +1,4 @@
--/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
-+/* COPYRIGHT JOYENT, INC. AND OTHER NODE CONTRIBUTORS. ALL RIGHTS RESERVED.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
-@@ -607,8 +607,7 @@ enum uv_udp_flags {
- */
- UV_UDP_REUSEADDR = 4,
- /*
-- * Indicates that the message was received by recvmmsg, so the buffer provided
-- * must not be freed by the recv_cb callback.
-+ * Unused. Here for API/ABI compatibility.
- */
- UV_UDP_MMSG_CHUNK = 8
- };
-diff --git a/src/unix/freebsd.c b/src/unix/freebsd.c
-index ef77e127c2..57bd04e240 100644
---- a/src/unix/freebsd.c
-+++ b/src/unix/freebsd.c
-@@ -288,28 +288,3 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
- uv__free(cp_times);
- return 0;
- }
--
--
--int uv__sendmmsg(int fd,
-- struct uv__mmsghdr* mmsg,
-- unsigned int vlen,
-- unsigned int flags) {
--#if __FreeBSD__ >= 11
-- return sendmmsg(fd, mmsg, vlen, flags);
--#else
-- return errno = ENOSYS, -1;
--#endif
--}
--
--
--int uv__recvmmsg(int fd,
-- struct uv__mmsghdr* mmsg,
-- unsigned int vlen,
-- unsigned int flags,
-- struct timespec* timeout) {
--#if __FreeBSD__ >= 11
-- return recvmmsg(fd, mmsg, vlen, flags, timeout);
--#else
-- return errno = ENOSYS, -1;
--#endif
--}
-diff --git a/src/unix/internal.h b/src/unix/internal.h
-index 598554b607..469fd7d2b8 100644
---- a/src/unix/internal.h
-+++ b/src/unix/internal.h
-@@ -31,7 +31,6 @@
- #include <fcntl.h> /* O_CLOEXEC and O_NONBLOCK, if supported. */
- #include <stdio.h>
- #include <errno.h>
--#include <sys/socket.h>
-
- #if defined(__STRICT_ANSI__)
- # define inline __inline
-@@ -328,27 +327,4 @@ int uv__getsockpeername(const uv_handle_t* handle,
- struct sockaddr* name,
- int* namelen);
-
--#if defined(__linux__) || \
-- defined(__FreeBSD__) || \
-- defined(__FreeBSD_kernel__)
--#define HAVE_MMSG 1
--struct uv__mmsghdr {
-- struct msghdr msg_hdr;
-- unsigned int msg_len;
--};
--
--int uv__recvmmsg(int fd,
-- struct uv__mmsghdr* mmsg,
-- unsigned int vlen,
-- unsigned int flags,
-- struct timespec* timeout);
--int uv__sendmmsg(int fd,
-- struct uv__mmsghdr* mmsg,
-- unsigned int vlen,
-- unsigned int flags);
--#else
--#define HAVE_MMSG 0
--#endif
--
--
- #endif /* UV_UNIX_INTERNAL_H_ */
-diff --git a/src/unix/linux-syscalls.c b/src/unix/linux-syscalls.c
-index 742f26ada8..eb5a8fd274 100644
---- a/src/unix/linux-syscalls.c
-+++ b/src/unix/linux-syscalls.c
-@@ -126,7 +126,6 @@
- # endif
- #endif /* __NR_getrandom */
-
--struct uv__mmsghdr;
-
- int uv__sendmmsg(int fd,
- struct uv__mmsghdr* mmsg,
-diff --git a/src/unix/linux-syscalls.h b/src/unix/linux-syscalls.h
-index 2e8fa2a519..7ee1511a45 100644
---- a/src/unix/linux-syscalls.h
-+++ b/src/unix/linux-syscalls.h
-@@ -61,6 +61,20 @@ struct uv__statx {
- uint64_t unused1[14];
- };
-
-+struct uv__mmsghdr {
-+ struct msghdr msg_hdr;
-+ unsigned int msg_len;
-+};
-+
-+int uv__recvmmsg(int fd,
-+ struct uv__mmsghdr* mmsg,
-+ unsigned int vlen,
-+ unsigned int flags,
-+ struct timespec* timeout);
-+int uv__sendmmsg(int fd,
-+ struct uv__mmsghdr* mmsg,
-+ unsigned int vlen,
-+ unsigned int flags);
- ssize_t uv__preadv(int fd, const struct iovec *iov, int iovcnt, int64_t offset);
- ssize_t uv__pwritev(int fd, const struct iovec *iov, int iovcnt, int64_t offset);
- int uv__dup3(int oldfd, int newfd, int flags);
-diff --git a/src/unix/udp.c b/src/unix/udp.c
-index f2fcae1760..982059ff48 100644
---- a/src/unix/udp.c
-+++ b/src/unix/udp.c
-@@ -32,8 +32,6 @@
- #endif
- #include <sys/un.h>
-
--#define UV__UDP_DGRAM_MAXSIZE (64 * 1024)
--
- #if defined(IPV6_JOIN_GROUP) && !defined(IPV6_ADD_MEMBERSHIP)
- # define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
- #endif
-@@ -51,36 +49,6 @@ static int uv__udp_maybe_deferred_bind(uv_udp_t* handle,
- int domain,
- unsigned int flags);
-
--#if HAVE_MMSG
--
--#define UV__MMSG_MAXWIDTH 20
--
--static int uv__udp_recvmmsg(uv_udp_t* handle, uv_buf_t* buf);
--static void uv__udp_sendmmsg(uv_udp_t* handle);
--
--static int uv__recvmmsg_avail;
--static int uv__sendmmsg_avail;
--static uv_once_t once = UV_ONCE_INIT;
--
--static void uv__udp_mmsg_init(void) {
-- int ret;
-- int s;
-- s = uv__socket(AF_INET, SOCK_DGRAM, 0);
-- if (s < 0)
-- return;
-- ret = uv__sendmmsg(s, NULL, 0, 0);
-- if (ret == 0 || errno != ENOSYS) {
-- uv__sendmmsg_avail = 1;
-- uv__recvmmsg_avail = 1;
-- } else {
-- ret = uv__recvmmsg(s, NULL, 0, 0, NULL);
-- if (ret == 0 || errno != ENOSYS)
-- uv__recvmmsg_avail = 1;
-- }
-- uv__close(s);
--}
--
--#endif
-
- void uv__udp_close(uv_udp_t* handle) {
- uv__io_close(handle->loop, &handle->io_watcher);
-@@ -180,61 +148,6 @@ static void uv__udp_io(uv_loop_t* loop, uv__io_t* w, unsigned int revents) {
- }
- }
-
--#if HAVE_MMSG
--static int uv__udp_recvmmsg(uv_udp_t* handle, uv_buf_t* buf) {
-- struct sockaddr_in6 peers[UV__MMSG_MAXWIDTH];
-- struct iovec iov[UV__MMSG_MAXWIDTH];
-- struct uv__mmsghdr msgs[UV__MMSG_MAXWIDTH];
-- ssize_t nread;
-- uv_buf_t chunk_buf;
-- size_t chunks;
-- int flags;
-- size_t k;
--
-- /* prepare structures for recvmmsg */
-- chunks = buf->len / UV__UDP_DGRAM_MAXSIZE;
-- if (chunks > ARRAY_SIZE(iov))
-- chunks = ARRAY_SIZE(iov);
-- for (k = 0; k < chunks; ++k) {
-- iov[k].iov_base = buf->base + k * UV__UDP_DGRAM_MAXSIZE;
-- iov[k].iov_len = UV__UDP_DGRAM_MAXSIZE;
-- msgs[k].msg_hdr.msg_iov = iov + k;
-- msgs[k].msg_hdr.msg_iovlen = 1;
-- msgs[k].msg_hdr.msg_name = peers + k;
-- msgs[k].msg_hdr.msg_namelen = sizeof(peers[0]);
-- }
--
-- do
-- nread = uv__recvmmsg(handle->io_watcher.fd, msgs, chunks, 0, NULL);
-- while (nread == -1 && errno == EINTR);
--
-- if (nread < 1) {
-- if (nread == 0 || errno == EAGAIN || errno == EWOULDBLOCK)
-- handle->recv_cb(handle, 0, buf, NULL, 0);
-- else
-- handle->recv_cb(handle, UV__ERR(errno), buf, NULL, 0);
-- } else {
-- /* pass each chunk to the application */
-- for (k = 0; k < (size_t) nread && handle->recv_cb != NULL; k++) {
-- flags = UV_UDP_MMSG_CHUNK;
-- if (msgs[k].msg_hdr.msg_flags & MSG_TRUNC)
-- flags |= UV_UDP_PARTIAL;
--
-- chunk_buf = uv_buf_init(iov[k].iov_base, iov[k].iov_len);
-- handle->recv_cb(handle,
-- msgs[k].msg_len,
-- &chunk_buf,
-- msgs[k].msg_hdr.msg_name,
-- flags);
-- }
--
-- /* one last callback so the original buffer is freed */
-- if (handle->recv_cb != NULL)
-- handle->recv_cb(handle, 0, buf, NULL, 0);
-- }
-- return nread;
--}
--#endif
-
- static void uv__udp_recvmsg(uv_udp_t* handle) {
- struct sockaddr_storage peer;
-@@ -254,27 +167,13 @@ static void uv__udp_recvmsg(uv_udp_t* handle) {
-
- do {
- buf = uv_buf_init(NULL, 0);
-- handle->alloc_cb((uv_handle_t*) handle, UV__UDP_DGRAM_MAXSIZE, &buf);
-+ handle->alloc_cb((uv_handle_t*) handle, 64 * 1024, &buf);
- if (buf.base == NULL || buf.len == 0) {
- handle->recv_cb(handle, UV_ENOBUFS, &buf, NULL, 0);
- return;
- }
- assert(buf.base != NULL);
-
--#if HAVE_MMSG
-- uv_once(&once, uv__udp_mmsg_init);
-- if (uv__recvmmsg_avail) {
-- /* Returned space for more than 1 datagram, use it to receive
-- * multiple datagrams. */
-- if (buf.len >= 2 * UV__UDP_DGRAM_MAXSIZE) {
-- nread = uv__udp_recvmmsg(handle, &buf);
-- if (nread > 0)
-- count -= nread;
-- continue;
-- }
-- }
--#endif
--
- memset(&h, 0, sizeof(h));
- memset(&peer, 0, sizeof(peer));
- h.msg_name = &peer;
-@@ -300,120 +199,21 @@ static void uv__udp_recvmsg(uv_udp_t* handle) {
-
- handle->recv_cb(handle, nread, &buf, (const struct sockaddr*) &peer, flags);
- }
-- count--;
- }
- /* recv_cb callback may decide to pause or close the handle */
- while (nread != -1
-- && count > 0
-+ && count-- > 0
- && handle->io_watcher.fd != -1
- && handle->recv_cb != NULL);
- }
-
--#if HAVE_MMSG
--static void uv__udp_sendmmsg(uv_udp_t* handle) {
-- uv_udp_send_t* req;
-- struct uv__mmsghdr h[UV__MMSG_MAXWIDTH];
-- struct uv__mmsghdr *p;
-- QUEUE* q;
-- ssize_t npkts;
-- size_t pkts;
-- size_t i;
--
-- if (QUEUE_EMPTY(&handle->write_queue))
-- return;
--
--write_queue_drain:
-- for (pkts = 0, q = QUEUE_HEAD(&handle->write_queue);
-- pkts < UV__MMSG_MAXWIDTH && q != &handle->write_queue;
-- ++pkts, q = QUEUE_HEAD(q)) {
-- assert(q != NULL);
-- req = QUEUE_DATA(q, uv_udp_send_t, queue);
-- assert(req != NULL);
--
-- p = &h[pkts];
-- memset(p, 0, sizeof(*p));
-- if (req->addr.ss_family == AF_UNSPEC) {
-- p->msg_hdr.msg_name = NULL;
-- p->msg_hdr.msg_namelen = 0;
-- } else {
-- p->msg_hdr.msg_name = &req->addr;
-- if (req->addr.ss_family == AF_INET6)
-- p->msg_hdr.msg_namelen = sizeof(struct sockaddr_in6);
-- else if (req->addr.ss_family == AF_INET)
-- p->msg_hdr.msg_namelen = sizeof(struct sockaddr_in);
-- else if (req->addr.ss_family == AF_UNIX)
-- p->msg_hdr.msg_namelen = sizeof(struct sockaddr_un);
-- else {
-- assert(0 && "unsupported address family");
-- abort();
-- }
-- }
-- h[pkts].msg_hdr.msg_iov = (struct iovec*) req->bufs;
-- h[pkts].msg_hdr.msg_iovlen = req->nbufs;
-- }
--
-- do
-- npkts = uv__sendmmsg(handle->io_watcher.fd, h, pkts, 0);
-- while (npkts == -1 && errno == EINTR);
--
-- if (npkts < 1) {
-- if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS)
-- return;
-- for (i = 0, q = QUEUE_HEAD(&handle->write_queue);
-- i < pkts && q != &handle->write_queue;
-- ++i, q = QUEUE_HEAD(q)) {
-- assert(q != NULL);
-- req = QUEUE_DATA(q, uv_udp_send_t, queue);
-- assert(req != NULL);
--
-- req->status = UV__ERR(errno);
-- QUEUE_REMOVE(&req->queue);
-- QUEUE_INSERT_TAIL(&handle->write_completed_queue, &req->queue);
-- }
-- uv__io_feed(handle->loop, &handle->io_watcher);
-- return;
-- }
--
-- for (i = 0, q = QUEUE_HEAD(&handle->write_queue);
-- i < pkts && q != &handle->write_queue;
-- ++i, q = QUEUE_HEAD(&handle->write_queue)) {
-- assert(q != NULL);
-- req = QUEUE_DATA(q, uv_udp_send_t, queue);
-- assert(req != NULL);
--
-- req->status = req->bufs[0].len;
--
-- /* Sending a datagram is an atomic operation: either all data
-- * is written or nothing is (and EMSGSIZE is raised). That is
-- * why we don't handle partial writes. Just pop the request
-- * off the write queue and onto the completed queue, done.
-- */
-- QUEUE_REMOVE(&req->queue);
-- QUEUE_INSERT_TAIL(&handle->write_completed_queue, &req->queue);
-- }
--
-- /* couldn't batch everything, continue sending (jump to avoid stack growth) */
-- if (!QUEUE_EMPTY(&handle->write_queue))
-- goto write_queue_drain;
-- uv__io_feed(handle->loop, &handle->io_watcher);
-- return;
--}
--#endif
-
- static void uv__udp_sendmsg(uv_udp_t* handle) {
- uv_udp_send_t* req;
-- struct msghdr h;
- QUEUE* q;
-+ struct msghdr h;
- ssize_t size;
-
--#if HAVE_MMSG
-- uv_once(&once, uv__udp_mmsg_init);
-- if (uv__sendmmsg_avail) {
-- uv__udp_sendmmsg(handle);
-- return;
-- }
--#endif
--
- while (!QUEUE_EMPTY(&handle->write_queue)) {
- q = QUEUE_HEAD(&handle->write_queue);
- assert(q != NULL);
-@@ -463,6 +263,7 @@ static void uv__udp_sendmsg(uv_udp_t* handle) {
- }
- }
-
-+
- /* On the BSDs, SO_REUSEPORT implies SO_REUSEADDR but with some additional
- * refinements for programs that use multicast.
- *
-
diff --git a/source/l/libuv/libuv.SlackBuild b/source/l/libuv/libuv.SlackBuild
index 4e182fa9..716c1c92 100755
--- a/source/l/libuv/libuv.SlackBuild
+++ b/source/l/libuv/libuv.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libuv
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
@@ -85,9 +85,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Revert commits that cause BIND to crash:
-zcat $CWD/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch.gz | patch -p1 --verbose || exit 1
-
if [ ! -r configure ]; then
NOCONFIGURE=1 ./autogen.sh
fi
diff --git a/source/l/oniguruma/oniguruma.SlackBuild b/source/l/oniguruma/oniguruma.SlackBuild
index 2699ab61..68573881 100755
--- a/source/l/oniguruma/oniguruma.SlackBuild
+++ b/source/l/oniguruma/oniguruma.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=oniguruma
-SRCNAM=onig
+SRCNAM=oniguruma
VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
@@ -86,6 +86,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+if [ ! -r configure ]; then
+ NOCONFIGURE=1 ./autogen.sh
+fi
+
# Configure, build, and install:
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
index 86d01e89..99017b16 100644
--- a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
+++ b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
@@ -1,6 +1,11 @@
---- ./test/Makefile.in.orig 2019-04-07 15:31:45.000000000 -0500
-+++ ./test/Makefile.in 2019-04-08 15:06:58.331894784 -0500
-@@ -106,19 +106,17 @@
+--- ./test/Makefile.in.orig 2020-04-19 16:53:21.000000000 -0500
++++ ./test/Makefile.in 2020-04-20 15:08:52.348545235 -0500
+@@ -102,24 +102,15 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ am__EXEEXT_1 = oob-test$(EXEEXT) infinite-loop$(EXEEXT) \
+- trap-crasher$(EXEEXT) fence-image-self-test$(EXEEXT) \
++ trap-crasher$(EXEEXT) \
region-translate-test$(EXEEXT) fetch-test$(EXEEXT) \
a1-trap-test$(EXEEXT) prng-test$(EXEEXT) \
radial-invalid$(EXEEXT) pdf-op-test$(EXEEXT) \
@@ -8,30 +13,34 @@
- scaling-crash-test$(EXEEXT) alpha-loop$(EXEEXT) \
- scaling-helpers-test$(EXEEXT) thread-test$(EXEEXT) \
- rotate-test$(EXEEXT) alphamap$(EXEEXT) \
-+ combiner-test$(EXEEXT) \
-+ scaling-crash-test$(EXEEXT) \
-+ thread-test$(EXEEXT) \
- gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \
+- gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \
- matrix-test$(EXEEXT) filter-reduction-test$(EXEEXT) \
- composite-traps-test$(EXEEXT) region-contains-test$(EXEEXT) \
-+ filter-reduction-test$(EXEEXT) \
-+ composite-traps-test$(EXEEXT) \
- glyph-test$(EXEEXT) solid-test$(EXEEXT) stress-test$(EXEEXT) \
+- glyph-test$(EXEEXT) solid-test$(EXEEXT) stress-test$(EXEEXT) \
- cover-test$(EXEEXT) blitters-test$(EXEEXT) \
- affine-test$(EXEEXT) scaling-test$(EXEEXT) composite$(EXEEXT) \
- tolerance-test$(EXEEXT)
-+ cover-test$(EXEEXT) \
-+ scaling-test$(EXEEXT)
- am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \
+-am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \
- check-formats$(EXEEXT) scaling-bench$(EXEEXT) \
-+ check-formats$(EXEEXT) \
- affine-bench$(EXEEXT)
+- affine-bench$(EXEEXT)
++ combiner-test$(EXEEXT) \
++ scaling-crash-test$(EXEEXT) \
++ thread-test$(EXEEXT) \
++ pixel-test$(EXEEXT)
++am__EXEEXT_2 =
PROGRAMS = $(noinst_PROGRAMS)
LTLIBRARIES = $(noinst_LTLIBRARIES)
-@@ -144,30 +142,6 @@
- affine_bench_DEPENDENCIES = libutils.la \
+ libutils_la_LIBADD =
+@@ -138,114 +129,24 @@
+ a1_trap_test_DEPENDENCIES = libutils.la \
$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
+-affine_bench_SOURCES = affine-bench.c
+-affine_bench_OBJECTS = affine-bench.$(OBJEXT)
+-affine_bench_LDADD = $(LDADD)
+-affine_bench_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
-affine_test_SOURCES = affine-test.c
-affine_test_OBJECTS = affine-test.$(OBJEXT)
-affine_test_LDADD = $(LDADD)
@@ -56,10 +65,15 @@
-blitters_test_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- check_formats_SOURCES = check-formats.c
- check_formats_OBJECTS = check-formats.$(OBJEXT)
- check_formats_LDADD = $(LDADD)
-@@ -180,12 +154,6 @@
+-check_formats_SOURCES = check-formats.c
+-check_formats_OBJECTS = check-formats.$(OBJEXT)
+-check_formats_LDADD = $(LDADD)
+-check_formats_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+ combiner_test_SOURCES = combiner-test.c
+ combiner_test_OBJECTS = combiner-test.$(OBJEXT)
+ combiner_test_LDADD = $(LDADD)
combiner_test_DEPENDENCIES = libutils.la \
$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -69,13 +83,60 @@
-composite_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- composite_traps_test_SOURCES = composite-traps-test.c
- composite_traps_test_OBJECTS = composite-traps-test.$(OBJEXT)
- composite_traps_test_LDADD = $(LDADD)
-@@ -240,12 +208,6 @@
- lowlevel_blt_bench_DEPENDENCIES = libutils.la \
+-composite_traps_test_SOURCES = composite-traps-test.c
+-composite_traps_test_OBJECTS = composite-traps-test.$(OBJEXT)
+-composite_traps_test_LDADD = $(LDADD)
+-composite_traps_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-cover_test_SOURCES = cover-test.c
+-cover_test_OBJECTS = cover-test.$(OBJEXT)
+-cover_test_LDADD = $(LDADD)
+-cover_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-fence_image_self_test_SOURCES = fence-image-self-test.c
+-fence_image_self_test_OBJECTS = fence-image-self-test.$(OBJEXT)
+-fence_image_self_test_LDADD = $(LDADD)
+-fence_image_self_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+ fetch_test_SOURCES = fetch-test.c
+ fetch_test_OBJECTS = fetch-test.$(OBJEXT)
+ fetch_test_LDADD = $(LDADD)
+ fetch_test_DEPENDENCIES = libutils.la \
+ $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+-filter_reduction_test_SOURCES = filter-reduction-test.c
+-filter_reduction_test_OBJECTS = filter-reduction-test.$(OBJEXT)
+-filter_reduction_test_LDADD = $(LDADD)
+-filter_reduction_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-glyph_test_SOURCES = glyph-test.c
+-glyph_test_OBJECTS = glyph-test.$(OBJEXT)
+-glyph_test_LDADD = $(LDADD)
+-glyph_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-gradient_crash_test_SOURCES = gradient-crash-test.c
+-gradient_crash_test_OBJECTS = gradient-crash-test.$(OBJEXT)
+-gradient_crash_test_LDADD = $(LDADD)
+-gradient_crash_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+ infinite_loop_SOURCES = infinite-loop.c
+ infinite_loop_OBJECTS = infinite-loop.$(OBJEXT)
+ infinite_loop_LDADD = $(LDADD)
+ infinite_loop_DEPENDENCIES = libutils.la \
$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
+-lowlevel_blt_bench_SOURCES = lowlevel-blt-bench.c
+-lowlevel_blt_bench_OBJECTS = lowlevel-blt-bench.$(OBJEXT)
+-lowlevel_blt_bench_LDADD = $(LDADD)
+-lowlevel_blt_bench_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
-matrix_test_SOURCES = matrix-test.c
-matrix_test_OBJECTS = matrix-test.$(OBJEXT)
-matrix_test_LDADD = $(LDADD)
@@ -85,10 +146,16 @@
oob_test_SOURCES = oob-test.c
oob_test_OBJECTS = oob-test.$(OBJEXT)
oob_test_LDADD = $(LDADD)
-@@ -282,48 +244,18 @@
- radial_perf_test_DEPENDENCIES = libutils.la \
+@@ -276,84 +177,24 @@
+ radial_invalid_DEPENDENCIES = libutils.la \
$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
+-radial_perf_test_SOURCES = radial-perf-test.c
+-radial_perf_test_OBJECTS = radial-perf-test.$(OBJEXT)
+-radial_perf_test_LDADD = $(LDADD)
+-radial_perf_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
-region_contains_test_SOURCES = region-contains-test.c
-region_contains_test_OBJECTS = region-contains-test.$(OBJEXT)
-region_contains_test_LDADD = $(LDADD)
@@ -131,10 +198,27 @@
-scaling_helpers_test_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- scaling_test_SOURCES = scaling-test.c
- scaling_test_OBJECTS = scaling-test.$(OBJEXT)
- scaling_test_LDADD = $(LDADD)
-@@ -348,12 +280,6 @@
+-scaling_test_SOURCES = scaling-test.c
+-scaling_test_OBJECTS = scaling-test.$(OBJEXT)
+-scaling_test_LDADD = $(LDADD)
+-scaling_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-solid_test_SOURCES = solid-test.c
+-solid_test_OBJECTS = solid-test.$(OBJEXT)
+-solid_test_LDADD = $(LDADD)
+-solid_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-stress_test_SOURCES = stress-test.c
+-stress_test_OBJECTS = stress-test.$(OBJEXT)
+-stress_test_LDADD = $(LDADD)
+-stress_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+ thread_test_SOURCES = thread-test.c
+ thread_test_OBJECTS = thread-test.$(OBJEXT)
+ thread_test_LDADD = $(LDADD)
thread_test_DEPENDENCIES = libutils.la \
$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -147,82 +231,96 @@
trap_crasher_SOURCES = trap-crasher.c
trap_crasher_OBJECTS = trap-crasher.$(OBJEXT)
trap_crasher_LDADD = $(LDADD)
-@@ -376,27 +302,23 @@
+@@ -376,27 +217,16 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/a1-trap-test.Po \
- ./$(DEPDIR)/affine-bench.Po ./$(DEPDIR)/affine-test.Po \
- ./$(DEPDIR)/alpha-loop.Po ./$(DEPDIR)/alphamap.Po \
- ./$(DEPDIR)/blitters-test.Po ./$(DEPDIR)/check-formats.Po \
-+ ./$(DEPDIR)/affine-bench.Po \
-+ ./$(DEPDIR)/check-formats.Po \
./$(DEPDIR)/combiner-test.Po \
- ./$(DEPDIR)/composite-traps-test.Po ./$(DEPDIR)/composite.Po \
-+ ./$(DEPDIR)/composite-traps-test.Po \
- ./$(DEPDIR)/cover-test.Po ./$(DEPDIR)/fence-image-self-test.Po \
- ./$(DEPDIR)/fetch-test.Po ./$(DEPDIR)/filter-reduction-test.Po \
- ./$(DEPDIR)/glyph-test.Po ./$(DEPDIR)/gradient-crash-test.Po \
- ./$(DEPDIR)/infinite-loop.Po ./$(DEPDIR)/lowlevel-blt-bench.Po \
+- ./$(DEPDIR)/cover-test.Po ./$(DEPDIR)/fence-image-self-test.Po \
+- ./$(DEPDIR)/fetch-test.Po ./$(DEPDIR)/filter-reduction-test.Po \
+- ./$(DEPDIR)/glyph-test.Po ./$(DEPDIR)/gradient-crash-test.Po \
+- ./$(DEPDIR)/infinite-loop.Po ./$(DEPDIR)/lowlevel-blt-bench.Po \
- ./$(DEPDIR)/matrix-test.Po ./$(DEPDIR)/oob-test.Po \
++ ./$(DEPDIR)/fetch-test.Po \
++ ./$(DEPDIR)/infinite-loop.Po \
+ ./$(DEPDIR)/oob-test.Po \
./$(DEPDIR)/pdf-op-test.Po ./$(DEPDIR)/pixel-test.Po \
./$(DEPDIR)/prng-test.Po ./$(DEPDIR)/radial-invalid.Po \
- ./$(DEPDIR)/radial-perf-test.Po \
+- ./$(DEPDIR)/radial-perf-test.Po \
- ./$(DEPDIR)/region-contains-test.Po ./$(DEPDIR)/region-test.Po \
./$(DEPDIR)/region-translate-test.Po \
- ./$(DEPDIR)/rotate-test.Po ./$(DEPDIR)/scaling-bench.Po \
./$(DEPDIR)/scaling-crash-test.Po \
- ./$(DEPDIR)/scaling-helpers-test.Po \
- ./$(DEPDIR)/scaling-test.Po ./$(DEPDIR)/solid-test.Po \
- ./$(DEPDIR)/stress-test.Po ./$(DEPDIR)/thread-test.Po \
+- ./$(DEPDIR)/scaling-test.Po ./$(DEPDIR)/solid-test.Po \
+- ./$(DEPDIR)/stress-test.Po ./$(DEPDIR)/thread-test.Po \
- ./$(DEPDIR)/tolerance-test.Po ./$(DEPDIR)/trap-crasher.Po \
++ ./$(DEPDIR)/thread-test.Po \
+ ./$(DEPDIR)/trap-crasher.Po \
./$(DEPDIR)/utils-prng.Plo ./$(DEPDIR)/utils.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -418,29 +340,27 @@
+@@ -417,30 +247,24 @@
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
- SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
+-SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
- affine-test.c alpha-loop.c alphamap.c blitters-test.c \
- check-formats.c combiner-test.c composite.c \
-+ check-formats.c combiner-test.c \
- composite-traps-test.c cover-test.c fence-image-self-test.c \
- fetch-test.c filter-reduction-test.c glyph-test.c \
- gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
+- composite-traps-test.c cover-test.c fence-image-self-test.c \
+- fetch-test.c filter-reduction-test.c glyph-test.c \
+- gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
- matrix-test.c oob-test.c pdf-op-test.c pixel-test.c \
-+ oob-test.c pdf-op-test.c pixel-test.c \
- prng-test.c radial-invalid.c radial-perf-test.c \
+- prng-test.c radial-invalid.c radial-perf-test.c \
- region-contains-test.c region-test.c region-translate-test.c \
- rotate-test.c scaling-bench.c scaling-crash-test.c \
- scaling-helpers-test.c scaling-test.c solid-test.c \
- stress-test.c thread-test.c tolerance-test.c trap-crasher.c
-+ region-translate-test.c \
-+ scaling-crash-test.c \
-+ scaling-test.c solid-test.c \
-+ stress-test.c thread-test.c trap-crasher.c
- DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
+-DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
- affine-test.c alpha-loop.c alphamap.c blitters-test.c \
- check-formats.c combiner-test.c composite.c \
-+ check-formats.c combiner-test.c \
- composite-traps-test.c cover-test.c fence-image-self-test.c \
- fetch-test.c filter-reduction-test.c glyph-test.c \
- gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
+- composite-traps-test.c cover-test.c fence-image-self-test.c \
+- fetch-test.c filter-reduction-test.c glyph-test.c \
+- gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
- matrix-test.c oob-test.c pdf-op-test.c pixel-test.c \
-+ oob-test.c pdf-op-test.c pixel-test.c \
- prng-test.c radial-invalid.c radial-perf-test.c \
+- prng-test.c radial-invalid.c radial-perf-test.c \
- region-contains-test.c region-test.c region-translate-test.c \
- rotate-test.c scaling-bench.c scaling-crash-test.c \
- scaling-helpers-test.c scaling-test.c solid-test.c \
- stress-test.c thread-test.c tolerance-test.c trap-crasher.c
++SOURCES = $(libutils_la_SOURCES) a1-trap-test.c \
++ combiner-test.c \
++ fetch-test.c \
++ infinite-loop.c \
++ oob-test.c pdf-op-test.c pixel-test.c \
++ prng-test.c radial-invalid.c \
+ region-translate-test.c \
+ scaling-crash-test.c \
-+ scaling-test.c solid-test.c \
-+ stress-test.c thread-test.c trap-crasher.c
++ thread-test.c trap-crasher.c
++DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c \
++ combiner-test.c \
++ fetch-test.c \
++ infinite-loop.c \
++ oob-test.c pdf-op-test.c pixel-test.c \
++ prng-test.c radial-invalid.c \
++ region-translate-test.c \
++ scaling-crash-test.c \
++ thread-test.c trap-crasher.c
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
-@@ -833,29 +753,18 @@
+@@ -826,46 +650,21 @@
+ oob-test \
+ infinite-loop \
+ trap-crasher \
+- fence-image-self-test \
+ region-translate-test \
+ fetch-test \
+ a1-trap-test \
prng-test \
radial-invalid \
pdf-op-test \
@@ -234,36 +332,42 @@
thread-test \
- rotate-test \
- alphamap \
- gradient-crash-test \
+- gradient-crash-test \
pixel-test \
- matrix-test \
- filter-reduction-test \
- composite-traps-test \
+- filter-reduction-test \
+- composite-traps-test \
- region-contains-test \
- glyph-test \
- solid-test \
- stress-test \
- cover-test \
+- glyph-test \
+- solid-test \
+- stress-test \
+- cover-test \
- blitters-test \
- affine-test \
- scaling-test \
+- scaling-test \
- composite \
- tolerance-test \
$(NULL)
-@@ -864,7 +773,6 @@
- lowlevel-blt-bench \
- radial-perf-test \
- check-formats \
+ # Other programs
+ OTHERPROGRAMS = \
+- lowlevel-blt-bench \
+- radial-perf-test \
+- check-formats \
- scaling-bench \
- affine-bench \
+- affine-bench \
$(NULL)
-@@ -956,22 +864,6 @@
- @rm -f affine-bench$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(affine_bench_OBJECTS) $(affine_bench_LDADD) $(LIBS)
+@@ -952,78 +751,18 @@
+ @rm -f a1-trap-test$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(a1_trap_test_OBJECTS) $(a1_trap_test_LDADD) $(LIBS)
+
+-affine-bench$(EXEEXT): $(affine_bench_OBJECTS) $(affine_bench_DEPENDENCIES) $(EXTRA_affine_bench_DEPENDENCIES)
+- @rm -f affine-bench$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(affine_bench_OBJECTS) $(affine_bench_LDADD) $(LIBS)
+-
-affine-test$(EXEEXT): $(affine_test_OBJECTS) $(affine_test_DEPENDENCIES) $(EXTRA_affine_test_DEPENDENCIES)
- @rm -f affine-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(affine_test_OBJECTS) $(affine_test_LDADD) $(LIBS)
@@ -280,10 +384,11 @@
- @rm -f blitters-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(blitters_test_OBJECTS) $(blitters_test_LDADD) $(LIBS)
-
- check-formats$(EXEEXT): $(check_formats_OBJECTS) $(check_formats_DEPENDENCIES) $(EXTRA_check_formats_DEPENDENCIES)
- @rm -f check-formats$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(check_formats_OBJECTS) $(check_formats_LDADD) $(LIBS)
-@@ -980,10 +872,6 @@
+-check-formats$(EXEEXT): $(check_formats_OBJECTS) $(check_formats_DEPENDENCIES) $(EXTRA_check_formats_DEPENDENCIES)
+- @rm -f check-formats$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(check_formats_OBJECTS) $(check_formats_LDADD) $(LIBS)
+-
+ combiner-test$(EXEEXT): $(combiner_test_OBJECTS) $(combiner_test_DEPENDENCIES) $(EXTRA_combiner_test_DEPENDENCIES)
@rm -f combiner-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(combiner_test_OBJECTS) $(combiner_test_LDADD) $(LIBS)
@@ -291,13 +396,42 @@
- @rm -f composite$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(composite_OBJECTS) $(composite_LDADD) $(LIBS)
-
- composite-traps-test$(EXEEXT): $(composite_traps_test_OBJECTS) $(composite_traps_test_DEPENDENCIES) $(EXTRA_composite_traps_test_DEPENDENCIES)
- @rm -f composite-traps-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(composite_traps_test_OBJECTS) $(composite_traps_test_LDADD) $(LIBS)
-@@ -1020,10 +908,6 @@
- @rm -f lowlevel-blt-bench$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS)
+-composite-traps-test$(EXEEXT): $(composite_traps_test_OBJECTS) $(composite_traps_test_DEPENDENCIES) $(EXTRA_composite_traps_test_DEPENDENCIES)
+- @rm -f composite-traps-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(composite_traps_test_OBJECTS) $(composite_traps_test_LDADD) $(LIBS)
+-
+-cover-test$(EXEEXT): $(cover_test_OBJECTS) $(cover_test_DEPENDENCIES) $(EXTRA_cover_test_DEPENDENCIES)
+- @rm -f cover-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(cover_test_OBJECTS) $(cover_test_LDADD) $(LIBS)
+-
+-fence-image-self-test$(EXEEXT): $(fence_image_self_test_OBJECTS) $(fence_image_self_test_DEPENDENCIES) $(EXTRA_fence_image_self_test_DEPENDENCIES)
+- @rm -f fence-image-self-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(fence_image_self_test_OBJECTS) $(fence_image_self_test_LDADD) $(LIBS)
+-
+ fetch-test$(EXEEXT): $(fetch_test_OBJECTS) $(fetch_test_DEPENDENCIES) $(EXTRA_fetch_test_DEPENDENCIES)
+ @rm -f fetch-test$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(fetch_test_OBJECTS) $(fetch_test_LDADD) $(LIBS)
+
+-filter-reduction-test$(EXEEXT): $(filter_reduction_test_OBJECTS) $(filter_reduction_test_DEPENDENCIES) $(EXTRA_filter_reduction_test_DEPENDENCIES)
+- @rm -f filter-reduction-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(filter_reduction_test_OBJECTS) $(filter_reduction_test_LDADD) $(LIBS)
+-
+-glyph-test$(EXEEXT): $(glyph_test_OBJECTS) $(glyph_test_DEPENDENCIES) $(EXTRA_glyph_test_DEPENDENCIES)
+- @rm -f glyph-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(glyph_test_OBJECTS) $(glyph_test_LDADD) $(LIBS)
+-
+-gradient-crash-test$(EXEEXT): $(gradient_crash_test_OBJECTS) $(gradient_crash_test_DEPENDENCIES) $(EXTRA_gradient_crash_test_DEPENDENCIES)
+- @rm -f gradient-crash-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(gradient_crash_test_OBJECTS) $(gradient_crash_test_LDADD) $(LIBS)
+-
+ infinite-loop$(EXEEXT): $(infinite_loop_OBJECTS) $(infinite_loop_DEPENDENCIES) $(EXTRA_infinite_loop_DEPENDENCIES)
+ @rm -f infinite-loop$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(infinite_loop_OBJECTS) $(infinite_loop_LDADD) $(LIBS)
+-lowlevel-blt-bench$(EXEEXT): $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_DEPENDENCIES) $(EXTRA_lowlevel_blt_bench_DEPENDENCIES)
+- @rm -f lowlevel-blt-bench$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS)
+-
-matrix-test$(EXEEXT): $(matrix_test_OBJECTS) $(matrix_test_DEPENDENCIES) $(EXTRA_matrix_test_DEPENDENCIES)
- @rm -f matrix-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(matrix_test_OBJECTS) $(matrix_test_LDADD) $(LIBS)
@@ -305,10 +439,14 @@
oob-test$(EXEEXT): $(oob_test_OBJECTS) $(oob_test_DEPENDENCIES) $(EXTRA_oob_test_DEPENDENCIES)
@rm -f oob-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(oob_test_OBJECTS) $(oob_test_LDADD) $(LIBS)
-@@ -1048,34 +932,14 @@
- @rm -f radial-perf-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(radial_perf_test_OBJECTS) $(radial_perf_test_LDADD) $(LIBS)
+@@ -1044,58 +783,18 @@
+ @rm -f radial-invalid$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(radial_invalid_OBJECTS) $(radial_invalid_LDADD) $(LIBS)
+-radial-perf-test$(EXEEXT): $(radial_perf_test_OBJECTS) $(radial_perf_test_DEPENDENCIES) $(EXTRA_radial_perf_test_DEPENDENCIES)
+- @rm -f radial-perf-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(radial_perf_test_OBJECTS) $(radial_perf_test_LDADD) $(LIBS)
+-
-region-contains-test$(EXEEXT): $(region_contains_test_OBJECTS) $(region_contains_test_DEPENDENCIES) $(EXTRA_region_contains_test_DEPENDENCIES)
- @rm -f region-contains-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(region_contains_test_OBJECTS) $(region_contains_test_LDADD) $(LIBS)
@@ -337,10 +475,19 @@
- @rm -f scaling-helpers-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_LDADD) $(LIBS)
-
- scaling-test$(EXEEXT): $(scaling_test_OBJECTS) $(scaling_test_DEPENDENCIES) $(EXTRA_scaling_test_DEPENDENCIES)
- @rm -f scaling-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(scaling_test_OBJECTS) $(scaling_test_LDADD) $(LIBS)
-@@ -1092,10 +956,6 @@
+-scaling-test$(EXEEXT): $(scaling_test_OBJECTS) $(scaling_test_DEPENDENCIES) $(EXTRA_scaling_test_DEPENDENCIES)
+- @rm -f scaling-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(scaling_test_OBJECTS) $(scaling_test_LDADD) $(LIBS)
+-
+-solid-test$(EXEEXT): $(solid_test_OBJECTS) $(solid_test_DEPENDENCIES) $(EXTRA_solid_test_DEPENDENCIES)
+- @rm -f solid-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(solid_test_OBJECTS) $(solid_test_LDADD) $(LIBS)
+-
+-stress-test$(EXEEXT): $(stress_test_OBJECTS) $(stress_test_DEPENDENCIES) $(EXTRA_stress_test_DEPENDENCIES)
+- @rm -f stress-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(stress_test_OBJECTS) $(stress_test_LDADD) $(LIBS)
+-
+ thread-test$(EXEEXT): $(thread_test_OBJECTS) $(thread_test_DEPENDENCIES) $(EXTRA_thread_test_DEPENDENCIES)
@rm -f thread-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS)
@@ -351,32 +498,34 @@
trap-crasher$(EXEEXT): $(trap_crasher_OBJECTS) $(trap_crasher_DEPENDENCIES) $(EXTRA_trap_crasher_DEPENDENCIES)
@rm -f trap-crasher$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(trap_crasher_OBJECTS) $(trap_crasher_LDADD) $(LIBS)
-@@ -1108,14 +968,9 @@
+@@ -1107,42 +806,17 @@
+ -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a1-trap-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-bench.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-bench.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-test.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blitters-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combiner-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cover-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence-image-self-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cover-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence-image-self-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fetch-test.Po@am__quote@ # am--include-marker
-@@ -1124,25 +979,18 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter-reduction-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glyph-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oob-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf-op-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixel-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prng-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-invalid.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-perf-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-perf-test.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-contains-test.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-translate-test.Po@am__quote@ # am--include-marker
@@ -384,15 +533,29 @@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-bench.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-crash-test.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-helpers-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solid-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solid-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread-test.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tolerance-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-crasher.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils-prng.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ # am--include-marker
-@@ -1443,13 +1291,6 @@
+@@ -1394,13 +1068,6 @@
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+-fence-image-self-test.log: fence-image-self-test$(EXEEXT)
+- @p='fence-image-self-test$(EXEEXT)'; \
+- b='fence-image-self-test'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+ region-translate-test.log: region-translate-test$(EXEEXT)
+ @p='region-translate-test$(EXEEXT)'; \
+ b='region-translate-test'; \
+@@ -1443,13 +1110,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -406,7 +569,7 @@
combiner-test.log: combiner-test$(EXEEXT)
@p='combiner-test$(EXEEXT)'; \
b='combiner-test'; \
-@@ -1464,20 +1305,6 @@
+@@ -1464,20 +1124,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -427,7 +590,7 @@
thread-test.log: thread-test$(EXEEXT)
@p='thread-test$(EXEEXT)'; \
b='thread-test'; \
-@@ -1485,20 +1312,6 @@
+@@ -1485,27 +1131,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -445,10 +608,17 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
- gradient-crash-test.log: gradient-crash-test$(EXEEXT)
- @p='gradient-crash-test$(EXEEXT)'; \
- b='gradient-crash-test'; \
-@@ -1513,13 +1326,6 @@
+-gradient-crash-test.log: gradient-crash-test$(EXEEXT)
+- @p='gradient-crash-test$(EXEEXT)'; \
+- b='gradient-crash-test'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+ pixel-test.log: pixel-test$(EXEEXT)
+ @p='pixel-test$(EXEEXT)'; \
+ b='pixel-test'; \
+@@ -1513,97 +1138,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -459,13 +629,20 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
- filter-reduction-test.log: filter-reduction-test$(EXEEXT)
- @p='filter-reduction-test$(EXEEXT)'; \
- b='filter-reduction-test'; \
-@@ -1534,13 +1340,6 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
+-filter-reduction-test.log: filter-reduction-test$(EXEEXT)
+- @p='filter-reduction-test$(EXEEXT)'; \
+- b='filter-reduction-test'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+-composite-traps-test.log: composite-traps-test$(EXEEXT)
+- @p='composite-traps-test$(EXEEXT)'; \
+- b='composite-traps-test'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
-region-contains-test.log: region-contains-test$(EXEEXT)
- @p='region-contains-test$(EXEEXT)'; \
- b='region-contains-test'; \
@@ -473,13 +650,34 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
- glyph-test.log: glyph-test$(EXEEXT)
- @p='glyph-test$(EXEEXT)'; \
- b='glyph-test'; \
-@@ -1569,20 +1368,6 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
+-glyph-test.log: glyph-test$(EXEEXT)
+- @p='glyph-test$(EXEEXT)'; \
+- b='glyph-test'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+-solid-test.log: solid-test$(EXEEXT)
+- @p='solid-test$(EXEEXT)'; \
+- b='solid-test'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+-stress-test.log: stress-test$(EXEEXT)
+- @p='stress-test$(EXEEXT)'; \
+- b='stress-test'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+-cover-test.log: cover-test$(EXEEXT)
+- @p='cover-test$(EXEEXT)'; \
+- b='cover-test'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
-blitters-test.log: blitters-test$(EXEEXT)
- @p='blitters-test$(EXEEXT)'; \
- b='blitters-test'; \
@@ -494,13 +692,13 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
- scaling-test.log: scaling-test$(EXEEXT)
- @p='scaling-test$(EXEEXT)'; \
- b='scaling-test'; \
-@@ -1590,20 +1375,6 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
+-scaling-test.log: scaling-test$(EXEEXT)
+- @p='scaling-test$(EXEEXT)'; \
+- b='scaling-test'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
-composite.log: composite$(EXEEXT)
- @p='composite$(EXEEXT)'; \
- b='composite'; \
@@ -518,32 +716,34 @@
.test.log:
@p='$<'; \
$(am__set_b); \
-@@ -1698,14 +1469,9 @@
+@@ -1697,42 +1231,17 @@
+
distclean: distclean-am
-rm -f ./$(DEPDIR)/a1-trap-test.Po
- -rm -f ./$(DEPDIR)/affine-bench.Po
+- -rm -f ./$(DEPDIR)/affine-bench.Po
- -rm -f ./$(DEPDIR)/affine-test.Po
- -rm -f ./$(DEPDIR)/alpha-loop.Po
- -rm -f ./$(DEPDIR)/alphamap.Po
- -rm -f ./$(DEPDIR)/blitters-test.Po
- -rm -f ./$(DEPDIR)/check-formats.Po
+- -rm -f ./$(DEPDIR)/check-formats.Po
-rm -f ./$(DEPDIR)/combiner-test.Po
- -rm -f ./$(DEPDIR)/composite-traps-test.Po
+- -rm -f ./$(DEPDIR)/composite-traps-test.Po
- -rm -f ./$(DEPDIR)/composite.Po
- -rm -f ./$(DEPDIR)/cover-test.Po
- -rm -f ./$(DEPDIR)/fence-image-self-test.Po
+- -rm -f ./$(DEPDIR)/cover-test.Po
+- -rm -f ./$(DEPDIR)/fence-image-self-test.Po
-rm -f ./$(DEPDIR)/fetch-test.Po
-@@ -1714,25 +1480,18 @@
- -rm -f ./$(DEPDIR)/gradient-crash-test.Po
+- -rm -f ./$(DEPDIR)/filter-reduction-test.Po
+- -rm -f ./$(DEPDIR)/glyph-test.Po
+- -rm -f ./$(DEPDIR)/gradient-crash-test.Po
-rm -f ./$(DEPDIR)/infinite-loop.Po
- -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
+- -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
- -rm -f ./$(DEPDIR)/matrix-test.Po
-rm -f ./$(DEPDIR)/oob-test.Po
-rm -f ./$(DEPDIR)/pdf-op-test.Po
-rm -f ./$(DEPDIR)/pixel-test.Po
-rm -f ./$(DEPDIR)/prng-test.Po
-rm -f ./$(DEPDIR)/radial-invalid.Po
- -rm -f ./$(DEPDIR)/radial-perf-test.Po
+- -rm -f ./$(DEPDIR)/radial-perf-test.Po
- -rm -f ./$(DEPDIR)/region-contains-test.Po
- -rm -f ./$(DEPDIR)/region-test.Po
-rm -f ./$(DEPDIR)/region-translate-test.Po
@@ -551,40 +751,42 @@
- -rm -f ./$(DEPDIR)/scaling-bench.Po
-rm -f ./$(DEPDIR)/scaling-crash-test.Po
- -rm -f ./$(DEPDIR)/scaling-helpers-test.Po
- -rm -f ./$(DEPDIR)/scaling-test.Po
- -rm -f ./$(DEPDIR)/solid-test.Po
- -rm -f ./$(DEPDIR)/stress-test.Po
+- -rm -f ./$(DEPDIR)/scaling-test.Po
+- -rm -f ./$(DEPDIR)/solid-test.Po
+- -rm -f ./$(DEPDIR)/stress-test.Po
-rm -f ./$(DEPDIR)/thread-test.Po
- -rm -f ./$(DEPDIR)/tolerance-test.Po
-rm -f ./$(DEPDIR)/trap-crasher.Po
-rm -f ./$(DEPDIR)/utils-prng.Plo
-rm -f ./$(DEPDIR)/utils.Plo
-@@ -1783,14 +1542,9 @@
+@@ -1782,42 +1291,17 @@
+
maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/a1-trap-test.Po
- -rm -f ./$(DEPDIR)/affine-bench.Po
+- -rm -f ./$(DEPDIR)/affine-bench.Po
- -rm -f ./$(DEPDIR)/affine-test.Po
- -rm -f ./$(DEPDIR)/alpha-loop.Po
- -rm -f ./$(DEPDIR)/alphamap.Po
- -rm -f ./$(DEPDIR)/blitters-test.Po
- -rm -f ./$(DEPDIR)/check-formats.Po
+- -rm -f ./$(DEPDIR)/check-formats.Po
-rm -f ./$(DEPDIR)/combiner-test.Po
- -rm -f ./$(DEPDIR)/composite-traps-test.Po
+- -rm -f ./$(DEPDIR)/composite-traps-test.Po
- -rm -f ./$(DEPDIR)/composite.Po
- -rm -f ./$(DEPDIR)/cover-test.Po
- -rm -f ./$(DEPDIR)/fence-image-self-test.Po
+- -rm -f ./$(DEPDIR)/cover-test.Po
+- -rm -f ./$(DEPDIR)/fence-image-self-test.Po
-rm -f ./$(DEPDIR)/fetch-test.Po
-@@ -1799,25 +1553,18 @@
- -rm -f ./$(DEPDIR)/gradient-crash-test.Po
+- -rm -f ./$(DEPDIR)/filter-reduction-test.Po
+- -rm -f ./$(DEPDIR)/glyph-test.Po
+- -rm -f ./$(DEPDIR)/gradient-crash-test.Po
-rm -f ./$(DEPDIR)/infinite-loop.Po
- -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
+- -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
- -rm -f ./$(DEPDIR)/matrix-test.Po
-rm -f ./$(DEPDIR)/oob-test.Po
-rm -f ./$(DEPDIR)/pdf-op-test.Po
-rm -f ./$(DEPDIR)/pixel-test.Po
-rm -f ./$(DEPDIR)/prng-test.Po
-rm -f ./$(DEPDIR)/radial-invalid.Po
- -rm -f ./$(DEPDIR)/radial-perf-test.Po
+- -rm -f ./$(DEPDIR)/radial-perf-test.Po
- -rm -f ./$(DEPDIR)/region-contains-test.Po
- -rm -f ./$(DEPDIR)/region-test.Po
-rm -f ./$(DEPDIR)/region-translate-test.Po
@@ -592,11 +794,126 @@
- -rm -f ./$(DEPDIR)/scaling-bench.Po
-rm -f ./$(DEPDIR)/scaling-crash-test.Po
- -rm -f ./$(DEPDIR)/scaling-helpers-test.Po
- -rm -f ./$(DEPDIR)/scaling-test.Po
- -rm -f ./$(DEPDIR)/solid-test.Po
- -rm -f ./$(DEPDIR)/stress-test.Po
+- -rm -f ./$(DEPDIR)/scaling-test.Po
+- -rm -f ./$(DEPDIR)/solid-test.Po
+- -rm -f ./$(DEPDIR)/stress-test.Po
-rm -f ./$(DEPDIR)/thread-test.Po
- -rm -f ./$(DEPDIR)/tolerance-test.Po
-rm -f ./$(DEPDIR)/trap-crasher.Po
-rm -f ./$(DEPDIR)/utils-prng.Plo
-rm -f ./$(DEPDIR)/utils.Plo
+--- ./demos/Makefile.in.orig 2020-04-19 16:53:21.000000000 -0500
++++ ./demos/Makefile.in 2020-04-20 14:54:20.827508022 -0500
+@@ -107,7 +107,7 @@
+ @HAVE_GTK_TRUE@ trap-test$(EXEEXT) tri-test$(EXEEXT) \
+ @HAVE_GTK_TRUE@ quad2quad$(EXEEXT) checkerboard$(EXEEXT) \
+ @HAVE_GTK_TRUE@ srgb-trap-test$(EXEEXT) srgb-test$(EXEEXT) \
+-@HAVE_GTK_TRUE@ scale$(EXEEXT) dither$(EXEEXT)
++@HAVE_GTK_TRUE@ scale$(EXEEXT)
+ PROGRAMS = $(noinst_PROGRAMS)
+ am__alpha_test_SOURCES_DIST = alpha-test.c gtk-utils.c gtk-utils.h \
+ ../test/utils.c ../test/utils.h ../test/utils-prng.c \
+@@ -185,15 +185,6 @@
+ @HAVE_GTK_TRUE@convolution_test_DEPENDENCIES = \
+ @HAVE_GTK_TRUE@ $(top_builddir)/pixman/libpixman-1.la \
+ @HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am__dither_SOURCES_DIST = dither.c gtk-utils.c gtk-utils.h \
+- ../test/utils.c ../test/utils.h ../test/utils-prng.c \
+- ../test/utils-prng.h
+-@HAVE_GTK_TRUE@am_dither_OBJECTS = dither.$(OBJEXT) $(am__objects_1)
+-dither_OBJECTS = $(am_dither_OBJECTS)
+-dither_LDADD = $(LDADD)
+-@HAVE_GTK_TRUE@dither_DEPENDENCIES = \
+-@HAVE_GTK_TRUE@ $(top_builddir)/pixman/libpixman-1.la \
+-@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__gradient_test_SOURCES_DIST = gradient-test.c gtk-utils.c \
+ gtk-utils.h ../test/utils.c ../test/utils.h \
+ ../test/utils-prng.c ../test/utils-prng.h
+@@ -308,7 +299,7 @@
+ ./$(DEPDIR)/checkerboard.Po ./$(DEPDIR)/clip-in.Po \
+ ./$(DEPDIR)/clip-test.Po ./$(DEPDIR)/composite-test.Po \
+ ./$(DEPDIR)/conical-test.Po ./$(DEPDIR)/convolution-test.Po \
+- ./$(DEPDIR)/dither.Po ./$(DEPDIR)/gradient-test.Po \
++ ./$(DEPDIR)/gradient-test.Po \
+ ./$(DEPDIR)/gtk-utils.Po ./$(DEPDIR)/linear-gradient.Po \
+ ./$(DEPDIR)/quad2quad.Po ./$(DEPDIR)/radial-test.Po \
+ ./$(DEPDIR)/scale.Po ./$(DEPDIR)/screen-test.Po \
+@@ -337,7 +328,7 @@
+ SOURCES = $(alpha_test_SOURCES) $(checkerboard_SOURCES) \
+ $(clip_in_SOURCES) $(clip_test_SOURCES) \
+ $(composite_test_SOURCES) $(conical_test_SOURCES) \
+- $(convolution_test_SOURCES) $(dither_SOURCES) \
++ $(convolution_test_SOURCES) \
+ $(gradient_test_SOURCES) $(linear_gradient_SOURCES) \
+ quad2quad.c $(radial_test_SOURCES) $(scale_SOURCES) \
+ $(screen_test_SOURCES) $(srgb_test_SOURCES) \
+@@ -349,7 +340,7 @@
+ $(am__composite_test_SOURCES_DIST) \
+ $(am__conical_test_SOURCES_DIST) \
+ $(am__convolution_test_SOURCES_DIST) \
+- $(am__dither_SOURCES_DIST) $(am__gradient_test_SOURCES_DIST) \
++ $(am__gradient_test_SOURCES_DIST) \
+ $(am__linear_gradient_SOURCES_DIST) quad2quad.c \
+ $(am__radial_test_SOURCES_DIST) $(am__scale_SOURCES_DIST) \
+ $(am__screen_test_SOURCES_DIST) $(am__srgb_test_SOURCES_DIST) \
+@@ -533,7 +524,6 @@
+ parrot.c \
+ parrot.jpg \
+ scale.ui \
+- dither.ui \
+ meson.build \
+ $(NULL)
+
+@@ -561,8 +551,7 @@
+ @HAVE_GTK_TRUE@ checkerboard \
+ @HAVE_GTK_TRUE@ srgb-trap-test \
+ @HAVE_GTK_TRUE@ srgb-test \
+-@HAVE_GTK_TRUE@ scale \
+-@HAVE_GTK_TRUE@ dither
++@HAVE_GTK_TRUE@ scale
+
+ @HAVE_GTK_TRUE@gradient_test_SOURCES = gradient-test.c $(GTK_UTILS)
+ @HAVE_GTK_TRUE@alpha_test_SOURCES = alpha-test.c $(GTK_UTILS)
+@@ -580,7 +569,6 @@
+ @HAVE_GTK_TRUE@srgb_test_SOURCES = srgb-test.c $(GTK_UTILS)
+ @HAVE_GTK_TRUE@srgb_trap_test_SOURCES = srgb-trap-test.c $(GTK_UTILS)
+ @HAVE_GTK_TRUE@scale_SOURCES = scale.c $(GTK_UTILS)
+-@HAVE_GTK_TRUE@dither_SOURCES = dither.c $(GTK_UTILS)
+ all: all-am
+
+ .SUFFIXES:
+@@ -652,10 +640,6 @@
+ @rm -f convolution-test$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(convolution_test_OBJECTS) $(convolution_test_LDADD) $(LIBS)
+
+-dither$(EXEEXT): $(dither_OBJECTS) $(dither_DEPENDENCIES) $(EXTRA_dither_DEPENDENCIES)
+- @rm -f dither$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(dither_OBJECTS) $(dither_LDADD) $(LIBS)
+-
+ gradient-test$(EXEEXT): $(gradient_test_OBJECTS) $(gradient_test_DEPENDENCIES) $(EXTRA_gradient_test_DEPENDENCIES)
+ @rm -f gradient-test$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gradient_test_OBJECTS) $(gradient_test_LDADD) $(LIBS)
+@@ -709,7 +693,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conical-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convolution-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-utils.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linear-gradient.Po@am__quote@ # am--include-marker
+@@ -917,7 +900,6 @@
+ -rm -f ./$(DEPDIR)/composite-test.Po
+ -rm -f ./$(DEPDIR)/conical-test.Po
+ -rm -f ./$(DEPDIR)/convolution-test.Po
+- -rm -f ./$(DEPDIR)/dither.Po
+ -rm -f ./$(DEPDIR)/gradient-test.Po
+ -rm -f ./$(DEPDIR)/gtk-utils.Po
+ -rm -f ./$(DEPDIR)/linear-gradient.Po
+@@ -983,7 +965,6 @@
+ -rm -f ./$(DEPDIR)/composite-test.Po
+ -rm -f ./$(DEPDIR)/conical-test.Po
+ -rm -f ./$(DEPDIR)/convolution-test.Po
+- -rm -f ./$(DEPDIR)/dither.Po
+ -rm -f ./$(DEPDIR)/gradient-test.Po
+ -rm -f ./$(DEPDIR)/gtk-utils.Po
+ -rm -f ./$(DEPDIR)/linear-gradient.Po