From 42cfd158d978ae31c05ee582f2bce421fb3d5da6 Mon Sep 17 00:00:00 2001 From: Guoyi Zhang Date: Sat, 8 Feb 2025 17:03:05 +1100 Subject: [PATCH] libmaus: fix the gcc 13 --- BioArchLinux/libmaus/PKGBUILD | 5 +++-- BioArchLinux/libmaus/lilac.yaml | 10 ++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/BioArchLinux/libmaus/PKGBUILD b/BioArchLinux/libmaus/PKGBUILD index 795fec7c10..dd4e56027e 100644 --- a/BioArchLinux/libmaus/PKGBUILD +++ b/BioArchLinux/libmaus/PKGBUILD @@ -9,9 +9,9 @@ arch=('x86_64') url=https://gitlab.com/german.tischler/libmaus2 license=('GPL-2.0-or-later') source=(https://gitlab.com/german.tischler/"${pkgname}"2/-/archive/"${pkgver//_/-}"/"${pkgname}"2-"${pkgver//_/-}".tar.gz - "gcc13.patch::https://gitlab.com/german.tischler/libmaus2/-/merge_requests/22.patch") + "gcc13.patch::https://gitlab.com/malacology/libmaus2/-/commit/f148c4571d17965192f01a1a25248c3cc3e07da8.patch") sha256sums=('08e6dee0fcb68253e1edd1e442650104051b096ffa8417b05f8b6f2aa04018e4' - '3f5a37c3c0a5cf5b0252a278ea434d98bbcf044e09712a0560740275f2555c5f') + '37297bef2ea8409e3f27f6638b513afcd290f0f6385e0f4c221f584773262258') makedepends=('make' 'gcc' 'boost') prepare() { @@ -19,6 +19,7 @@ prepare() { patch -p1 < $srcdir/gcc13.patch } + build() { cd "${srcdir}"/libmaus2-"${pkgver//_/-}" ./configure --prefix="${pkgdir}"/usr --exec-prefix "${pkgdir}"/ diff --git a/BioArchLinux/libmaus/lilac.yaml b/BioArchLinux/libmaus/lilac.yaml index d859ab1eb3..c8f3ab540d 100644 --- a/BioArchLinux/libmaus/lilac.yaml +++ b/BioArchLinux/libmaus/lilac.yaml @@ -2,10 +2,16 @@ build_prefix: extra-x86_64 maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org +pre_build_script: | + update_pkgver_and_pkgrel(_G.newver) post_build_script: | git_pkgbuild_commit() update_aur_repo() update_on: - - source: cmd - cmd: curl -sS https://gitlab.com/german.tischler/libmaus2/-/tags | grep '\-release-' | head -n1 | sed 's// /g' | awk '{print $5}' | sed 's/-/_/g' + - source: gitlab + gitlab: german.tischler/libmaus2 + use_max_tag: true + include_regex: (\d+.\d+.\d+-release-\d+) + from_pattern: (\d+.\d+.\d+)-release-(\d+) + to_pattern: \1_release_\2 time_limit_hours: 6