Accepting request 80657 from home:vuntz:branches:GNOME:Factory
Update to 3.1.90 OBS-URL: https://build.opensuse.org/request/show/80657 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/orca?expand=0&rev=109
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
40aec945e8
commit
e16cbbe522
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6daed36c39c030cb9105ae8ffce1a5a8e75c56c803b5af9350d50505ad247243
|
||||
size 3596786
|
||||
3
orca-3.1.90.tar.bz2
Normal file
3
orca-3.1.90.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:747fcb66257f5574d75e5872588dc01e77bd80faaf528139947685929febf18d
|
||||
size 3698155
|
||||
121
orca-no-pygtk-configure.patch
Normal file
121
orca-no-pygtk-configure.patch
Normal file
@ -0,0 +1,121 @@
|
||||
From 308d98046713303630cf4a53398065a2ceb23848 Mon Sep 17 00:00:00 2001
|
||||
From: Joanmarie Diggs <joanmarie.diggs@gmail.com>
|
||||
Date: Thu, 01 Sep 2011 14:22:20 +0000
|
||||
Subject: Fix for bug 657902 - Remove static binding cruft from configure.ac and acinclude.m4
|
||||
|
||||
---
|
||||
Index: orca-3.1.90/configure.ac
|
||||
===================================================================
|
||||
--- orca-3.1.90.orig/configure.ac
|
||||
+++ orca-3.1.90/configure.ac
|
||||
@@ -47,10 +47,8 @@ AM_PATH_PYTHON(2.4)
|
||||
|
||||
AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find python module: dbus)])
|
||||
AM_CHECK_PYMOD(cairo,,,[AC_MSG_ERROR(Could not find python module: cairo)])
|
||||
-AM_CHECK_PYMOD(pango,,,[AC_MSG_ERROR(Could not find python module: pango)])
|
||||
AM_CHECK_PYMOD(json,,,[AC_MSG_ERROR(Could not find python module: json)])
|
||||
AM_CHECK_PYMOD(xdg,,,[AC_MSG_ERROR(Could not find python module: xdg)])
|
||||
-AM_CHECK_PYMOD(wnck,,[wnck_available="yes"],[wnck_available="no"])
|
||||
AM_CHECK_PYMOD(brlapi,,[brlapi_available="yes"],[brlapi_available="no"])
|
||||
AM_CHECK_PYMOD(speechd,,[speechd_available="yes"],[speechd_available="no"])
|
||||
LOUIS_TABLE_DIR=""
|
||||
Index: orca-3.1.90/acinclude.m4
|
||||
===================================================================
|
||||
--- orca-3.1.90.orig/acinclude.m4
|
||||
+++ orca-3.1.90/acinclude.m4
|
||||
@@ -23,40 +23,6 @@ $2])
|
||||
CPPFLAGS="$save_CPPFLAGS"
|
||||
])
|
||||
|
||||
-dnl AM_CHECK_PYGTK(VERSION [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
|
||||
-dnl Check if pygtk supports the given version.
|
||||
-AC_DEFUN([AM_CHECK_PYGTK],
|
||||
-[AC_REQUIRE([AM_PATH_PYTHON])
|
||||
-AC_MSG_CHECKING(for pygtk version $1)
|
||||
-py_mod_var=`echo $1 | sed 'y%./+-%__p_%'`
|
||||
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
|
||||
-prog="
|
||||
-import sys
|
||||
-try:
|
||||
- import pygtk
|
||||
- pygtk.require('$1')
|
||||
-except:
|
||||
- sys.exit(1)
|
||||
-sys.exit(0)"
|
||||
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
|
||||
- then
|
||||
- eval "py_cv_mod_$py_mod_var=yes"
|
||||
- else
|
||||
- eval "py_cv_mod_$py_mod_var=no"
|
||||
- fi
|
||||
-])
|
||||
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
|
||||
-if test "x$py_val" != xno; then
|
||||
- AC_MSG_RESULT(yes)
|
||||
- ifelse([$2], [],, [$2
|
||||
-])dnl
|
||||
-else
|
||||
- AC_MSG_RESULT(no)
|
||||
- ifelse([$3], [],, [$3
|
||||
-])dnl
|
||||
-fi
|
||||
-])
|
||||
-
|
||||
dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
|
||||
dnl Check if a module containing a given symbol is visible to python.
|
||||
AC_DEFUN([AM_CHECK_PYMOD],
|
||||
@@ -67,8 +33,7 @@ AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
|
||||
ifelse([$2],[], [prog="
|
||||
import sys
|
||||
try:
|
||||
- import pygtk
|
||||
- pygtk.require('2.0')
|
||||
+ from gi.repository import Gtk
|
||||
import $1
|
||||
except ImportError:
|
||||
sys.exit(1)
|
||||
@@ -95,44 +60,6 @@ else
|
||||
])dnl
|
||||
fi
|
||||
])
|
||||
-
|
||||
-dnl AM_CHECK_PYORBIT_MOD(MODNAME [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
|
||||
-dnl Check if a module containing a given ORBit module is visible to python.
|
||||
-AC_DEFUN([AM_CHECK_PYORBIT_MOD],
|
||||
-[AC_REQUIRE([AM_PATH_PYTHON])
|
||||
-py_mod_var=$1
|
||||
-AC_MSG_CHECKING(for python ORBit module $1)
|
||||
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
|
||||
-prog="
|
||||
-import sys
|
||||
-try:
|
||||
- import pygtk
|
||||
- pygtk.require('2.0')
|
||||
- import ORBit
|
||||
- ORBit.load_typelib(\"$1\")
|
||||
- module_name = \"$1\".replace(\"_\",\".\")
|
||||
- __import__(module_name)
|
||||
-except:
|
||||
- sys.exit(1)
|
||||
-sys.exit(0)"
|
||||
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
|
||||
- then
|
||||
- eval "py_cv_mod_$py_mod_var=yes"
|
||||
- else
|
||||
- eval "py_cv_mod_$py_mod_var=no"
|
||||
- fi
|
||||
-])
|
||||
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
|
||||
-if test "x$py_val" != xno; then
|
||||
- AC_MSG_RESULT(yes)
|
||||
- ifelse([$2], [],, [$2
|
||||
-])dnl
|
||||
-else
|
||||
- AC_MSG_RESULT(no)
|
||||
- ifelse([$3], [],, [$3
|
||||
-])dnl
|
||||
-fi
|
||||
-])
|
||||
|
||||
dnl PYDOC_CHECK()
|
||||
AC_DEFUN([PYDOC_CHECK],
|
||||
34
orca.changes
34
orca.changes
@ -1,3 +1,37 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 31 16:09:19 CEST 2011 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 3.1.90:
|
||||
+ General:
|
||||
- bgo#626254: Migrate from PyGTK to PyGObject
|
||||
introspection-based bindings
|
||||
- bgo#652485: Remove deprecated (or soon-to-be deprecated)
|
||||
GtkBox, GtkTable, etc. and use GtkGrid instead.
|
||||
- bgo#657646: Default stopSpeechOnActiveDescendantChanged()
|
||||
should not be so restrictive
|
||||
- bgo#657579: Orca should not present tooltips shown as a
|
||||
result of mouse hovering unless the 'present tooltips'
|
||||
setting is enabled
|
||||
+ Gecko
|
||||
- bgo#599361: Significant delay building up the contents of
|
||||
certain lines in Firefox
|
||||
- bgo#650904: Work around AT-SPI2 caching issues with
|
||||
Thunderbird
|
||||
+ Updated translations.
|
||||
- Remove at-spi-devel, pyatspi, python-gobject-devel,
|
||||
python-gtk-devel BuildRequires: they are not needed with the port
|
||||
to introspection-based bindings.
|
||||
- Add pkgconfig(atspi-2), pkgconfig(gtk+-3.0),
|
||||
pkgconfig(pygobject-3.0) BuildRequires: new dependencies.
|
||||
- Remove python-gtk Requires as orca has been ported to
|
||||
introspection-based bindings. However, add python-gobject
|
||||
Requires which is still clearly needed.
|
||||
- Replace python-wnck Recommends with typelib(Wnck), to follow the
|
||||
change to introspection-based bindings.
|
||||
- Add orca-no-pygtk-configure.patch: do not require old bindings
|
||||
for the build.
|
||||
- Add call to gnome-autogen.sh for the above patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 22 13:31:35 UTC 2011 - dimstar@opensuse.org
|
||||
|
||||
|
||||
19
orca.spec
19
orca.spec
@ -18,32 +18,31 @@
|
||||
|
||||
|
||||
Name: orca
|
||||
Version: 3.1.5
|
||||
Version: 3.1.90
|
||||
Release: 1
|
||||
License: LGPLv2.1+
|
||||
Summary: Screen reader for GNOME
|
||||
Url: http://www.gnome.org/
|
||||
Group: System/GUI/GNOME
|
||||
Source: http://download.gnome.org/sources/orca/3.1/%{name}-%{version}.tar.bz2
|
||||
BuildRequires: at-spi-devel
|
||||
# PATCH-FIX-UPSTREAM orca-no-pygtk-configure.patch vuntz@opensuse.org -- Taken from git, do not require old bindings to build
|
||||
Patch0: orca-no-pygtk-configure.patch
|
||||
BuildRequires: dbus-1-python
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: gnome-doc-utils-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: liblouis-devel
|
||||
# pyatspi is a virtual name that is provided by the default at-spi stack
|
||||
BuildRequires: pyatspi
|
||||
BuildRequires: python
|
||||
BuildRequires: python-brlapi
|
||||
BuildRequires: python-gobject-devel
|
||||
BuildRequires: python-gtk-devel
|
||||
BuildRequires: python-louis
|
||||
BuildRequires: python-speechd
|
||||
BuildRequires: python-wnck
|
||||
BuildRequires: python-xdg
|
||||
BuildRequires: translation-update-upstream
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(atspi-2) >= 2.1.90
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.1.14
|
||||
BuildRequires: pkgconfig(pygobject-3.0) >= 2.90.3
|
||||
Requires: dbus-1-python
|
||||
# the gsettings tool is used to know if a11y is enabled
|
||||
Requires: glib2-tools
|
||||
@ -51,12 +50,12 @@ Requires: glib2-tools
|
||||
Requires: pyatspi
|
||||
Requires: python-brlapi
|
||||
Requires: python-gstreamer-0_10
|
||||
Requires: python-gtk
|
||||
Requires: python-gobject
|
||||
Requires: python-louis
|
||||
Requires: python-xdg
|
||||
Recommends: %{name}-lang
|
||||
Recommends: python-speechd
|
||||
Recommends: python-wnck
|
||||
Recommends: typelib(Wnck)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if %suse_version <= 1110
|
||||
%define python_sitearch %{py_sitedir}
|
||||
@ -72,8 +71,10 @@ combinations of speech, braille, and/or magnification.
|
||||
%prep
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
NO_CONFIGURE=1 gnome-autogen.sh
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user