* [PR PATCH] botan: update to 3.0.0.
@ 2023-05-20 19:13 mhmdanas
2023-07-22 16:51 ` [PR PATCH] [Updated] " mhmdanas
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: mhmdanas @ 2023-05-20 19:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1218 bytes --]
There is a new pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages botan-3.0.0
https://github.com/void-linux/void-packages/pull/43974
botan: update to 3.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43974.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-botan-3.0.0-43974.patch --]
[-- Type: text/x-diff, Size: 4821 bytes --]
From 4cec06caa7a8387b08779ede9ec57e0f14f4fe92 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 20 May 2023 20:09:59 +0100
Subject: [PATCH 1/4] botan: update to 3.0.0.
---
common/shlibs | 2 +-
srcpkgs/botan/template | 32 +++++++++++++-------------------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4803f08e1e0f..544cbc677f9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2909,7 +2909,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.0.0_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/template b/srcpkgs/botan/template
index 6b381a014d66..b5e558af1f36 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.0.0
+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=5da552e00fa1c047a90c22eb5f0247ec27e7432b68b78e10a7ce0955269ccad7
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 7ebefab79f83b19f8ececbf8496c4d85003b2576 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 20 May 2023 20:12:15 +0100
Subject: [PATCH 2/4] corectrl: revbump for botan-3.0.0.
---
srcpkgs/corectrl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index b85385804faa..01447148fb32 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
From 2b1805ebc685f75794146ea654f0ed9a40d09270 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 20 May 2023 20:12:16 +0100
Subject: [PATCH 3/4] keepassxc: revbump for botan-3.0.0.
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index ddc700edc819..348255689f4b 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 4abd5ffa4b2431e0d1c4bb771e48d2faeff3f2cc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 20 May 2023 20:12:17 +0100
Subject: [PATCH 4/4] qownnotes: revbump for botan-3.0.0.
---
srcpkgs/qownnotes/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index d79035baacce..11eb98df2b9e 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,7 +1,7 @@
# Template file for 'qownnotes'
pkgname=qownnotes
version=23.2.3
-revision=1
+revision=2
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="botan-devel qt5-declarative-devel qt5-svg-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] botan: update to 3.0.0.
2023-05-20 19:13 [PR PATCH] botan: update to 3.0.0 mhmdanas
@ 2023-07-22 16:51 ` mhmdanas
2023-12-01 23:25 ` [PR PATCH] [Updated] botan: update to 3.1.1 mhmdanas
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: mhmdanas @ 2023-07-22 16:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1366 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages botan-3.0.0
https://github.com/void-linux/void-packages/pull/43974
botan: update to 3.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Blocking issues:
- https://github.com/pbek/QOwnNotes/issues/2786
- https://gitlab.com/corectrl/corectrl/-/issues/373
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43974.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-botan-3.0.0-43974.patch --]
[-- Type: text/x-diff, Size: 6116 bytes --]
From 44dae369b507e07ff461d93ecad53d1ac9c1b5f9 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
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 <botan/build.h> // IWYU pragma: export
- #include <botan/assert.h> // IWYU pragma: export
-+#include <climits>
- #include <cstddef> // IWYU pragma: export
- #include <cstdint> // IWYU pragma: export
- #include <memory> // 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 <triallax@tutanota.com>
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 <notloremipsum@protonmail.com>"
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 <triallax@tutanota.com>
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 <triallax@tutanota.com>
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] botan: update to 3.1.1.
2023-05-20 19:13 [PR PATCH] botan: update to 3.0.0 mhmdanas
2023-07-22 16:51 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-12-01 23:25 ` mhmdanas
2023-12-02 0:52 ` mhmdanas
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: mhmdanas @ 2023-12-01 23:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1374 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages botan-3.0.0
https://github.com/void-linux/void-packages/pull/43974
botan: update to 3.1.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Blocking issues:
- [ ] https://github.com/pbek/QOwnNotes/issues/2786
- [x] https://gitlab.com/corectrl/corectrl/-/issues/373
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43974.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-botan-3.0.0-43974.patch --]
[-- Type: text/x-diff, Size: 4654 bytes --]
From 9c7b0bc73c5bd2365190445578be2136b043a42d Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Fri, 1 Dec 2023 23:23:54 +0000
Subject: [PATCH 1/2] New package: botan3-3.2.0
---
common/shlibs | 1 +
srcpkgs/botan3-devel | 1 +
srcpkgs/botan3-doc | 1 +
srcpkgs/botan3/template | 91 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 94 insertions(+)
create mode 120000 srcpkgs/botan3-devel
create mode 120000 srcpkgs/botan3-doc
create mode 100644 srcpkgs/botan3/template
diff --git a/common/shlibs b/common/shlibs
index 90018a5616f86..de81e2c05b0c8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2840,6 +2840,7 @@ 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.2 botan3-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/botan3-devel b/srcpkgs/botan3-devel
new file mode 120000
index 0000000000000..a965da97290f7
--- /dev/null
+++ b/srcpkgs/botan3-devel
@@ -0,0 +1 @@
+botan3
\ No newline at end of file
diff --git a/srcpkgs/botan3-doc b/srcpkgs/botan3-doc
new file mode 120000
index 0000000000000..a965da97290f7
--- /dev/null
+++ b/srcpkgs/botan3-doc
@@ -0,0 +1 @@
+botan3
\ No newline at end of file
diff --git a/srcpkgs/botan3/template b/srcpkgs/botan3/template
new file mode 100644
index 0000000000000..0efc919fd4aaf
--- /dev/null
+++ b/srcpkgs/botan3/template
@@ -0,0 +1,91 @@
+# Template file for 'botan3'
+pkgname=botan3
+version=3.2.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="doxygen python3"
+makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+short_desc="Crypto library written in C++"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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=049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3
+python_version=3
+
+LDFLAGS="-pthread"
+
+do_configure() {
+ local _args _cpu
+
+ _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*)
+ _cpu="i686"
+ ;;
+ x86_64*)
+ _cpu="x86_64"
+ ;;
+ armv[56]*)
+ _cpu="arm"
+ _args+=" --disable-modules=simd"
+ ;;
+ armv7*)
+ _cpu="armv7-a"
+ _args+=" --disable-modules=simd"
+ ;;
+ aarch64*)
+ _cpu="armv8-a"
+ ;;
+ mips*)
+ _cpu="mips32"
+ ;;
+ ppc64le*)
+ _cpu="ppc64le"
+ ;;
+ ppc64*)
+ _cpu="ppc64"
+ ;;
+ ppc*)
+ _cpu="ppc"
+ ;;
+ *)
+ _cpu="${XBPS_TARGET_MACHINE%-musl}"
+ ;;
+ esac
+
+ python3 configure.py \
+ --distribution-info="Void Linux botan-${version}_${revision}" \
+ --cpu=${_cpu} \
+ ${_args}
+}
+
+post_install() {
+ vlicense license.txt
+}
+
+botan3-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share/doc
+ }
+}
+
+botan3-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From 5dfb094917e0449fe4d0abc5849339932e7b07ce Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Fri, 1 Dec 2023 23:24:42 +0000
Subject: [PATCH 2/2] keepassxc: update to 2.7.6.
---
srcpkgs/keepassxc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index a215aefc2b1ca..636f182c3bb39 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.6
-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)
@@ -12,7 +12,7 @@ configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_SSHAGENT=$(vopt_if sshagent ON OFF)
-DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF)"
hostmakedepends="qt5-devel ruby-asciidoctor"
-makedepends="qt5-tools-devel qt5-svg-devel botan-devel libargon2-devel
+makedepends="qt5-tools-devel qt5-svg-devel botan3-devel libargon2-devel
qrencode-devel readline-devel pcsclite-devel
qt5-x11extras-devel
$(vopt_if autotype 'libXtst-devel libXi-devel')
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] botan: update to 3.1.1.
2023-05-20 19:13 [PR PATCH] botan: update to 3.0.0 mhmdanas
2023-07-22 16:51 ` [PR PATCH] [Updated] " mhmdanas
2023-12-01 23:25 ` [PR PATCH] [Updated] botan: update to 3.1.1 mhmdanas
@ 2023-12-02 0:52 ` mhmdanas
2023-12-04 20:53 ` mhmdanas
2024-02-14 11:01 ` [PR PATCH] [Closed]: New package: botan3-3.2.0 mhmdanas
4 siblings, 0 replies; 6+ messages in thread
From: mhmdanas @ 2023-12-02 0:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages botan-3.0.0
https://github.com/void-linux/void-packages/pull/43974
botan: update to 3.1.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
`corectrl` has an upstream patch to support Botan 3, might bump the package and incorporate the patch later.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43974.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-botan-3.0.0-43974.patch --]
[-- Type: text/x-diff, Size: 4912 bytes --]
From 40cdca3428a56f2c02bf088cb202201a10ca1e34 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Fri, 1 Dec 2023 23:23:54 +0000
Subject: [PATCH 1/2] New package: botan3-3.2.0
---
common/shlibs | 1 +
srcpkgs/botan/update | 1 +
srcpkgs/botan3-devel | 1 +
srcpkgs/botan3-doc | 1 +
srcpkgs/botan3/template | 91 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 95 insertions(+)
create mode 100644 srcpkgs/botan/update
create mode 120000 srcpkgs/botan3-devel
create mode 120000 srcpkgs/botan3-doc
create mode 100644 srcpkgs/botan3/template
diff --git a/common/shlibs b/common/shlibs
index 90018a5616f86..de81e2c05b0c8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2840,6 +2840,7 @@ 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.2 botan3-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/update b/srcpkgs/botan/update
new file mode 100644
index 0000000000000..370e7276de932
--- /dev/null
+++ b/srcpkgs/botan/update
@@ -0,0 +1 @@
+ignore="[^2].*"
diff --git a/srcpkgs/botan3-devel b/srcpkgs/botan3-devel
new file mode 120000
index 0000000000000..a965da97290f7
--- /dev/null
+++ b/srcpkgs/botan3-devel
@@ -0,0 +1 @@
+botan3
\ No newline at end of file
diff --git a/srcpkgs/botan3-doc b/srcpkgs/botan3-doc
new file mode 120000
index 0000000000000..a965da97290f7
--- /dev/null
+++ b/srcpkgs/botan3-doc
@@ -0,0 +1 @@
+botan3
\ No newline at end of file
diff --git a/srcpkgs/botan3/template b/srcpkgs/botan3/template
new file mode 100644
index 0000000000000..0efc919fd4aaf
--- /dev/null
+++ b/srcpkgs/botan3/template
@@ -0,0 +1,91 @@
+# Template file for 'botan3'
+pkgname=botan3
+version=3.2.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="doxygen python3"
+makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+short_desc="Crypto library written in C++"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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=049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3
+python_version=3
+
+LDFLAGS="-pthread"
+
+do_configure() {
+ local _args _cpu
+
+ _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*)
+ _cpu="i686"
+ ;;
+ x86_64*)
+ _cpu="x86_64"
+ ;;
+ armv[56]*)
+ _cpu="arm"
+ _args+=" --disable-modules=simd"
+ ;;
+ armv7*)
+ _cpu="armv7-a"
+ _args+=" --disable-modules=simd"
+ ;;
+ aarch64*)
+ _cpu="armv8-a"
+ ;;
+ mips*)
+ _cpu="mips32"
+ ;;
+ ppc64le*)
+ _cpu="ppc64le"
+ ;;
+ ppc64*)
+ _cpu="ppc64"
+ ;;
+ ppc*)
+ _cpu="ppc"
+ ;;
+ *)
+ _cpu="${XBPS_TARGET_MACHINE%-musl}"
+ ;;
+ esac
+
+ python3 configure.py \
+ --distribution-info="Void Linux botan-${version}_${revision}" \
+ --cpu=${_cpu} \
+ ${_args}
+}
+
+post_install() {
+ vlicense license.txt
+}
+
+botan3-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share/doc
+ }
+}
+
+botan3-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From 4860bb827ab755d67ec9b47352e9cd5e6f4338d9 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Fri, 1 Dec 2023 23:24:42 +0000
Subject: [PATCH 2/2] keepassxc: update to 2.7.6.
---
srcpkgs/keepassxc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index a215aefc2b1ca..636f182c3bb39 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.6
-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)
@@ -12,7 +12,7 @@ configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_SSHAGENT=$(vopt_if sshagent ON OFF)
-DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF)"
hostmakedepends="qt5-devel ruby-asciidoctor"
-makedepends="qt5-tools-devel qt5-svg-devel botan-devel libargon2-devel
+makedepends="qt5-tools-devel qt5-svg-devel botan3-devel libargon2-devel
qrencode-devel readline-devel pcsclite-devel
qt5-x11extras-devel
$(vopt_if autotype 'libXtst-devel libXi-devel')
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] botan: update to 3.1.1.
2023-05-20 19:13 [PR PATCH] botan: update to 3.0.0 mhmdanas
` (2 preceding siblings ...)
2023-12-02 0:52 ` mhmdanas
@ 2023-12-04 20:53 ` mhmdanas
2024-02-14 11:01 ` [PR PATCH] [Closed]: New package: botan3-3.2.0 mhmdanas
4 siblings, 0 replies; 6+ messages in thread
From: mhmdanas @ 2023-12-04 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages botan-3.0.0
https://github.com/void-linux/void-packages/pull/43974
botan: update to 3.1.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
`corectrl` has an upstream patch to support Botan 3, might bump the package and incorporate the patch later.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43974.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-botan-3.0.0-43974.patch --]
[-- Type: text/x-diff, Size: 10315 bytes --]
From 631e926174795183eb0dbbdeeea271c668236041 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Fri, 1 Dec 2023 23:23:54 +0000
Subject: [PATCH 1/3] New package: botan3-3.2.0
---
common/shlibs | 1 +
srcpkgs/botan/update | 1 +
srcpkgs/botan3-devel | 1 +
srcpkgs/botan3-doc | 1 +
srcpkgs/botan3/template | 92 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 96 insertions(+)
create mode 100644 srcpkgs/botan/update
create mode 120000 srcpkgs/botan3-devel
create mode 120000 srcpkgs/botan3-doc
create mode 100644 srcpkgs/botan3/template
diff --git a/common/shlibs b/common/shlibs
index 1b25a12956eeb..abf3ad3396e33 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2840,6 +2840,7 @@ 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.2 botan3-3.2.0_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/update b/srcpkgs/botan/update
new file mode 100644
index 0000000000000..370e7276de932
--- /dev/null
+++ b/srcpkgs/botan/update
@@ -0,0 +1 @@
+ignore="[^2].*"
diff --git a/srcpkgs/botan3-devel b/srcpkgs/botan3-devel
new file mode 120000
index 0000000000000..a965da97290f7
--- /dev/null
+++ b/srcpkgs/botan3-devel
@@ -0,0 +1 @@
+botan3
\ No newline at end of file
diff --git a/srcpkgs/botan3-doc b/srcpkgs/botan3-doc
new file mode 120000
index 0000000000000..a965da97290f7
--- /dev/null
+++ b/srcpkgs/botan3-doc
@@ -0,0 +1 @@
+botan3
\ No newline at end of file
diff --git a/srcpkgs/botan3/template b/srcpkgs/botan3/template
new file mode 100644
index 0000000000000..051a2ce5e2bac
--- /dev/null
+++ b/srcpkgs/botan3/template
@@ -0,0 +1,92 @@
+# Template file for 'botan3'
+pkgname=botan3
+version=3.2.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="doxygen python3"
+makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+short_desc="Crypto library written in C++"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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=049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3
+python_version=3
+
+LDFLAGS="-pthread"
+
+do_configure() {
+ local _args _cpu
+
+ _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*)
+ _cpu="i686"
+ ;;
+ x86_64*)
+ _cpu="x86_64"
+ ;;
+ armv[56]*)
+ _cpu="arm"
+ _args+=" --disable-modules=simd"
+ ;;
+ armv7*)
+ _cpu="armv7-a"
+ _args+=" --disable-modules=simd"
+ ;;
+ aarch64*)
+ _cpu="armv8-a"
+ ;;
+ mips*)
+ _cpu="mips32"
+ ;;
+ ppc64le*)
+ _cpu="ppc64le"
+ ;;
+ ppc64*)
+ _cpu="ppc64"
+ ;;
+ ppc*)
+ _cpu="ppc"
+ ;;
+ *)
+ _cpu="${XBPS_TARGET_MACHINE%-musl}"
+ ;;
+ esac
+
+ python3 configure.py \
+ --distribution-info="Void Linux botan-${version}_${revision}" \
+ --cpu=${_cpu} \
+ ${_args}
+}
+
+post_install() {
+ vlicense license.txt
+ mv ${DESTDIR}/usr/bin/botan{,3}
+}
+
+botan3-doc_package() {
+ short_desc+=" - documentation"
+ pkg_install() {
+ vmove usr/share/doc
+ }
+}
+
+botan3-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From 1d2bc267187179e27b9a00f7bfab0c4419606109 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Fri, 1 Dec 2023 23:24:42 +0000
Subject: [PATCH 2/3] keepassxc: build with botan3.
---
srcpkgs/keepassxc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index a215aefc2b1ca..636f182c3bb39 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.6
-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)
@@ -12,7 +12,7 @@ configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_SSHAGENT=$(vopt_if sshagent ON OFF)
-DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF)"
hostmakedepends="qt5-devel ruby-asciidoctor"
-makedepends="qt5-tools-devel qt5-svg-devel botan-devel libargon2-devel
+makedepends="qt5-tools-devel qt5-svg-devel botan3-devel libargon2-devel
qrencode-devel readline-devel pcsclite-devel
qt5-x11extras-devel
$(vopt_if autotype 'libXtst-devel libXi-devel')
From 4a9f47d7f57a6c48f3bb960d9f5fab562fbc7bec Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Mon, 4 Dec 2023 17:11:23 +0000
Subject: [PATCH 3/3] corectrl: update to 1.3.8.
---
srcpkgs/corectrl/patches/botan-3.patch | 106 +++++++++++++++++++++++++
srcpkgs/corectrl/template | 15 ++--
2 files changed, 114 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/corectrl/patches/botan-3.patch
diff --git a/srcpkgs/corectrl/patches/botan-3.patch b/srcpkgs/corectrl/patches/botan-3.patch
new file mode 100644
index 0000000000000..035c2124f0d0f
--- /dev/null
+++ b/srcpkgs/corectrl/patches/botan-3.patch
@@ -0,0 +1,106 @@
+From c2c1983aa6b4855cf77d540f8b0c83fd38c2251c Mon Sep 17 00:00:00 2001
+From: Juan Palacios <jpalaciosdev@gmail.com>
+Date: Thu, 28 Sep 2023 17:39:17 +0200
+Subject: [PATCH] Add Botan 3 compilation support
+
+Botan 3 takes precedence over Botan 2 when both versions are installed in the
+system.
+
+Fixes #373.
+---
+Patch mostly based on https://gitlab.com/corectrl/corectrl/-/commit/0650b7c670fd692697b0e6d63c1fe5124a3c1fe7.
+
+ CMakeLists.txt | 8 ++++++--
+ cmake/FindBotan.cmake | 22 +++++++++++++++++-----
+ src/helper/CMakeLists.txt | 8 ++++++--
+ 3 files changed, 29 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 521c804..d156cff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,7 @@ if(NOT TARGET uninstall)
+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+ endif()
+
+-set(CMAKE_CXX_STANDARD 17)
++set(CMAKE_CXX_STANDARD 20)
+
+ option (WITH_DEBUG_INFO "Add debug information (to Debug builds)" OFF)
+
+@@ -38,7 +38,11 @@ endif()
+ find_package(Qt5 5.9 COMPONENTS Core DBus Quick Charts Widgets Network Svg REQUIRED)
+ find_package(Qt5LinguistTools REQUIRED)
+ find_package(QuaZip REQUIRED)
+-find_package(Botan REQUIRED)
++
++find_package(Botan QUIET)
++if(NOT Botan_FOUND)
++ message(FATAL_ERROR "Botan library not found")
++endif()
+
+ find_package(fmt 5 QUIET)
+ if(NOT fmt_FOUND)
+diff --git a/cmake/FindBotan.cmake b/cmake/FindBotan.cmake
+index 99584b3..914c40a 100644
+--- a/cmake/FindBotan.cmake
++++ b/cmake/FindBotan.cmake
+@@ -16,14 +16,13 @@
+ # This file is in the public domain
+
+ find_package(PkgConfig REQUIRED)
+-pkg_check_modules(Botan botan-2)
+
+-if(NOT Botan_FOUND)
+- find_path(Botan_INCLUDE_DIRS NAMES botan/botan.h
+- PATH_SUFFIXES botan-2
++macro(FIND_BOTAN_IN_FS BOTAN_VER)
++ find_path(Botan_INCLUDE_DIRS NAMES botan/types.h
++ PATH_SUFFIXES ${BOTAN_VER}
+ DOC "The botan include directory")
+
+- find_library(Botan_LIBRARIES NAMES botan botan-2
++ find_library(Botan_LIBRARIES NAMES botan ${BOTAN_VER}
+ DOC "The botan library")
+
+ # Use some standard module to handle the QUIETLY and REQUIRED arguments, and
+@@ -36,6 +35,19 @@ if(NOT Botan_FOUND)
+ set(Botan_INCLUDE_DIR ${Botan_INCLUDE_DIRS} CACHE INTERNAL "")
+ set(Botan_FOUND ${Botan_FOUND} CACHE INTERNAL "")
+ endif()
++endmacro()
++
++pkg_check_modules(Botan botan-3)
++if(NOT Botan_FOUND)
++ find_botan_in_fs(botan-3)
++endif()
++
++if(NOT Botan_FOUND)
++ pkg_check_modules(Botan botan-2)
++
++ if(NOT Botan_FOUND)
++ find_botan_in_fs(botan-2)
++ endif()
+ endif()
+
+ mark_as_advanced(Botan_INCLUDE_DIRS Botan_LIBRARIES)
+diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
+index 3fe2ace..bd78a6b 100644
+--- a/src/helper/CMakeLists.txt
++++ b/src/helper/CMakeLists.txt
+@@ -1,6 +1,10 @@
+ find_package(PkgConfig REQUIRED)
+-find_package(Qt5 5.9 COMPONENTS Core DBus REQUIRED)
+-find_package(Botan REQUIRED)
++find_package(Qt5 5.15 COMPONENTS Core DBus REQUIRED)
++
++find_package(Botan QUIET)
++if(NOT Botan_FOUND)
++ message(FATAL_ERROR "Botan library not found")
++endif()
+
+ set(DBUS_DATADIR_PREFIX_DIR ${CMAKE_INSTALL_FULL_DATADIR})
+ option(INSTALL_DBUS_FILES_IN_PREFIX "Use installation prefix for D-Bus files" OFF)
+--
+2.43.0
+
diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index c0e84089016f6..ad07b389f36be 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,17 +1,18 @@
# Template file for 'corectrl'
pkgname=corectrl
-version=1.2.3
-revision=3
+version=1.3.8
+revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake
-kcoreaddons kauth"
-makedepends="botan-devel kauth-devel karchive-devel qt5-charts-devel
-qt5-tools-devel libdrm-devel qt5-svg-devel"
+kcoreaddons"
+makedepends="botan3-devel quazip-devel qt5-charts-devel dbus-devel fmt-devel
+ qt5-tools-devel libdrm-devel qt5-svg-devel polkit-devel pugixml-devel"
depends="dbus hicolor-icon-theme qt5-quickcontrols2 qt5-svg glxinfo"
short_desc="User-friendly hardware control application"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/corectrl/corectrl"
-distfiles="${homepage}/-/archive/v${version}/corectrl-v${version}.tar.gz"
-checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12
+changelog="https://gitlab.com/corectrl/corectrl/-/raw/master/CHANGELOG.md"
+distfiles="https://gitlab.com/corectrl/corectrl/-/archive/v${version}/corectrl-v${version}.tar.gz"
+checksum=1585508717980c3b3a17a1cb6852b4bdd9bf4d4014acbbce2b1f1b73c2f777d9
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Closed]: New package: botan3-3.2.0
2023-05-20 19:13 [PR PATCH] botan: update to 3.0.0 mhmdanas
` (3 preceding siblings ...)
2023-12-04 20:53 ` mhmdanas
@ 2024-02-14 11:01 ` mhmdanas
4 siblings, 0 replies; 6+ messages in thread
From: mhmdanas @ 2024-02-14 11:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]
There's a closed pull request on the void-packages repository
New package: botan3-3.2.0
https://github.com/void-linux/void-packages/pull/43974
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-14 11:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-20 19:13 [PR PATCH] botan: update to 3.0.0 mhmdanas
2023-07-22 16:51 ` [PR PATCH] [Updated] " mhmdanas
2023-12-01 23:25 ` [PR PATCH] [Updated] botan: update to 3.1.1 mhmdanas
2023-12-02 0:52 ` mhmdanas
2023-12-04 20:53 ` mhmdanas
2024-02-14 11:01 ` [PR PATCH] [Closed]: New package: botan3-3.2.0 mhmdanas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).