[packages/libgda5] - fix vala and java 1.8 detection - rel 3

baggins baggins at pld-linux.org
Thu May 5 18:49:07 CEST 2016


commit 287f0265b95ec8f78ec33e994aecf038ee70b124
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu May 5 18:48:41 2016 +0200

    - fix vala and java 1.8 detection
    - rel 3

 java8.patch  | 14 ++++++++++++++
 libgda5.spec |  5 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/libgda5.spec b/libgda5.spec
index 6c36dc2..6d49394 100644
--- a/libgda5.spec
+++ b/libgda5.spec
@@ -23,7 +23,7 @@ Summary:	GNU Data Access library
 Summary(pl.UTF-8):	Biblioteka GNU Data Access
 Name:		libgda5
 Version:	5.2.4
-Release:	2
+Release:	3
 License:	LGPL v2+/GPL v2+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-%{version}.tar.xz
@@ -34,6 +34,7 @@ Patch2:		%{name}-missing.patch
 Patch3:		%{name}-format.patch
 Patch4:		%{name}-yelp.patch
 Patch5:		java-arch.patch
+Patch6:		java8.patch
 URL:		http://www.gnome-db.org/
 %{?with_firebird:BuildRequires:	Firebird-devel}
 BuildRequires:	autoconf >= 2.68
@@ -387,6 +388,7 @@ Narzędzia graficzne dla GDA.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 # included version is bash-specific, use system file
@@ -411,7 +413,6 @@ export _JAVA_SUFFIX="/lib/amd64/server"
 javac getsp.java
 %endif
 %configure \
-	%{?with_vala:VALA_API_VERSION="$(pkg-config --version vapigen)"} \
 	--disable-silent-rules \
 	%{!?with_vala:--disable-vala} \
 	--enable-gda-gi \
diff --git a/java8.patch b/java8.patch
new file mode 100644
index 0000000..c3397ae
--- /dev/null
+++ b/java8.patch
@@ -0,0 +1,14 @@
+--- libgda-5.2.4/m4/java.m4~	2016-05-05 18:28:46.000000000 +0200
++++ libgda-5.2.4/m4/java.m4	2016-05-05 18:39:44.169761450 +0200
+@@ -175,6 +175,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"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgda5.git/commitdiff/287f0265b95ec8f78ec33e994aecf038ee70b124



More information about the pld-cvs-commit mailing list