summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/kde/kde/build/akonadi-contacts2
-rw-r--r--source/kde/kde/build/akonadi-import-wizard2
-rw-r--r--source/kde/kde/build/akonadiconsole2
-rw-r--r--source/kde/kde/build/akregator2
-rw-r--r--source/kde/kde/build/grantlee-editor2
-rw-r--r--source/kde/kde/build/kdepim-addons2
-rw-r--r--source/kde/kde/build/kget2
-rw-r--r--source/kde/kde/build/kleopatra2
-rw-r--r--source/kde/kde/build/kmail2
-rw-r--r--source/kde/kde/build/kmail-account-wizard2
-rw-r--r--source/kde/kde/build/libkleo2
-rw-r--r--source/kde/kde/build/mailcommon2
-rw-r--r--source/kde/kde/build/mbox-importer2
-rw-r--r--source/kde/kde/build/messagelib2
-rw-r--r--source/kde/kde/build/pim-data-exporter2
-rw-r--r--source/l/boost/0001-b2-fix-install.patch80
-rwxr-xr-xsource/l/boost/boost.SlackBuild6
-rwxr-xr-xsource/x/libvdpau/libvdpau.SlackBuild2
18 files changed, 100 insertions, 18 deletions
diff --git a/source/kde/kde/build/akonadi-contacts b/source/kde/kde/build/akonadi-contacts
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/akonadi-contacts
+++ b/source/kde/kde/build/akonadi-contacts
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/akonadi-import-wizard b/source/kde/kde/build/akonadi-import-wizard
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/akonadi-import-wizard
+++ b/source/kde/kde/build/akonadi-import-wizard
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/akonadiconsole b/source/kde/kde/build/akonadiconsole
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/akonadiconsole
+++ b/source/kde/kde/build/akonadiconsole
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/akregator b/source/kde/kde/build/akregator
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/akregator
+++ b/source/kde/kde/build/akregator
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/grantlee-editor b/source/kde/kde/build/grantlee-editor
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/grantlee-editor
+++ b/source/kde/kde/build/grantlee-editor
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kdepim-addons b/source/kde/kde/build/kdepim-addons
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kdepim-addons
+++ b/source/kde/kde/build/kdepim-addons
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kget b/source/kde/kde/build/kget
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kget
+++ b/source/kde/kde/build/kget
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kleopatra b/source/kde/kde/build/kleopatra
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kleopatra
+++ b/source/kde/kde/build/kleopatra
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kmail b/source/kde/kde/build/kmail
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kmail
+++ b/source/kde/kde/build/kmail
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kmail-account-wizard b/source/kde/kde/build/kmail-account-wizard
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kmail-account-wizard
+++ b/source/kde/kde/build/kmail-account-wizard
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/libkleo b/source/kde/kde/build/libkleo
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/libkleo
+++ b/source/kde/kde/build/libkleo
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/mailcommon b/source/kde/kde/build/mailcommon
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/mailcommon
+++ b/source/kde/kde/build/mailcommon
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/mbox-importer b/source/kde/kde/build/mbox-importer
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/mbox-importer
+++ b/source/kde/kde/build/mbox-importer
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/messagelib b/source/kde/kde/build/messagelib
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/messagelib
+++ b/source/kde/kde/build/messagelib
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/pim-data-exporter b/source/kde/kde/build/pim-data-exporter
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/pim-data-exporter
+++ b/source/kde/kde/build/pim-data-exporter
@@ -1 +1 @@
-1
+2
diff --git a/source/l/boost/0001-b2-fix-install.patch b/source/l/boost/0001-b2-fix-install.patch
new file mode 100644
index 000000000..c513cc54c
--- /dev/null
+++ b/source/l/boost/0001-b2-fix-install.patch
@@ -0,0 +1,80 @@
+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 27e7f36b6..e15783d4c 100755
--- a/source/l/boost/boost.SlackBuild
+++ b/source/l/boost/boost.SlackBuild
@@ -2,7 +2,7 @@
# Copyright 2007, 2008, 2012 Eric Hameleers, Eindhoven, NL
# Copyright 2007-2008, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, NL
-# Copyright 2008, 2009, 2010, 2013, 2014, 2015, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2014, 2015, 2017, 2018, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -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:-2}
+BUILD=${BUILD:-3}
PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -85,6 +85,8 @@ 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/x/libvdpau/libvdpau.SlackBuild b/source/x/libvdpau/libvdpau.SlackBuild
index 7ee30c090..4b15127c2 100755
--- a/source/x/libvdpau/libvdpau.SlackBuild
+++ b/source/x/libvdpau/libvdpau.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libvdpau
VERSION=${VERSION:-$(echo libvdpau-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in