Fridrich Strba 2017-09-06 13:19:12 +00:00 committed by Git OBS Bridge
parent decf2c81fd
commit 41897fc017
7 changed files with 26 additions and 60 deletions

2
HOWTO
View File

@ -4,7 +4,7 @@ object and the jar into somehwere where the JRE can find it and configure the
accessiblity configuration of the JRE to load this. accessiblity configuration of the JRE to load this.
For OpenJDK, the process looks like this: For OpenJDK, the process looks like this:
ln -s %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0 \ ln -s %{_libdir}/java-atk-wrapper/libatk-wrapper.so.? \
/usr/lib/jvm/jre/lib/%{arch}/libatk-wrapper.so /usr/lib/jvm/jre/lib/%{arch}/libatk-wrapper.so
ln -s %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar \ ln -s %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar \
/usr/lib/jvm/jre/lib/ext/ /usr/lib/jvm/jre/lib/ext/

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0feec305ec253ae3f84b7faa67afe8f6693e9252e417bcb069174d9f1d03afd3
size 259340

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b8f685caed7c424babac8b158f51355c772d1e2a0b8a1ce8ced4980edae223e2
size 293364

View File

@ -1,29 +0,0 @@
---
jni/src/jawtoplevel.c | 1 +
jni/src/jawutil.c | 1 +
2 files changed, 2 insertions(+)
Index: java-atk-wrapper-0.30.4/jni/src/jawtoplevel.c
===================================================================
--- java-atk-wrapper-0.30.4.orig/jni/src/jawtoplevel.c
+++ java-atk-wrapper-0.30.4/jni/src/jawtoplevel.c
@@ -19,6 +19,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <glib.h>
#include "jawtoplevel.h"
Index: java-atk-wrapper-0.30.4/jni/src/jawutil.c
===================================================================
--- java-atk-wrapper-0.30.4.orig/jni/src/jawutil.c
+++ java-atk-wrapper-0.30.4/jni/src/jawutil.c
@@ -19,6 +19,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <glib.h>
#include "jawutil.h"
#include "jawtoplevel.h"

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Sep 6 13:12:32 UTC 2017 - fstrba@suse.com
- Upgrade to upsteam 0.33.2
- Removed patch:
* java-atk-wrapper-fortify-decl.patch
+ Integrated upsteam
- Add manifest.txt missing from the tarball
- Force source/bytecode target to 1.7.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 17 09:12:08 UTC 2014 - fstrba@suse.com Fri Oct 17 09:12:08 UTC 2014 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package java-atk-wrapper # spec file for package java-atk-wrapper
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2017 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
@ -16,9 +16,9 @@
# #
%global major_version 0.30 %global major_version 0.33
Name: java-atk-wrapper Name: java-atk-wrapper
Version: 0.30.5 Version: 0.33.2
Release: 0 Release: 0
Summary: Java ATK Wrapper Summary: Java ATK Wrapper
License: LGPL-2.0+ License: LGPL-2.0+
@ -26,23 +26,16 @@ Group: Development/Libraries/Java
Url: http://git.gnome.org/browse/java-atk-wrapper/ Url: http://git.gnome.org/browse/java-atk-wrapper/
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{major_version}/%{name}-%{version}.tar.xz Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{major_version}/%{name}-%{version}.tar.xz
Source1: HOWTO Source1: HOWTO
#PATCH-FIX-UPSTREAM: add missing includes, mvyskocil@suse.com Source2: manifest.txt
Patch0: java-atk-wrapper-fortify-decl.patch
BuildRequires: atk-devel BuildRequires: atk-devel
BuildRequires: gconf2-devel BuildRequires: gconf2-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: java-devel >= 1.6.0 BuildRequires: java-devel >= 1.7.0
BuildRequires: xz BuildRequires: xz
Requires: java >= 1.6.0 Requires: java >= 1.7.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1130
BuildRequires: xprop BuildRequires: xprop
Requires: xprop Requires: xprop
%else
BuildRequires: xorg-x11
Requires: xorg-x11
%endif
%description %description
Java ATK Wrapper is a implementation of ATK by using JNI technic. It Java ATK Wrapper is a implementation of ATK by using JNI technic. It
@ -56,28 +49,18 @@ change of underlying communication mechanism.
%prep %prep
%setup -q %setup -q
%patch0 -p1
cp %{SOURCE1} . cp %{SOURCE1} .
cp %{SOURCE2} wrapper/
%build %build
%configure JAVACFLAGS="-source 1.5 -target 1.5" %configure JAVACFLAGS="-source 1.7 -target 1.7" --libdir=%{_libdir}/%{name}
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
# java-atk-wrapper's make install is broken by design make -C jni install DESTDIR=%{buildroot}
# it installs to the current JDK_HOME. We want to install it to a central install wrapper/java-atk-wrapper.jar %{buildroot}%{_libdir}/%{name}/
# location and then allow all/any JRE's/JDK's to use it.
# make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p %{buildroot}%{_libdir}/%{name}
mv wrapper/java-atk-wrapper.jar %{buildroot}%{_libdir}/%{name}/
mv jni/src/.libs/libatk-wrapper.so.0.0.13 %{buildroot}%{_libdir}/%{name}/
ln -s %{_libdir}/%{name}/libatk-wrapper.so.0.0.13 \
%{buildroot}%{_libdir}/%{name}/libatk-wrapper.so.0
%files %files
%defattr(-,root,root,-)
%doc AUTHORS %doc AUTHORS
%doc COPYING.LESSER %doc COPYING.LESSER
%doc NEWS %doc NEWS

2
manifest.txt Normal file
View File

@ -0,0 +1,2 @@
Main-Class: org.GNOME.Accessibility.AtkWrapper