forked from pool/java-atk-wrapper
Accepting request 561159 from Java:Factory
Fix build with jdk10 OBS-URL: https://build.opensuse.org/request/show/561159 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-atk-wrapper?expand=0&rev=9
This commit is contained in:
commit
1097b01a4d
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 2 17:35:32 UTC 2018 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* jaw-javah.patch
|
||||||
|
+ Do not search for javah, since it is not needed during the
|
||||||
|
build
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 8 08:54:50 UTC 2017 - fstrba@suse.com
|
Wed Nov 8 08:54:50 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package java-atk-wrapper
|
# spec file for package java-atk-wrapper
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -33,6 +33,7 @@ Patch0: jaw-avoid-version.patch
|
|||||||
Patch1: jaw-java_required.patch
|
Patch1: jaw-java_required.patch
|
||||||
Patch2: jaw-quotes.patch
|
Patch2: jaw-quotes.patch
|
||||||
Patch3: jaw-gdk.patch
|
Patch3: jaw-gdk.patch
|
||||||
|
Patch4: jaw-javah.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: java-devel >= 1.7
|
BuildRequires: java-devel >= 1.7
|
||||||
@ -68,6 +69,7 @@ change of underlying communication mechanism.
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
cp %{SOURCE1} .
|
cp %{SOURCE1} .
|
||||||
cp %{SOURCE2} wrapper/
|
cp %{SOURCE2} wrapper/
|
||||||
cp %{SOURCE3} .
|
cp %{SOURCE3} .
|
||||||
|
15
jaw-javah.patch
Normal file
15
jaw-javah.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
--- java-atk-wrapper-0.33.2/configure.ac 2018-01-02 18:30:15.178317330 +0100
|
||||||
|
+++ java-atk-wrapper-0.33.2/configure.ac 2018-01-02 18:31:01.643499937 +0100
|
||||||
|
@@ -90,12 +90,6 @@
|
||||||
|
fi
|
||||||
|
AC_SUBST(JAVAC)
|
||||||
|
|
||||||
|
-AC_PATH_PROG(JAVAH,javah,,${JAVA_PATH})
|
||||||
|
-if test -z "$JAVAH"; then
|
||||||
|
- AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
|
||||||
|
-fi
|
||||||
|
-AC_SUBST(JAVAH)
|
||||||
|
-
|
||||||
|
AC_SUBST(JAVACFLAGS)
|
||||||
|
|
||||||
|
AC_PATH_PROG(JAR,jar,,${JAVA_PATH})
|
Loading…
x
Reference in New Issue
Block a user