[packages/libsigrok] - rediff patches

[baggins]

commit 0cc2b98438b5eb75d32f51af63c8605b95f9110a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Mar 5 22:51:34 2021 +0100

    - rediff patches

 libsigrok-java.patch   |  9 +++++----
 libsigrok-python.patch |  7 ++++---
 libsigrok-ruby.patch   | 30 ++++++++++++++++--------------
 3 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/libsigrok-java.patch b/libsigrok-java.patch
index 55dce9c..e3b9c3e 100644
--- a/libsigrok-java.patch
+++ b/libsigrok-java.patch
@@ -1,8 +1,9 @@
---- libsigrok-0.4.0/Makefile.am.orig	2016-07-02 08:54:03.332196411 +0200
-+++ libsigrok-0.4.0/Makefile.am	2016-07-02 08:54:51.591934967 +0200
-@@ -743,9 +743,11 @@
+diff -urNp -x '*.orig' libsigrok-0.5.2.org/Makefile.am libsigrok-0.5.2/Makefile.am
+--- libsigrok-0.5.2.org/Makefile.am	2021-03-05 22:45:56.830753458 +0100
++++ libsigrok-0.5.2/Makefile.am	2021-03-05 22:45:56.894086518 +0100
+@@ -932,9 +932,11 @@ $(JLIB): $(JCXX) \
  		-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
- 		-lsigrokcxx $(LIBSIGROKCXX_LIBS) -o $(JLIB)
+ 		-lsigrokcxx $(LIBSIGROKCXX_LIBS) $(SR_EXTRA_CXX_LIBS) -o $(JLIB)
  
 +jnilibdir = $(libdir)
 +
diff --git a/libsigrok-python.patch b/libsigrok-python.patch
index b596896..670f512 100644
--- a/libsigrok-python.patch
+++ b/libsigrok-python.patch
@@ -1,6 +1,7 @@
---- libsigrok-0.4.0/Makefile.am.orig	2016-01-29 23:44:34.000000000 +0100
-+++ libsigrok-0.4.0/Makefile.am	2016-06-30 19:57:26.586034973 +0200
-@@ -638,7 +638,7 @@
+diff -urNp -x '*.orig' libsigrok-0.5.2.org/Makefile.am libsigrok-0.5.2/Makefile.am
+--- libsigrok-0.5.2.org/Makefile.am	2019-12-25 21:29:19.000000000 +0100
++++ libsigrok-0.5.2/Makefile.am	2021-03-05 22:45:56.574087898 +0100
+@@ -822,7 +822,7 @@ $(PDIR)/timestamp: $(PDIR)/sigrok/core/c
  python-install:
  	$(AM_V_at)$(MKDIR_P) "$(DESTDIR)$(prefix)" "$(DESTDIR)$(exec_prefix)"
  	destdir='$(DESTDIR)'; $(setup_py) install $${destdir:+"--root=$$destdir"} \
diff --git a/libsigrok-ruby.patch b/libsigrok-ruby.patch
index 5c6f179..2f2c0ee 100644
--- a/libsigrok-ruby.patch
+++ b/libsigrok-ruby.patch
@@ -1,17 +1,7 @@
---- libsigrok-0.4.0/configure.ac.orig	2016-01-29 23:44:34.000000000 +0100
-+++ libsigrok-0.4.0/configure.ac	2016-07-02 08:53:49.128940025 +0200
-@@ -506,7 +506,7 @@
- AM_COND_IF([BINDINGS_CXX], [
- 	PKG_CHECK_MODULES([LIBSIGROKCXX], [$SR_PKGLIBS_CXX])
- 	PKG_CHECK_MODULES([PYSIGROK], [$SR_PKGLIBS_PYTHON $SR_PKGLIBS_CXX])
--	PKG_CHECK_MODULES([RBSIGROK], [$SR_PKGLIBS_RUBY $SR_PKGLIBS_CXX], [AC_SUBST(RBSIGROK_EXTDIR, "lib/$($PKG_CONFIG --variable=sitearch $SR_PKGLIBS_RUBY)/$($PKG_CONFIG --variable=RUBY_BASE_NAME $SR_PKGLIBS_RUBY)/vendor_ruby/$($PKG_CONFIG --variable=ruby_version $SR_PKGLIBS_RUBY)")])
-+	PKG_CHECK_MODULES([RBSIGROK], [$SR_PKGLIBS_RUBY $SR_PKGLIBS_CXX], [AC_SUBST(RBSIGROK_EXTDIR, "$($PKG_CONFIG --variable=vendorarchdir $SR_PKGLIBS_RUBY)")])
- ])
- 
- # Check for specific libusb features, now that we know the CFLAGS.
---- libsigrok-0.5.0/Makefile.am~	2018-07-04 20:24:21.000000000 +0200
-+++ libsigrok-0.5.0/Makefile.am	2018-07-04 20:30:43.023460726 +0200
-@@ -757,8 +757,8 @@ $(REXT): $(ROBJ) @ORDER@ bindings/cxx/li
+diff -urNp -x '*.orig' libsigrok-0.5.2.org/Makefile.am libsigrok-0.5.2/Makefile.am
+--- libsigrok-0.5.2.org/Makefile.am	2021-03-05 22:45:56.670754148 +0100
++++ libsigrok-0.5.2/Makefile.am	2021-03-05 22:45:56.734087208 +0100
+@@ -868,8 +868,8 @@ $(REXT): $(ROBJ) @ORDER@ bindings/cxx/li
  ruby-build: $(REXT)
  
  ruby-install: $(REXT)
@@ -22,3 +12,15 @@
  
  ruby-uninstall:
  	rm -f $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)/sigrok.$(RUBY_DLEXT)
+diff -urNp -x '*.orig' libsigrok-0.5.2.org/configure.ac libsigrok-0.5.2/configure.ac
+--- libsigrok-0.5.2.org/configure.ac	2019-12-25 21:29:19.000000000 +0100
++++ libsigrok-0.5.2/configure.ac	2021-03-05 22:45:56.734087208 +0100
+@@ -566,7 +566,7 @@ PKG_CHECK_MODULES([TESTS], [$SR_PKGLIBS_
+ AM_COND_IF([BINDINGS_CXX], [
+ 	PKG_CHECK_MODULES([LIBSIGROKCXX], [$SR_PKGLIBS_CXX])
+ 	PKG_CHECK_MODULES([PYSIGROK], [$SR_PKGLIBS_PYTHON $SR_PKGLIBS_CXX])
+-	PKG_CHECK_MODULES([RBSIGROK], [$SR_PKGLIBS_RUBY $SR_PKGLIBS_CXX], [AC_SUBST(RBSIGROK_EXTDIR, "lib/$($PKG_CONFIG --variable=sitearch $SR_PKGLIBS_RUBY)/$($PKG_CONFIG --variable=RUBY_BASE_NAME $SR_PKGLIBS_RUBY)/vendor_ruby/$($PKG_CONFIG --variable=ruby_version $SR_PKGLIBS_RUBY)")])
++	PKG_CHECK_MODULES([RBSIGROK], [$SR_PKGLIBS_RUBY $SR_PKGLIBS_CXX], [AC_SUBST(RBSIGROK_EXTDIR, "$($PKG_CONFIG --variable=vendorarchdir $SR_PKGLIBS_RUBY)")])
+ ])
+ 
+ # Check for specific libusb features, now that we know the CFLAGS.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libsigrok.git/commitdiff/0cc2b98438b5eb75d32f51af63c8605b95f9110a