From 4dce31ec37c0775174b08b2f68290a4aafc66561 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 25 Jun 2020 14:51:24 +0200 Subject: [PATCH] fix build with JDK11 --- libidn-jar.patch | 29 +++++++++++++++++++++++++++++ libidn.spec | 3 +++ 2 files changed, 32 insertions(+) create mode 100644 libidn-jar.patch diff --git a/libidn-jar.patch b/libidn-jar.patch new file mode 100644 index 0000000..424d5e4 --- /dev/null +++ b/libidn-jar.patch @@ -0,0 +1,29 @@ +commit d19cfa1589ae4718b9f6d67a175d6e2868e4b8b8 +Author: Simon Josefsson +Date: Tue Apr 28 16:58:37 2020 +0200 + + Fix libidn.jar building with non-gcj. + +diff --git a/java/Makefile.am b/java/Makefile.am +index 1bb706fa..3d72989c 100644 +--- a/java/Makefile.am ++++ b/java/Makefile.am +@@ -46,16 +46,14 @@ libidn-$(VERSION).jar: + gnu/inet/encoding/Punycode.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/PunycodeException.class \ +- -C $(builddir)/src/main/java \ +- gnu/inet/encoding/RangeSet\$$1.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/RangeSet\$$Builder.class \ +- -C $(builddir)/src/main/java \ +- gnu/inet/encoding/RangeSet.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/RangeSet\$$Range.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/RangeSet\$$RangeContainsComparator.class \ ++ -C $(builddir)/src/main/java \ ++ gnu/inet/encoding/RangeSet.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/RFC3454.class \ + -C $(builddir)/src/main/java \ diff --git a/libidn.spec b/libidn.spec index ede9daa..2d9b561 100644 --- a/libidn.spec +++ b/libidn.spec @@ -12,6 +12,8 @@ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz # Allow disabling Emacs support Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch +# Fix build with JDK11 +Patch1: libidn-jar.patch BuildRequires: autoconf autoconf-archive BuildRequires: automake @@ -76,6 +78,7 @@ This package contains javadoc for %{name}-java. %prep %setup -q %patch0 -p1 +%patch1 -p1 autoreconf -vif # Prevent from regenerating sources by gengetopt because it's broken. touch src/idn_cmd.c src/idn_cmd.h