[arch-commits] Commit in libsigrokdecode/trunk (2 files)

[Evangelos Foutras]

    Date: Friday, December 10, 2021 @ 16:28:21
  Author: foutrelis
Revision: 1068113

upgpkg: libsigrokdecode 0.5.3-5: fix build with Python 3.10

Added:
  libsigrokdecode/trunk/use-python3-embed.pc-as-a-fallback.patch
Modified:
  libsigrokdecode/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   10 +++++++---
 use-python3-embed.pc-as-a-fallback.patch |   23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-10 16:25:53 UTC (rev 1068112)
+++ PKGBUILD	2021-12-10 16:28:21 UTC (rev 1068113)
@@ -4,7 +4,7 @@
 
 pkgname=libsigrokdecode
 pkgver=0.5.3
-pkgrel=4
+pkgrel=5
 pkgdesc='C library that provides protocol decoding for logic analyzers, protocol decoders, etc.'
 arch=('x86_64')
 url='https://www.sigrok.org/wiki/Libsigrokdecode'
@@ -11,13 +11,17 @@
 license=('GPL3')
 depends=('glib2' 'python')
 source=("https://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-$pkgver.tar.gz"
-        $pkgname-py39.patch::https://github.com/sigrokproject/libsigrokdecode/commit/9b0ad5177bd6.patch)
+        $pkgname-py39.patch::https://github.com/sigrokproject/libsigrokdecode/commit/9b0ad5177bd6.patch
+        use-python3-embed.pc-as-a-fallback.patch)
 sha512sums=('23393504b68135ed4ae8e8a654df024620af02e84fa3955956c61899388812229108155b4ae8d946e61f33dc8a8807db090d608350548a7a717d966442b07b9e'
-            'f1b26c227fc0eb5e831563e328a20beeb2412576bc50a0a241923dad1ebd1bd0eb07f2b3a4230ba99e3bf8db04cac6480ed8724e9727514d65cb3afe6838e189')
+            'f1b26c227fc0eb5e831563e328a20beeb2412576bc50a0a241923dad1ebd1bd0eb07f2b3a4230ba99e3bf8db04cac6480ed8724e9727514d65cb3afe6838e189'
+            'a4b22157898308cd248decf977e637e214c8f75aca2b8af4803a01208d0cbbe11ddb232e3d356e531e72c43a1a0ff07bc08e30f8378fa67f23f23665a7e53cb1')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../$pkgname-py39.patch
+  # https://sourceforge.net/p/sigrok/mailman/message/37168276/
+  patch -Np1 -i ../use-python3-embed.pc-as-a-fallback.patch
 }
 
 build() {

Added: use-python3-embed.pc-as-a-fallback.patch
===================================================================
--- use-python3-embed.pc-as-a-fallback.patch	                        (rev 0)
+++ use-python3-embed.pc-as-a-fallback.patch	2021-12-10 16:28:21 UTC (rev 1068113)
@@ -0,0 +1,23 @@
+From f5cc2a8c10e3147c534a56ea0b98815b5d4115aa Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Thu, 3 Dec 2020 19:17:00 +0200
+Subject: [PATCH] configure.ac: Use python3-embed.pc as a fallback
+
+This provides some future-proofing against newer Python versions.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2917cb3..f576f2b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary])
+ # first, since usually only that variant will add "-lpython3.8".
+ # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
+ SR_PKG_CHECK([python3], [SRD_PKGLIBS],
+-	[python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
++	[python-3.9-embed], [python-3.8-embed], [python3-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
+ AS_IF([test "x$sr_have_python3" = xno],
+ 	[AC_MSG_ERROR([Cannot find Python 3 development headers.])])
+