diff options
| -rw-r--r-- | misc/orca/Makefile | 8 | ||||
| -rw-r--r-- | misc/orca/PLIST | 111 | ||||
| -rw-r--r-- | misc/orca/distinfo | 9 | ||||
| -rw-r--r-- | misc/orca/patches/patch-aa | 39 |
4 files changed, 77 insertions, 90 deletions
diff --git a/misc/orca/Makefile b/misc/orca/Makefile index 49c71227a2c..e5ef783fb5b 100644 --- a/misc/orca/Makefile +++ b/misc/orca/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.22 2009/09/23 09:54:46 tron Exp $ +# $NetBSD: Makefile,v 1.23 2009/11/17 15:47:26 wiz Exp $ # -DISTNAME= orca-2.26.3 -PKGREVISION= 1 +DISTNAME= orca-2.28.1 CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/orca/2.26/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/orca/2.28/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -35,6 +34,7 @@ BUILDLINK_API_DEPENDS.gnome-speech+= gnome-speech>=0.3.10 .include "../../net/ORBit2/buildlink3.mk" .include "../../net/py-ORBit/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/py-dbus/buildlink3.mk" BUILDLINK_API_DEPENDS.gnome-mag+= gnome-mag>=0.12.5 .include "../../x11/gnome-mag/buildlink3.mk" #BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.16 diff --git a/misc/orca/PLIST b/misc/orca/PLIST index fe8bd4b8936..37765ceca61 100644 --- a/misc/orca/PLIST +++ b/misc/orca/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2009/08/09 08:29:03 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2009/11/17 15:47:26 wiz Exp $ bin/orca ${PYSITELIB}/orca/__init__.py ${PYSITELIB}/orca/__init__.pyc @@ -18,10 +18,9 @@ ${PYSITELIB}/orca/bookmarks.pyo ${PYSITELIB}/orca/braille.py ${PYSITELIB}/orca/braille.pyc ${PYSITELIB}/orca/braille.pyo -${PYSITELIB}/orca/braillegenerator.py -${PYSITELIB}/orca/braillegenerator.pyc -${PYSITELIB}/orca/braillegenerator.pyo -${PYSITELIB}/orca/brlmodule.la +${PYSITELIB}/orca/braille_generator.py +${PYSITELIB}/orca/braille_generator.pyc +${PYSITELIB}/orca/braille_generator.pyo ${PYSITELIB}/orca/brlmon.py ${PYSITELIB}/orca/brlmon.pyc ${PYSITELIB}/orca/brlmon.pyo @@ -55,6 +54,12 @@ ${PYSITELIB}/orca/flat_review.pyo ${PYSITELIB}/orca/focus_tracking_presenter.py ${PYSITELIB}/orca/focus_tracking_presenter.pyc ${PYSITELIB}/orca/focus_tracking_presenter.pyo +${PYSITELIB}/orca/formatting.py +${PYSITELIB}/orca/formatting.pyc +${PYSITELIB}/orca/formatting.pyo +${PYSITELIB}/orca/generator.py +${PYSITELIB}/orca/generator.pyc +${PYSITELIB}/orca/generator.pyo ${PYSITELIB}/orca/gnomespeechfactory.py ${PYSITELIB}/orca/gnomespeechfactory.pyc ${PYSITELIB}/orca/gnomespeechfactory.pyo @@ -85,9 +90,9 @@ ${PYSITELIB}/orca/orca.pyo ${PYSITELIB}/orca/orca_console_prefs.py ${PYSITELIB}/orca/orca_console_prefs.pyc ${PYSITELIB}/orca/orca_console_prefs.pyo -${PYSITELIB}/orca/orca_glade.py -${PYSITELIB}/orca/orca_glade.pyc -${PYSITELIB}/orca/orca_glade.pyo +${PYSITELIB}/orca/orca_gtkbuilder.py +${PYSITELIB}/orca/orca_gtkbuilder.pyc +${PYSITELIB}/orca/orca_gtkbuilder.pyo ${PYSITELIB}/orca/orca_gui_find.py ${PYSITELIB}/orca/orca_gui_find.pyc ${PYSITELIB}/orca/orca_gui_find.pyo @@ -160,21 +165,24 @@ ${PYSITELIB}/orca/scripts/apps/__init__.pyo ${PYSITELIB}/orca/scripts/apps/acroread.py ${PYSITELIB}/orca/scripts/apps/acroread.pyc ${PYSITELIB}/orca/scripts/apps/acroread.pyo +${PYSITELIB}/orca/scripts/apps/ddu.py +${PYSITELIB}/orca/scripts/apps/ddu.pyc +${PYSITELIB}/orca/scripts/apps/ddu.pyo ${PYSITELIB}/orca/scripts/apps/ekiga.py ${PYSITELIB}/orca/scripts/apps/ekiga.pyc ${PYSITELIB}/orca/scripts/apps/ekiga.pyo ${PYSITELIB}/orca/scripts/apps/evolution/__init__.py ${PYSITELIB}/orca/scripts/apps/evolution/__init__.pyc ${PYSITELIB}/orca/scripts/apps/evolution/__init__.pyo +${PYSITELIB}/orca/scripts/apps/evolution/formatting.py +${PYSITELIB}/orca/scripts/apps/evolution/formatting.pyc +${PYSITELIB}/orca/scripts/apps/evolution/formatting.pyo ${PYSITELIB}/orca/scripts/apps/evolution/script.py ${PYSITELIB}/orca/scripts/apps/evolution/script.pyc ${PYSITELIB}/orca/scripts/apps/evolution/script.pyo ${PYSITELIB}/orca/scripts/apps/evolution/speech_generator.py ${PYSITELIB}/orca/scripts/apps/evolution/speech_generator.pyc ${PYSITELIB}/orca/scripts/apps/evolution/speech_generator.pyo -${PYSITELIB}/orca/scripts/apps/evolution/where_am_i.py -${PYSITELIB}/orca/scripts/apps/evolution/where_am_i.pyc -${PYSITELIB}/orca/scripts/apps/evolution/where_am_i.pyo ${PYSITELIB}/orca/scripts/apps/gcalctool/__init__.py ${PYSITELIB}/orca/scripts/apps/gcalctool/__init__.pyc ${PYSITELIB}/orca/scripts/apps/gcalctool/__init__.pyo @@ -184,9 +192,6 @@ ${PYSITELIB}/orca/scripts/apps/gcalctool/script.pyo ${PYSITELIB}/orca/scripts/apps/gcalctool/speech_generator.py ${PYSITELIB}/orca/scripts/apps/gcalctool/speech_generator.pyc ${PYSITELIB}/orca/scripts/apps/gcalctool/speech_generator.pyo -${PYSITELIB}/orca/scripts/apps/gcalctool/where_am_i.py -${PYSITELIB}/orca/scripts/apps/gcalctool/where_am_i.pyc -${PYSITELIB}/orca/scripts/apps/gcalctool/where_am_i.pyo ${PYSITELIB}/orca/scripts/apps/gdmlogin.py ${PYSITELIB}/orca/scripts/apps/gdmlogin.pyc ${PYSITELIB}/orca/scripts/apps/gdmlogin.pyo @@ -220,12 +225,12 @@ ${PYSITELIB}/orca/scripts/apps/gnome-terminal.pyo ${PYSITELIB}/orca/scripts/apps/gnome-window-properties/__init__.py ${PYSITELIB}/orca/scripts/apps/gnome-window-properties/__init__.pyc ${PYSITELIB}/orca/scripts/apps/gnome-window-properties/__init__.pyo +${PYSITELIB}/orca/scripts/apps/gnome-window-properties/formatting.py +${PYSITELIB}/orca/scripts/apps/gnome-window-properties/formatting.pyc +${PYSITELIB}/orca/scripts/apps/gnome-window-properties/formatting.pyo ${PYSITELIB}/orca/scripts/apps/gnome-window-properties/script.py ${PYSITELIB}/orca/scripts/apps/gnome-window-properties/script.pyc ${PYSITELIB}/orca/scripts/apps/gnome-window-properties/script.pyo -${PYSITELIB}/orca/scripts/apps/gnome-window-properties/speech_generator.py -${PYSITELIB}/orca/scripts/apps/gnome-window-properties/speech_generator.pyc -${PYSITELIB}/orca/scripts/apps/gnome-window-properties/speech_generator.pyo ${PYSITELIB}/orca/scripts/apps/gnome_segv2.py ${PYSITELIB}/orca/scripts/apps/gnome_segv2.pyc ${PYSITELIB}/orca/scripts/apps/gnome_segv2.pyo @@ -247,6 +252,21 @@ ${PYSITELIB}/orca/scripts/apps/notification-daemon.pyo ${PYSITELIB}/orca/scripts/apps/notify-osd.py ${PYSITELIB}/orca/scripts/apps/notify-osd.pyc ${PYSITELIB}/orca/scripts/apps/notify-osd.pyo +${PYSITELIB}/orca/scripts/apps/packagemanager/__init__.py +${PYSITELIB}/orca/scripts/apps/packagemanager/__init__.pyc +${PYSITELIB}/orca/scripts/apps/packagemanager/__init__.pyo +${PYSITELIB}/orca/scripts/apps/packagemanager/braille_generator.py +${PYSITELIB}/orca/scripts/apps/packagemanager/braille_generator.pyc +${PYSITELIB}/orca/scripts/apps/packagemanager/braille_generator.pyo +${PYSITELIB}/orca/scripts/apps/packagemanager/script.py +${PYSITELIB}/orca/scripts/apps/packagemanager/script.pyc +${PYSITELIB}/orca/scripts/apps/packagemanager/script.pyo +${PYSITELIB}/orca/scripts/apps/packagemanager/speech_generator.py +${PYSITELIB}/orca/scripts/apps/packagemanager/speech_generator.pyc +${PYSITELIB}/orca/scripts/apps/packagemanager/speech_generator.pyo +${PYSITELIB}/orca/scripts/apps/packagemanager/tutorialgenerator.py +${PYSITELIB}/orca/scripts/apps/packagemanager/tutorialgenerator.pyc +${PYSITELIB}/orca/scripts/apps/packagemanager/tutorialgenerator.pyo ${PYSITELIB}/orca/scripts/apps/pidgin/__init__.py ${PYSITELIB}/orca/scripts/apps/pidgin/__init__.pyc ${PYSITELIB}/orca/scripts/apps/pidgin/__init__.pyo @@ -259,9 +279,6 @@ ${PYSITELIB}/orca/scripts/apps/pidgin/script_settings.pyo ${PYSITELIB}/orca/scripts/apps/pidgin/speech_generator.py ${PYSITELIB}/orca/scripts/apps/pidgin/speech_generator.pyc ${PYSITELIB}/orca/scripts/apps/pidgin/speech_generator.pyo -${PYSITELIB}/orca/scripts/apps/pidgin/where_am_i.py -${PYSITELIB}/orca/scripts/apps/pidgin/where_am_i.pyc -${PYSITELIB}/orca/scripts/apps/pidgin/where_am_i.pyo ${PYSITELIB}/orca/scripts/apps/planner/__init__.py ${PYSITELIB}/orca/scripts/apps/planner/__init__.pyc ${PYSITELIB}/orca/scripts/apps/planner/__init__.pyo @@ -280,6 +297,9 @@ ${PYSITELIB}/orca/scripts/apps/rhythmbox/__init__.pyo ${PYSITELIB}/orca/scripts/apps/rhythmbox/braille_generator.py ${PYSITELIB}/orca/scripts/apps/rhythmbox/braille_generator.pyc ${PYSITELIB}/orca/scripts/apps/rhythmbox/braille_generator.pyo +${PYSITELIB}/orca/scripts/apps/rhythmbox/formatting.py +${PYSITELIB}/orca/scripts/apps/rhythmbox/formatting.pyc +${PYSITELIB}/orca/scripts/apps/rhythmbox/formatting.pyo ${PYSITELIB}/orca/scripts/apps/rhythmbox/script.py ${PYSITELIB}/orca/scripts/apps/rhythmbox/script.pyc ${PYSITELIB}/orca/scripts/apps/rhythmbox/script.pyo @@ -292,6 +312,9 @@ ${PYSITELIB}/orca/scripts/apps/soffice/__init__.pyo ${PYSITELIB}/orca/scripts/apps/soffice/braille_generator.py ${PYSITELIB}/orca/scripts/apps/soffice/braille_generator.pyc ${PYSITELIB}/orca/scripts/apps/soffice/braille_generator.pyo +${PYSITELIB}/orca/scripts/apps/soffice/formatting.py +${PYSITELIB}/orca/scripts/apps/soffice/formatting.pyc +${PYSITELIB}/orca/scripts/apps/soffice/formatting.pyo ${PYSITELIB}/orca/scripts/apps/soffice/script.py ${PYSITELIB}/orca/scripts/apps/soffice/script.pyc ${PYSITELIB}/orca/scripts/apps/soffice/script.pyo @@ -301,9 +324,9 @@ ${PYSITELIB}/orca/scripts/apps/soffice/script_settings.pyo ${PYSITELIB}/orca/scripts/apps/soffice/speech_generator.py ${PYSITELIB}/orca/scripts/apps/soffice/speech_generator.pyc ${PYSITELIB}/orca/scripts/apps/soffice/speech_generator.pyo -${PYSITELIB}/orca/scripts/apps/soffice/where_am_i.py -${PYSITELIB}/orca/scripts/apps/soffice/where_am_i.pyc -${PYSITELIB}/orca/scripts/apps/soffice/where_am_i.pyo +${PYSITELIB}/orca/scripts/apps/soffice/structural_navigation.py +${PYSITELIB}/orca/scripts/apps/soffice/structural_navigation.pyc +${PYSITELIB}/orca/scripts/apps/soffice/structural_navigation.pyo ${PYSITELIB}/orca/scripts/apps/yelp.py ${PYSITELIB}/orca/scripts/apps/yelp.pyc ${PYSITELIB}/orca/scripts/apps/yelp.pyo @@ -322,6 +345,9 @@ ${PYSITELIB}/orca/scripts/toolkits/Gecko/bookmarks.pyo ${PYSITELIB}/orca/scripts/toolkits/Gecko/braille_generator.py ${PYSITELIB}/orca/scripts/toolkits/Gecko/braille_generator.pyc ${PYSITELIB}/orca/scripts/toolkits/Gecko/braille_generator.pyo +${PYSITELIB}/orca/scripts/toolkits/Gecko/formatting.py +${PYSITELIB}/orca/scripts/toolkits/Gecko/formatting.pyc +${PYSITELIB}/orca/scripts/toolkits/Gecko/formatting.pyo ${PYSITELIB}/orca/scripts/toolkits/Gecko/script.py ${PYSITELIB}/orca/scripts/toolkits/Gecko/script.pyc ${PYSITELIB}/orca/scripts/toolkits/Gecko/script.pyo @@ -334,24 +360,18 @@ ${PYSITELIB}/orca/scripts/toolkits/Gecko/speech_generator.pyo ${PYSITELIB}/orca/scripts/toolkits/Gecko/structural_navigation.py ${PYSITELIB}/orca/scripts/toolkits/Gecko/structural_navigation.pyc ${PYSITELIB}/orca/scripts/toolkits/Gecko/structural_navigation.pyo -${PYSITELIB}/orca/scripts/toolkits/Gecko/where_am_i.py -${PYSITELIB}/orca/scripts/toolkits/Gecko/where_am_i.pyc -${PYSITELIB}/orca/scripts/toolkits/Gecko/where_am_i.pyo ${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/__init__.py ${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyc ${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyo -${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py -${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyc -${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyo +${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/formatting.py +${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/formatting.pyc +${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/formatting.pyo ${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/script.py ${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/script.pyc ${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/script.pyo -${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.py -${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyc -${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyo -${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.py -${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyc -${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyo +${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.py +${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.pyc +${PYSITELIB}/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.pyo ${PYSITELIB}/orca/scripts/toolkits/VCL.py ${PYSITELIB}/orca/scripts/toolkits/VCL.pyc ${PYSITELIB}/orca/scripts/toolkits/VCL.pyo @@ -361,15 +381,18 @@ ${PYSITELIB}/orca/scripts/toolkits/__init__.pyo ${PYSITELIB}/orca/settings.py ${PYSITELIB}/orca/settings.pyc ${PYSITELIB}/orca/settings.pyo +${PYSITELIB}/orca/sound.py +${PYSITELIB}/orca/sound.pyc +${PYSITELIB}/orca/sound.pyo ${PYSITELIB}/orca/speech.py ${PYSITELIB}/orca/speech.pyc ${PYSITELIB}/orca/speech.pyo +${PYSITELIB}/orca/speech_generator.py +${PYSITELIB}/orca/speech_generator.pyc +${PYSITELIB}/orca/speech_generator.pyo ${PYSITELIB}/orca/speechdispatcherfactory.py ${PYSITELIB}/orca/speechdispatcherfactory.pyc ${PYSITELIB}/orca/speechdispatcherfactory.pyo -${PYSITELIB}/orca/speechgenerator.py -${PYSITELIB}/orca/speechgenerator.pyc -${PYSITELIB}/orca/speechgenerator.pyo ${PYSITELIB}/orca/speechserver.py ${PYSITELIB}/orca/speechserver.pyc ${PYSITELIB}/orca/speechserver.pyo @@ -398,6 +421,7 @@ share/locale/bg/LC_MESSAGES/orca.mo share/locale/bn/LC_MESSAGES/orca.mo share/locale/bn_IN/LC_MESSAGES/orca.mo share/locale/ca/LC_MESSAGES/orca.mo +share/locale/ca@valencia/LC_MESSAGES/orca.mo share/locale/cs/LC_MESSAGES/orca.mo share/locale/cy/LC_MESSAGES/orca.mo share/locale/da/LC_MESSAGES/orca.mo @@ -411,6 +435,7 @@ share/locale/et/LC_MESSAGES/orca.mo share/locale/eu/LC_MESSAGES/orca.mo share/locale/fi/LC_MESSAGES/orca.mo share/locale/fr/LC_MESSAGES/orca.mo +share/locale/ga/LC_MESSAGES/orca.mo share/locale/gl/LC_MESSAGES/orca.mo share/locale/gu/LC_MESSAGES/orca.mo share/locale/he/LC_MESSAGES/orca.mo @@ -454,7 +479,9 @@ share/locale/vi/LC_MESSAGES/orca.mo share/locale/zh_CN/LC_MESSAGES/orca.mo share/locale/zh_HK/LC_MESSAGES/orca.mo share/locale/zh_TW/LC_MESSAGES/orca.mo -share/orca/glade/orca-find.glade -share/orca/glade/orca-mainwin.glade -share/orca/glade/orca-quit.glade -share/orca/glade/orca-setup.glade +share/orca/ui/orca-advanced-magnification.ui +share/orca/ui/orca-find.ui +share/orca/ui/orca-mainwin.ui +share/orca/ui/orca-preferences-warning.ui +share/orca/ui/orca-quit.ui +share/orca/ui/orca-setup.ui diff --git a/misc/orca/distinfo b/misc/orca/distinfo index 93a11b9657d..b75f980aac0 100644 --- a/misc/orca/distinfo +++ b/misc/orca/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.12 2009/08/09 08:29:03 wiz Exp $ +$NetBSD: distinfo,v 1.13 2009/11/17 15:47:26 wiz Exp $ -SHA1 (orca-2.26.3.tar.bz2) = e04cf4c92b4ef474dead0594a1a9df89b8e1ade9 -RMD160 (orca-2.26.3.tar.bz2) = c0abd0c5f420f16f7ae6310c2eb8966a9dce83cc -Size (orca-2.26.3.tar.bz2) = 2250070 bytes -SHA1 (patch-aa) = 7e7dd9215365f44d41e467241be93cc97f7ba76a +SHA1 (orca-2.28.1.tar.bz2) = 110b480ab085cfeb8d86a1c99aaf45d2189d0b16 +RMD160 (orca-2.28.1.tar.bz2) = aebf8ca969811d0d653b912523e24070c4896178 +Size (orca-2.28.1.tar.bz2) = 2176412 bytes diff --git a/misc/orca/patches/patch-aa b/misc/orca/patches/patch-aa deleted file mode 100644 index 4e190ebb6ff..00000000000 --- a/misc/orca/patches/patch-aa +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2009/05/19 23:53:11 wiz Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=583274 - ---- src/orca/orca.in.orig 2008-10-14 22:49:59.000000000 +0000 -+++ src/orca/orca.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # Orca - # -@@ -30,7 +30,7 @@ - - # Set the user's $PATH for this script. - # --export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin" -+#export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin" - - # Save the arguments away. - # -@@ -137,7 +137,7 @@ if [ "x$LOGNAME" != "xgdm" ] ; then - fi - fi - --if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] ; then -+if [ `echo $ARGS | grep -c "\-q"` -gt 0 ] ; then - # If the user has done -q or --quit, that means to tell any - # existing orca process to quit. So, we just do a cleanup. - # -@@ -154,7 +154,7 @@ else - if [ "x$ARGS" = "x" ] ; then - CLEANUP=1 - else -- CLEANUP=`egrep -c "\-s|\-t|\-n|\-u|\-e|\-d" <<< $ARGS` -+ CLEANUP=`echo $ARGS | egrep -c "\-s|\-t|\-n|\-u|\-e|\-d"` - fi - - # Clean up before running orca to get anything that might |