[arch-commits] Commit in urjtag/trunk (PKGBUILD fix-gcc-10.patch)

[Filipe Laíns]

    Date: Friday, November 13, 2020 @ 17:00:57
  Author: ffy00
Revision: 753921

Python 3.9 rebuild (2019.12-2)

Fixes compilation with GCC 10

Added:
  urjtag/trunk/fix-gcc-10.patch
Modified:
  urjtag/trunk/PKGBUILD

------------------+
 PKGBUILD         |   14 +++++++++++---
 fix-gcc-10.patch |   25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-13 16:14:26 UTC (rev 753920)
+++ PKGBUILD	2020-11-13 17:00:57 UTC (rev 753921)
@@ -2,7 +2,7 @@
 
 pkgname=urjtag
 pkgver=2019.12
-pkgrel=1
+pkgrel=2
 pkgdesc='Enhanced, modern tool for communicating over JTAG with flash chips, CPUs, and many more'
 arch=('x86_64')
 url='http://openocd.org'
@@ -10,9 +10,17 @@
 depends=('libftdi-compat' 'libusb-compat')
 makedepends=('python')
 optdepends=('python: Python bindings')
-source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz")
-sha512sums=('e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36')
+source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"
+        'fix-gcc-10.patch')
+sha512sums=('e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36'
+            'a36dd96453e0da225f1974f44fa42e35d9abb6979657457d7f4dd25f8112092085b3520ad3ed4868a194f6628db985df4eaf44232247cbe03f5fbc2fb79e2727')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -p2 -i ../fix-gcc-10.patch
+}
+
 build() {
   cd $pkgname-$pkgver
 

Added: fix-gcc-10.patch
===================================================================
--- fix-gcc-10.patch	                        (rev 0)
+++ fix-gcc-10.patch	2020-11-13 17:00:57 UTC (rev 753921)
@@ -0,0 +1,25 @@
+commit d4c97a8110dc6e5671b30dd06cdcd31b1833554e
+Author: Dan Horák <dan at danny.cz>
+Date:   Thu Feb 13 16:49:39 2020 +0100
+
+    fix UrjtagError declaration
+
+    Fix build with GCC 10 new default.
+
+    References:
+      https://gcc.gnu.org/gcc-10/porting_to.html#common
+      https://bugzilla.redhat.com/show_bug.cgi?id=1793499
+
+diff --git a/urjtag/bindings/python/py_urjtag.h b/urjtag/bindings/python/py_urjtag.h
+index 38582ebb..16b120d8 100644
+--- a/urjtag/bindings/python/py_urjtag.h
++++ b/urjtag/bindings/python/py_urjtag.h
+@@ -35,7 +35,7 @@ struct urj_pyregister
+ extern PyTypeObject urj_pyregister_Type;
+
+ extern PyObject *urj_py_chkret (int rc);
+-PyObject *UrjtagError;
++extern PyObject *UrjtagError;
+
+ extern int urj_pyc_precheck (urj_chain_t *urc, int checks_needed);
+ #define UPRC_CBL 1