diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/aaa_libraries/aaa_libraries.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/aaa_libraries/tracked-files-tmp.d/boost | 40 | ||||
-rwxr-xr-x | source/ap/pamixer/pamixer.SlackBuild | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kig | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kopeninghours | 2 | ||||
-rw-r--r-- | source/kde/kde/build/krita | 2 | ||||
-rw-r--r-- | source/l/boost/0001-b2-fix-install.patch | 80 | ||||
-rwxr-xr-x | source/l/boost/boost.SlackBuild | 4 | ||||
-rwxr-xr-x | source/l/cryfs/cryfs.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/openexr/openexr.SlackBuild | 2 |
10 files changed, 48 insertions, 90 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild index ec67c4b93..ff27cd322 100755 --- a/source/a/aaa_libraries/aaa_libraries.SlackBuild +++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_libraries VERSION=${VERSION:-15.1} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_libraries/tracked-files-tmp.d/boost b/source/a/aaa_libraries/tracked-files-tmp.d/boost new file mode 100644 index 000000000..b7f7cf7cd --- /dev/null +++ b/source/a/aaa_libraries/tracked-files-tmp.d/boost @@ -0,0 +1,40 @@ +# We'll keep these around for a little while... probably remove on 2022-05-15 or thereabouts +/usr/lib/libboost_atomic.so.1.78.0 +/usr/lib/libboost_chrono.so.1.78.0 +/usr/lib/libboost_container.so.1.78.0 +/usr/lib/libboost_context.so.1.78.0 +/usr/lib/libboost_contract.so.1.78.0 +/usr/lib/libboost_coroutine.so.1.78.0 +/usr/lib/libboost_date_time.so.1.78.0 +/usr/lib/libboost_fiber.so.1.78.0 +/usr/lib/libboost_filesystem.so.1.78.0 +/usr/lib/libboost_graph.so.1.78.0 +/usr/lib/libboost_iostreams.so.1.78.0 +/usr/lib/libboost_json.so.1.78.0 +/usr/lib/libboost_locale.so.1.78.0 +/usr/lib/libboost_log.so.1.78.0 +/usr/lib/libboost_log_setup.so.1.78.0 +/usr/lib/libboost_math_c99.so.1.78.0 +/usr/lib/libboost_math_c99f.so.1.78.0 +/usr/lib/libboost_math_c99l.so.1.78.0 +/usr/lib/libboost_math_tr1.so.1.78.0 +/usr/lib/libboost_math_tr1f.so.1.78.0 +/usr/lib/libboost_math_tr1l.so.1.78.0 +/usr/lib/libboost_nowide.so.1.78.0 +/usr/lib/libboost_prg_exec_monitor.so.1.78.0 +/usr/lib/libboost_program_options.so.1.78.0 +/usr/lib/libboost_python27.so.1.78.0 +/usr/lib/libboost_python39.so.1.78.0 +/usr/lib/libboost_random.so.1.78.0 +/usr/lib/libboost_regex.so.1.78.0 +/usr/lib/libboost_serialization.so.1.78.0 +/usr/lib/libboost_stacktrace_addr2line.so.1.78.0 +/usr/lib/libboost_stacktrace_basic.so.1.78.0 +/usr/lib/libboost_stacktrace_noop.so.1.78.0 +/usr/lib/libboost_system.so.1.78.0 +/usr/lib/libboost_thread.so.1.78.0 +/usr/lib/libboost_timer.so.1.78.0 +/usr/lib/libboost_type_erasure.so.1.78.0 +/usr/lib/libboost_unit_test_framework.so.1.78.0 +/usr/lib/libboost_wave.so.1.78.0 +/usr/lib/libboost_wserialization.so.1.78.0 diff --git a/source/ap/pamixer/pamixer.SlackBuild b/source/ap/pamixer/pamixer.SlackBuild index f074c0eed..687058886 100755 --- a/source/ap/pamixer/pamixer.SlackBuild +++ b/source/ap/pamixer/pamixer.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pamixer VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/kde/kde/build/kig b/source/kde/kde/build/kig index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kig +++ b/source/kde/kde/build/kig @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kopeninghours b/source/kde/kde/build/kopeninghours index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kopeninghours +++ b/source/kde/kde/build/kopeninghours @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -1 +2 diff --git a/source/l/boost/0001-b2-fix-install.patch b/source/l/boost/0001-b2-fix-install.patch deleted file mode 100644 index c513cc54c..000000000 --- a/source/l/boost/0001-b2-fix-install.patch +++ /dev/null @@ -1,80 +0,0 @@ -https://github.com/bfgroup/b2/pull/113 - -From 62e7321669f66a90e2a90c8f31af34f59ebc5d7a Mon Sep 17 00:00:00 2001 -From: Dmitry Arkhipov <grisumbras@gmail.com> -Date: Thu, 9 Dec 2021 08:11:57 +0300 -Subject: [PATCH] Don't skip install targets if there's <build>no in ureqs - ---- - src/tools/stage.jam | 4 ++++ - test/install_build_no.py | 26 ++++++++++++++++++++++++++ - test/test_all.py | 1 + - 3 files changed, 31 insertions(+) - create mode 100755 test/install_build_no.py - -Index: boost_1_78_0/tools/build/src/tools/stage.jam -=================================================================== ---- boost_1_78_0.orig/tools/build/src/tools/stage.jam 2021-12-09 16:30:45.956457531 +0300 -+++ boost_1_78_0/tools/build/src/tools/stage.jam 2021-12-09 16:30:45.952457519 +0300 -@@ -476,10 +476,14 @@ class install-target-class : basic-targe - } - DELETE_MODULE $(result) ; - return [ sequence.unique $(result2) ] ; - } - -+ rule skip-from-usage-requirements ( ) -+ { -+ } -+ - # Returns true iff 'type' is subtype of some element of 'types-to-include'. - # - local rule include-type ( type : types-to-include * ) - { - local found ; -Index: boost_1_78_0/tools/build/test/install_build_no.py -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ boost_1_78_0/tools/build/test/install_build_no.py 2021-12-09 16:30:45.953457522 +0300 -@@ -0,0 +1,26 @@ -+#!/usr/bin/python -+ -+# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com) -+# Distributed under the Boost Software License, Version 1.0. -+# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt) -+ -+# Check that <build>no in usage-requirements of dependencies does not affect -+# install rule, i.e. a skipped installed target does not affect insallation of -+# other targets. -+ -+import BoostBuild -+ -+t = BoostBuild.Tester() -+ -+t.write("a.cpp", "int main() {}\n") -+ -+t.write("jamroot.jam", """ -+make x : : maker : <build>no ; -+exe a : a.cpp ; -+install install : x a ; -+""") -+ -+t.run_build_system() -+t.expect_addition("install/a.exe") -+ -+t.cleanup() -Index: boost_1_78_0/tools/build/test/test_all.py -=================================================================== ---- boost_1_78_0.orig/tools/build/test/test_all.py 2021-12-09 16:30:45.956457531 +0300 -+++ boost_1_78_0/tools/build/test/test_all.py 2021-12-09 16:30:45.953457522 +0300 -@@ -248,10 +248,11 @@ tests = ["abs_workdir", - "implicit_dependency", - "indirect_conditional", - "inherit_toolset", - "inherited_dependency", - "inline", -+ "install_build_no", - "libjpeg", - "liblzma", - "libpng", - "libtiff", - "libzstd", diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index ae6f8b12d..60e78b71e 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -85,8 +85,6 @@ rm -rf boost_$VERSION tar xvf $CWD/boost_$VERSION.tar.?z || exit 1 cd boost_$VERSION || exit 1 -zcat $CWD/0001-b2-fix-install.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/cryfs/cryfs.SlackBuild b/source/l/cryfs/cryfs.SlackBuild index 425de6086..912d929c3 100755 --- a/source/l/cryfs/cryfs.SlackBuild +++ b/source/l/cryfs/cryfs.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cryfs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/openexr/openexr.SlackBuild b/source/l/openexr/openexr.SlackBuild index 3a4963551..e7e468d47 100755 --- a/source/l/openexr/openexr.SlackBuild +++ b/source/l/openexr/openexr.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=openexr VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |