[arch-commits] Commit in java-rxtx/trunk (3 files)

[Balló György]

    Date: Thursday, May 28, 2020 @ 08:24:59
  Author: bgyorgy
Revision: 636201

upgpkg: java-rxtx 2.2pre2-7: Fix build, fix undefined symbol (FS#66054)

Added:
  java-rxtx/trunk/java11.patch
  java-rxtx/trunk/rxtx-2.2-undefined_symbol.patch
Modified:
  java-rxtx/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   16 +++++++++++++---
 java11.patch                    |   12 ++++++++++++
 rxtx-2.2-undefined_symbol.patch |   12 ++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-28 08:12:35 UTC (rev 636200)
+++ PKGBUILD	2020-05-28 08:24:59 UTC (rev 636201)
@@ -4,7 +4,7 @@
 pkgname=java-rxtx
 _pkgname=rxtx
 pkgver=2.2pre2
-pkgrel=6
+pkgrel=7
 pkgdesc="Java library for serial IO"
 arch=('x86_64')
 url="http://rxtx.qbang.org/"
@@ -19,13 +19,17 @@
         rxtx-2.2-lock.patch
         rxtx-2.2-fhs_lock.patch
         ttyACM_port.patch
-        java10.patch)
+        java10.patch
+        java11.patch
+        rxtx-2.2-undefined_symbol.patch)
 md5sums=('7eedb18e3f33a427e2b0e9be8ce3f94c'
          '2f21ec5eb108f871815242698b6150f1'
          '1f7c43d582bfe9daea22d7f7057436da'
          'f4d22d263f45cd1d4db6242dd0ac78ae'
          '903a3fe0067d0682dd5f64483c741df6'
-         '683dd95e6e419b2b63851c08ede7ca86')
+         '683dd95e6e419b2b63851c08ede7ca86'
+         '1db5c64e239c80294d00c932237889dd'
+         '4695fe9bb28a7c9b21447f998fb46b02')
 
 prepare() {
   cd $_pkgname-$pkgver
@@ -44,6 +48,12 @@
 
   # Fix build with openjdk10
   patch -Np1 -i ../java10.patch
+  
+  # Fix build with openjdk11
+  patch -Np1 -i ../java11.patch
+  
+  # Fix undefined symbol
+  patch -Np1 -i ../rxtx-2.2-undefined_symbol.patch
 
   rm *.m4
   autoreconf -fi

Added: java11.patch
===================================================================
--- java11.patch	                        (rev 0)
+++ java11.patch	2020-05-28 08:24:59 UTC (rev 636201)
@@ -0,0 +1,12 @@
+diff -Naur rxtx-2.2pre2.orig/src/gnu/io/LPRPort.java rxtx-2.2pre2/src/gnu/io/LPRPort.java
+--- rxtx-2.2pre2.orig/src/gnu/io/LPRPort.java	2007-04-26 07:26:05.000000000 +0200
++++ rxtx-2.2pre2/src/gnu/io/LPRPort.java	2020-05-28 10:20:22.755141415 +0200
+@@ -370,7 +370,7 @@
+ 		public void run()
+ 		{
+ 			eventLoop();
+-			yield();
++			Thread.yield();
+ 		}
+ 	}
+ }

Added: rxtx-2.2-undefined_symbol.patch
===================================================================
--- rxtx-2.2-undefined_symbol.patch	                        (rev 0)
+++ rxtx-2.2-undefined_symbol.patch	2020-05-28 08:24:59 UTC (rev 636201)
@@ -0,0 +1,12 @@
+--- rxtx-20100211.orig/src/SerialImp.c	2018-11-04 13:02:53.306800091 +0100
++++ rxtx-20100211.new/src/SerialImp.c	2018-11-04 13:01:39.495497644 +0100
+--- ./src/SerialImp.c.orig	2018-11-04 13:02:53.306800091 +0100
++++ ./src/SerialImp.c		2018-11-04 13:01:39.495497644 +0100
+@@ -148,6 +148,7 @@
+ #endif /* LIBLOCKDEV */
+ 
+ extern int errno;
++#include <sys/sysmacros.h>
+ 
+ #include "SerialImp.h"
+