Accepting request 539794 from Java:Factory
Fix some warnings/errors OBS-URL: https://build.opensuse.org/request/show/539794 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-atk-wrapper?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
a39cacd995
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 8 08:54:50 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Added patch:
|
||||
* jaw-gdk.patch
|
||||
+ Remove requirement of gdk3. It is not really needed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 26 20:21:22 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Added patches:
|
||||
* jaw-quotes.patch
|
||||
+ Add quotes when adding CFLAGS to JAW_CFLAGS in order to avoid
|
||||
that first of the CFLAGS be evaluated as a command
|
||||
* jaw-java_required.patch
|
||||
+ Modify java requirement to 1.7, since the code cannot be
|
||||
built with source level 1.6 due to a diamond operator
|
||||
- Modified patch:
|
||||
* jaw-avoid-version.patch
|
||||
+ Completely discard all libtool versioning of the library
|
||||
+ This library is not linked, only loaded by the java code and
|
||||
as such, it needs only .so extension
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 24 13:28:45 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
||||
@ -30,6 +30,9 @@ Source2: https://git.gnome.org/browse/java-atk-wrapper/plain/wrapper/mani
|
||||
Source3: https://git.gnome.org/browse/java-atk-wrapper/plain/autogen.sh
|
||||
# Avoid libtool versioning; this library is dynamically loaded from Java code
|
||||
Patch0: jaw-avoid-version.patch
|
||||
Patch1: jaw-java_required.patch
|
||||
Patch2: jaw-quotes.patch
|
||||
Patch3: jaw-gdk.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: java-devel >= 1.7
|
||||
@ -42,7 +45,6 @@ BuildRequires: pkgconfig(atk-bridge-2.0)
|
||||
BuildRequires: pkgconfig(atspi-2) >= 2.14.0
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
BuildRequires: pkgconfig(gdk-2.0)
|
||||
BuildRequires: pkgconfig(gdk-3.0)
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
|
||||
BuildRequires: pkgconfig(gobject-2.0)
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
@ -63,6 +65,9 @@ change of underlying communication mechanism.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
cp %{SOURCE1} .
|
||||
cp %{SOURCE2} wrapper/
|
||||
cp %{SOURCE3} .
|
||||
|
||||
@ -1,11 +1,35 @@
|
||||
--- java-atk-wrapper-0.33.2/jni/src/Makefile.am 2015-06-25 19:57:08.000000000 +0200
|
||||
+++ java-atk-wrapper-0.33.2/jni/src/Makefile.am 2017-10-10 18:26:19.645994291 +0200
|
||||
@@ -32,7 +32,7 @@
|
||||
libatk_wrapper_la_LDFLAGS = $(LIB_ATK_WRAPPER_LD_FLAGS) \
|
||||
$(LT_VERSION_INFO) \
|
||||
$(PLATFORM_LDFLAGS) \
|
||||
- $(AM_LDFLAGS)
|
||||
+ $(AM_LDFLAGS) -avoid-version
|
||||
--- java-atk-wrapper-0.33.2/configure.ac 2015-07-07 13:52:28.000000000 +0200
|
||||
+++ java-atk-wrapper-0.33.2/configure.ac 2017-10-26 17:40:12.668221042 +0200
|
||||
@@ -9,17 +9,6 @@
|
||||
m4_pattern_allow([AM_PROG_AR])
|
||||
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
|
||||
|
||||
libatk_wrapper_la_LIBADD = $(JAW_LIBS)
|
||||
-# Before making a release, the LT_VERSION string should be modified.
|
||||
-# The string is of the form C:R:A.
|
||||
-# - If interfaces have been changed or added, but binary compatibility has
|
||||
-# been preserved, change to C+1:0:A+1
|
||||
-# - If binary compatibility has been broken (eg removed or changed interfaces)
|
||||
-# change to C+1:0:0
|
||||
-# - If the interface is the same as the previous version, change to C:R+1:A
|
||||
-
|
||||
-LIB_ATK_WRAPPER_LT_VERSION=5:0:0
|
||||
-AC_SUBST(LIB_ATK_WRAPPER_LT_VERSION)
|
||||
-
|
||||
# jni
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
@@ -51,14 +40,7 @@
|
||||
])
|
||||
AC_SUBST(JAW_LIBS)
|
||||
|
||||
-case "${target_os}" in
|
||||
-cygwin*)
|
||||
LIB_ATK_WRAPPER_LD_FLAGS="-avoid-version -no-undefined"
|
||||
- ;;
|
||||
-*)
|
||||
- LIB_ATK_WRAPPER_LD_FLAGS="-version-info $LIB_ATK_WRAPPER_LT_VERSION -no-undefined"
|
||||
- ;;
|
||||
-esac
|
||||
AC_SUBST(LIB_ATK_WRAPPER_LD_FLAGS)
|
||||
|
||||
# java wrapper
|
||||
|
||||
10
jaw-gdk.patch
Normal file
10
jaw-gdk.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- java-atk-wrapper-0.33.2/configure.ac 2015-07-07 13:52:28.000000000 +0200
|
||||
+++ java-atk-wrapper-0.33.2/configure.ac 2017-11-08 09:48:15.643164733 +0100
|
||||
@@ -46,7 +46,6 @@
|
||||
glib-2.0 >= 2.32.0
|
||||
gthread-2.0
|
||||
gdk-2.0
|
||||
- gdk-3.0
|
||||
gobject-2.0
|
||||
])
|
||||
AC_SUBST(JAW_LIBS)
|
||||
11
jaw-java_required.patch
Normal file
11
jaw-java_required.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- java-atk-wrapper-0.33.2/configure.ac 2015-07-07 13:52:28.000000000 +0200
|
||||
+++ java-atk-wrapper-0.33.2/configure.ac 2017-10-26 17:42:11.472221491 +0200
|
||||
@@ -64,7 +64,7 @@
|
||||
# java wrapper
|
||||
|
||||
AM_CONDITIONAL(USER, test `whoami` = "root")
|
||||
-JAVA_REQUIRED=1.6
|
||||
+JAVA_REQUIRED=1.7
|
||||
JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge"
|
||||
|
||||
AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location])
|
||||
11
jaw-quotes.patch
Normal file
11
jaw-quotes.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- java-atk-wrapper-0.33.2/configure.ac 2015-07-07 13:52:28.000000000 +0200
|
||||
+++ java-atk-wrapper-0.33.2/configure.ac 2017-10-26 17:46:08.411172252 +0200
|
||||
@@ -125,7 +125,7 @@
|
||||
|
||||
|
||||
if test "x$GCC" = xyes; then
|
||||
- JAW_CFLAGS=$JAW_CFLAGS $CFLAGS
|
||||
+ JAW_CFLAGS="$JAW_CFLAGS $CFLAGS"
|
||||
else
|
||||
AC_MSG_ERROR("You should compile with GCC")
|
||||
fi
|
||||
Loading…
x
Reference in New Issue
Block a user