From 57c4a3ea68f07c8f3b5d06911d16b3656a63caca3585095e2c18158f918a00e5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 26 Oct 2017 20:29:57 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=18 --- java-atk-wrapper.changes | 16 +++++++++++++++ java-atk-wrapper.spec | 4 ++++ jaw-avoid-version.patch | 42 +++++++++++++++++++++++++++++++--------- jaw-java_required.patch | 11 +++++++++++ jaw-quotes.patch | 11 +++++++++++ 5 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 jaw-java_required.patch create mode 100644 jaw-quotes.patch diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes index 8e5578a..49466e4 100644 --- a/java-atk-wrapper.changes +++ b/java-atk-wrapper.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +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 diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index b6672e2..b55d378 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -30,6 +30,8 @@ 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 BuildRequires: autoconf BuildRequires: automake BuildRequires: java-devel >= 1.7 @@ -63,6 +65,8 @@ change of underlying communication mechanism. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 cp %{SOURCE1} . cp %{SOURCE2} wrapper/ cp %{SOURCE3} . diff --git a/jaw-avoid-version.patch b/jaw-avoid-version.patch index 686d335..dd4254a 100644 --- a/jaw-avoid-version.patch +++ b/jaw-avoid-version.patch @@ -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 diff --git a/jaw-java_required.patch b/jaw-java_required.patch new file mode 100644 index 0000000..510d836 --- /dev/null +++ b/jaw-java_required.patch @@ -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]) diff --git a/jaw-quotes.patch b/jaw-quotes.patch new file mode 100644 index 0000000..391dc02 --- /dev/null +++ b/jaw-quotes.patch @@ -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 From a60614927339d7c31be647e64a3455f86f554cc3b12222538c227fa9ab53ff6c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 27 Oct 2017 06:48:04 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=19 --- java-atk-wrapper.changes | 11 +++++ java-atk-wrapper.spec | 10 +++- jaw-java9.patch | 101 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 jaw-java9.patch diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes index 49466e4..750664f 100644 --- a/java-atk-wrapper.changes +++ b/java-atk-wrapper.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 26 20:31:48 UTC 2017 - fstrba@suse.com + +- Added patch: + * jaw-java9.patch + + Let the java-atk-wrapper implement the + javax.accessibility.AccessibilityProvider + + Require jdk9 for build, since this class was introduced in + jdk9 +- Build with jdk9 or higher + ------------------------------------------------------------------- Thu Oct 26 20:21:22 UTC 2017 - fstrba@suse.com diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index b55d378..3930b26 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -32,9 +32,9 @@ Source3: https://git.gnome.org/browse/java-atk-wrapper/plain/autogen.sh Patch0: jaw-avoid-version.patch Patch1: jaw-java_required.patch Patch2: jaw-quotes.patch +Patch3: jaw-java9.patch BuildRequires: autoconf BuildRequires: automake -BuildRequires: java-devel >= 1.7 BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: xprop @@ -51,6 +51,11 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gthread-2.0) Requires: java >= 1.7 Requires: xprop +%if 0%{?suse_version} >= 1330 +BuildRequires: java-devel >= 9 +%else +BuildRequires: java-devel >= 1-7 +%endif %description Java ATK Wrapper is a implementation of ATK by using JNI technic. It @@ -67,6 +72,9 @@ change of underlying communication mechanism. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%if 0%{?suse_version} >= 1330 +%patch3 -p1 +%endif cp %{SOURCE1} . cp %{SOURCE2} wrapper/ cp %{SOURCE3} . diff --git a/jaw-java9.patch b/jaw-java9.patch new file mode 100644 index 0000000..a3f0774 --- /dev/null +++ b/jaw-java9.patch @@ -0,0 +1,101 @@ +--- 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.7 ++JAVA_REQUIRED=9.0 + JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge" + + AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location]) +@@ -169,6 +169,8 @@ + wrapper/org/Makefile + wrapper/org/GNOME/Makefile + wrapper/org/GNOME/Accessibility/Makefile ++ wrapper/META-INF/Makefile ++ wrapper/META-INF/services/Makefile + ]) + AC_OUTPUT + +--- java-atk-wrapper-0.33.2/wrapper/Makefile.am 2015-07-01 02:19:15.000000000 +0200 ++++ java-atk-wrapper-0.33.2/wrapper/Makefile.am 2017-10-26 17:42:11.472221491 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS=org ++SUBDIRS=org META-INF + JARFILES=java-atk-wrapper.jar + ALL_CLASSES=org/GNOME/Accessibility/*.class + DEP_CLASSES=$(wildcard $(ALL_CLASSES)) +@@ -16,7 +16,7 @@ + EXTRA_DIST = $(properties_DATA) + + $(JARFILES) : $(DEP_CLASSES) +- $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class ++ $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class META-INF/services/javax.accessibility.AccessibilityProvider + + all-local : $(DATA) $(JARFILES) + +--- java-atk-wrapper-0.33.2/wrapper/META-INF/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ java-atk-wrapper-0.33.2/wrapper/META-INF/Makefile.am 2017-10-26 17:42:11.472221491 +0200 +@@ -0,0 +1 @@ ++SUBDIRS=services +--- java-atk-wrapper-0.33.2/wrapper/META-INF/services/javax.accessibility.AccessibilityProvider 1970-01-01 01:00:00.000000000 +0100 ++++ java-atk-wrapper-0.33.2/wrapper/META-INF/services/javax.accessibility.AccessibilityProvider 2017-10-26 17:42:11.472221491 +0200 +@@ -0,0 +1 @@ ++org.GNOME.Accessibility.AtkProvider +--- java-atk-wrapper-0.33.2/wrapper/META-INF/services/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ java-atk-wrapper-0.33.2/wrapper/META-INF/services/Makefile.am 2017-10-26 17:42:11.472221491 +0200 +@@ -0,0 +1 @@ ++EXTRA_DIST = javax.accessibility.AccessibilityProvider +--- java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/AtkProvider.java 1970-01-01 01:00:00.000000000 +0100 ++++ java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/AtkProvider.java 2017-10-26 17:42:11.472221491 +0200 +@@ -0,0 +1,38 @@ ++/* ++ * Java ATK Wrapper for GNOME ++ * Copyright (C) 2017 Oracle and/or its affiliates. ++ * Copyright (C) 2017 Fridrich Strba ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++package org.GNOME.Accessibility; ++ ++import javax.accessibility.AccessibilityProvider; ++ ++public final class AtkProvider extends AccessibilityProvider { ++ private final String name = "org.GNOME.Accessibility.AtkWrapper"; ++ ++ public AtkProvider() {} ++ ++ public String getName() { ++ return name; ++ } ++ ++ public void activate() { ++ new AtkWrapper(); ++ } ++ ++} +--- java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/Makefile.am 2015-06-30 23:56:32.000000000 +0200 ++++ java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/Makefile.am 2017-10-26 17:42:11.472221491 +0200 +@@ -10,7 +10,7 @@ + sed -e "s;\@XPROP\@;${XPROP};g" \ + < $< >$@ + +-%.class : %.java ++%.class : %.java AtkWrapper.java + CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) $(JAVACFLAGS) -d $(top_builddir)/wrapper $< + + clean-local: From 965b3136ca48cb21455cb1e1c598cd3416927e551a14a54bf3cab816c29cf9c5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 30 Oct 2017 15:16:23 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=20 --- java-atk-wrapper.changes | 6 ++---- java-atk-wrapper.spec | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes index 750664f..2782f1b 100644 --- a/java-atk-wrapper.changes +++ b/java-atk-wrapper.changes @@ -4,10 +4,8 @@ Thu Oct 26 20:31:48 UTC 2017 - fstrba@suse.com - Added patch: * jaw-java9.patch + Let the java-atk-wrapper implement the - javax.accessibility.AccessibilityProvider - + Require jdk9 for build, since this class was introduced in - jdk9 -- Build with jdk9 or higher + javax.accessibility.AccessibilityProvider if building with + jdk9 ------------------------------------------------------------------- Thu Oct 26 20:21:22 UTC 2017 - fstrba@suse.com diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index 3930b26..f5140a1 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -35,6 +35,7 @@ Patch2: jaw-quotes.patch Patch3: jaw-java9.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: java-devel >= 1-7 BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: xprop @@ -51,11 +52,6 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gthread-2.0) Requires: java >= 1.7 Requires: xprop -%if 0%{?suse_version} >= 1330 -BuildRequires: java-devel >= 9 -%else -BuildRequires: java-devel >= 1-7 -%endif %description Java ATK Wrapper is a implementation of ATK by using JNI technic. It @@ -72,7 +68,7 @@ change of underlying communication mechanism. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%if 0%{?suse_version} >= 1330 +%if %{?pkg_vcmp:%{pkg_vcmp} java-devel >= 9}%{!?pkg_vcmp:0} %patch3 -p1 %endif cp %{SOURCE1} . From cbbeb7ae7193afb65da4bbdb712f4a715f112f70efab3903de48cab42422b7da Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 31 Oct 2017 07:31:29 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=21 --- java-atk-wrapper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index f5140a1..6099564 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -68,7 +68,7 @@ change of underlying communication mechanism. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%if %{?pkg_vcmp:%{pkg_vcmp} java-devel >= 9}%{!?pkg_vcmp:0} +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} %patch3 -p1 %endif cp %{SOURCE1} . From bb62058dfad5b5434b97cbb21004878a18d4f6c0ce6c62e232ab6a946a354c55 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 31 Oct 2017 10:41:07 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=22 --- java-atk-wrapper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index 6099564..4cae8e3 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -35,7 +35,7 @@ Patch2: jaw-quotes.patch Patch3: jaw-java9.patch BuildRequires: autoconf BuildRequires: automake -BuildRequires: java-devel >= 1-7 +BuildRequires: java-devel >= 1.7 BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: xprop From 9048f1a2b41b42f0b1155099c37016fd9d4a458ce0bdad574923b81f1229fd0a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 7 Nov 2017 09:46:20 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=23 --- java-atk-wrapper.changes | 9 ---- java-atk-wrapper.spec | 4 -- jaw-java9.patch | 101 --------------------------------------- 3 files changed, 114 deletions(-) delete mode 100644 jaw-java9.patch diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes index 2782f1b..49466e4 100644 --- a/java-atk-wrapper.changes +++ b/java-atk-wrapper.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Thu Oct 26 20:31:48 UTC 2017 - fstrba@suse.com - -- Added patch: - * jaw-java9.patch - + Let the java-atk-wrapper implement the - javax.accessibility.AccessibilityProvider if building with - jdk9 - ------------------------------------------------------------------- Thu Oct 26 20:21:22 UTC 2017 - fstrba@suse.com diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index 4cae8e3..b55d378 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -32,7 +32,6 @@ Source3: https://git.gnome.org/browse/java-atk-wrapper/plain/autogen.sh Patch0: jaw-avoid-version.patch Patch1: jaw-java_required.patch Patch2: jaw-quotes.patch -Patch3: jaw-java9.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: java-devel >= 1.7 @@ -68,9 +67,6 @@ change of underlying communication mechanism. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} -%patch3 -p1 -%endif cp %{SOURCE1} . cp %{SOURCE2} wrapper/ cp %{SOURCE3} . diff --git a/jaw-java9.patch b/jaw-java9.patch deleted file mode 100644 index a3f0774..0000000 --- a/jaw-java9.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- 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.7 -+JAVA_REQUIRED=9.0 - JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge" - - AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location]) -@@ -169,6 +169,8 @@ - wrapper/org/Makefile - wrapper/org/GNOME/Makefile - wrapper/org/GNOME/Accessibility/Makefile -+ wrapper/META-INF/Makefile -+ wrapper/META-INF/services/Makefile - ]) - AC_OUTPUT - ---- java-atk-wrapper-0.33.2/wrapper/Makefile.am 2015-07-01 02:19:15.000000000 +0200 -+++ java-atk-wrapper-0.33.2/wrapper/Makefile.am 2017-10-26 17:42:11.472221491 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS=org -+SUBDIRS=org META-INF - JARFILES=java-atk-wrapper.jar - ALL_CLASSES=org/GNOME/Accessibility/*.class - DEP_CLASSES=$(wildcard $(ALL_CLASSES)) -@@ -16,7 +16,7 @@ - EXTRA_DIST = $(properties_DATA) - - $(JARFILES) : $(DEP_CLASSES) -- $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class -+ $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class META-INF/services/javax.accessibility.AccessibilityProvider - - all-local : $(DATA) $(JARFILES) - ---- java-atk-wrapper-0.33.2/wrapper/META-INF/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/META-INF/Makefile.am 2017-10-26 17:42:11.472221491 +0200 -@@ -0,0 +1 @@ -+SUBDIRS=services ---- java-atk-wrapper-0.33.2/wrapper/META-INF/services/javax.accessibility.AccessibilityProvider 1970-01-01 01:00:00.000000000 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/META-INF/services/javax.accessibility.AccessibilityProvider 2017-10-26 17:42:11.472221491 +0200 -@@ -0,0 +1 @@ -+org.GNOME.Accessibility.AtkProvider ---- java-atk-wrapper-0.33.2/wrapper/META-INF/services/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/META-INF/services/Makefile.am 2017-10-26 17:42:11.472221491 +0200 -@@ -0,0 +1 @@ -+EXTRA_DIST = javax.accessibility.AccessibilityProvider ---- java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/AtkProvider.java 1970-01-01 01:00:00.000000000 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/AtkProvider.java 2017-10-26 17:42:11.472221491 +0200 -@@ -0,0 +1,38 @@ -+/* -+ * Java ATK Wrapper for GNOME -+ * Copyright (C) 2017 Oracle and/or its affiliates. -+ * Copyright (C) 2017 Fridrich Strba -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+package org.GNOME.Accessibility; -+ -+import javax.accessibility.AccessibilityProvider; -+ -+public final class AtkProvider extends AccessibilityProvider { -+ private final String name = "org.GNOME.Accessibility.AtkWrapper"; -+ -+ public AtkProvider() {} -+ -+ public String getName() { -+ return name; -+ } -+ -+ public void activate() { -+ new AtkWrapper(); -+ } -+ -+} ---- java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/Makefile.am 2015-06-30 23:56:32.000000000 +0200 -+++ java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/Makefile.am 2017-10-26 17:42:11.472221491 +0200 -@@ -10,7 +10,7 @@ - sed -e "s;\@XPROP\@;${XPROP};g" \ - < $< >$@ - --%.class : %.java -+%.class : %.java AtkWrapper.java - CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) $(JAVACFLAGS) -d $(top_builddir)/wrapper $< - - clean-local: From 78751e3159dd4ed2e73b6374c0e9ad7ad10a33868072073ae28b50dad174bf7b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 8 Nov 2017 08:55:38 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=24 --- java-atk-wrapper.changes | 7 +++++++ java-atk-wrapper.spec | 3 ++- jaw-gdk.patch | 10 ++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 jaw-gdk.patch diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes index 49466e4..ef37e7d 100644 --- a/java-atk-wrapper.changes +++ b/java-atk-wrapper.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index b55d378..ce91b45 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -32,6 +32,7 @@ Source3: https://git.gnome.org/browse/java-atk-wrapper/plain/autogen.sh 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 @@ -44,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) @@ -67,6 +67,7 @@ change of underlying communication mechanism. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 cp %{SOURCE1} . cp %{SOURCE2} wrapper/ cp %{SOURCE3} . diff --git a/jaw-gdk.patch b/jaw-gdk.patch new file mode 100644 index 0000000..ef8618d --- /dev/null +++ b/jaw-gdk.patch @@ -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)