Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / 
cysignals


Commits:
8c6ddbfb by Antonio Rojas at 2025-01-22T08:33:38+01:00
upgpkg: 1.12.2-4: Fix PARI signal handling

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- − fix-pari-signal-handling.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = cysignals
        pkgdesc = Interrupt and signal handling for Cython
        pkgver = 1.12.2
-       pkgrel = 3
+       pkgrel = 4
        url = https://www.sagemath.org
        arch = x86_64
        license = LGPL-3.0-only
@@ -14,8 +14,6 @@ pkgbase = cysignals
        depends = glibc
        depends = python
        source = git+https://github.com/sagemath/cysignals#tag=1.12.2
-       source = fix-pari-signal-handling.patch
        sha256sums = 
5872e1cfb1151b6c6ea4376f4bfac6910b2d5ff33e906f78baf9e24e3a73f34a
-       sha256sums = 
f892b76ab5f403842950b2d3dcca4402430282358aa679123b72e30f3724f035
 
 pkgname = python-cysignals


=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
 pkgbase=cysignals
 pkgname=python-cysignals
 pkgver=1.12.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Interrupt and signal handling for Cython'
 arch=(x86_64)
 url='https://www.sagemath.org'
@@ -16,13 +16,14 @@ makedepends=(cython
              python-build
              python-installer)
 checkdepends=(python-pytest)
-source=(git+https://github.com/sagemath/cysignals#tag=$pkgver
-        fix-pari-signal-handling.patch)
-sha256sums=('5872e1cfb1151b6c6ea4376f4bfac6910b2d5ff33e906f78baf9e24e3a73f34a'
-            'f892b76ab5f403842950b2d3dcca4402430282358aa679123b72e30f3724f035')
+source=(git+https://github.com/sagemath/cysignals#tag=$pkgver)
+sha256sums=('5872e1cfb1151b6c6ea4376f4bfac6910b2d5ff33e906f78baf9e24e3a73f34a')
 
 prepare() {
-  patch -d $pkgbase -p1 < fix-pari-signal-handling.patch
+  cd $pkgbase
+# Fix PARI signal handling
+  git cherry-pick -n db7ad339bf34dcc56845217dd6ee24dd552396ac
+  git cherry-pick -n 2d37d973741c54a5886e154ac67a3a6451483d3c
 }
 
 build() {


=====================================
fix-pari-signal-handling.patch deleted
=====================================
@@ -1,13 +0,0 @@
-diff --git a/src/cysignals/implementation.c b/src/cysignals/implementation.c
-index 20a83d0..18b8144 100644
---- a/src/cysignals/implementation.c
-+++ b/src/cysignals/implementation.c
-@@ -591,7 +591,7 @@ static void _sig_on_interrupt_received(void)
-     do_raise_exception(cysigs.interrupt_received);
-     cysigs.sig_on_count = 0;
-     cysigs.interrupt_received = 0;
--    custom_signal_unblock();
-+    custom_set_pending_signal(0);
- 
- #if HAVE_SIGPROCMASK
-     sigprocmask(SIG_SETMASK, &oldset, NULL);



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/cysignals/-/commit/8c6ddbfba1b80427eb29cba4a6be8c2b5fdcb7cf

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/cysignals/-/commit/8c6ddbfba1b80427eb29cba4a6be8c2b5fdcb7cf
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to