From: Piraty <Piraty@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] botan: update to 2.19.1
Date: Tue, 12 Apr 2022 10:26:01 +0200 [thread overview]
Message-ID: <20220412082601.X3IUPvEo06bZ_M0l63dFiozmYlaBRtaF58KyLA-xr_Y@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36646@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages botan-2.19.1
https://github.com/void-linux/void-packages/pull/36646
botan: update to 2.19.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36646.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-botan-2.19.1-36646.patch --]
[-- Type: text/x-diff, Size: 5016 bytes --]
From 096747f5ec51c9f6b890224c45f7cccb05668a0e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 00:54:09 +0200
Subject: [PATCH 1/3] botan: update to 2.19.1.
dropped update file as botan does semver for a long time now
---
common/shlibs | 2 +-
srcpkgs/botan/botan_types_include_climits.patch | 10 ++++++++++
srcpkgs/botan/template | 8 ++++----
srcpkgs/botan/update | 1 -
4 files changed, 15 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/botan/botan_types_include_climits.patch
diff --git a/common/shlibs b/common/shlibs
index 0ac24701898d..fc5a031056fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2897,7 +2897,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.16 botan-2.16.0_3
+libbotan-2.so.19 botan-2.19.1_1
libswipl.so.8 swi-prolog-8.2.4_2
libpcre2-16.so.0 libpcre2-10.22_1
libpcre2-32.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/botan/botan_types_include_climits.patch b/srcpkgs/botan/botan_types_include_climits.patch
new file mode 100644
index 000000000000..d52301ccaab4
--- /dev/null
+++ b/srcpkgs/botan/botan_types_include_climits.patch
@@ -0,0 +1,10 @@
+--- 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 282bceabd3ce..99dad5b720dc 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
-version=2.16.0
-revision=4
+version=2.19.1
+revision=1
wrksrc="${pkgname^}-${version}"
build_style=gnu-makefile
pycompile_module="botan.py"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://botan.randombit.net/"
distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
-checksum=92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628
+checksum=e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560
python_version=3
LDFLAGS="-pthread"
@@ -78,7 +78,7 @@ do_configure() {
}
do_check() {
- ./botan-test
+ make check
}
post_install() {
diff --git a/srcpkgs/botan/update b/srcpkgs/botan/update
index 04f08c11ede7..e69de29bb2d1 100644
--- a/srcpkgs/botan/update
+++ b/srcpkgs/botan/update
@@ -1 +0,0 @@
-pattern='\K[0-9]+\.[0-9]*[02468]\.[0-9]+'
From 3361c18d2223e99ee580e8201b2a91aa66d0db0d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 00:55:52 +0200
Subject: [PATCH 2/3] corectrl: update to 1.2.3.
---
srcpkgs/corectrl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index 513afe8b595a..ad16c9a8de76 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,6 +1,6 @@
# Template file for 'corectrl'
pkgname=corectrl
-version=1.2.2
+version=1.2.3
revision=1
wrksrc=${pkgname}-v${version}
build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/corectrl/corectrl"
distfiles="${homepage}/-/archive/v${version}/corectrl-v${version}.tar.gz"
-checksum=ecfbdb3d99974a64fe6fab90f4bb543154ddc7004eeac14ef65b4ae6e661ca57
+checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 00a8b40ff75e410cfb85031f0a4571ca57d147c1 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 09:53:48 +0200
Subject: [PATCH 3/3] qownnotes: update to 22.4.0.
---
srcpkgs/qownnotes/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index b55900e3023a..db79662ba4bf 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
# Template file for 'qownnotes'
pkgname=qownnotes
-version=21.12.3
+version=22.4.0
revision=1
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,8 +13,8 @@ license="GPL-2.0-only"
homepage="https://www.qownnotes.org"
changelog="https://www.qownnotes.org/changelog.html"
distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
-checksum=a92df38f9c88f381af77800c339fe6aa8196a7a260081b0a48f61f1ae4c28029
+checksum=96b682608ecdf303e2c5d5eb2341812db3c3848e15bc4832ba5d426f01bdbd66
pre_build() {
- sed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
+ vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
}
next prev parent reply other threads:[~2022-04-12 8:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-11 23:05 [PR PATCH] " Piraty
2022-04-12 8:26 ` Piraty [this message]
2022-04-12 21:43 ` [PR PATCH] [Updated] " Piraty
2022-04-12 22:08 ` [PR PATCH] [Closed]: " Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220412082601.X3IUPvEo06bZ_M0l63dFiozmYlaBRtaF58KyLA-xr_Y@z \
--to=piraty@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).