diff options
author | Adrien Nader <adrien@notk.org> | 2015-11-01 20:15:37 +0100 |
---|---|---|
committer | Adrien Nader <adrien@notk.org> | 2015-11-01 20:15:37 +0100 |
commit | c62a302b3542eb5623ee4e6d0ea0353c8136c4b3 (patch) | |
tree | c606bdaf3387d298922bf8f59527dbd6ef9df5b1 /slackware64-current/source | |
parent | b67fc11432994fed6107e67cccb1e9adee31474b (diff) |
Sun Nov 1 17:11:32 UTC 2015
kde/calligra-2.9.8-x86_64-2.txz: Rebuilt.
Recompiled against gsl-2.0.
kde/step-4.14.3-x86_64-3.txz: Rebuilt.
Recompiled against gsl-2.0.
l/cairo-1.14.4-x86_64-1.txz: Upgraded.
l/gsl-2.0-x86_64-1.txz: Upgraded.
l/orc-0.4.24-x86_64-1.txz: Upgraded.
Diffstat (limited to 'slackware64-current/source')
31 files changed, 48 insertions, 554 deletions
diff --git a/slackware64-current/source/CHECKSUMS.md5 b/slackware64-current/source/CHECKSUMS.md5 index ceb3c31db..540704698 100644 --- a/slackware64-current/source/CHECKSUMS.md5 +++ b/slackware64-current/source/CHECKSUMS.md5 @@ -10,8 +10,8 @@ tail +13 CHECKSUMS.md5 | md5sum -c --quiet - | less /pub/gnu, or at any GNU mirror site. MD5 message digest Filename -bd94ac439f08bbdaecb8c701ed95f362 ./FILE_LIST -f808e9b1b2dd38cd6b303769eaaf7616 ./MANIFEST.bz2 +9fc5b11a6abf08e6d523100b3b323462 ./FILE_LIST +dfda6243d59db34cb379e7bc98c553cc ./MANIFEST.bz2 842fe24ea4cecdae8e72ccac18b6e1b5 ./README.TXT 7f4b26d2cde0214973d510a97ed3d8b4 ./a/aaa_base/_aaa_base.tar.gz f8c6144a142c65f4525c2b705f358d7a ./a/aaa_base/aaa_base.SlackBuild @@ -2341,6 +2341,7 @@ c09c67d46fc4916661545954a197a521 ./kde/KDE.options 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/bluedevil 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/bomber 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/bovo +26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/calligra 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/cantor 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/cervisia 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/dolphin-plugins @@ -2504,7 +2505,7 @@ c09c67d46fc4916661545954a197a521 ./kde/KDE.options 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/smokegen 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/smokekde 6d7fce9fee471194aa8b5b6e47267f03 ./kde/build/smokeqt -26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/step +6d7fce9fee471194aa8b5b6e47267f03 ./kde/build/step 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/superkaramba 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/svgpart 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/sweeper @@ -3514,8 +3515,8 @@ cc852e85c9b8f7932641c548943bc815 ./l/automoc4/slack-desc 0ffe39f451dfb1e428ed3e86d39c8cde ./l/boost/boost.SlackBuild 85d9f2025f926168db27d33aa32005d5 ./l/boost/boost_1_58_0.tar.xz bb5f275b3b9bcc316e2bae11deb735a1 ./l/boost/slack-desc -4d67110b8b6064f7e453abf8b88c9853 ./l/cairo/cairo-1.14.2.tar.xz -50c9e337faf9d14255412015245bb0a3 ./l/cairo/cairo.SlackBuild +c4f514f294058a5dc6fdb4dc28cb449b ./l/cairo/cairo-1.14.4.tar.xz +8aadae01f36c036cbb6c727c80776957 ./l/cairo/cairo.SlackBuild 8db230de32aa54fb03462e6c5aee963c ./l/cairo/paredown.sh 968ee21a54466b727752ff5f635bb5d0 ./l/cairo/slack-desc 7ea49ed8c335215c1edc6fae83e6b912 ./l/chmlib/chmlib-0.40.tar.bz2 @@ -3741,7 +3742,7 @@ f132a38ca46cfaf1d0fcb2e8c7aaa0d3 ./l/grantlee/grantlee-0.5.1.tar.xz e7ec56bb55013e89500c8f3ae6fcf738 ./l/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.tar.xz 6facbdff690c50ffa7c76ad85b3f0c37 ./l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild 8893987837e08dd589a5219f971ff5c5 ./l/gsettings-desktop-schemas/slack-desc -4f181d35845f5b7404e970ae40999c1b ./l/gsl/gsl-1.16.tar.xz +a602821261c5757be0d13152fa63ca02 ./l/gsl/gsl-2.0.tar.xz b5d694449ba618c8feb939820986cdff ./l/gsl/gsl.SlackBuild 20dd5b54a4d4e0218722cd963cab878d ./l/gsl/slack-desc 3c223f1d2716e1861ba84287ea02b164 ./l/gst-plugins-base/gst-plugins-base-1.6.0.tar.xz @@ -4245,8 +4246,8 @@ cdb0758f96a2178b49f8c41a382896b7 ./l/openexr/openexr.SlackBuild 9d4f796039b7703a16deeb9eb8ac45e3 ./l/openjpeg/openjpeg-2.1.0.tar.xz 89ff6ebeb2cbab9418f89217928f2d86 ./l/openjpeg/openjpeg.SlackBuild 90603facdf45db3391e1d19bfc44ada9 ./l/openjpeg/slack-desc -eecd4788688a95aae97adf1125585cbf ./l/orc/orc-0.4.22.tar.xz -aba4312cdd9e1362c9231c8294ea3755 ./l/orc/orc.SlackBuild +9e793ec34c0e20339659dd4bbbf62135 ./l/orc/orc-0.4.24.tar.xz +0c0ae0f7a92860cd22cc1535e9e03e35 ./l/orc/orc.SlackBuild aee8b7209dfa2755877e93a37a0f208f ./l/orc/slack-desc 7fde35d4a127b55ce8bbcefe109bc80d ./l/pango/pango-1.38.1.tar.xz b6ca4d8f826eb2e7f034e2850b85e076 ./l/pango/pango.SlackBuild diff --git a/slackware64-current/source/CHECKSUMS.md5.asc b/slackware64-current/source/CHECKSUMS.md5.asc index 305a397e4..42260d446 100644 --- a/slackware64-current/source/CHECKSUMS.md5.asc +++ b/slackware64-current/source/CHECKSUMS.md5.asc @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iEUEABECAAYFAlY0/u8ACgkQakRjwEAQIjNlIACfUzBodX0jhbll0/Oc8+lv3VN+ -CK4AmOnLL9A0+33ek/CmR9p5e4ZxskY= -=fBJT +iEYEABECAAYFAlY2SdMACgkQakRjwEAQIjMcegCeMsOaHJfDaI9adkdnFOVuIg6E +w40AnjG7H8/MCMeNJEKB2YBgDRz6cNwV +=lVVf -----END PGP SIGNATURE----- diff --git a/slackware64-current/source/FILE_LIST b/slackware64-current/source/FILE_LIST index 6bb7176d8..3d6f23008 100644 --- a/slackware64-current/source/FILE_LIST +++ b/slackware64-current/source/FILE_LIST @@ -1,15 +1,15 @@ -Sat Oct 31 17:48:02 UTC 2015 +Sun Nov 1 17:19:54 UTC 2015 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 19 root root 4096 2015-10-31 17:48 . --rw-r--r-- 1 root root 469054 2015-10-31 00:26 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 181 2015-10-31 00:26 ./CHECKSUMS.md5.asc --rw-r--r-- 1 root root 655058 2015-10-31 00:26 ./FILE_LIST --rw-r--r-- 1 root root 11231670 2015-10-31 17:48 ./MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2015-11-01 17:19 . +-rw-r--r-- 1 root root 467723 2015-10-31 21:19 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 181 2015-10-31 21:19 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 653437 2015-10-31 21:19 ./FILE_LIST +-rw-r--r-- 1 root root 11232726 2015-11-01 17:19 ./MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./README.TXT drwxr-xr-x 103 root root 4096 2015-10-31 17:21 ./a drwxr-xr-x 2 root root 4096 2013-10-11 23:25 ./a/aaa_base @@ -1111,7 +1111,7 @@ drwxr-xr-x 2 root root 4096 2015-08-14 08:28 ./ap/linuxdoc-tools/sources -rw-r--r-- 1 root root 212 2014-05-15 23:52 ./ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.20-lib64.patch.xz -rw-r--r-- 1 root root 356 2014-05-15 23:52 ./ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch.xz -rw-r--r-- 1 root root 427204 2013-04-12 09:23 ./ap/linuxdoc-tools/sources/linuxdoc-tools_0.9.69.tar.xz --r--r--r-- 1 root root 756 2012-05-30 14:39 ./ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl.xz +-rw-r--r-- 1 root root 756 2012-05-30 14:39 ./ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl.xz -rw-r--r-- 1 root root 712 2012-05-28 20:45 ./ap/linuxdoc-tools/sources/openjade-1.3.2-gcc46.patch.xz -rw-r--r-- 1 root root 711620 2003-04-18 20:32 ./ap/linuxdoc-tools/sources/openjade-1.3.3-pre1.tar.xz -rw-r--r-- 1 root root 1531211 2015-08-14 08:08 ./ap/linuxdoc-tools/sources/opensp-1.5.2-22.fc23.src.rpm @@ -2603,7 +2603,7 @@ drwxr-xr-x 2 root root 4096 2015-10-28 19:13 ./k/packaging-x86_64/kernel- drwxr-xr-x 13 root root 4096 2015-04-01 19:10 ./kde -rwxr-xr-x 1 root root 18317 2014-05-09 23:10 ./kde/KDE.SlackBuild -rw-r--r-- 1 root root 1886 2015-08-14 18:04 ./kde/KDE.options -drwxr-xr-x 2 root root 4096 2015-10-26 18:28 ./kde/build +drwxr-xr-x 2 root root 4096 2015-11-01 16:12 ./kde/build -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/amarok -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/amor -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/analitza @@ -2616,6 +2616,7 @@ drwxr-xr-x 2 root root 4096 2015-10-26 18:28 ./kde/build -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/bluedevil -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/bomber -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/bovo +-rw-r--r-- 1 root root 2 2015-11-01 16:12 ./kde/build/calligra -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/cantor -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/cervisia -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/dolphin-plugins @@ -2779,7 +2780,7 @@ drwxr-xr-x 2 root root 4096 2015-10-26 18:28 ./kde/build -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/smokegen -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/smokekde -rw-r--r-- 1 root root 2 2015-10-24 19:46 ./kde/build/smokeqt --rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/step +-rw-r--r-- 1 root root 2 2015-11-01 16:12 ./kde/build/step -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/superkaramba -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/svgpart -rw-r--r-- 1 root root 2 2015-10-24 00:15 ./kde/build/sweeper @@ -3651,7 +3652,7 @@ drwxr-xr-x 2 root root 4096 2012-01-16 12:17 ./kdei/kde-l10n/slack-desc -rw-r--r-- 1 root root 189 2008-05-26 07:46 ./kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-wa -rw-r--r-- 1 root root 236 2008-05-26 07:46 ./kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_CN -rw-r--r-- 1 root root 225 2008-05-26 07:46 ./kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_TW -drwxr-xr-x 264 root root 12288 2015-10-28 05:35 ./l +drwxr-xr-x 264 root root 12288 2015-11-01 04:35 ./l drwxr-xr-x 3 root root 4096 2015-10-21 21:51 ./l/ConsoleKit2 -rw-r--r-- 1 root root 705880 2015-08-10 06:49 ./l/ConsoleKit2/ConsoleKit2-1.0.0.tar.xz -rwxr-xr-x 1 root root 5100 2015-10-21 21:52 ./l/ConsoleKit2/ConsoleKit2.SlackBuild @@ -3851,9 +3852,9 @@ drwxr-xr-x 2 root root 4096 2015-04-20 18:21 ./l/boost -rwxr-xr-x 1 root root 4995 2015-04-02 14:54 ./l/boost/boost.SlackBuild -rw-r--r-- 1 root root 60779768 2015-04-16 08:57 ./l/boost/boost_1_58_0.tar.xz -rw-r--r-- 1 root root 889 2008-08-01 01:35 ./l/boost/slack-desc -drwxr-xr-x 2 root root 4096 2015-03-18 20:37 ./l/cairo --rw-r--r-- 1 root root 3488904 2015-03-11 02:06 ./l/cairo/cairo-1.14.2.tar.xz --rwxr-xr-x 1 root root 3896 2015-03-16 08:32 ./l/cairo/cairo.SlackBuild +drwxr-xr-x 2 root root 4096 2015-11-01 16:06 ./l/cairo +-rw-r--r-- 1 root root 3564468 2015-10-29 03:27 ./l/cairo/cairo-1.14.4.tar.xz +-rwxr-xr-x 1 root root 3902 2015-11-01 16:06 ./l/cairo/cairo.SlackBuild -rwxr-xr-x 1 root root 2139 2013-02-20 22:49 ./l/cairo/paredown.sh -rw-r--r-- 1 root root 851 2006-01-18 02:12 ./l/cairo/slack-desc drwxr-xr-x 2 root root 4096 2010-08-05 23:55 ./l/chmlib @@ -4128,8 +4129,8 @@ drwxr-xr-x 2 root root 4096 2015-10-22 04:13 ./l/gsettings-desktop-schema -rw-r--r-- 1 root root 573792 2015-10-20 13:22 ./l/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.tar.xz -rwxr-xr-x 1 root root 3486 2015-08-07 18:22 ./l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild -rw-r--r-- 1 root root 978 2011-11-28 06:07 ./l/gsettings-desktop-schemas/slack-desc -drwxr-xr-x 2 root root 4096 2015-07-26 17:53 ./l/gsl --rw-r--r-- 1 root root 1959432 2015-07-26 17:50 ./l/gsl/gsl-1.16.tar.xz +drwxr-xr-x 2 root root 4096 2015-11-01 04:33 ./l/gsl +-rw-r--r-- 1 root root 2016264 2015-10-31 19:03 ./l/gsl/gsl-2.0.tar.xz -rwxr--r-- 1 root root 3932 2015-10-15 22:31 ./l/gsl/gsl.SlackBuild -rw-r--r-- 1 root root 898 2013-11-22 19:47 ./l/gsl/slack-desc drwxr-xr-x 2 root root 4096 2015-10-04 18:22 ./l/gst-plugins-base @@ -4768,9 +4769,9 @@ drwxr-xr-x 2 root root 4096 2015-03-10 16:53 ./l/openjpeg -rw-r--r-- 1 root root 1183096 2015-02-19 20:36 ./l/openjpeg/openjpeg-2.1.0.tar.xz -rwxr-xr-x 1 root root 3796 2015-03-10 16:53 ./l/openjpeg/openjpeg.SlackBuild -rw-r--r-- 1 root root 685 2012-10-27 15:02 ./l/openjpeg/slack-desc -drwxr-xr-x 2 root root 4096 2014-11-07 03:38 ./l/orc --rw-r--r-- 1 root root 445792 2014-08-27 09:36 ./l/orc/orc-0.4.22.tar.xz --rwxr-xr-x 1 root root 3917 2014-11-08 22:17 ./l/orc/orc.SlackBuild +drwxr-xr-x 2 root root 4096 2015-10-31 20:23 ./l/orc +-rw-r--r-- 1 root root 455880 2015-06-24 21:54 ./l/orc/orc-0.4.24.tar.xz +-rwxr-xr-x 1 root root 4007 2015-10-31 20:25 ./l/orc/orc.SlackBuild -rw-r--r-- 1 root root 929 2014-11-07 11:36 ./l/orc/slack-desc drwxr-xr-x 2 root root 4096 2015-10-18 02:01 ./l/pango -rw-r--r-- 1 root root 1047372 2015-10-12 19:18 ./l/pango/pango-1.38.1.tar.xz diff --git a/slackware64-current/source/MANIFEST.bz2 b/slackware64-current/source/MANIFEST.bz2 index ca6bc1ab7..36afb933f 100644 --- a/slackware64-current/source/MANIFEST.bz2 +++ b/slackware64-current/source/MANIFEST.bz2 @@ -1 +1 @@ -4d676cbbd112afdc53c02cc1f0d1441a76bd90eb +941076e2bd5df0d63df7283ad134a7b8a215e3e7 diff --git a/slackware64-current/source/a/lvm2/LVM2.2.02.129.tar.xz b/slackware64-current/source/a/lvm2/LVM2.2.02.129.tar.xz deleted file mode 100644 index 7052c29b0..000000000 --- a/slackware64-current/source/a/lvm2/LVM2.2.02.129.tar.xz +++ /dev/null @@ -1 +0,0 @@ -f54b88b404bd404632e8dd96b59b9ed894475e18 diff --git a/slackware64-current/source/a/xz/xz-5.2.1.tar.xz b/slackware64-current/source/a/xz/xz-5.2.1.tar.xz deleted file mode 100644 index 133487b7e..000000000 --- a/slackware64-current/source/a/xz/xz-5.2.1.tar.xz +++ /dev/null @@ -1 +0,0 @@ -3f8886729170c0ad7fb40c586d2f143ba73a0f2d diff --git a/slackware64-current/source/a/xz/xz-5.2.1.tar.xz.sig b/slackware64-current/source/a/xz/xz-5.2.1.tar.xz.sig deleted file mode 100644 index 90ac9534f..000000000 --- a/slackware64-current/source/a/xz/xz-5.2.1.tar.xz.sig +++ /dev/null @@ -1 +0,0 @@ -b115d1f15ed904d1b3f2e95aa235cdafb1c39273 diff --git a/slackware64-current/source/kde/build/calligra b/slackware64-current/source/kde/build/calligra new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/slackware64-current/source/kde/build/calligra @@ -0,0 +1 @@ +2 diff --git a/slackware64-current/source/kde/build/step b/slackware64-current/source/kde/build/step index 0cfbf0888..00750edc0 100644 --- a/slackware64-current/source/kde/build/step +++ b/slackware64-current/source/kde/build/step @@ -1 +1 @@ -2 +3 diff --git a/slackware64-current/source/l/cairo/cairo-1.14.2.tar.xz b/slackware64-current/source/l/cairo/cairo-1.14.2.tar.xz deleted file mode 100644 index 0f137ae0e..000000000 --- a/slackware64-current/source/l/cairo/cairo-1.14.2.tar.xz +++ /dev/null @@ -1 +0,0 @@ -10f0caeef544687535a1adad88b3bce5310e8401 diff --git a/slackware64-current/source/l/cairo/cairo-1.14.4.tar.xz b/slackware64-current/source/l/cairo/cairo-1.14.4.tar.xz new file mode 100644 index 000000000..7184d8c23 --- /dev/null +++ b/slackware64-current/source/l/cairo/cairo-1.14.4.tar.xz @@ -0,0 +1 @@ +edf5cc50434fc99c8b15db5bf57ffc79378adba1 diff --git a/slackware64-current/source/l/cairo/cairo.SlackBuild b/slackware64-current/source/l/cairo/cairo.SlackBuild index f92b8f27e..4440cdf78 100755 --- a/slackware64-current/source/l/cairo/cairo.SlackBuild +++ b/slackware64-current/source/l/cairo/cairo.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -37,8 +37,8 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" diff --git a/slackware64-current/source/l/gsl/gsl-1.16.tar.xz b/slackware64-current/source/l/gsl/gsl-1.16.tar.xz deleted file mode 100644 index d55cc16a9..000000000 --- a/slackware64-current/source/l/gsl/gsl-1.16.tar.xz +++ /dev/null @@ -1 +0,0 @@ -ae224a7a7debf2b68aba5beeeab5a9c6e99c5a9c diff --git a/slackware64-current/source/l/gsl/gsl-2.0.tar.xz b/slackware64-current/source/l/gsl/gsl-2.0.tar.xz new file mode 100644 index 000000000..a3a8508d7 --- /dev/null +++ b/slackware64-current/source/l/gsl/gsl-2.0.tar.xz @@ -0,0 +1 @@ +472e7259a1259049513daed1bc61fc89b58777a1 diff --git a/slackware64-current/source/l/orc/orc-0.4.22.tar.xz b/slackware64-current/source/l/orc/orc-0.4.22.tar.xz deleted file mode 100644 index a3b43651c..000000000 --- a/slackware64-current/source/l/orc/orc-0.4.22.tar.xz +++ /dev/null @@ -1 +0,0 @@ -c50cf2f2a9a7e4ab400fd79f706e831ace1936bc diff --git a/slackware64-current/source/l/orc/orc-0.4.24.tar.xz b/slackware64-current/source/l/orc/orc-0.4.24.tar.xz new file mode 100644 index 000000000..1b3bec39b --- /dev/null +++ b/slackware64-current/source/l/orc/orc-0.4.24.tar.xz @@ -0,0 +1 @@ +f5d447398b757170e7508bc30d344ca2e9ada155 diff --git a/slackware64-current/source/l/orc/orc.SlackBuild b/slackware64-current/source/l/orc/orc.SlackBuild index e535e7d08..e424fa6ae 100755 --- a/slackware64-current/source/l/orc/orc.SlackBuild +++ b/slackware64-current/source/l/orc/orc.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2014 Eric Hameleers, Eindhoven, NL -# Copyright 2014 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2014, 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=orc -VERSION=${VERSION:-0.4.22} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -35,7 +35,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -43,8 +43,8 @@ if [ -z "$ARCH" ]; then export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -97,7 +97,7 @@ LDFLAGS="$SLKLDFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --disable-static \ - --build=$TARGET + --build=$TARGET || exit 1 # Build and install: make || exit 1 @@ -125,7 +125,7 @@ fi # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - COPYING README TODO \ + COPYING* README* RELEASE TODO \ $PKG/usr/doc/$PKGNAM-$VERSION # Add a description: diff --git a/slackware64-current/source/x/xdg-utils/patches/0001-xdg-screensaver-should-control-X11-s-screensaver-in-.patch b/slackware64-current/source/x/xdg-utils/patches/0001-xdg-screensaver-should-control-X11-s-screensaver-in-.patch deleted file mode 100644 index 7c6d15725..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0001-xdg-screensaver-should-control-X11-s-screensaver-in-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0f06aadc8696f3e9234687bbc93b50a3f724b822 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Sun, 4 Jan 2015 16:21:09 -0600 -Subject: [PATCH 01/11] xdg-screensaver should control X11's screensaver in - xfce as fallback (BR80089) - ---- - ChangeLog | 3 +++ - scripts/xdg-screensaver.in | 4 ++++ - 2 files changed, 7 insertions(+) - -diff --git a/ChangeLog b/ChangeLog -index 3399286..735fee7 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,8 @@ - === xdg-utils 1.1.x === - -+2015-01-04 Rex Dieter <rdieter@fedoraproject.org> -+ * xdg-screensaver should control X11's screensaver in xfce as fallback (BR80089) -+ - 2014-10-09 Rex Dieter <rdieter@fedoraproject.org> - * xdg-screensaver plasma5 support - -diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in -index 047d555..d9cb4d2 100644 ---- a/scripts/xdg-screensaver.in -+++ b/scripts/xdg-screensaver.in -@@ -104,6 +104,10 @@ perform_action() - screensaver_xscreensaver "$1" - ;; - -+ xfce) -+ [ -n "$DISPLAY" ] && screensaver_xserver "$1" -+ ;; -+ - '') - [ -n "$DISPLAY" ] && screensaver_xserver "$1" - ;; --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/patches/0002-xdg-open-command-injection-vulnerability-BR66670.patch b/slackware64-current/source/x/xdg-utils/patches/0002-xdg-open-command-injection-vulnerability-BR66670.patch deleted file mode 100644 index 3a65c04fa..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0002-xdg-open-command-injection-vulnerability-BR66670.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 11a4bd44692f74a8b8b4615e44dc897c929ef1e5 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Mon, 5 Jan 2015 13:09:05 -0600 -Subject: [PATCH 02/11] xdg-open: command injection vulnerability (BR66670) - ---- - ChangeLog | 3 +++ - scripts/xdg-open.in | 6 +++--- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 735fee7..e309517 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,8 @@ - === xdg-utils 1.1.x === - -+2015-01-05 Rex Dieter <rdieter@fedoraproject.org> -+ * xdg-open: command injection vulnerability (BR66670) -+ - 2015-01-04 Rex Dieter <rdieter@fedoraproject.org> - * xdg-screensaver should control X11's screensaver in xfce as fallback (BR80089) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 0145be3..9f01747 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -186,17 +186,17 @@ search_desktop_file() - # FIXME: Actually LC_MESSAGES should be used as described in - # http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s04.html - localised_name="'$(get_key "${file}" "Name")'" -- arguments_exec="$(echo "$arguments" | sed -e 's*%[fFuU]*"'"$arg_one"'"*g' \ -+ arguments_exec="$(echo "$arguments" | sed -e 's*%[fFuU]*'"$arg_one"'*g' \ - -e 's*%i*'"$icon"'*g' \ - -e 's*%c*'"$localised_name"'*g')" - - if [ -x "$command_exec" ] ; then - if echo "$arguments" | grep -iq '%[fFuU]' ; then - echo START "$command_exec" "$arguments_exec" -- eval "$command_exec" "$arguments_exec" -+ eval "$command_exec" '$arguments_exec' - else - echo START "$command_exec" "$arguments_exec" "$arg" -- eval "$command_exec" "$arguments_exec" "$arg" -+ eval "$command_exec" '$arguments_exec' '$arg' - fi - - if [ $? -eq 0 ]; then --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/patches/0003-xdg-mime-dereference-symlinks-when-using-mimetype-or.patch b/slackware64-current/source/x/xdg-utils/patches/0003-xdg-mime-dereference-symlinks-when-using-mimetype-or.patch deleted file mode 100644 index 9b7797c24..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0003-xdg-mime-dereference-symlinks-when-using-mimetype-or.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ffa6e473fc95d1980b230195fecdafcd7193dca7 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Thu, 15 Jan 2015 09:16:38 -0600 -Subject: [PATCH 03/11] xdg-mime: dereference symlinks when using mimetype or - file (BR39923) - ---- - ChangeLog | 3 +++ - scripts/xdg-mime.in | 8 ++++---- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index e309517..3c7b095 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,8 @@ - === xdg-utils 1.1.x === - -+2015-01-15 Reuben Thomas <rrt@sc3d.org> -+ * xdg-mime: dereference symlinks when using mimetype or file (BR39923) -+ - 2015-01-05 Rex Dieter <rdieter@fedoraproject.org> - * xdg-open: command injection vulnerability (BR66670) - -diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in -index 0290d77..80781c8 100644 ---- a/scripts/xdg-mime.in -+++ b/scripts/xdg-mime.in -@@ -98,11 +98,11 @@ info_gnome() - info_generic() - { - if mimetype --version >/dev/null 2>&1; then -- DEBUG 1 "Running mimetype -b \"$1\"" -- mimetype -b "$1" -+ DEBUG 1 "Running mimetype --brief --dereference \"$1\"" -+ mimetype --brief --dereference "$1" - else -- DEBUG 1 "Running file --mime-type \"$1\"" -- /usr/bin/file -b --mime-type "$1" 2> /dev/null -+ DEBUG 1 "Running file --brief --dereference --mime-type \"$1\"" -+ /usr/bin/file --brief --dereference --mime-type "$1" 2> /dev/null - fi - - if [ $? -eq 0 ]; then --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/patches/0004-xdg-screensaver-Change-screensaver_freedesktop-s-int.patch b/slackware64-current/source/x/xdg-utils/patches/0004-xdg-screensaver-Change-screensaver_freedesktop-s-int.patch deleted file mode 100644 index 01d5be8d3..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0004-xdg-screensaver-Change-screensaver_freedesktop-s-int.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8e9fa9bcc85fd31d4548870aad27c0593f64c433 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Thu, 15 Jan 2015 10:09:43 -0600 -Subject: [PATCH 04/11] xdg-screensaver: Change screensaver_freedesktop's - interpretation of GetActive (BR29859) - ---- - ChangeLog | 1 + - scripts/xdg-screensaver.in | 8 ++++---- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 3c7b095..fa90e70 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -2,6 +2,7 @@ - - 2015-01-15 Reuben Thomas <rrt@sc3d.org> - * xdg-mime: dereference symlinks when using mimetype or file (BR39923) -+ * xdg-screensaver: Change screensaver_freedesktop's interpretation of GetActive (BR29859) - - 2015-01-05 Rex Dieter <rdieter@fedoraproject.org> - * xdg-open: command injection vulnerability (BR66670) -diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in -index d9cb4d2..579b80e 100644 ---- a/scripts/xdg-screensaver.in -+++ b/scripts/xdg-screensaver.in -@@ -300,13 +300,13 @@ screensaver_freedesktop() - org.freedesktop.ScreenSaver.GetActive \ - | grep boolean | cut -d ' ' -f 5` - result=$? -- if [ x"$status" = "xtrue" ]; then -+ if [ x"$status" = "xtrue" -o x"$status" = "xfalse" ]; then - echo "enabled" -- elif [ x"$status" = "xfalse" ]; then -- echo "disabled" -- else -+ elif [ x"$result" != "x0" ]; then - echo "ERROR: dbus org.freedesktop.ScreenSaver.GetActive returned '$status'" >&2 - return 1 -+ else -+ echo "disabled" - fi - ;; - --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/patches/0005-xdg-open-better-fix-for-command-injection-vulnerabil.patch b/slackware64-current/source/x/xdg-utils/patches/0005-xdg-open-better-fix-for-command-injection-vulnerabil.patch deleted file mode 100644 index b7f616824..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0005-xdg-open-better-fix-for-command-injection-vulnerabil.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ab071beaabb62ceda3028dd5efa85e8057c29006 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Mon, 19 Jan 2015 05:18:57 -0600 -Subject: [PATCH 05/11] xdg-open: better fix for command injection - vulnerability (BR66670) - ---- - ChangeLog | 3 +++ - scripts/xdg-open.in | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index fa90e70..627df21 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,8 @@ - === xdg-utils 1.1.x === - -+2015-01-19 Rex Dieter <rdieter@fedoraproject.org> -+ * xdg-open: better fix for command injection vulnerability (BR66670) -+ - 2015-01-15 Reuben Thomas <rrt@sc3d.org> - * xdg-mime: dereference symlinks when using mimetype or file (BR39923) - * xdg-screensaver: Change screensaver_freedesktop's interpretation of GetActive (BR29859) -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 9f01747..b6045f8 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -193,10 +193,10 @@ search_desktop_file() - if [ -x "$command_exec" ] ; then - if echo "$arguments" | grep -iq '%[fFuU]' ; then - echo START "$command_exec" "$arguments_exec" -- eval "$command_exec" '$arguments_exec' -+ eval "'$command_exec'" "'$arguments_exec'" - else - echo START "$command_exec" "$arguments_exec" "$arg" -- eval "$command_exec" '$arguments_exec' '$arg' -+ eval "'$command_exec'" "'$arguments_exec'" "'$arg'" - fi - - if [ $? -eq 0 ]; then --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/patches/0006-xdg-open-Improve-performance-of-get_key-function.patch b/slackware64-current/source/x/xdg-utils/patches/0006-xdg-open-Improve-performance-of-get_key-function.patch deleted file mode 100644 index de05e7f6e..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0006-xdg-open-Improve-performance-of-get_key-function.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 46e8421a238640d0a18d3fe856466c1d22aeadbf Mon Sep 17 00:00:00 2001 -From: Alex Henrie <alexhenrie24@gmail.com> -Date: Sat, 17 Jan 2015 01:15:19 -0700 -Subject: [PATCH 06/11] xdg-open: Improve performance of get_key function - ---- - scripts/xdg-open.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index b6045f8..ee2889e 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -57,11 +57,11 @@ get_key() - "["*) - desktop_entry="" - ;; -- *) -+ "${key}="*) - # Only match Desktop Entry group - if [ -n "${desktop_entry}" ] - then -- echo "${line}" | grep -E "^${key}=" | cut -d= -f 2- -+ echo "${line}" | cut -d= -f 2- - fi - esac - done < "${file}" --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/patches/0007-Add-changelog-for-prior-commit.patch b/slackware64-current/source/x/xdg-utils/patches/0007-Add-changelog-for-prior-commit.patch deleted file mode 100644 index 59cf07dce..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0007-Add-changelog-for-prior-commit.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e8ee3b18d16e41b95148111b920a0c8beed3ac6c Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Mon, 19 Jan 2015 05:37:34 -0600 -Subject: [PATCH 07/11] Add changelog for prior commit - ---- - ChangeLog | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ChangeLog b/ChangeLog -index 627df21..9a01f82 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -2,6 +2,7 @@ - - 2015-01-19 Rex Dieter <rdieter@fedoraproject.org> - * xdg-open: better fix for command injection vulnerability (BR66670) -+ * xdg-open is extremely slow because get_key executes grep unnecessarily (BR88524) - - 2015-01-15 Reuben Thomas <rrt@sc3d.org> - * xdg-mime: dereference symlinks when using mimetype or file (BR39923) --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/patches/0008-xdg-open-safer-xdg-open-BR89130.patch b/slackware64-current/source/x/xdg-utils/patches/0008-xdg-open-safer-xdg-open-BR89130.patch deleted file mode 100644 index 93d88b81d..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0008-xdg-open-safer-xdg-open-BR89130.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 13d9b0cac97e438bf7dc06452ee7fb3480907d88 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Fri, 20 Feb 2015 15:54:46 -0600 -Subject: [PATCH 08/11] xdg-open: safer xdg-open (BR89130) - -inspired by patch from Vincent Bernat <bernat@debian.org> ---- - ChangeLog | 3 +++ - scripts/xdg-open.in | 65 ++++++++++++++++++++++++++++++++--------------------- - 2 files changed, 43 insertions(+), 25 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 9a01f82..0c0ab97 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,8 @@ - === xdg-utils 1.1.x === - -+2015-02-20 Rex Dieter <rdieter@fedoraproject.org> -+ * xdg-open: safer xdg-open (BR89130), inspired by patch from Vincent Bernat <bernat@debian.org> -+ - 2015-01-19 Rex Dieter <rdieter@fedoraproject.org> - * xdg-open: better fix for command injection vulnerability (BR66670) - * xdg-open is extremely slow because get_key executes grep unnecessarily (BR88524) -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index ee2889e..074ba6f 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -161,7 +161,7 @@ search_desktop_file() - { - local default="$1" - local dir="$2" -- local arg="$3" -+ local target="$3" - - local file="" - # look for both vendor-app.desktop, vendor/app.desktop -@@ -174,34 +174,49 @@ search_desktop_file() - if [ -r "$file" ] ; then - command="$(get_key "${file}" "Exec" | first_word)" - command_exec=`which $command 2>/dev/null` -- arguments="$(get_key "${file}" "Exec" | last_word)" -- arg_one="`echo "$arg" | sed 's/[&*\\]/\\\\&/g'`" - icon="$(get_key "${file}" "Icon")" -- if [ "${icon}" != "" ] -- then -- icon="--icon '${icon}'" -- else -- icon="''" -- fi - # FIXME: Actually LC_MESSAGES should be used as described in - # http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s04.html -- localised_name="'$(get_key "${file}" "Name")'" -- arguments_exec="$(echo "$arguments" | sed -e 's*%[fFuU]*'"$arg_one"'*g' \ -- -e 's*%i*'"$icon"'*g' \ -- -e 's*%c*'"$localised_name"'*g')" -- -- if [ -x "$command_exec" ] ; then -- if echo "$arguments" | grep -iq '%[fFuU]' ; then -- echo START "$command_exec" "$arguments_exec" -- eval "'$command_exec'" "'$arguments_exec'" -- else -- echo START "$command_exec" "$arguments_exec" "$arg" -- eval "'$command_exec'" "'$arguments_exec'" "'$arg'" -- fi -+ localised_name="$(get_key "${file}" "Name")" -+ set -- $(get_key "${file}" "Exec" | last_word) -+ # We need to replace any occurrence of "%f", "%F" and -+ # the like by the target file. We examine each -+ # argument and append the modified argument to the -+ # end then shift. -+ local args=$# -+ local replaced=0 -+ while [ $args -gt 0 ]; do -+ case $1 in -+ %[c]) -+ replaced=1 -+ arg="${localised_name}" -+ shift -+ set -- "$@" "$arg" -+ ;; -+ %[fFuU]) -+ replaced=1 -+ arg="$(echo $target | sed 's/[&*\\]/\\\\&/g')" -+ shift -+ set -- "$@" "$arg" -+ ;; -+ %[i]) -+ replaced=1 -+ shift -+ set -- "$@" "--icon" "$icon" -+ ;; -+ *) -+ arg="$1" -+ shift -+ set -- "$@" "$arg" -+ ;; -+ esac -+ args=$(( $args - 1 )) -+ done -+ [ $replaced -eq 1 ] || set -- "$@" "$target" -+ "$command_exec" "$@" - -- if [ $? -eq 0 ]; then -- exit_success -- fi -+ if [ $? -eq 0 ]; then -+ exit_success - fi - fi - --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/patches/0009-one-more-s-arg-target-rename-fix-for-prior-commit.patch b/slackware64-current/source/x/xdg-utils/patches/0009-one-more-s-arg-target-rename-fix-for-prior-commit.patch deleted file mode 100644 index 98fb8045b..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0009-one-more-s-arg-target-rename-fix-for-prior-commit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8f5e1cd175662027ff96582e387078e85f088ffa Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@gmail.com> -Date: Sat, 21 Feb 2015 09:25:41 -0600 -Subject: [PATCH 09/11] one more s/$arg/$target/ rename fix for prior commit - ---- - scripts/xdg-open.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 074ba6f..678eae4 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -221,7 +221,7 @@ search_desktop_file() - fi - - for d in $dir/*/; do -- [ -d "$d" ] && search_desktop_file "$default" "$d" "$arg" -+ [ -d "$d" ] && search_desktop_file "$default" "$d" "$target" - done - } - --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/patches/0010-xdg-mime-do-not-report-multiple-desktop-files-BR6032.patch b/slackware64-current/source/x/xdg-utils/patches/0010-xdg-mime-do-not-report-multiple-desktop-files-BR6032.patch deleted file mode 100644 index ae85ac017..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0010-xdg-mime-do-not-report-multiple-desktop-files-BR6032.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e04f8065335e391f47b04513d395e02a7f13d56e Mon Sep 17 00:00:00 2001 -From: Lionel Orry <lionel.orry@gmail.com> -Date: Wed, 13 Aug 2014 09:56:25 +0200 -Subject: [PATCH 10/11] xdg-mime: do not report multiple desktop files - (BR60329) - -since commit 050333e3, xdg-mime checks both defaults.list and -mimeinfo.cache. When a result is present in both files, it returns both -results separated by a space. - -When this is the case, the desktop file name is made of the duplicated -filename and the following chain of executions does not work properly. - -This commit tries to select the first found line before extracting the -desktop file name. - -Signed-off-by: Lionel Orry <lionel.orry@gmail.com> ---- - scripts/xdg-mime.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in -index 80781c8..74cadfa 100644 ---- a/scripts/xdg-mime.in -+++ b/scripts/xdg-mime.in -@@ -383,7 +383,7 @@ defapp_generic() - for x in `echo "$xdg_system_dirs" | sed 's/:/ /g'`; do - for prefix in "$XDG_MENU_PREFIX" ""; do - DEBUG 2 "Checking $x/applications/${prefix}defaults.list and $x/applications/${prefix}mimeinfo.cache" -- trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1` -+ trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | head -n 1 | cut -d '=' -f 2 | cut -d ';' -f 1` - if [ -n "$trader_result" ] ; then - echo $trader_result - exit_success --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/patches/0011-add-ChangeLog-entry-for-previous-commit.patch b/slackware64-current/source/x/xdg-utils/patches/0011-add-ChangeLog-entry-for-previous-commit.patch deleted file mode 100644 index 804b4f18f..000000000 --- a/slackware64-current/source/x/xdg-utils/patches/0011-add-ChangeLog-entry-for-previous-commit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bed791793af46ccb69107b95af87862335d4a702 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@gmail.com> -Date: Tue, 24 Feb 2015 10:29:04 -0600 -Subject: [PATCH 11/11] add ChangeLog entry for previous commit - ---- - ChangeLog | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/ChangeLog b/ChangeLog -index 0c0ab97..6f6097a 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,8 @@ - === xdg-utils 1.1.x === - -+2015-02-24 Lionel Orry <lionel.orry@gmail.com> -+ * xdg-mime: do not report multiple desktop files (BR60329) -+ - 2015-02-20 Rex Dieter <rdieter@fedoraproject.org> - * xdg-open: safer xdg-open (BR89130), inspired by patch from Vincent Bernat <bernat@debian.org> - --- -2.3.1 - diff --git a/slackware64-current/source/x/xdg-utils/xdg-utils-1.1.0-rc3.tar.xz b/slackware64-current/source/x/xdg-utils/xdg-utils-1.1.0-rc3.tar.xz deleted file mode 100644 index b0a5f9daa..000000000 --- a/slackware64-current/source/x/xdg-utils/xdg-utils-1.1.0-rc3.tar.xz +++ /dev/null @@ -1 +0,0 @@ -7ee0da3401faa5a946f6953d63b7871238891a3c diff --git a/slackware64-current/source/x/xdg-utils/xdg-utils-cvs_checkout.sh b/slackware64-current/source/x/xdg-utils/xdg-utils-cvs_checkout.sh deleted file mode 100755 index 74d7ba0e6..000000000 --- a/slackware64-current/source/x/xdg-utils/xdg-utils-cvs_checkout.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - - -MODULE=$(basename $0 -cvs_checkout.sh) -DATE=$(date +%Y%m%d) - -set -x - -rm -rf $MODULE - -cvs -z3 -d:pserver:anonymous@cvs.freedesktop.org:/cvs/portland checkout -P portland/$MODULE -pushd portland -find . -name CVS -exec rm -rf "{}" \; 2> /dev/null -tar cjf ../$MODULE-${DATE}cvs.tar.bz2 $MODULE -popd - -rm -rf portland diff --git a/slackware64-current/source/xap/sane/sane-backends-1.0.24.tar.xz b/slackware64-current/source/xap/sane/sane-backends-1.0.24.tar.xz deleted file mode 100644 index c21d2b425..000000000 --- a/slackware64-current/source/xap/sane/sane-backends-1.0.24.tar.xz +++ /dev/null @@ -1 +0,0 @@ -bbf2742529512290e4cb02150cd01279a4828457 |