Date: Tuesday, April 11, 2023 @ 18:19:24
Author: arojas
Revision: 1444727
upgpkg: libsigrok 0.5.2-11: Python 3.11 rebuild
Added:
libsigrok/trunk/libsigrok-0.5.2-swig-4.1.patch
Modified:
libsigrok/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 5 +++-
libsigrok-0.5.2-swig-4.1.patch | 45 +++++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-11 18:17:19 UTC (rev 1444726)
+++ PKGBUILD 2023-04-11 18:19:24 UTC (rev 1444727)
@@ -3,7 +3,7 @@
pkgname=libsigrok
pkgver=0.5.2
-pkgrel=10
+pkgrel=11
pkgdesc='Client software that supports various hardware logic analyzers, core
library'
arch=('x86_64')
url='https://www.sigrok.org/wiki/Libsigrok'
@@ -14,9 +14,11 @@
'sigrok-firmware-fx2lafw: Cypress FX2-based device support')
source=("https://sigrok.org/download/source/$pkgname/$pkgname-$pkgver.tar.gz";
"fix_swig4_java_bindings.patch"
+ "libsigrok-0.5.2-swig-4.1.patch"
"fix_ruby_bindings.patch::https://sigrok.org/bugzilla/attachment.cgi?id=640";)
sha512sums=('cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092'
'0e6bdddb2dcc03d76e5d16708bb127ec8a9207fba0e04b436ac92e370618cc0b1bc9d3e2c86a0878783626f2a8b59961c3a1a52a1e180e69005e3585e5766a89'
+
'7a1e35b6b268d117e67dff55c2ff1320257525eedb7454a068732d79074b6d743036ab2c11043952738dd3990ca084782feeb15ad92a306b3b58c73ecc530154'
'0e5b9ed566605acac02de6f559f9029929be7ca34d9688ed35d24d66c1b014f89a16902a4de79d0a1ef6347be257f24f77ea37b880aab757b2c338497de23030')
prepare() {
@@ -23,6 +25,7 @@
cd $pkgname-$pkgver
patch -p1 < ../fix_swig4_java_bindings.patch #
https://sigrok.org/bugzilla/show_bug.cgi?id=1527
patch -p1 < ../fix_ruby_bindings.patch #
https://sigrok.org/bugzilla/show_bug.cgi?id=1526
+ patch -p1 < ../libsigrok-0.5.2-swig-4.1.patch #
https://sigrok.org/bugzilla/show_bug.cgi?id=1827
# regenerate ./configure so it can detect Python 3.10
autoreconf -vi
Added: libsigrok-0.5.2-swig-4.1.patch
===================================================================
--- libsigrok-0.5.2-swig-4.1.patch (rev 0)
+++ libsigrok-0.5.2-swig-4.1.patch 2023-04-11 18:19:24 UTC (rev 1444727)
@@ -0,0 +1,45 @@
+diff --git a/Makefile.am b/Makefile.am
+index 280cf64d..2080b27b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -876,7 +876,7 @@ python-build: $(PDIR)/timestamp
+
+ $(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \
+ bindings/swig/classes.i bindings/swig/templates.i \
+- bindings/swig/enums.i $(PDOC_START) $(PDOC_END) \
++ $(PDOC_START) $(PDOC_END) \
+ $(library_include_HEADERS) \
+ $(nodist_library_include_HEADERS) \
+ $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
+@@ -918,8 +918,7 @@ $(RDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
+ $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py ruby $(CPPXMLDOC) >
$@
+
+ $(RWRAP): $(srcdir)/$(RDIR)/classes.i $(RDOC) \
+- bindings/swig/classes.i bindings/swig/templates.i \
+- bindings/swig/enums.i
++ bindings/swig/classes.i bindings/swig/templates.i
+ $(AM_V_GEN)$(SWIG) -ruby -c++ -Ibindings -Ibindings/cxx/include
-I$(RDIR) $(local_includes) $(swig_defs) -o $@ $(srcdir)/$(RDIR)/classes.i
+
+ $(ROBJ): $(RWRAP) \
+@@ -977,7 +976,7 @@ $(JDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
+ $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py java $(CPPXMLDOC) >
$@
+
+ $(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i \
+- bindings/swig/templates.i bindings/swig/enums.i \
++ bindings/swig/templates.i \
+ $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
+ $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS)
+ -$(AM_V_at)rm -f $(java_cleanfiles)
+diff --git a/bindings/swig/classes.i b/bindings/swig/classes.i
+index 523995da..3e1d8a6c 100644
+--- a/bindings/swig/classes.i
++++ b/bindings/swig/classes.i
+@@ -215,6 +215,8 @@ typedef std::map<const sigrok::ConfigKey *,
Glib::VariantBase>
+
+ %include <libsigrokcxx/libsigrokcxx.hpp>
+
++#ifdef SWIGCXX
+ %include "swig/enums.i"
++#endif
+
+ %include <libsigrokcxx/enums.hpp>
