From 44dae369b507e07ff461d93ecad53d1ac9c1b5f9 Mon Sep 17 00:00:00 2001 From: triallax Date: Sat, 20 May 2023 20:09:59 +0100 Subject: [PATCH 1/4] botan: update to 3.1.1. --- common/shlibs | 2 +- .../patches/botan_types_include_climits.patch | 10 ------ srcpkgs/botan/template | 32 ++++++++----------- 3 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/botan/patches/botan_types_include_climits.patch diff --git a/common/shlibs b/common/shlibs index dc2e91141d95c..7574f54bf9ecd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2912,7 +2912,7 @@ libKDb3.so.4 kdb-3.1.0_1 libKPropertyWidgets3.so.4 kproperty-3.1.0_1 libKPropertyCore3.so.4 kproperty-3.1.0_1 libKReport3.so.4 kreport-3.1.0_1 -libbotan-2.so.19 botan-2.19.1_1 +libbotan-3.so.0 botan-3.1.1_1 libswipl.so.9 swi-prolog-9.0.0_1 libpcre2-16.so.0 libpcre2-10.22_1 libpcre2-32.so.0 libpcre2-10.22_1 diff --git a/srcpkgs/botan/patches/botan_types_include_climits.patch b/srcpkgs/botan/patches/botan_types_include_climits.patch deleted file mode 100644 index d52301ccaab40..0000000000000 --- a/srcpkgs/botan/patches/botan_types_include_climits.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/lib/utils/types.h 2017-10-13 08:08:04.055686756 +0000 -+++ b/src/lib/utils/types.h 2017-10-13 08:08:46.043688922 +0000 -@@ -12,6 +12,7 @@ - - #include // IWYU pragma: export - #include // IWYU pragma: export -+#include - #include // IWYU pragma: export - #include // IWYU pragma: export - #include // IWYU pragma: export diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index 6b381a014d66a..bbc2bd82452cd 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -1,7 +1,7 @@ # Template file for 'botan' pkgname=botan -version=2.19.3 -revision=2 +version=3.1.1 +revision=1 build_style=gnu-makefile hostmakedepends="doxygen python3" makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel" @@ -11,7 +11,7 @@ license="BSD-2-Clause" homepage="https://botan.randombit.net/" changelog="https://botan.randombit.net/news.html" distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz" -checksum=dae047f399c5a47f087db5d3d9d9e8f11ae4985d14c928d71da1aff801802d55 +checksum=30c84fe919936a98fef5331f246c62aa2c0e4d2085b2d4511207f6a20afa3a6b python_version=3 LDFLAGS="-pthread" @@ -19,15 +19,13 @@ LDFLAGS="-pthread" do_configure() { local _args _cpu - _args="--prefix=/usr" - _args+=" --os=linux" - _args+=" --with-doxygen" - _args+=" --with-bzip2" - _args+=" --with-lzma" - _args+=" --with-zlib" - _args+=" --with-sqlite3" - _args+=" --enable-shared" - _args+=" --cc=gcc" + _args="--prefix=/usr --os=linux --with-doxygen --with-bzip2 --with-lzma + --with-zlib --with-sqlite3 --cc=gcc --build-targets cli + --build-targets shared --build-targets static" + + if [ "$XBPS_CHECK_PKGS" ]; then + _args+=" --build-targets tests" + fi case "$XBPS_TARGET_MACHINE" in i686*) @@ -36,11 +34,7 @@ do_configure() { x86_64*) _cpu="x86_64" ;; - armv5*) - _cpu="arm" - _args+=" --disable-modules=simd" - ;; - armv6*) + armv[56]*) _cpu="arm" _args+=" --disable-modules=simd" ;; @@ -90,8 +84,8 @@ botan-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig } } From c12662ff491017af800295c2dffdcaad2c64958f Mon Sep 17 00:00:00 2001 From: triallax Date: Sat, 20 May 2023 20:12:15 +0100 Subject: [PATCH 2/4] corectrl: revbump for botan-3.1.1. --- srcpkgs/corectrl/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template index b85385804faac..db1252770f831 100644 --- a/srcpkgs/corectrl/template +++ b/srcpkgs/corectrl/template @@ -1,7 +1,7 @@ # Template file for 'corectrl' pkgname=corectrl version=1.2.3 -revision=3 +revision=4 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake @@ -13,6 +13,7 @@ short_desc="User-friendly hardware control application" maintainer="Lorem " license="GPL-3.0-or-later" homepage="https://gitlab.com/corectrl/corectrl" +changelog="https://gitlab.com/corectrl/corectrl/-/raw/master/CHANGELOG.md" distfiles="${homepage}/-/archive/v${version}/corectrl-v${version}.tar.gz" checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12 From 3e262b041f388b1efc5ac882e2c789c39350a9f1 Mon Sep 17 00:00:00 2001 From: triallax Date: Sat, 20 May 2023 20:12:16 +0100 Subject: [PATCH 3/4] keepassxc: revbump for botan-3.1.1. --- srcpkgs/keepassxc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template index ddc700edc8194..348255689f4b3 100644 --- a/srcpkgs/keepassxc/template +++ b/srcpkgs/keepassxc/template @@ -1,7 +1,7 @@ # Template file for 'keepassxc' pkgname=keepassxc version=2.7.5 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF) From 547ce6883eba1f9053b0fc5c2efa1a16d24fb7ad Mon Sep 17 00:00:00 2001 From: triallax Date: Sat, 20 May 2023 20:12:17 +0100 Subject: [PATCH 4/4] qownnotes: revbump for botan-3.1.1. --- srcpkgs/qownnotes/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template index 9d8192e6e5025..091af4a8b8a98 100644 --- a/srcpkgs/qownnotes/template +++ b/srcpkgs/qownnotes/template @@ -1,7 +1,7 @@ # Template file for 'qownnotes' pkgname=qownnotes version=23.6.5 -revision=1 +revision=2 build_style=qmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" makedepends="botan-devel qt5-declarative-devel qt5-svg-devel