[libgda] Fix the build with JRE 1.8

Kalev Lember kalev at fedoraproject.org
Sat May 17 13:17:11 UTC 2014


commit 25df3d062a3ccf69b018953336077de102f974f1
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sat May 17 14:57:07 2014 +0200

    Fix the build with JRE 1.8

 libgda-jre18.patch |   14 ++++++++++++++
 libgda.spec        |    4 ++++
 2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/libgda-jre18.patch b/libgda-jre18.patch
new file mode 100644
index 0000000..f66fa8f
--- /dev/null
+++ b/libgda-jre18.patch
@@ -0,0 +1,14 @@
+--- libgda-5.2.2/configure.orig	2014-05-17 14:58:33.206028742 +0200
++++ libgda-5.2.2/configure	2014-05-17 14:58:45.937790443 +0200
+@@ -23200,6 +23259,11 @@
+ 		    JTYPE="Sun JRE 1.7"
+ 		    JFLAGS="-Xlint:unchecked -Xlint:deprecation"
+ 		    ;;
++                JRE1.8.*)
++		    try_java=true
++		    JTYPE="Sun JRE 1.8"
++		    JFLAGS="-Xlint:unchecked -Xlint:deprecation"
++		    ;;
+                 JREgcj-4*)
+ 		    try_java=true
+ 		    JTYPE="GCJ"
diff --git a/libgda.spec b/libgda.spec
index 2e767c1..2749178 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -20,6 +20,8 @@ Source:         http://ftp.gnome.org/pub/GNOME/sources/%{name}/5.2/%{name}-%{ver
 
 # Fix FTBFS with -Werror=format-security
 Patch0:         0001-Markup-message-correction.patch
+# Backported patch to support JRE 1.8
+Patch1:         libgda-jre18.patch
 
 BuildRequires:    pkgconfig >= 0.8
 BuildRequires:    glib2-devel >= 2.28.0
@@ -180,6 +182,7 @@ This %{name}-java includes the %{name} Java JDBC provider.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # AUTHORS not in UTF-8
 iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new && \
@@ -390,6 +393,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Sat May 17 2014 Kalev Lember <kalevlember at gmail.com> - 1:5.2.2-1
 - Update to 5.2.2
 - Fix FTBFS with -Werror=format-security (#1037160)
+- Fix the build with JRE 1.8
 
 * Wed Apr 23 2014 Tomáš Mráz <tmraz at redhat.com> - 1:5.1.2-5
 - Rebuild for new libgcrypt


More information about the scm-commits mailing list