diff --git a/ChangeLog.rss b/ChangeLog.rss index 41f84d826..f11741cf1 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,23 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Sat, 28 Nov 2020 19:21:58 GMT - Sun, 29 Nov 2020 07:59:44 GMT + Sun, 29 Nov 2020 20:52:56 GMT + Mon, 30 Nov 2020 07:59:45 GMT maintain_current_git.sh v 1.12 + + Sun, 29 Nov 2020 20:52:56 GMT + Sun, 29 Nov 2020 20:52:56 GMT + https://git.slackware.nl/current/tag/?h=20201129205256 + 20201129205256 + + +ap/vim-8.2.2069-x86_64-1.txz: Upgraded. +e/emacspeak-53.0-x86_64-1.txz: Upgraded. +x/fontconfig-2.13.93-x86_64-1.txz: Upgraded. +xap/vim-gvim-8.2.2069-x86_64-1.txz: Upgraded. + ]]> + + Sat, 28 Nov 2020 19:21:58 GMT Sat, 28 Nov 2020 19:21:58 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 91f0a30ca..746bf7c09 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +Sun Nov 29 20:52:56 UTC 2020 +ap/vim-8.2.2069-x86_64-1.txz: Upgraded. +e/emacspeak-53.0-x86_64-1.txz: Upgraded. +x/fontconfig-2.13.93-x86_64-1.txz: Upgraded. +xap/vim-gvim-8.2.2069-x86_64-1.txz: Upgraded. ++--------------------------+ Sat Nov 28 19:21:58 UTC 2020 a/sysvinit-2.98-x86_64-1.txz: Upgraded. d/ninja-1.10.2-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index c5ac621cd..c5ce4700d 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Sat Nov 28 19:25:22 UTC 2020 +Sun Nov 29 20:55:36 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-11-28 19:21 . +drwxr-xr-x 12 root root 4096 2020-11-29 20:52 . -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 1397292 2020-11-27 20:45 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2020-11-27 20:45 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1396020 2020-11-29 20:20 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2020-11-29 20:20 ./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 1092073 2020-11-28 19:21 ./ChangeLog.txt +-rw-r--r-- 1 root root 1092307 2020-11-29 20:52 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2020-11-25 02:03 ./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-11-25 02:03 ./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 1793732 2020-11-27 20:44 ./FILELIST.TXT +-rw-r--r-- 1 root root 1792259 2020-11-29 20:19 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 773111 2020-11-28 19:24 ./PACKAGES.TXT +-rw-r--r-- 1 root root 773111 2020-11-29 20:55 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3629 2020-11-25 01:01 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -791,11 +791,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-11-28 19:24 ./slackware64 --rw-r--r-- 1 root root 304314 2020-11-28 19:24 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2020-11-28 19:24 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 378630 2020-11-28 19:24 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3900236 2020-11-28 19:24 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2020-11-29 20:55 ./slackware64 +-rw-r--r-- 1 root root 304314 2020-11-29 20:55 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2020-11-29 20:55 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 378630 2020-11-29 20:54 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3897360 2020-11-29 20:54 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT drwxr-xr-x 2 root root 24576 2020-11-28 19:24 ./slackware64/a -rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt @@ -1172,7 +1172,7 @@ drwxr-xr-x 2 root root 24576 2020-11-28 19:24 ./slackware64/a -rw-r--r-- 1 root root 540 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txt -rw-r--r-- 1 root root 56156 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz.asc -drwxr-xr-x 2 root root 20480 2020-11-25 23:29 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2020-11-29 20:18 ./slackware64/ap -rw-r--r-- 1 root root 291 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txt -rw-r--r-- 1 root root 694880 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz -rw-r--r-- 1 root root 163 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz.asc @@ -1418,9 +1418,9 @@ drwxr-xr-x 2 root root 20480 2020-11-25 23:29 ./slackware64/ap -rw-r--r-- 1 root root 375 2018-04-13 13:33 ./slackware64/ap/vbetool-1.2.2-x86_64-2.txt -rw-r--r-- 1 root root 14852 2018-04-13 13:33 ./slackware64/ap/vbetool-1.2.2-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:33 ./slackware64/ap/vbetool-1.2.2-x86_64-2.txz.asc --rw-r--r-- 1 root root 383 2020-11-09 19:23 ./slackware64/ap/vim-8.2.1969-x86_64-1.txt --rw-r--r-- 1 root root 7611060 2020-11-09 19:23 ./slackware64/ap/vim-8.2.1969-x86_64-1.txz --rw-r--r-- 1 root root 163 2020-11-09 19:23 ./slackware64/ap/vim-8.2.1969-x86_64-1.txz.asc +-rw-r--r-- 1 root root 383 2020-11-29 19:59 ./slackware64/ap/vim-8.2.2069-x86_64-1.txt +-rw-r--r-- 1 root root 7614328 2020-11-29 19:59 ./slackware64/ap/vim-8.2.2069-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-11-29 19:59 ./slackware64/ap/vim-8.2.2069-x86_64-1.txz.asc -rw-r--r-- 1 root root 604 2020-10-20 18:59 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-5.txt -rw-r--r-- 1 root root 180172 2020-10-20 18:59 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-5.txz -rw-r--r-- 1 root root 163 2020-10-20 18:59 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-5.txz.asc @@ -1646,13 +1646,13 @@ drwxr-xr-x 2 root root 16384 2020-11-28 19:24 ./slackware64/d -rw-r--r-- 1 root root 591 2018-04-13 14:12 ./slackware64/d/yasm-1.3.0-x86_64-2.txt -rw-r--r-- 1 root root 532592 2018-04-13 14:12 ./slackware64/d/yasm-1.3.0-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 14:12 ./slackware64/d/yasm-1.3.0-x86_64-2.txz.asc -drwxr-xr-x 2 root root 4096 2020-08-11 20:16 ./slackware64/e +drwxr-xr-x 2 root root 4096 2020-11-29 20:18 ./slackware64/e -rw-r--r-- 1 root root 471 2020-08-11 18:22 ./slackware64/e/emacs-27.1-x86_64-1.txt -rw-r--r-- 1 root root 37270100 2020-08-11 18:22 ./slackware64/e/emacs-27.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2020-08-11 18:22 ./slackware64/e/emacs-27.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 663 2020-07-29 04:41 ./slackware64/e/emacspeak-52.0-x86_64-1.txt --rw-r--r-- 1 root root 14989288 2020-07-29 04:41 ./slackware64/e/emacspeak-52.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2020-07-29 04:41 ./slackware64/e/emacspeak-52.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 663 2020-11-29 18:19 ./slackware64/e/emacspeak-53.0-x86_64-1.txt +-rw-r--r-- 1 root root 15004660 2020-11-29 18:19 ./slackware64/e/emacspeak-53.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-11-29 18:19 ./slackware64/e/emacspeak-53.0-x86_64-1.txz.asc -rwxr-xr-x 1 root root 2897 2009-06-24 22:06 ./slackware64/e/install-packages -rw-r--r-- 1 root root 446 2006-09-18 10:41 ./slackware64/e/install.end -rw-r--r-- 1 root root 1023 2020-07-29 04:33 ./slackware64/e/maketag @@ -4073,7 +4073,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 61440 2020-11-27 20:42 ./slackware64/x +drwxr-xr-x 2 root root 61440 2020-11-29 20:54 ./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 @@ -4212,9 +4212,9 @@ drwxr-xr-x 2 root root 61440 2020-11-27 20:42 ./slackware64/x -rw-r--r-- 1 root root 451 2018-06-06 02:14 ./slackware64/x/font-xfree86-type1-1.0.4-noarch-3.txt -rw-r--r-- 1 root root 36508 2018-06-06 02:14 ./slackware64/x/font-xfree86-type1-1.0.4-noarch-3.txz -rw-r--r-- 1 root root 163 2018-06-06 02:14 ./slackware64/x/font-xfree86-type1-1.0.4-noarch-3.txz.asc --rw-r--r-- 1 root root 385 2020-05-19 18:39 ./slackware64/x/fontconfig-2.13.92-x86_64-1.txt --rw-r--r-- 1 root root 315392 2020-05-19 18:39 ./slackware64/x/fontconfig-2.13.92-x86_64-1.txz --rw-r--r-- 1 root root 163 2020-05-19 18:39 ./slackware64/x/fontconfig-2.13.92-x86_64-1.txz.asc +-rw-r--r-- 1 root root 385 2020-11-29 20:46 ./slackware64/x/fontconfig-2.13.93-x86_64-1.txt +-rw-r--r-- 1 root root 320824 2020-11-29 20:46 ./slackware64/x/fontconfig-2.13.93-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-11-29 20:46 ./slackware64/x/fontconfig-2.13.93-x86_64-1.txz.asc -rw-r--r-- 1 root root 372 2020-10-21 21:39 ./slackware64/x/fonttosfnt-1.2.0-x86_64-1.txt -rw-r--r-- 1 root root 33480 2020-10-21 21:39 ./slackware64/x/fonttosfnt-1.2.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2020-10-21 21:39 ./slackware64/x/fonttosfnt-1.2.0-x86_64-1.txz.asc @@ -4955,7 +4955,7 @@ drwxr-xr-x 2 root root 61440 2020-11-27 20:42 ./slackware64/x -rw-r--r-- 1 root root 213 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txt -rw-r--r-- 1 root root 25288 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz.asc -drwxr-xr-x 2 root root 12288 2020-11-18 21:43 ./slackware64/xap +drwxr-xr-x 2 root root 12288 2020-11-29 20:18 ./slackware64/xap -rw-r--r-- 1 root root 625 2020-04-05 20:17 ./slackware64/xap/MPlayer-20200103-x86_64-2.txt -rw-r--r-- 1 root root 2733304 2020-04-05 20:17 ./slackware64/xap/MPlayer-20200103-x86_64-2.txz -rw-r--r-- 1 root root 163 2020-04-05 20:17 ./slackware64/xap/MPlayer-20200103-x86_64-2.txz.asc @@ -5066,9 +5066,9 @@ drwxr-xr-x 2 root root 12288 2020-11-18 21:43 ./slackware64/xap -rw-r--r-- 1 root root 1332952 2020-11-18 20:14 ./slackware64/xap/ssr-0.4.2-x86_64-2.txz -rw-r--r-- 1 root root 163 2020-11-18 20:14 ./slackware64/xap/ssr-0.4.2-x86_64-2.txz.asc -rw-r--r-- 1 root root 654 2020-08-15 19:16 ./slackware64/xap/tagfile --rw-r--r-- 1 root root 503 2020-11-09 19:23 ./slackware64/xap/vim-gvim-8.2.1969-x86_64-1.txt --rw-r--r-- 1 root root 1489524 2020-11-09 19:23 ./slackware64/xap/vim-gvim-8.2.1969-x86_64-1.txz --rw-r--r-- 1 root root 163 2020-11-09 19:23 ./slackware64/xap/vim-gvim-8.2.1969-x86_64-1.txz.asc +-rw-r--r-- 1 root root 503 2020-11-29 19:59 ./slackware64/xap/vim-gvim-8.2.2069-x86_64-1.txt +-rw-r--r-- 1 root root 1493260 2020-11-29 19:59 ./slackware64/xap/vim-gvim-8.2.2069-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-11-29 19:59 ./slackware64/xap/vim-gvim-8.2.2069-x86_64-1.txz.asc -rw-r--r-- 1 root root 455 2020-04-05 20:08 ./slackware64/xap/windowmaker-0.95.9-x86_64-1.txt -rw-r--r-- 1 root root 1759652 2020-04-05 20:08 ./slackware64/xap/windowmaker-0.95.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2020-04-05 20:08 ./slackware64/xap/windowmaker-0.95.9-x86_64-1.txz.asc @@ -5201,11 +5201,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-11-28 19:25 ./source --rw-r--r-- 1 root root 503470 2020-11-28 19:25 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2020-11-28 19:25 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 709634 2020-11-28 19:24 ./source/FILE_LIST --rw-r--r-- 1 root root 22243753 2020-11-28 19:24 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2020-11-29 20:55 ./source +-rw-r--r-- 1 root root 502355 2020-11-29 20:55 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2020-11-29 20:55 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 708384 2020-11-29 20:55 ./source/FILE_LIST +-rw-r--r-- 1 root root 22239778 2020-11-29 20:55 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 119 root root 4096 2020-11-27 19:24 ./source/a -rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./source/a/FTBFSlog @@ -6833,12 +6833,12 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/vbetool -rw-r--r-- 1 root root 24915 2015-12-20 20:37 ./source/ap/vbetool/vbetool-1.2.2.tar.gz -rwxr-xr-x 1 root root 3202 2019-09-29 23:48 ./source/ap/vbetool/vbetool.SlackBuild -rw-r--r-- 1 root root 129 2008-11-24 18:23 ./source/ap/vbetool/vbetool.info -drwxr-xr-x 2 root root 4096 2020-11-09 19:18 ./source/ap/vim +drwxr-xr-x 2 root root 4096 2020-11-29 19:58 ./source/ap/vim -rw-r--r-- 1 root root 299348 2009-07-09 22:03 ./source/ap/vim/ctags-5.8.tar.xz -rw-r--r-- 1 root root 8249 2006-01-19 17:01 ./source/ap/vim/gvim.png -rw-r--r-- 1 root root 834 2018-02-27 06:13 ./source/ap/vim/slack-desc.vim -rw-r--r-- 1 root root 959 2018-03-15 02:41 ./source/ap/vim/slack-desc.vim-gvim --rw-r--r-- 1 root root 9702677 2020-11-09 19:16 ./source/ap/vim/vim-8.2.1969.tar.lz +-rw-r--r-- 1 root root 9715891 2020-11-29 19:58 ./source/ap/vim/vim-8.2.2069.tar.lz -rwxr-xr-x 1 root root 6157 2020-01-12 22:56 ./source/ap/vim/vim-gvim.SlackBuild -rwxr-xr-x 1 root root 7536 2020-01-12 22:56 ./source/ap/vim/vim.SlackBuild -rw-r--r-- 1 root root 283 2019-01-11 20:43 ./source/ap/vim/vim.vimrc.diff.gz @@ -7289,11 +7289,11 @@ drwxr-xr-x 2 root root 4096 2020-08-11 18:19 ./source/e/emacs -rw-r--r-- 1 root root 488 2020-08-10 22:45 ./source/e/emacs/emacs-27.1.tar.xz.sig -rwxr-xr-x 1 root root 6971 2020-08-11 18:20 ./source/e/emacs/emacs.SlackBuild -rw-r--r-- 1 root root 549 2018-02-27 06:13 ./source/e/emacs/slack-desc -drwxr-xr-x 2 root root 4096 2020-07-29 04:41 ./source/e/emacspeak --rw-r--r-- 1 root root 15719370 2020-05-03 17:47 ./source/e/emacspeak/emacspeak-52.0.tar.lz +drwxr-xr-x 2 root root 4096 2020-11-29 18:18 ./source/e/emacspeak +-rw-r--r-- 1 root root 15717427 2020-11-21 17:10 ./source/e/emacspeak/emacspeak-53.0.tar.lz -rwxr-xr-x 1 root root 5147 2020-07-29 02:52 ./source/e/emacspeak/emacspeak.SlackBuild -rw-r--r-- 1 root root 37 2020-07-28 19:08 ./source/e/emacspeak/emacspeak.url --rwxr-xr-x 1 root root 1421 2020-07-29 04:41 ./source/e/emacspeak/prune-unneeded-files.sh +-rwxr-xr-x 1 root root 1476 2020-11-29 18:17 ./source/e/emacspeak/prune-unneeded-files.sh -rw-r--r-- 1 root root 1120 2018-02-27 06:13 ./source/e/emacspeak/slack-desc drwxr-xr-x 2 root root 4096 2018-02-27 06:13 ./source/f -rw-r--r-- 1 root root 960 2018-02-27 06:13 ./source/f/slack-desc.linux-faqs @@ -11653,27 +11653,16 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/x/dejavu-fonts-ttf -rwxr-xr-x 1 root root 2983 2019-09-29 23:48 ./source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild -rw-r--r-- 1 root root 169 2018-06-05 22:36 ./source/x/dejavu-fonts-ttf/doinst.sh.gz -rw-r--r-- 1 root root 904 2018-02-27 06:13 ./source/x/dejavu-fonts-ttf/slack-desc -drwxr-xr-x 3 root root 4096 2020-05-19 18:10 ./source/x/fontconfig +drwxr-xr-x 3 root root 4096 2020-11-29 20:45 ./source/x/fontconfig -rw-r--r-- 1 root root 139 2013-02-28 21:07 ./source/x/fontconfig/doinst.sh.gz -drwxr-xr-x 2 root root 4096 2020-05-19 17:42 ./source/x/fontconfig/fedora-patches --rw-r--r-- 1 root root 675 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch.gz --rw-r--r-- 1 root root 438 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch.gz --rw-r--r-- 1 root root 1969 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch.gz --rw-r--r-- 1 root root 1629 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch.gz --rw-r--r-- 1 root root 2275 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch.gz --rw-r--r-- 1 root root 452 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch.gz --rw-r--r-- 1 root root 814 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch.gz --rw-r--r-- 1 root root 9115 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-mt.patch.gz --rw-r--r-- 1 root root 2578 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-read-latest-cache.patch.gz --rw-r--r-- 1 root root 419 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-required-freetype-version.patch.gz --rw-r--r-- 1 root root 622 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-score-hint-on-match.patch.gz +drwxr-xr-x 2 root root 4096 2020-11-29 19:51 ./source/x/fontconfig/fedora-patches -rw-r--r-- 1 root root 326 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-sleep-less.patch.gz --rw-r--r-- 1 root root 2714 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-sysroot.patch.gz --rw-r--r-- 1 root root 1413128 2019-08-09 11:17 ./source/x/fontconfig/fontconfig-2.13.92.tar.xz --rwxr-xr-x 1 root root 7824 2020-05-19 18:38 ./source/x/fontconfig/fontconfig.SlackBuild --rw-r--r-- 1 root root 340 2017-04-30 19:35 ./source/x/fontconfig/fontconfig.dejavu.diff.gz --rw-r--r-- 1 root root 574 2013-03-01 04:32 ./source/x/fontconfig/fontconfig.font.dir.list.diff.gz --rw-r--r-- 1 root root 346 2017-04-30 19:19 ./source/x/fontconfig/fontconfig.liberation.diff.gz +-rw-r--r-- 1 root root 1418288 2020-11-28 04:04 ./source/x/fontconfig/fontconfig-2.13.93.tar.xz +-rwxr-xr-x 1 root root 6882 2020-11-29 20:52 ./source/x/fontconfig/fontconfig.SlackBuild +-rw-r--r-- 1 root root 338 2020-11-29 20:41 ./source/x/fontconfig/fontconfig.dejavu.diff.gz +-rw-r--r-- 1 root root 560 2020-11-29 19:44 ./source/x/fontconfig/fontconfig.font.dir.list.diff.gz +-rw-r--r-- 1 root root 342 2020-11-29 20:42 ./source/x/fontconfig/fontconfig.liberation.diff.gz +-rw-r--r-- 1 root root 341 2020-11-29 20:43 ./source/x/fontconfig/fontconfig.noto.diff.gz -rw-r--r-- 1 root root 30 2020-05-19 02:12 ./source/x/fontconfig/fontconfig.url -rw-r--r-- 1 root root 657 2007-01-25 05:00 ./source/x/fontconfig/setup.05.fontconfig -rw-r--r-- 1 root root 843 2020-05-19 02:09 ./source/x/fontconfig/slack-desc @@ -12429,20 +12418,20 @@ drwxr-xr-x 10 root root 4096 2019-10-28 19:02 ./source/x/x11/post-install -rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-ttf.post-install -rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-type1.post-install -rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-100dpi.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-75dpi.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-speedo.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-type1.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-cronyx-cyrillic.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-cursor-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-daewoo-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-dec-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-ibm-type1.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-isas-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-jis-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-micro-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-cyrillic.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-ethiopic.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-meltho.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-75dpi.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-speedo.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-type1.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-cronyx-cyrillic.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-cursor-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-daewoo-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-dec-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-ibm-type1.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-isas-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-jis-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-micro-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-cyrillic.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-ethiopic.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-meltho.post-install -rw-r--r-- 1 root root 664 2008-02-01 03:22 ./source/x/x11/post-install/font-misc-misc.post-install -rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-mutt-misc.post-install -rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-schumacher-misc.post-install diff --git a/recompress.sh b/recompress.sh index 55c63b2cc..bd23670f2 100755 --- a/recompress.sh +++ b/recompress.sh @@ -1208,19 +1208,8 @@ gzip ./source/x/libvdpau/doinst.sh gzip ./source/x/ttf-tlwg/doinst.sh gzip ./source/x/xterm/doinst.sh gzip ./source/x/fontconfig/fontconfig.font.dir.list.diff -gzip ./source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch +gzip ./source/x/fontconfig/fontconfig.noto.diff gzip ./source/x/fontconfig/fedora-patches/fontconfig-sleep-less.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-score-hint-on-match.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-required-freetype-version.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-read-latest-cache.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-sysroot.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch -gzip ./source/x/fontconfig/fedora-patches/fontconfig-mt.patch gzip ./source/x/fontconfig/doinst.sh gzip ./source/x/fontconfig/fontconfig.liberation.diff gzip ./source/x/fontconfig/fontconfig.dejavu.diff diff --git a/source/e/emacspeak/prune-unneeded-files.sh b/source/e/emacspeak/prune-unneeded-files.sh index 6acef88dd..b78b68720 100755 --- a/source/e/emacspeak/prune-unneeded-files.sh +++ b/source/e/emacspeak/prune-unneeded-files.sh @@ -37,6 +37,9 @@ tar xf ${PKGNAM}-${VERSION}.tar.bz2 || exit 1 # Drop the Makefile in etc/: rm -f ${PKGNAM}-${VERSION}/etc/Makefile +# More cruft: +rm -rf ${PKGNAM}-${VERSION}/.ccls-cache + # Repack as .tar.lz: rm -f ${PKGNAM}-${VERSION}.tar tar cf ${PKGNAM}-${VERSION}.tar ${PKGNAM}-${VERSION} diff --git a/source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch b/source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch deleted file mode 100644 index cfbc206f9..000000000 --- a/source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/src/fccache.c b/src/fccache.c -index 2d398c73..7139b082 100644 ---- a/src/fccache.c -+++ b/src/fccache.c -@@ -845,7 +845,7 @@ FcCacheTimeValid (FcConfig *config, FcCache *cache, struct stat *dir_stat) - FcCacheDir (cache), cache->checksum, (int) dir_stat->st_mtime); - #endif - -- return cache->checksum == (int) dir_stat->st_mtime && fnano; -+ return dir_stat->st_mtime == 0 || (cache->checksum == (int) dir_stat->st_mtime && fnano); - } - - static FcBool -@@ -1041,17 +1041,39 @@ static FcBool - FcDirCacheMapHelper (FcConfig *config, int fd, struct stat *fd_stat, struct stat *dir_stat, struct timeval *latest_cache_mtime, void *closure) - { - FcCache *cache = FcDirCacheMapFd (config, fd, fd_stat, dir_stat); -- struct timeval cache_mtime; -+ struct timeval cache_mtime, zero_mtime = { 0, 0}, dir_mtime; - - if (!cache) - return FcFalse; - cache_mtime.tv_sec = fd_stat->st_mtime; -+ dir_mtime.tv_sec = dir_stat->st_mtime; - #ifdef HAVE_STRUCT_STAT_ST_MTIM - cache_mtime.tv_usec = fd_stat->st_mtim.tv_nsec / 1000; -+ dir_mtime.tv_usec = dir_stat->st_mtim.tv_nsec / 1000; - #else - cache_mtime.tv_usec = 0; -+ dir_mtime.tv_usec = 0; - #endif -- if (timercmp (latest_cache_mtime, &cache_mtime, <)) -+ /* special take care of OSTree */ -+ if (!timercmp (&zero_mtime, &dir_mtime, !=)) -+ { -+ if (!timercmp (&zero_mtime, &cache_mtime, !=)) -+ { -+ if (*((FcCache **) closure)) -+ FcDirCacheUnload (*((FcCache **) closure)); -+ } -+ else if (*((FcCache **) closure) && !timercmp (&zero_mtime, latest_cache_mtime, !=)) -+ { -+ FcDirCacheUnload (cache); -+ return FcFalse; -+ } -+ else if (timercmp (latest_cache_mtime, &cache_mtime, <)) -+ { -+ if (*((FcCache **) closure)) -+ FcDirCacheUnload (*((FcCache **) closure)); -+ } -+ } -+ else if (timercmp (latest_cache_mtime, &cache_mtime, <)) - { - if (*((FcCache **) closure)) - FcDirCacheUnload (*((FcCache **) closure)); diff --git a/source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch b/source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch deleted file mode 100644 index 8b773081f..000000000 --- a/source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN fontconfig-2.13.92.orig/src/fcformat.c fontconfig-2.13.92/src/fcformat.c ---- fontconfig-2.13.92.orig/src/fcformat.c 2018-07-19 12:14:39.000000000 +0900 -+++ fontconfig-2.13.92/src/fcformat.c 2020-01-20 13:05:33.626227767 +0900 -@@ -78,7 +78,7 @@ - #define FCCAT_FORMAT "\"%{file|basename|cescape}\" %{index} \"%{-file{%{=unparse|cescape}}}\"" - #define FCMATCH_FORMAT "%{file:-|basename}: \"%{family[0]:-}\" \"%{style[0]:-}\"" - #define FCLIST_FORMAT "%{?file{%{file}: }}%{-file{%{=unparse}}}" --#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}%{[]lang{font(:lang=%{lang|downcase|translate(_,-)})\n}}" -+#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}" - - - static void diff --git a/source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch b/source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch deleted file mode 100644 index fda5c2d65..000000000 --- a/source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch +++ /dev/null @@ -1,122 +0,0 @@ -From fcada522913e5e07efa6367eff87ace9f06d24c8 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Wed, 28 Aug 2019 17:46:03 +0900 -Subject: [PATCH] Do not return FcFalse from FcConfigParseAndLoad*() if - complain is set to false - -https://bugzilla.redhat.com/show_bug.cgi?id=1744377 ---- - src/fcxml.c | 8 ++++--- - test/Makefile.am | 4 ++++ - test/test-bz1744377.c | 51 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 60 insertions(+), 3 deletions(-) - create mode 100644 test/test-bz1744377.c - -diff --git a/src/fcxml.c b/src/fcxml.c -index 2e26e77a..076fa301 100644 ---- a/src/fcxml.c -+++ b/src/fcxml.c -@@ -3526,7 +3526,7 @@ _FcConfigParse (FcConfig *config, - int len; - FcStrBuf sbuf; - char buf[BUFSIZ]; -- FcBool ret = FcFalse; -+ FcBool ret = FcFalse, complain_again = complain; - - #ifdef _WIN32 - if (!pGetSystemWindowsDirectory) -@@ -3605,7 +3605,7 @@ _FcConfigParse (FcConfig *config, - close (fd); - - ret = FcConfigParseAndLoadFromMemoryInternal (config, filename, FcStrBufDoneStatic (&sbuf), complain, load); -- complain = FcFalse; /* no need to reclaim here */ -+ complain_again = FcFalse; /* no need to reclaim here */ - bail1: - FcStrBufDestroy (&sbuf); - bail0: -@@ -3613,7 +3613,9 @@ bail0: - FcStrFree (filename); - if (realfilename) - FcStrFree (realfilename); -- if (!ret && complain) -+ if (!complain) -+ return FcTrue; -+ if (!ret && complain_again) - { - if (name) - FcConfigMessage (0, FcSevereError, "Cannot %s config file \"%s\"", load ? "load" : "scan", name); -diff --git a/test/Makefile.am b/test/Makefile.am -index f9c21581..a9fa089a 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -131,6 +131,10 @@ TESTS += test-d1f48f11 - endif - endif - -+check_PROGRAMS += test-bz1744377 -+test_bz1744377_LDADD = $(top_builddir)/src/libfontconfig.la -+TESTS += test-bz1744377 -+ - EXTRA_DIST=run-test.sh run-test-conf.sh $(LOG_COMPILER) $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names - - CLEANFILES=out out1 out2 fonts.conf out.expected -diff --git a/test/test-bz1744377.c b/test/test-bz1744377.c -new file mode 100644 -index 00000000..d7f10535 ---- /dev/null -+++ b/test/test-bz1744377.c -@@ -0,0 +1,51 @@ -+/* -+ * fontconfig/test/test-bz1744377.c -+ * -+ * Copyright © 2000 Keith Packard -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of the author(s) not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. The authors make no -+ * representations about the suitability of this software for any purpose. It -+ * is provided "as is" without express or implied warranty. -+ * -+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. -+ */ -+#include -+ -+int -+main (void) -+{ -+ const FcChar8 *doc = "" -+ "\n" -+ " blahblahblah\n" -+ "\n" -+ ""; -+ const FcChar8 *doc2 = "" -+ "\n" -+ " blahblahblah\n" -+ "\n" -+ ""; -+ FcConfig *cfg = FcConfigCreate (); -+ -+ if (!FcConfigParseAndLoadFromMemory (cfg, doc, FcTrue)) -+ return 1; -+ if (FcConfigParseAndLoadFromMemory (cfg, doc2, FcTrue)) -+ return 1; -+ if (!FcConfigParseAndLoadFromMemory (cfg, doc2, FcFalse)) -+ return 1; -+ -+ FcConfigDestroy (cfg); -+ -+ return 0; -+} --- -2.23.0 - diff --git a/source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch b/source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch deleted file mode 100644 index 2e337364d..000000000 --- a/source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch +++ /dev/null @@ -1,144 +0,0 @@ -From fbc05949ef52c8a8d69233eed77f6636dffec280 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Wed, 26 Feb 2020 15:42:21 +0900 -Subject: [PATCH] Fix assertion in FcFini() - -Due to the unproper initialization of `latest_mtime', the duplicate caches -was still in fcCacheChains with no references. which means no one frees -them. thus, the memory leak was happened. - -Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/227 ---- - src/fccache.c | 9 +++++---- - src/fcinit.c | 4 ++-- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/src/fccache.c b/src/fccache.c -index 4744a84..035458e 100644 ---- a/src/fccache.c -+++ b/src/fccache.c -@@ -365,7 +365,6 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, - struct stat file_stat, dir_stat; - FcBool ret = FcFalse; - const FcChar8 *sysroot = FcConfigGetSysRoot (config); -- struct timeval latest_mtime = (struct timeval){ 0 }; - - if (sysroot) - d = FcStrBuildFilename (sysroot, dir, NULL); -@@ -390,6 +389,8 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, - #ifndef _WIN32 - FcBool retried = FcFalse; - #endif -+ struct timeval latest_mtime = (struct timeval){ 0 }; -+ - if (sysroot) - cache_hashed = FcStrBuildFilename (sysroot, cache_dir, cache_base, NULL); - else -@@ -1081,12 +1082,12 @@ FcDirCacheLoadFile (const FcChar8 *cache_file, struct stat *file_stat) - - if (!file_stat) - file_stat = &my_file_stat; -- fd = FcDirCacheOpenFile (cache_file, file_stat); -- if (fd < 0) -- return NULL; - config = FcConfigReference (NULL); - if (!config) - return NULL; -+ fd = FcDirCacheOpenFile (cache_file, file_stat); -+ if (fd < 0) -+ return NULL; - cache = FcDirCacheMapFd (config, fd, file_stat, NULL); - FcConfigDestroy (config); - close (fd); -diff --git a/src/fcinit.c b/src/fcinit.c -index 6f82ebd..0e1421e 100644 ---- a/src/fcinit.c -+++ b/src/fcinit.c -@@ -199,10 +199,10 @@ void - FcFini (void) - { - FcConfigFini (); -- FcCacheFini (); -+ FcConfigPathFini (); - FcDefaultFini (); - FcObjectFini (); -- FcConfigPathFini (); -+ FcCacheFini (); - } - - /* --- -2.24.1 - -From 6f6b39780215714386606ca1c5457a7106639ff4 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Mon, 23 Mar 2020 14:03:47 +0900 -Subject: [PATCH] Fix assertion in FcCacheFini() again - -The previous fix in fbc05949ef52c8a8d69233eed77f6636dffec280 was wrong. reverting. - -When reading older caches, FcDirCacheMapHelper() returns FcFalse and -it became the return value from FcDirCacheProcess() too, which is wrong. -Actually one of calls for FcDirCacheMapHelper() should be successfully -finished and closure should have a valid pointer for cache. - -Due to this, the proper finalization process wasn't running against -cache in closure. - -Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/227 ---- - src/fccache.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/fccache.c b/src/fccache.c -index 035458e..2d398c7 100644 ---- a/src/fccache.c -+++ b/src/fccache.c -@@ -365,6 +365,7 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, - struct stat file_stat, dir_stat; - FcBool ret = FcFalse; - const FcChar8 *sysroot = FcConfigGetSysRoot (config); -+ struct timeval latest_mtime = (struct timeval){ 0 }; - - if (sysroot) - d = FcStrBuildFilename (sysroot, dir, NULL); -@@ -389,7 +390,6 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, - #ifndef _WIN32 - FcBool retried = FcFalse; - #endif -- struct timeval latest_mtime = (struct timeval){ 0 }; - - if (sysroot) - cache_hashed = FcStrBuildFilename (sysroot, cache_dir, cache_base, NULL); -@@ -445,6 +445,8 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, - } - FcStrListDone (list); - -+ if (closure) -+ return !!(*((FcCache **)closure) != NULL); - return ret; - } - -@@ -792,7 +794,18 @@ FcCacheFini (void) - int i; - - for (i = 0; i < FC_CACHE_MAX_LEVEL; i++) -- assert (fcCacheChains[i] == NULL); -+ { -+ if (FcDebug() & FC_DBG_CACHE) -+ { -+ if (fcCacheChains[i] != NULL) -+ { -+ FcCacheSkip *s = fcCacheChains[i]; -+ printf("Fontconfig error: not freed %p (dir: %s, refcount %d)\n", s->cache, FcCacheDir(s->cache), s->ref.count); -+ } -+ } -+ else -+ assert (fcCacheChains[i] == NULL); -+ } - assert (fcCacheMaxLevel == 0); - - free_lock (); --- -2.24.1 - diff --git a/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch b/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch deleted file mode 100644 index 9045fc053..000000000 --- a/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch +++ /dev/null @@ -1,490 +0,0 @@ -diff -uNr fontconfig-2.13.92.orig/conf.d/05-reset-dirs-sample.conf fontconfig-2.13.92/conf.d/05-reset-dirs-sample.conf ---- fontconfig-2.13.92.orig/conf.d/05-reset-dirs-sample.conf 2019-05-08 10:22:25.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/05-reset-dirs-sample.conf 2020-03-28 15:53:41.792757065 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - Re-define fonts dirs sample - -diff -uNr fontconfig-2.13.92.orig/conf.d/09-autohint-if-no-hinting.conf fontconfig-2.13.92/conf.d/09-autohint-if-no-hinting.conf ---- fontconfig-2.13.92.orig/conf.d/09-autohint-if-no-hinting.conf 2019-07-30 13:03:27.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/09-autohint-if-no-hinting.conf 2020-03-28 15:53:41.764757635 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-autohint.conf fontconfig-2.13.92/conf.d/10-autohint.conf ---- fontconfig-2.13.92.orig/conf.d/10-autohint.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-autohint.conf 2020-03-28 15:53:41.829756312 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-hinting-full.conf fontconfig-2.13.92/conf.d/10-hinting-full.conf ---- fontconfig-2.13.92.orig/conf.d/10-hinting-full.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-hinting-full.conf 2020-03-28 15:53:41.714758653 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-hinting-medium.conf fontconfig-2.13.92/conf.d/10-hinting-medium.conf ---- fontconfig-2.13.92.orig/conf.d/10-hinting-medium.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-hinting-medium.conf 2020-03-28 15:53:41.809756719 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-hinting-none.conf fontconfig-2.13.92/conf.d/10-hinting-none.conf ---- fontconfig-2.13.92.orig/conf.d/10-hinting-none.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-hinting-none.conf 2020-03-28 15:53:41.796756984 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-hinting-slight.conf fontconfig-2.13.92/conf.d/10-hinting-slight.conf ---- fontconfig-2.13.92.orig/conf.d/10-hinting-slight.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-hinting-slight.conf 2020-03-28 15:53:41.760757717 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-no-sub-pixel.conf fontconfig-2.13.92/conf.d/10-no-sub-pixel.conf ---- fontconfig-2.13.92.orig/conf.d/10-no-sub-pixel.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-no-sub-pixel.conf 2020-03-28 15:53:41.743758063 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-scale-bitmap-fonts.conf fontconfig-2.13.92/conf.d/10-scale-bitmap-fonts.conf ---- fontconfig-2.13.92.orig/conf.d/10-scale-bitmap-fonts.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-scale-bitmap-fonts.conf 2020-03-28 15:53:41.727758389 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-sub-pixel-bgr.conf fontconfig-2.13.92/conf.d/10-sub-pixel-bgr.conf ---- fontconfig-2.13.92.orig/conf.d/10-sub-pixel-bgr.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-sub-pixel-bgr.conf 2020-03-28 15:53:41.841756068 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-sub-pixel-rgb.conf fontconfig-2.13.92/conf.d/10-sub-pixel-rgb.conf ---- fontconfig-2.13.92.orig/conf.d/10-sub-pixel-rgb.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-sub-pixel-rgb.conf 2020-03-28 15:53:41.723758470 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-sub-pixel-vbgr.conf fontconfig-2.13.92/conf.d/10-sub-pixel-vbgr.conf ---- fontconfig-2.13.92.orig/conf.d/10-sub-pixel-vbgr.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-sub-pixel-vbgr.conf 2020-03-28 15:53:41.772757472 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-sub-pixel-vrgb.conf fontconfig-2.13.92/conf.d/10-sub-pixel-vrgb.conf ---- fontconfig-2.13.92.orig/conf.d/10-sub-pixel-vrgb.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-sub-pixel-vrgb.conf 2020-03-28 15:53:41.706758816 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/10-unhinted.conf fontconfig-2.13.92/conf.d/10-unhinted.conf ---- fontconfig-2.13.92.orig/conf.d/10-unhinted.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/10-unhinted.conf 2020-03-28 15:53:41.739758145 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/11-lcdfilter-default.conf fontconfig-2.13.92/conf.d/11-lcdfilter-default.conf ---- fontconfig-2.13.92.orig/conf.d/11-lcdfilter-default.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/11-lcdfilter-default.conf 2020-03-28 15:53:41.731758307 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/11-lcdfilter-legacy.conf fontconfig-2.13.92/conf.d/11-lcdfilter-legacy.conf ---- fontconfig-2.13.92.orig/conf.d/11-lcdfilter-legacy.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/11-lcdfilter-legacy.conf 2020-03-28 15:53:41.837756149 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/11-lcdfilter-light.conf fontconfig-2.13.92/conf.d/11-lcdfilter-light.conf ---- fontconfig-2.13.92.orig/conf.d/11-lcdfilter-light.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/11-lcdfilter-light.conf 2020-03-28 15:53:41.768757554 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/20-unhint-small-vera.conf fontconfig-2.13.92/conf.d/20-unhint-small-vera.conf ---- fontconfig-2.13.92.orig/conf.d/20-unhint-small-vera.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/20-unhint-small-vera.conf 2020-03-28 15:53:41.784757228 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/25-unhint-nonlatin.conf fontconfig-2.13.92/conf.d/25-unhint-nonlatin.conf ---- fontconfig-2.13.92.orig/conf.d/25-unhint-nonlatin.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/25-unhint-nonlatin.conf 2020-03-28 15:53:41.817756556 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/30-metric-aliases.conf fontconfig-2.13.92/conf.d/30-metric-aliases.conf ---- fontconfig-2.13.92.orig/conf.d/30-metric-aliases.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/30-metric-aliases.conf 2020-03-28 15:53:41.718758572 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/40-nonlatin.conf fontconfig-2.13.92/conf.d/40-nonlatin.conf ---- fontconfig-2.13.92.orig/conf.d/40-nonlatin.conf 2019-05-08 10:22:25.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/40-nonlatin.conf 2020-03-28 15:53:41.735758226 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/45-generic.conf fontconfig-2.13.92/conf.d/45-generic.conf ---- fontconfig-2.13.92.orig/conf.d/45-generic.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/45-generic.conf 2020-03-28 15:53:41.833756231 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/45-latin.conf fontconfig-2.13.92/conf.d/45-latin.conf ---- fontconfig-2.13.92.orig/conf.d/45-latin.conf 2019-05-08 10:22:25.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/45-latin.conf 2020-03-28 15:53:41.756757798 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/49-sansserif.conf fontconfig-2.13.92/conf.d/49-sansserif.conf ---- fontconfig-2.13.92.orig/conf.d/49-sansserif.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/49-sansserif.conf 2020-03-28 15:53:41.845755987 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/50-user.conf fontconfig-2.13.92/conf.d/50-user.conf ---- fontconfig-2.13.92.orig/conf.d/50-user.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/50-user.conf 2020-03-28 15:53:41.710758735 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/51-local.conf fontconfig-2.13.92/conf.d/51-local.conf ---- fontconfig-2.13.92.orig/conf.d/51-local.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/51-local.conf 2020-03-28 15:53:41.805756801 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/60-generic.conf fontconfig-2.13.92/conf.d/60-generic.conf ---- fontconfig-2.13.92.orig/conf.d/60-generic.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/60-generic.conf 2020-03-28 15:53:41.702758898 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/60-latin.conf fontconfig-2.13.92/conf.d/60-latin.conf ---- fontconfig-2.13.92.orig/conf.d/60-latin.conf 2019-05-08 10:22:25.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/60-latin.conf 2020-03-28 15:53:41.752757880 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - -diff -uNr fontconfig-2.13.92.orig/conf.d/65-fonts-persian.conf fontconfig-2.13.92/conf.d/65-fonts-persian.conf ---- fontconfig-2.13.92.orig/conf.d/65-fonts-persian.conf 2018-06-05 12:36:38.000000000 +0200 -+++ fontconfig-2.13.92/conf.d/65-fonts-persian.conf 2020-03-28 15:53:41.748757961 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - - - -diff -uNr fontconfig-2.13.92.orig/doc/fonts-conf.5 fontconfig-2.13.92/doc/fonts-conf.5 ---- fontconfig-2.13.92.orig/doc/fonts-conf.5 2019-08-09 13:12:20.000000000 +0200 -+++ fontconfig-2.13.92/doc/fonts-conf.5 2020-03-28 15:53:41.685759244 +0100 -@@ -264,7 +264,7 @@ - .sp - .nf - -- -+ - - \&... - -@@ -554,7 +554,7 @@ - .sp - .nf - -- -+ - - - - - -diff -uNr fontconfig-2.13.92.orig/fonts.conf.in fontconfig-2.13.92/fonts.conf.in ---- fontconfig-2.13.92.orig/fonts.conf.in 2019-05-08 10:22:25.000000000 +0200 -+++ fontconfig-2.13.92/fonts.conf.in 2020-03-28 15:53:41.698758979 +0100 -@@ -1,5 +1,5 @@ - -- -+ - - - diff --git a/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch b/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch deleted file mode 100644 index 51655890d..000000000 --- a/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a4aa66a858f1ecd375c5efe5916398281f73f794 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Wed, 20 Nov 2019 02:13:58 +0000 -Subject: [PATCH] Correct reset-dirs in DTD - -Empty elements need to be declared as such in well-formed DTDs. ---- - fonts.dtd | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fonts.dtd b/fonts.dtd -index f8c9f2c..40ecb4e 100644 ---- a/fonts.dtd -+++ b/fonts.dtd -@@ -124,7 +124,7 @@ - -- -+ - - - -- @FC_DEFAULT_FONTS@ +- @FC_DEFAULT_FONTS@ - @FC_FONTPATH@ + /usr/share/fonts/OTF + /usr/share/fonts/TTF @@ -16,20 +16,18 @@ fonts ~/.fonts - + -+ + diff --git a/source/x/fontconfig/fontconfig.liberation.diff b/source/x/fontconfig/fontconfig.liberation.diff index b9c9daeb8..ecb707186 100644 --- a/source/x/fontconfig/fontconfig.liberation.diff +++ b/source/x/fontconfig/fontconfig.liberation.diff @@ -1,34 +1,34 @@ ---- ./conf.d/60-latin.conf.orig 2016-07-10 21:41:05.000000000 -0500 -+++ ./conf.d/60-latin.conf 2017-04-30 14:18:52.426996569 -0500 -@@ -4,8 +4,9 @@ +--- ./conf.d/60-latin.conf.orig 2020-11-27 19:56:42.000000000 -0600 ++++ ./conf.d/60-latin.conf 2020-11-29 14:42:35.363035464 -0600 +@@ -5,7 +5,10 @@ serif -- Bitstream Vera Serif + Liberation Serif DejaVu Serif ++ Noto Serif + Bitstream Vera Serif Times New Roman Thorndale AMT Luxi Serif -@@ -17,8 +18,9 @@ +@@ -17,7 +20,10 @@ sans-serif -- Bitstream Vera Sans + Liberation Sans DejaVu Sans ++ Noto Sans + Bitstream Vera Sans Verdana Arial Albany AMT -@@ -34,8 +36,9 @@ +@@ -33,7 +39,10 @@ monospace -- Bitstream Vera Sans Mono + Liberation Mono DejaVu Sans Mono ++ Noto Sans Mono + Bitstream Vera Sans Mono Inconsolata Andale Mono diff --git a/source/x/fontconfig/fontconfig.noto.diff b/source/x/fontconfig/fontconfig.noto.diff new file mode 100644 index 000000000..ea8bf8baf --- /dev/null +++ b/source/x/fontconfig/fontconfig.noto.diff @@ -0,0 +1,35 @@ +--- ./conf.d/60-latin.conf.orig 2020-11-27 19:56:42.000000000 -0600 ++++ ./conf.d/60-latin.conf 2020-11-29 14:43:33.291036760 -0600 +@@ -5,7 +5,10 @@ + + serif + ++ Noto Serif ++ Liberation Serif + DejaVu Serif ++ Bitstream Vera Serif + Times New Roman + Thorndale AMT + Luxi Serif +@@ -17,7 +20,10 @@ + + sans-serif + ++ Noto Sans ++ Liberation Sans + DejaVu Sans ++ Bitstream Vera Sans + Verdana + Arial + Albany AMT +@@ -33,7 +39,10 @@ + + monospace + ++ Noto Sans Mono ++ Liberation Mono + DejaVu Sans Mono ++ Bitstream Vera Sans Mono + Inconsolata + Andale Mono + Courier New