[arch-commits] Commit in java-rxtx/trunk (PKGBUILD java10.patch)

[Balló György]

    Date: Wednesday, April 25, 2018 @ 06:18:23
  Author: bgyorgy
Revision: 317731

upgpkg: java-rxtx 2.2pre2-5

Don't create lock group, it's already created by the filesystem package (FS#58342)

Added:
  java-rxtx/trunk/java10.patch
Modified:
  java-rxtx/trunk/PKGBUILD

--------------+
 PKGBUILD     |   25 ++++++++++++++++---------
 java10.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-25 06:17:28 UTC (rev 317730)
+++ PKGBUILD	2018-04-25 06:18:23 UTC (rev 317731)
@@ -5,7 +5,7 @@
 pkgname=java-rxtx
 _pkgname=rxtx
 pkgver=2.2pre2
-pkgrel=4
+pkgrel=5
 pkgdesc="Java library for serial IO"
 arch=('x86_64')
 url="http://rxtx.qbang.org/"
@@ -19,27 +19,35 @@
         utsrelease.patch
         rxtx-2.2-lock.patch
         rxtx-2.2-fhs_lock.patch
-        ttyACM_port.patch)
+        ttyACM_port.patch
+        java10.patch)
 md5sums=('7eedb18e3f33a427e2b0e9be8ce3f94c'
          '2f21ec5eb108f871815242698b6150f1'
          '1f7c43d582bfe9daea22d7f7057436da'
          'f4d22d263f45cd1d4db6242dd0ac78ae'
-         '903a3fe0067d0682dd5f64483c741df6')
+         '903a3fe0067d0682dd5f64483c741df6'
+         'c743b0be1ae32e8e7d1bc3e596a65766')
 
 prepare() {
   cd $_pkgname-$pkgver
 
   # Fix build
-  patch -Np1 -i "$srcdir/utsrelease.patch"
+  patch -Np1 -i ../utsrelease.patch
 
   # Fix lockdir patch
-  patch -Np1 -i "$srcdir/rxtx-2.2-lock.patch"
+  patch -Np1 -i ../rxtx-2.2-lock.patch
 
   # Fix buffer overflow
-  patch -Np1 -i "$srcdir/rxtx-2.2-fhs_lock.patch"
+  patch -Np1 -i ../rxtx-2.2-fhs_lock.patch
 
   # Enable more ports
-  patch -Np1 -i "$srcdir/ttyACM_port.patch"
+  patch -Np1 -i ../ttyACM_port.patch
+
+  # Fix build with openjdk10
+  patch -Np1 -i ../java10.patch
+
+  rm *.m4
+  autoreconf -fi
 }
 
 build() {
@@ -54,7 +62,6 @@
   make JHOME="$pkgdir/usr/share/java/rxtx" RXTX_PATH="$pkgdir/usr/lib" install
 
   # Setup lock directory
-  install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
-  echo 'g lock - - -' > "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  install -dm755 "$pkgdir"/usr/lib/tmpfiles.d
   echo 'd /run/lock/lockdev 0775 root lock -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }

Added: java10.patch
===================================================================
--- java10.patch	                        (rev 0)
+++ java10.patch	2018-04-25 06:18:23 UTC (rev 317731)
@@ -0,0 +1,28 @@
+diff -Naur rxtx-2.2pre2.orig/configure.in rxtx-2.2pre2/configure.in
+--- rxtx-2.2pre2.orig/configure.in	2008-12-31 03:28:37.000000000 +0100
++++ rxtx-2.2pre2/configure.in	2018-04-25 07:50:42.382848449 +0200
+@@ -483,8 +483,7 @@
+ 		;;
+ 	*)
+ 		find_java_native_include jni_md.h
+-		JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni"
+-		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3"
++		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -h \$(DEST) -O -source 6 -target 1.6"
+ 		JAR="\$(JPATH)/bin/jar"
+ 		JAVADOC="\$(JPATH)/bin/javadoc"
+ 		CFLAGS=$CFLAGS" -D_BSD_SOURCE"
+diff -Naur rxtx-2.2pre2.orig/Makefile.am rxtx-2.2pre2/Makefile.am
+--- rxtx-2.2pre2.orig/Makefile.am	2008-09-14 23:36:27.000000000 +0200
++++ rxtx-2.2pre2/Makefile.am	2018-04-25 07:50:01.198326446 +0200
+@@ -111,11 +111,6 @@
+ $(CLASSES): $(javafiles) $(TOP)/Makefile
+ 	$(JAVAH_FIX)
+ 	$(JAVAC) $(javafiles)
+-	$(JAVAH) `(for i in $(javahfiles);do \
+-		if grep > /dev/null native.*\( $(SPATH)/gnu/io/$$i.java; then \
+-			echo $(CLASSDIR).$$i; \
+-		fi; \
+-	done)`
+ 	$(JAR) cf $(JARTARGET) $(CLASSTOP)/*
+ 
+ #  install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its