depau / 0001-fix-add-missing-pysimulavr-module.patch

From 03c647d668d5761e72764caa2dc4b184bef99b06 Mon Sep 17 00:00:00 2001 From: Davide Depau <[email protected]> Date: Sun, 22 Mar 2026 19:06:15 +0100 Subject: [PATCH] fix: add missing pysimulavr module --- .SRCINFO | 6 ++++++ 0002-fix-missing-include-in-tests.patch | 24 ++++++++++++++++++++++++ PKGBUILD | 18 +++++++++++++++--- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 0002-fix-missing-include-in-tests.patch diff --git a/.SRCINFO b/.SRCINFO index a18d260..a379ada 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -10,6 +10,10 @@ pkgbase = simulavr-git makedepends = help2man makedepends = iverilog makedepends = python + makedepends = python-setuptools + makedepends = python-build + makedepends = python-installer + makedepends = python-wheel makedepends = swig makedepends = tcl makedepends = texinfo @@ -17,7 +21,9 @@ pkgbase = simulavr-git conflicts = simulavr source = simulavr-git::git+https://git.savannah.nongnu.org/git/simulavr.git source = 0001-fix_check.patch + source = 0002-fix-missing-include-in-tests.patch sha256sums = SKIP sha256sums = b8e271804031dcd9536553851e41296f24523e6a2c5a0e2154750f0ad80ef309 + sha256sums = cf84f7e1873968a4d59bda141a2b063dbc6b9938b6b9d577075ad6f4e988dad5 pkgname = simulavr-git diff --git a/0002-fix-missing-include-in-tests.patch b/0002-fix-missing-include-in-tests.patch new file mode 100644 index 0000000..f531419 --- /dev/null +++ b/0002-fix-missing-include-in-tests.patch @@ -0,0 +1,24 @@ +From 971503adfca4e5ba65d4abd678f7b2e6f5568678 Mon Sep 17 00:00:00 2001 +From: Davide Depau <[email protected]> +Date: Tue, 17 Mar 2026 16:33:29 +0100 +Subject: [PATCH] fix: missing include in tests + +--- + regress/gtest/gtest-1.10.0/src/gtest-death-test.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/regress/gtest/gtest-1.10.0/src/gtest-death-test.cc b/regress/gtest/gtest-1.10.0/src/gtest-death-test.cc +index da09a1c..9c59408 100644 +--- a/regress/gtest/gtest-1.10.0/src/gtest-death-test.cc ++++ b/regress/gtest/gtest-1.10.0/src/gtest-death-test.cc +@@ -33,6 +33,7 @@ + #include "gtest/gtest-death-test.h" + + #include <utility> ++#include <cstdint> + + #include "gtest/internal/gtest-port.h" + #include "gtest/internal/custom/gtest.h" +-- +2.53.0 + diff --git a/PKGBUILD b/PKGBUILD index a8fd827..d04f370 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,6 @@ # Maintainer: Sven Karsten Greiner <[email protected]> # Contributor: Tony Lambiris <[email protected]> +# Contributor: Davide Depau <[email protected]> pkgname=simulavr-git pkgver=1.1.0.r5.g32985f7 @@ -20,13 +21,15 @@ depends=() # doxygen dot python-sphinx rst2pdf python-beautifulsoup4 python-requests # # To run tests: avr-gcc avr-libc valgrind -makedepends=('cmake' 'git' 'help2man' 'iverilog' 'python' 'swig' 'tcl' 'texinfo') +makedepends=('cmake' 'git' 'help2man' 'iverilog' 'python' 'python-setuptools' 'python-build' 'python-installer' 'python-wheel' 'swig' 'tcl' 'texinfo') provides=('simulavr') conflicts=('simulavr') source=("${pkgname}::git+https://git.savannah.nongnu.org/git/simulavr.git" - '0001-fix_check.patch') + '0001-fix_check.patch' + '0002-fix-missing-include-in-tests.patch') sha256sums=('SKIP' - 'b8e271804031dcd9536553851e41296f24523e6a2c5a0e2154750f0ad80ef309') + 'b8e271804031dcd9536553851e41296f24523e6a2c5a0e2154750f0ad80ef309' + 'cf84f7e1873968a4d59bda141a2b063dbc6b9938b6b9d577075ad6f4e988dad5') pkgver() { cd "${srcdir}/${pkgname}" @@ -36,6 +39,7 @@ pkgver() { prepare() { cd "${srcdir}/${pkgname}" patch -p1 -i ../0001-fix_check.patch + patch -p1 -i ../0002-fix-missing-include-in-tests.patch } build() { @@ -49,6 +53,9 @@ build() { make -j1 -C build make -j1 -C build progdoc + + cd "${srcdir}/${pkgname}/build/pysimulavr" + python -m build --wheel --no-isolation } package() { @@ -56,6 +63,11 @@ package() { make DESTDIR="${pkgdir}" install + # The pysimulavr CMakeLists.txt has no install() rule, so install it manually. + # build_py copies pysimulavr.py into build/lib* so --skip-build finds it. + cd "${srcdir}/${pkgname}/build/pysimulavr" + python -m installer --destdir="$pkgdir" dist/*.whl + mv "${pkgdir}/usr/share/doc/common" "${pkgdir}/usr/share/doc/simulavr" # Headers are moved into their own subdirectory to prevent conflicts. -- 2.53.0