December 2009 - openSUSE Commits - openSUSE Mailing Lists

commit raptor for openSUSE:Factory
by root＠Hilbert.suse.de 30 Dec '09

30 Dec '09

Hello community, here is the log from the commit of package raptor for openSUSE:Factory checked in at Wed Dec 30 00:29:28 CET 2009. -------- --- raptor/raptor.changes 2008-09-15 17:45:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/raptor/raptor.changes 2009-12-03 19:34:12.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Dec 3 19:19:21 CET 2009 - dmueller(a)suse.de + +- update to 1.4.20: + Turtle serializing performance improvement by Chris Cannam + librdfa RDFa parser updates to fix empty datatype, xml:lang and 1-char + prefixes by Manu Sporny + Fix a crash when the GRDDL parser reported errors + Enable large file support for 32-bit systems + Several resilience improvements by Lauri Aalto + Other minor portability and bug fixes + Fixed reported issues: 0000306 0000307 0000310 and 0000312. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- raptor-1.4.18.tar.bz2 New: ---- raptor-1.4.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ raptor.spec ++++++ --- /var/tmp/diff_new_pack.utmgHY/_old 2009-12-30 00:29:13.000000000 +0100 +++ /var/tmp/diff_new_pack.utmgHY/_new 2009-12-30 00:29:13.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package raptor (Version 1.4.18) +# spec file for package raptor (Version 1.4.20) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,9 +21,9 @@ Name: raptor BuildRequires: curl-devel gtkdoc libxml2-devel libxslt-devel pkg-config Summary: Raptor RDF Parser Toolkit -Version: 1.4.18 -Release: 28 -License: The Apache Software License +Version: 1.4.20 +Release: 1 +License: ASLv.. Group: System/Libraries Source: %{name}-%{version}.tar.bz2 Url: http://www.redland.opensource.ac.uk/raptor/ @@ -40,7 +40,7 @@ Dave Beckett <dave(a)dajobe.org> %package -n libraptor1 -License: LGPL v2.1 or later; The Apache Software License +License: LGPLv2.1+ ; ASLv.. Summary: Raptor RDF Parser Toolkit Group: System/Libraries @@ -55,7 +55,7 @@ Dave Beckett <dave(a)dajobe.org> %package -n libraptor-devel -License: LGPL v2.1 or later; The Apache Software License +License: LGPLv2.1+ ; ASLv.. Summary: Development package for the raptor library Group: Development/Libraries/C and C++ Requires: libraptor1 = %{version} glibc-devel ++++++ raptor-1.4.18.tar.bz2 -> raptor-1.4.20.tar.bz2 ++++++ ++++ 155791 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-atspi for openSUSE:Factory
by root＠Hilbert.suse.de 30 Dec '09

30 Dec '09

Hello community, here is the log from the commit of package python-atspi for openSUSE:Factory checked in at Wed Dec 30 00:29:21 CET 2009. -------- --- python-atspi/python-atspi.changes 2009-12-02 19:37:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-atspi/python-atspi.changes 2009-12-22 17:48:32.000000000 +0100 @@ -1,0 +2,40 @@ +Tue Dec 22 17:42:01 CET 2009 - vuntz(a)opensuse.org + +- Update to version 0.1.4: + + For a full list of changes, see + http://git.gnome.org/browse/pyatspi2/log/?id=PYATSPI_0_1_4 + + Fix 100% CPU usage. The event dispatcher funtion was running + continuously. + + Addition of new 'Accessibility' D-Bus bus. The bus address is + located using X properties. + + Do not rely on cache for children of MANAGES_DESCENDANTS + objects + + Fixes to the Test desktop allowing the unit tests to be run in + non-cached mode. + + Fix the getAttributes method of the text api to return + semicolon delimited string as required by accerciser. + + Fix problem with children changed signal when adding or + removing applications. + + Change name of exception to new merged + AccessibleObjectNoLongerAvailable exception. + + Correct wrong method name in the 'Selection' interface. + + Remove reference to 'interfaces' module that was causing error + in orca test suite. + + Modify selection interface to use the new out-of-process + protocol for transferring accessible objects. + + Added collection support + + Perform type checking on Enumeration equality. + + Fix inconsistencies in Table interface introduced by + out-of-process and method name changes in the protocol. + + Fix get_application errors. A check was not made to see if the + application name was the Registry. + + Fix name errors in table.py - use of 'interfaces' module. + + Up the recursion limit. The '15' limit was met while running + the orca test suite. + + Fix name error in create_application method of the + CachedDesktop. + + Add a missing 'unref' function to the StateSet api. This + function does nothing and is needed for compatibility with the + CORBA class. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pyatspi-0.1.3.tar.bz2 New: ---- pyatspi-0.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-atspi.spec ++++++ --- /var/tmp/diff_new_pack.BMaj5g/_old 2009-12-30 00:29:07.000000000 +0100 +++ /var/tmp/diff_new_pack.BMaj5g/_new 2009-12-30 00:29:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-atspi (Version 0.1.3) +# spec file for package python-atspi (Version 0.1.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: python-atspi %define _name pyatspi -Version: 0.1.3 +Version: 0.1.4 Release: 1 Summary: Assistive Technology Service Provider Interface - Python bindings License: LGPLv2.0 ++++++ pyatspi-0.1.3.tar.bz2 -> pyatspi-0.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/configure new/pyatspi-0.1.4/configure --- old/pyatspi-0.1.3/configure 2009-11-30 17:21:28.000000000 +0100 +++ new/pyatspi-0.1.4/configure 2009-12-18 17:28:18.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for pyatspi 0.1.3. +# Generated by GNU Autoconf 2.64 for pyatspi 0.1.4. # # Report bugs to <accessibility-atspi(a)lists.linux-foundation.org>. # @@ -698,8 +698,8 @@ # Identity of this package. PACKAGE_NAME='pyatspi' PACKAGE_TARNAME='pyatspi' -PACKAGE_VERSION='0.1.3' -PACKAGE_STRING='pyatspi 0.1.3' +PACKAGE_VERSION='0.1.4' +PACKAGE_STRING='pyatspi 0.1.4' PACKAGE_BUGREPORT='accessibility-atspi(a)lists.linux-foundation.org' PACKAGE_URL='' @@ -1474,7 +1474,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pyatspi 0.1.3 to adapt to many kinds of systems. +\`configure' configures pyatspi 0.1.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1548,7 +1548,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pyatspi 0.1.3:";; + short | recursive ) echo "Configuration of pyatspi 0.1.4:";; esac cat <<\_ACEOF @@ -1676,7 +1676,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pyatspi configure 0.1.3 +pyatspi configure 0.1.4 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1954,7 +1954,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pyatspi $as_me 0.1.3, which was +It was created by pyatspi $as_me 0.1.4, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2774,7 +2774,7 @@ # Define the identity of the package. PACKAGE='pyatspi' - VERSION='0.1.3' + VERSION='0.1.4' cat >>confdefs.h <<_ACEOF @@ -12784,7 +12784,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pyatspi $as_me 0.1.3, which was +This file was extended by pyatspi $as_me 0.1.4, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12848,7 +12848,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -pyatspi config.status 0.1.3 +pyatspi config.status 0.1.4 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/configure.ac new/pyatspi-0.1.4/configure.ac --- old/pyatspi-0.1.3/configure.ac 2009-11-30 17:19:47.000000000 +0100 +++ new/pyatspi-0.1.4/configure.ac 2009-12-18 17:22:43.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([pyatspi], [0.1.3], [accessibility-atspi(a)lists.linux-foundation.org] +AC_INIT([pyatspi], [0.1.4], [accessibility-atspi(a)lists.linux-foundation.org] AC_CONFIG_AUX_DIR(config) LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/accessible.py new/pyatspi-0.1.4/pyatspi/accessible.py --- old/pyatspi-0.1.3/pyatspi/accessible.py 2009-11-27 16:55:13.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/accessible.py 2009-12-18 14:54:42.000000000 +0100 @@ -15,7 +15,8 @@ from interfaces import * from enum import Enum -from state import StateSet, _marshal_state_set +from state import * +from state import _marshal_state_set from relation import _marshal_relation_set from role import Role, ROLE_NAMES @@ -222,8 +223,10 @@ if index >= count: raise IndexError func = self.get_dbus_method("GetChildAtIndex", dbus_interface=ATSPI_ACCESSIBLE) - path = func (index) - return self.acc_factory.create_accessible(self._app_name, path, ATSPI_ACCESSIBLE) + (name, path) = func (index) + if (name == ""): + name = self._app_name + return self.acc_factory.create_accessible(name, path, ATSPI_ACCESSIBLE) def getLocalizedRoleName(self): func = self.get_dbus_method("GetLocalizedRoleName", dbus_interface=ATSPI_ACCESSIBLE) @@ -260,8 +263,9 @@ return self._pgetter(self.dbus_interface, "Name") def get_parent(self): + name, path = self._pgetter (self.dbus_interface, "Parent") return self.acc_factory.create_accessible(self._app_name, - self._pgetter (self.dbus_interface, "Parent"), + path, ATSPI_ACCESSIBLE) def get_interfaces (self): @@ -287,10 +291,17 @@ return self.cache(self.app_name, self.acc_path) def getChildAtIndex(self, index): - (name, path) = self.cached_data.children[index] - if (name == ""): - name = self._app_name - return self.acc_factory.create_accessible(name, path, ATSPI_ACCESSIBLE) + if (self.cached_data.state[0] & (1 << STATE_MANAGES_DESCENDANTS)): + func = self.get_dbus_method("GetChildAtIndex", dbus_interface=ATSPI_ACCESSIBLE) + (name, path) = func (index) + if (name == ""): + name = self._app_name + return self.acc_factory.create_accessible(name, path, ATSPI_ACCESSIBLE) + else: + (name, path) = self.cached_data.children[index] + if (name == ""): + name = self._app_name + return self.acc_factory.create_accessible(name, path, ATSPI_ACCESSIBLE) def getRelationSet(self): if self._relation_set is not None: @@ -321,7 +332,10 @@ return _marshal_state_set(self.cached_data.state) def get_childCount(self): - return len(self.cached_data.children) + if (self.cached_data.state[0] & (1 << STATE_MANAGES_DESCENDANTS)): + return Int32(self._pgetter(self.dbus_interface, "ChildCount")) + else: + return len(self.cached_data.children) def get_description(self): return self.cached_data.description @@ -395,7 +409,7 @@ or raises a NotImplemented error if the given interface is not supported. """ - if interface in self.interfaces: + if interface in self.interfaces or interface == "org.freedesktop.atspi.Collection": return self.acc_factory.create_accessible(self.app_name, self.acc_path, interface, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/appevent.py new/pyatspi-0.1.4/pyatspi/appevent.py --- old/pyatspi-0.1.3/pyatspi/appevent.py 2009-11-30 16:46:05.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/appevent.py 2009-12-18 13:47:43.000000000 +0100 @@ -267,7 +267,7 @@ if not self._application: try: return self._acc_factory.create_application(self._source_application) - except AccessibleObjectNotAvailable: + except AccessibleObjectNoLongerExists: pass return self._application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/busutils/bus.py new/pyatspi-0.1.4/pyatspi/busutils/bus.py --- old/pyatspi-0.1.3/pyatspi/busutils/bus.py 2009-11-30 16:46:05.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/busutils/bus.py 2009-12-10 10:41:16.000000000 +0100 @@ -17,10 +17,34 @@ import dbus.bus as _bus import dbus.connection as _connection +import os as _os + import gobject from proxy import AccessibilityProxy +import sys +import traceback + +def _get_accessibility_bus_address (): + + from Xlib import display, Xatom + + if "AT_SPI_DISPLAY" in _os.environ.keys(): + dname = _os.environ["AT_SPI_DISPLAY"] + else: + dname = None + + if dname: + d = display.Display(dname) + else: + d = display.Display() + a = d.get_atom ("AT_SPI_BUS") + s = d.screen().root + p = s.get_property (a, Xatom.STRING, 0, 100) + + return p.value + class _AccessibilityBus (_bus.BusConnection): """ The bus used for accessibility @@ -37,23 +61,24 @@ normal during signal delivery. """ - def __init__ (self): - _bus.BusConnection.__init__(self, _bus.BusConnection.TYPE_SESSION, mainloop=None) + def __new__ (cls, address, mainloop): + return _bus.BusConnection.__new__(cls, address, mainloop) + def __init__ (self, address, mainloop): + _bus.BusConnection.__init__(self, address, mainloop) self._signal_queue = _queue.Queue () - gobject.idle_add(self._event_dispatch) - def _event_dispatch (self): while not self._signal_queue.empty(): (func, args, kwargs) = self._signal_queue.get (False) func (*args, **kwargs) - return True + return False def add_signal_receiver (self, func, *args, **kwargs): def wrapper (*iargs, **ikwargs): self._signal_queue.put ((func, iargs, ikwargs)) + gobject.idle_add(self._event_dispatch) return _bus.BusConnection.add_signal_receiver (self, wrapper, *args, **kwargs) @@ -73,5 +98,15 @@ if AccessibilityBus._shared_instance: return AccessibilityBus._shared_instance else: - AccessibilityBus._shared_instance = _AccessibilityBus.__new__ (cls) + try: + AccessibilityBus._shared_instance = _AccessibilityBus.__new__ (cls, _get_accessibility_bus_address(), None) + except Exception: + AccessibilityBus._shared_instance = _AccessibilityBus.__new__ (cls, _bus.BusConnection.TYPE_SESSION, None) + return AccessibilityBus._shared_instance + + def __init__ (self): + try: + _AccessibilityBus.__init__ (self, _get_accessibility_bus_address(), None) + except Exception: + _AccessibilityBus.__init__ (self, _bus.BusConnection.TYPE_SESSION, None) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/busutils/proxy.py new/pyatspi-0.1.4/pyatspi/busutils/proxy.py --- old/pyatspi-0.1.3/pyatspi/busutils/proxy.py 2009-11-30 16:46:05.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/busutils/proxy.py 2009-12-18 16:31:28.000000000 +0100 @@ -14,12 +14,11 @@ import dbus.connection as _connection import gobject -import gtk import Queue class _MainLoopPool (Queue.Queue): - _RE_ENTRANCY_LIMIT = 15 + _RE_ENTRANCY_LIMIT = 100 def __init__ (self): Queue.Queue.__init__(self) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/cache.py new/pyatspi-0.1.4/pyatspi/cache.py --- old/pyatspi-0.1.3/pyatspi/cache.py 2009-11-30 16:49:22.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/cache.py 2009-12-10 13:17:48.000000000 +0100 @@ -138,26 +138,17 @@ self._application_list.append(bus_name) self._application_cache[bus_name] = AccessibleCache(self._event_dispatcher, bus_name) - event = Event(("add", 0, 0, ""), - self._factory, - ATSPI_DESKTOP_PATH, - ATSPI_REGISTRY_NAME, - "org.freedesktop.atspi.Event.Object", - "children-changed") + self._event_dispatcher.notifyChildrenChange(ATSPI_REGISTRY_NAME, + ATSPI_DESKTOP_PATH, + True) elif update_type == ApplicationCache._APPLICATIONS_REMOVE: #TODO Fail safely if app does not exist self._application_list.remove(bus_name) del(self._application_cache[bus_name]) - event = Event(("remove", 0, 0, ""), - self._factory, - ATSPI_DESKTOP_PATH, - ATSPI_REGISTRY_NAME, - "org.freedesktop.atspi.Event.Object", - "children-changed") - - - self._event_dispatcher.notifyChildrenChange(event) + self._event_dispatcher.notifyChildrenChange(ATSPI_REGISTRY_NAME, + ATSPI_DESKTOP_PATH, + False) def _refresh(self): new = self._app_register.getApplications() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/collection.py new/pyatspi-0.1.4/pyatspi/collection.py --- old/pyatspi-0.1.3/pyatspi/collection.py 2009-11-25 13:27:58.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/collection.py 2009-12-18 14:54:42.000000000 +0100 @@ -16,51 +16,49 @@ from enum import Enum from accessible import Accessible +from dbus.types import UInt32 + __all__ = [ - "Collection", + "Collection", + "MatchRule", + "SortOrder", + "MatchType", + "TreeTraversalType", ] #------------------------------------------------------------------------------ -class Collection(Accessible): - - def createMatchRule(self, *args, **kwargs): - func = self.get_dbus_method("CreateMatchRule", dbus_interface=ATSPI_COLLECTION) - return func(*args, **kwargs) - - def freeMatchRule(self, *args, **kwargs): - func = self.get_dbus_method("FreeMatchRule", dbus_interface=ATSPI_COLLECTION) - return func(*args, **kwargs) - - def getActiveDescendant(self, *args, **kwargs): - func = self.get_dbus_method("GetActiveDescendant", dbus_interface=ATSPI_COLLECTION) - return func(*args, **kwargs) - - def getMatches(self, *args, **kwargs): - func = self.get_dbus_method("GetMatches", dbus_interface=ATSPI_COLLECTION) - return func(*args, **kwargs) - - def getMatchesFrom(self, *args, **kwargs): - func = self.get_dbus_method("GetMatchesFrom", dbus_interface=ATSPI_COLLECTION) - return func(*args, **kwargs) +class MatchType(Enum): + _enum_lookup = { + 0:'MATCH_INVALID', + 1:'MATCH_ALL', + 2:'MATCH_ANY', + 3:'MATCH_NONE', + 4:'MATCH_EMPTY', + 5:'MATCH_LAST_DEFINED', + } + +class SortOrder(Enum): + _enum_lookup = { + 0:'SORT_ORDER_INVALID', + 1:'SORT_ORDER_CANONICAL', + 2:'SORT_ORDER_FLOW', + 3:'SORT_ORDER_TAB', + 4:'SORT_ORDER_REVERSE_CANONICAL', + 5:'SORT_ORDER_REVERSE_FLOW', + 6:'SORT_ORDER_REVERSE_TAB', + 7:'SORT_ORDER_LAST_DEFINED', + } + +class TreeTraversalType(Enum): + _enum_lookup = { + 0:'TREE_RESTRICT_CHILDREN', + 1:'TREE_RESTRICT_SIBLING', + 2:'TREE_INORDER', + 3:'TREE_LAST_DEFINED', + } - def getMatchesTo(self, *args, **kwargs): - func = self.get_dbus_method("GetMatchesTo", dbus_interface=ATSPI_COLLECTION) - return func(*args, **kwargs) - - def isAncestorOf(self, *args, **kwargs): - func = self.get_dbus_method("IsAncestorOf", dbus_interface=ATSPI_COLLECTION) - return func(*args, **kwargs) - - class MatchType(Enum): - _enum_lookup = { - 0:'MATCH_INVALID', - 1:'MATCH_ALL', - 2:'MATCH_ANY', - 3:'MATCH_NONE', - 4:'MATCH_EMPTY', - 5:'MATCH_LAST_DEFINED', - } +class Collection(Accessible): MATCH_ALL = MatchType(1) MATCH_ANY = MatchType(2) @@ -69,18 +67,6 @@ MATCH_LAST_DEFINED = MatchType(5) MATCH_NONE = MatchType(3) - class SortOrder(Enum): - _enum_lookup = { - 0:'SORT_ORDER_INVALID', - 1:'SORT_ORDER_CANONICAL', - 2:'SORT_ORDER_FLOW', - 3:'SORT_ORDER_TAB', - 4:'SORT_ORDER_REVERSE_CANONICAL', - 5:'SORT_ORDER_REVERSE_FLOW', - 6:'SORT_ORDER_REVERSE_TAB', - 7:'SORT_ORDER_LAST_DEFINED', - } - SORT_ORDER_CANONICAL = SortOrder(1) SORT_ORDER_FLOW = SortOrder(2) SORT_ORDER_INVALID = SortOrder(0) @@ -90,17 +76,105 @@ SORT_ORDER_REVERSE_TAB = SortOrder(6) SORT_ORDER_TAB = SortOrder(3) - class TreeTraversalType(Enum): - _enum_lookup = { - 0:'TREE_RESTRICT_CHILDREN', - 1:'TREE_RESTRICT_SIBLING', - 2:'TREE_INORDER', - 3:'TREE_LAST_DEFINED', - } - TREE_INORDER = TreeTraversalType(2) TREE_LAST_DEFINED = TreeTraversalType(3) TREE_RESTRICT_CHILDREN = TreeTraversalType(0) TREE_RESTRICT_SIBLING = TreeTraversalType(1) + def isAncestorOf(self, object): + print "isAncestorOf unimplemented" + return False + + def createMatchRule(self, states, stateMatchType, attributes, attributeMatchType, roles, roleMatchType, interfaces, interfaceMatchType, invert): + attributes_rule = str.join("\n", attributes) + roles_rule = [0, 0, 0, 0] + for role in roles: + roles_rule[role/32] |= (1<<(role%32)) + for i in range(0,4): + roles_rule[i] = int(roles_rule[i]) + return MatchRule(states, stateMatchType, attributes_rule, attributeMatchType, roles_rule, roleMatchType, interfaces, interfaceMatchType, invert) + + def freeMatchRule(self, rule): + pass + + def getAccessibles(self, ret): + for i in range(0, len(ret)): + (name, path) = ret[i] + if (name == ""): + name = self._app_name + ret[i] = self.acc_factory.create_accessible(name, path, + ATSPI_ACCESSIBLE) + return ret; + + def getMatches(self, rule, sortby, count, traverse): + func = self.get_dbus_method("GetMatches", dbus_interface=ATSPI_COLLECTION) + ret = func(rule, sortby, count, traverse) + return self.getAccessibles (ret) + + def getMatchesTo(self, current_object, rule, sortby, tree, recurse, count, traverse): + func = self.get_dbus_method("GetMatchesTo", dbus_interface=ATSPI_COLLECTION) + ret = func(current_object._acc_path, rule, sortby, tree, recurse, count, traverse) + return self.getAccessibles (ret) + + def getMatchesFrom(self, current_object, rule, sortby, tree, count, traverse): + func = self.get_dbus_method("GetMatchesFrom", dbus_interface=ATSPI_COLLECTION) + ret = func(current_object._acc_path, rule, sortby, tree, count, traverse) + return self.getAccessibles (ret) + + def getActiveDescendant(self): + print "getActiveDescendant unimplemented" + return + +class MatchRule(tuple): + def __new__(cls, states, stateMatchType, attributes, attributeMatchType, roles, roleMatchType, interfaces, interfaceMatchType, invert): + return tuple.__new__(cls, (states, int(stateMatchType), attributes, int(attributeMatchType), roles, int(roleMatchType), interfaces, int(interfaceMatchType), invert)) + #def __init__(self, states, stateMatchType, attributes, attributeMatchType, roles, roleMatchType, interfaces, interfaceMatchType, invert): + #tuple.__init__(self, (states, int(stateMatchType), attributes, int(attributeMatchType), roles, int(roleMatchType), interfaces, int(interfaceMatchType), invert)) + + def _get_states(self): + return self[0] + def _set_states(self, val): + self[0] = val + states = property(fget=_get_states, fset=_set_states) + def _get_stateMatchType(self): + return self[1] + def _set_stateMatchType(self, val): + self[1] = val + stateMatchType = property(fget=_get_stateMatchType, fset=_set_stateMatchType) + def _get_attributes(self): + return self[2] + def _set_attributes(self, val): + self[2] = val + attributes = property(fget=_get_attributes, fset=_set_attributes) + def _get_attributeMatchType(self): + return self[3] + def _set_attributeMatchType(self, val): + self[3] = val + attributeMatchType = property(fget=_get_attributeMatchType, fset=_set_attributeMatchType) + def _get_roles(self): + return self[4] + def _set_roles(self, val): + self[4] = val + roles = property(fget=_get_roles, fset=_set_roles) + def _get_roleMatchType(self): + return self[5] + def _set_roleMatchType(self, val): + self[5] = val + roleMatchType = property(fget=_get_roleMatchType, fset=_set_roleMatchType) + def _get_interfaces(self): + return self[6] + def _set_interfaces(self, val): + self[6] = val + interfaces = property(fget=_get_interfaces, fset=_set_interfaces) + def _get_interfaceMatchType(self): + return self[7] + def _set_interfaceMatchType(self, val): + self[7] = val + interfaceMatchType = property(fget=_get_interfaceMatchType, fset=_set_interfaceMatchType) + def _get_invert(self): + return self[8] + def _set_invert(self, val): + self[8] = val + invert = property(fget=_get_invert, fset=_set_invert) + #END---------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/desktop.py new/pyatspi-0.1.4/pyatspi/desktop.py --- old/pyatspi-0.1.3/pyatspi/desktop.py 2009-11-30 16:46:05.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/desktop.py 2009-12-18 15:18:08.000000000 +0100 @@ -413,22 +413,26 @@ _TREE_PATH = '/org/freedesktop/atspi/tree' _TREE_INTERFACE = 'org.freedesktop.atspi.Tree' - def __init__(self, app_name): - Accessible.__init__(self, *args); + def __init__(self, app_name, factory): + BaseDesktop.__init__(self, factory); obj = AccessibilityBus().get_object (app_name, self._TREE_PATH) tree = dbus.Interface (obj, self._TREE_INTERFACE) self._single_app = app_name - self._root = self.tree.getRoot () + self._root = tree.GetRoot () def getChildAtIndex(self, index): - return self.create_application (self._root) + #TODO - Check index + return self._acc_factory.create_accessible (self._single_app, + self._root, + interfaces.ATSPI_APPLICATION) def create_application (self, app_name): - return self.acc_factory.create_accessible (app_name, - self._root, - interfaces.ATSPI_APPLICATION) + #TODO - Check name + return self._acc_factory.create_accessible (self._single_app, + self._root, + interfaces.ATSPI_APPLICATION) def get_childCount(self): return 1 @@ -445,32 +449,30 @@ _TREE_PATH = '/org/freedesktop/atspi/tree' _TREE_INTERFACE = 'org.freedesktop.atspi.Tree' - def __init__(self, connection, *args): + def __init__(self, *args): BaseDesktop.__init__(self, *args); - self._connection = connection - obj = connection.get_object(interfaces.ATSPI_REGISTRY_NAME, - interfaces.ATSPI_REGISTRY_PATH, - introspect=False) + self._connection = AccessibilityBus() + obj = self._connection.get_object(interfaces.ATSPI_REGISTRY_NAME, + interfaces.ATSPI_REGISTRY_PATH) self._app_register = dbus.Interface(obj, interfaces.ATSPI_REGISTRY_INTERFACE) def create_application (self, app_name): obj = self._connection.get_object (app_name, - self._TREE_PATH, - introspect=False) + self._TREE_PATH) tree = dbus.Interface (obj, self._TREE_INTERFACE) - root = tree.getRoot () + root = tree.GetRoot () return self.acc_factory.create_accessible (app_name, root, interfaces.ATSPI_APPLICATION) def getChildAtIndex(self, index): - applications = self._app_register.getApplications() + applications = self._app_register.GetApplications() return self.acc_factory.create_application(applications[index]) def get_childCount(self): - applications = self._app_register.getApplications() + applications = self._app_register.GetApplications() return len (applications) #------------------------------------------------------------------------------ @@ -485,7 +487,10 @@ self.cache = cache def create_application (self, app_name): - acc_path = self.cache.get_app_root(app_name) + if app_name == interfaces.ATSPI_REGISTRY_NAME: + acc_path = interfaces.ATSPI_DESKTOP_PATH + else: + acc_path = self.cache.get_app_root(app_name) return self.acc_factory.create_accessible (app_name, acc_path, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/enum.py new/pyatspi-0.1.4/pyatspi/enum.py --- old/pyatspi-0.1.3/pyatspi/enum.py 2009-11-17 19:29:23.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/enum.py 2009-12-18 14:56:57.000000000 +0100 @@ -27,9 +27,12 @@ def __eq__(self, other): if other is None: return False - if int(self) == int(other): - return True - else: + try: + if int(self) == int(other): + return True + else: + return False + except ValueError: return False def __hash__(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/selection.py new/pyatspi-0.1.4/pyatspi/selection.py --- old/pyatspi-0.1.3/pyatspi/selection.py 2009-11-25 13:27:58.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/selection.py 2009-12-18 14:20:55.000000000 +0100 @@ -81,9 +81,12 @@ @return a pointer to a selected Accessible child object, specified by selectedChildIndex. """ - func = self.get_dbus_method("getSelectedChild", dbus_interface=ATSPI_SELECTION) - return self.acc_factory.create_accessible(self._app_name, func(index), - interfaces.ATSPI_ACCESSIBLE) + func = self.get_dbus_method("GetSelectedChild", dbus_interface=ATSPI_SELECTION) + (name, path) = func (index) + if (name == ""): + name = self._app_name + return self.acc_factory.create_accessible(name, path, + ATSPI_ACCESSIBLE) def isChildSelected(self, index): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/state.py new/pyatspi-0.1.4/pyatspi/state.py --- old/pyatspi-0.1.3/pyatspi/state.py 2009-11-17 19:29:23.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/state.py 2009-12-18 16:27:40.000000000 +0100 @@ -253,4 +253,23 @@ """ return list(self.states) + def raw(self): + """ + Gets the sequence of all states in this set as a pair of + 32-bit flags, suitable for transmitting via dbus.. + + @return: List of two 32-bit flags representing the states + @rtype: list + """ + lower = upper = 0 + for i in range (0, 32): + if (self.contains(i)): + lower |= (1 << i) + for i in range (32, 64): + if (self.contains(i)): + upper |= (1 << (i - 32)) + return [lower, upper] + + def unref(self): + pass #END---------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/table.py new/pyatspi-0.1.4/pyatspi/table.py --- old/pyatspi-0.1.3/pyatspi/table.py 2009-11-25 13:27:58.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/table.py 2009-12-18 15:07:48.000000000 +0100 @@ -71,12 +71,12 @@ @return an Accessible object representing the specified table cell. """ - func = self.get_dbus_method("getAccessibleAt", dbus_interface=ATSPI_TABLE) + func = self.get_dbus_method("GetAccessibleAt", dbus_interface=ATSPI_TABLE) (name, path) = func(row, column) if (name == ""): name = self._app_name return self.acc_factory.create_accessible(name, path, - interfaces.ATSPI_ACCESSIBLE) + ATSPI_ACCESSIBLE) def getColumnAtIndex(self, index): """ @@ -127,9 +127,9 @@ @return an Accessible representatin of the specified table column, if available. """ - func = self.get_dbus_method("getColumnHeader", dbus_interface=ATSPI_TABLE) + func = self.get_dbus_method("GetColumnHeader", dbus_interface=ATSPI_TABLE) return self.acc_factory.create_accessible(self._app_name, func(index), - interfaces.ATSPI_ACCESSIBLE) + ATSPI_ACCESSIBLE) def getIndexAt(self, row, column): """ @@ -232,9 +232,12 @@ @return an Accessible representatin of the specified table row, if available. """ - func = self.get_dbus_method("getRowHeader", dbus_interface=ATSPI_TABLE) - return self.acc_factory.create_accessible(self._app_name, func(row), - interfaces.ATSPI_ACCESSIBLE) + func = self.get_dbus_method("GetRowHeader", dbus_interface=ATSPI_TABLE) + (name, path) = func (row) + if (name == ""): + name = self._app_name + return self.acc_factory.create_accessible(name, path, + ATSPI_ACCESSIBLE) def getSelectedColumns(self): """ @@ -316,7 +319,7 @@ if (name == ""): name = self._app_name return self.acc_factory.create_accessible(name, path, - interfaces.ATSPI_ACCESSIBLE) + ATSPI_ACCESSIBLE) _captionDoc = \ """ An Accessible which represents of a caption for a Table. @@ -367,7 +370,7 @@ if (name == ""): name = self._app_name return self.acc_factory.create_accessible(name, path, - interfaces.ATSPI_ACCESSIBLE) + ATSPI_ACCESSIBLE) _summaryDoc = \ """ An accessible object which summarizes the contents of a Table. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/pyatspi/text.py new/pyatspi-0.1.4/pyatspi/text.py --- old/pyatspi-0.1.3/pyatspi/text.py 2009-11-25 13:27:58.000000000 +0100 +++ new/pyatspi-0.1.4/pyatspi/text.py 2009-12-10 11:44:19.000000000 +0100 @@ -202,8 +202,9 @@ """ func = self.get_dbus_method("GetAttributes", dbus_interface=ATSPI_TEXT) [attrs, startOffset, endOffset] = func(Int32(offset)) - dict = [key + ':' + attrs[key] for key in attrs] - return [dict, startOffset, endOffset] + arr = [key + ':' + value for key, value in attrs.items()] + str = ';'.join (arr) + return [str, startOffset, endOffset] def getBoundedRanges(self, x, y, width, height, coordType, xClipType, yClipType): #TODO Return a list of range structures diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/tests/apps/test-application.c new/pyatspi-0.1.4/tests/apps/test-application.c --- old/pyatspi-0.1.3/tests/apps/test-application.c 2009-11-25 13:27:58.000000000 +0100 +++ new/pyatspi-0.1.4/tests/apps/test-application.c 2009-12-08 23:29:54.000000000 +0100 @@ -250,7 +250,7 @@ {"test-module", 0, 0, G_OPTION_ARG_STRING, &tmodule_path, "Module containing test scenario", NULL}, {"test-atspi-library", 0, 0, G_OPTION_ARG_STRING, &amodule_path, "Gtk module with atk-atspi adaptor", NULL}, {"test-data-directory", 0, 0, G_OPTION_ARG_STRING, &tdata_path, "Path to directory of test data", NULL}, - {"atspi-dbus-name", 0, 0, G_OPTION_ARG_STRING, &bus_name, "Bus name", NULL}, + {"test-dbus-name", 0, 0, G_OPTION_ARG_STRING, &bus_name, "Bus name", NULL}, {NULL} }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/tests/pyatspi/runtests.sh new/pyatspi-0.1.4/tests/pyatspi/runtests.sh --- old/pyatspi-0.1.3/tests/pyatspi/runtests.sh 2009-11-17 19:29:23.000000000 +0100 +++ new/pyatspi-0.1.4/tests/pyatspi/runtests.sh 2009-12-18 14:54:42.000000000 +0100 @@ -7,6 +7,7 @@ $PYTHON $top_srcdir/tests/pyatspi/testrunner -l libaccessibleapp.so -m accessibletest -n AccessibleTest $PYTHON $top_srcdir/tests/pyatspi/testrunner -l libactionapp.so -m actiontest -n ActionTest +$PYTHON $top_srcdir/tests/pyatspi/testrunner -l libaccessibleapp.so -m collectiontest -n AccessibleTest $PYTHON $top_srcdir/tests/pyatspi/testrunner -l libcomponentapp.so -m componenttest -n ComponentTest $PYTHON $top_srcdir/tests/pyatspi/testrunner -l librelationapp.so -m relationtest -n RelationTest $PYTHON $top_srcdir/tests/pyatspi/testrunner -l libaccessibleapp.so -m statetest -n StateTest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-0.1.3/tests/pyatspi/testrunner new/pyatspi-0.1.4/tests/pyatspi/testrunner --- old/pyatspi-0.1.3/tests/pyatspi/testrunner 2009-11-17 19:29:24.000000000 +0100 +++ new/pyatspi-0.1.4/tests/pyatspi/testrunner 2009-12-08 23:31:55.000000000 +0100 @@ -28,11 +28,15 @@ if (dbus_name): print " ".join([test_application, "--atspi-dbus-name", dbus_name, + "--atspi-no-register", + "--test-dbus-name", dbus_name, "--test-atspi-library", test_atspi_library, "--test-module", test_module, "--test-data-directory", test_data_directory,]) pop = Popen([test_application, "--atspi-dbus-name", dbus_name, + "--atspi-no-register", + "--test-dbus-name", dbus_name, "--test-atspi-library", test_atspi_library, "--test-module", test_module, "--test-data-directory", test_data_directory,]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit procmeter for openSUSE:Factory
by root＠Hilbert.suse.de 30 Dec '09

30 Dec '09

Hello community, here is the log from the commit of package procmeter for openSUSE:Factory checked in at Wed Dec 30 00:29:16 CET 2009. -------- --- procmeter/procmeter.changes 2006-08-17 02:14:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/procmeter/procmeter.changes 2009-12-29 02:36:45.000000000 +0100 @@ -1,0 +2,83 @@ +Tue Dec 29 02:13:24 CET 2009 - vuntz(a)opensuse.org + +- Update to version 3.5b: + + New Features + - Extended Window Manager Hints can be specified with a -w + option. + - Increase the number of interrupts possible in stat-intr. + + Bug Fixes + - Be more careful looking for modules (check '.' and '..'). + - Set the locale to "C" to avoid problems parsing numbers. + - Ensure that graph-min and graph-max options are used + properly. + - Extended the line buffer size for parsing /proc/interrupts. + - Remove fixed size line buffers in modules (realloc more space + as needed). + - Allow LCD version to specify priority as a string or numeric + value. +- Changes from version 3.5a: + + Bug Fixes + - Stop the GTK2 version crashing when displayed items are + removed. + - Make sure that the right mouse button menu works with no + outputs displayed. + - Make the GTK1 and GTK2 version windows resize themselves like + Xaw version. + - Updates to manual pages to reflect new executable names. + - Bug fixes for ACPI module. +- Changes from version 3.5: + + New features + - Added a gtk2 version of ProcMeter3. + - Renamed the executables but added backwards compatibility + links. + - Added DESTDIR option to Makefiles. +- Changes from version 3.4g: + + Bug fixes: + - Quicker default update of the date displays (useful after + suspending). + - Uptime now accurately shows system running time even after + suspend. + - Fix ACPI battery discharge rates. + - Fix for crashes with stat-cpu outputs on multi-CPU machines. + - Change to use longer integer values for netdev outputs. + - Search other places for hardware sensors information. +- Changes from version 3.4f: + + Bug fixes: + - The biff module re-reads the inbox if the size or timestamp + change. + - The df module uses longer strings for reading from + /proc/mounts. +- Changes from version 3.4e: + + New or changed modules: + - Add in the new CPU statistics (iowait, irq, softirq and + steal). + - Add in a display of the CPU clock speed. + + Bug fixes: + - Fix some spelling mistakes in the manual pages. + - Change the default scaling for the DiskUsage outputs to 5 + grid lines of 20%. + - Fix some gcc-4.x compilation warnings. + - Fix some ACPI module bugs. +- Changes from version 3.4d: + + Bug fixes: + - Updated ACPI support to handle kernel version 2.6. + - Added support for /dev/mapper in disk statistics. + - Change to using 64-bit variables from /proc/stat. +- Changes from version 3.4c: + + Bug fixes: + - Make grid-max option work for GTK version. + - Handle kernel 2.6.x better for hardware sensors. +- Changes from version 3.4b: + + New or changed modules: + - Handle different header line for hostap wireless driver. + + Bug fixes: + - Modules that didn't work with kernel 2.6.x now do. + - Improved some module initialisation functions. +- Replace gtk-devel BuildRequires with gtk2-devel. +- Update procmeter3-3.4a.patch: some parts were upstreamed. +- Drop procmeter3-3.4a-array.patch: fixed upstream. +- Drop procmeter3-3.4a-ia64.patch: not needed anymore. +- Remove AutoReqProv: it's default now. +- Use makeinstall macro. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- procmeter3-3.4a-array.patch procmeter3-3.4a-ia64.patch procmeter3-3.4a.tar.bz2 New: ---- procmeter3-3.5b.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procmeter.spec ++++++ --- /var/tmp/diff_new_pack.dE4Qtf/_old 2009-12-30 00:29:04.000000000 +0100 +++ /var/tmp/diff_new_pack.dE4Qtf/_new 2009-12-30 00:29:04.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package procmeter (Version 3.4a) +# spec file for package procmeter (Version 3.5b) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,45 +19,33 @@ Name: procmeter -BuildRequires: gtk-devel update-desktop-files -License: GPL v2 or later +BuildRequires: gtk2-devel update-desktop-files +License: GPLv2+ Group: System/Monitoring Provides: procmtr Obsoletes: procmtr -AutoReqProv: on -Version: 3.4a -Release: 371 +Version: 3.5b +Release: 1 Summary: Display actual system parameters Url: http://www.gedanken.demon.co.uk/procmeter3/ Source: procmeter3-%{version}.tar.bz2 Source1: procmeter3.desktop -Patch: procmeter3-%{version}.patch -Patch1: procmeter3-%{version}-ia64.patch -Patch2: procmeter3-%{version}-array.patch +Patch: procmeter3-3.4a.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description With procmeter one can display various system parameters as e.g. processor load, network load, etc. - - -Authors: --------- - Andrew M. Bishop <amb(a)gedanken.demon.co.uk> - %prep %setup -q -n procmeter3-%{version} %patch -%patch1 -%patch2 %build make XLIBDIR=/usr/%{_lib} %install -rm -rf $RPM_BUILD_ROOT -make "DESTDIR=$RPM_BUILD_ROOT" install +%makeinstall %suse_update_desktop_file -i procmeter3 System Monitor %clean @@ -66,10 +54,9 @@ %files %defattr(-,root,root) %doc ChangeLog ANNOUNCE LSM NEWS README -/usr/share/applications/*.desktop -/usr/bin/* -/usr/lib/ProcMeter3 -%doc /usr/share/man/man1/* -%doc /usr/share/man/man5/* +%{_datadir}/applications/*.desktop +%{_bindir}/* +%{_libexecdir}/ProcMeter3/ +%doc %{_mandir}/man?/* %changelog ++++++ procmeter3-3.4a.patch ++++++ --- /var/tmp/diff_new_pack.dE4Qtf/_old 2009-12-30 00:29:04.000000000 +0100 +++ /var/tmp/diff_new_pack.dE4Qtf/_new 2009-12-30 00:29:04.000000000 +0100 @@ -23,67 +23,9 @@ -CFLAGS=-g -O2 -Wall +CFLAGS=$(RPM_OPT_FLAGS) -Wall - LDFLAGS= + LDFLAGS=-rdynamic PATHDEFS=-DINSTDIR=\"$(INSTDIR)\" -DLIB_PATH=\"$(LIB_PATH)\" \ -@@ -125,35 +125,35 @@ - install : - @[ -f procmeter3 ] || [ -f gprocmeter3 ] || [ -f procmeter3-log ] || [ -f procmeter3-lcd ] || \ - (echo "*** Run 'make all' or 'make procmeter3' or 'make gprocmeter3' or 'make procmeter3-log' or 'make procmeter3-lcd' first." ; exit 1) -- install -d $(LIB_PATH) -- install -d $(MOD_PATH) -- install -d $(RC_PATH) -+ install -d $(DESTDIR)$(LIB_PATH) -+ install -d $(DESTDIR)$(MOD_PATH) -+ install -d $(DESTDIR)$(RC_PATH) - # - $(MAKE) -C modules install MOD_PATH=$(MOD_PATH) LIB_PATH=$(LIB_PATH) - # -- install -d $(INSTDIR)/bin -- [ ! -f procmeter3 ] || install -m 755 procmeter3 $(INSTDIR)/bin -+ install -d $(DESTDIR)$(INSTDIR)/bin -+ [ ! -f procmeter3 ] || install -m 755 procmeter3 $(DESTDIR)$(INSTDIR)/bin - @[ -f procmeter3 ] || (echo "" ; echo "*** The procmeter3 program has not been installed (it does not exist)." ; echo "") -- [ ! -f gprocmeter3 ] || install -m 755 gprocmeter3 $(INSTDIR)/bin -+ [ ! -f gprocmeter3 ] || install -m 755 gprocmeter3 $(DESTDIR)$(INSTDIR)/bin - @[ -f gprocmeter3 ] || (echo "" ; echo "*** The gprocmeter3 program has not been installed (it does not exist)." ; echo "") -- [ ! -f procmeter3-log ] || install -m 755 procmeter3-log $(INSTDIR)/bin -+ [ ! -f procmeter3-log ] || install -m 755 procmeter3-log $(DESTDIR)$(INSTDIR)/bin - @[ -f procmeter3-log ] || (echo "" ; echo "*** The procmeter3-log program has not been installed (it does not exist)." ; echo "") -- [ ! -f procmeter3-lcd ] || install -m 755 procmeter3-lcd $(INSTDIR)/bin -+ [ ! -f procmeter3-lcd ] || install -m 755 procmeter3-lcd $(DESTDIR)$(INSTDIR)/bin - @[ -f procmeter3-lcd ] || (echo "" ; echo "*** The procmeter3-lcd program has not been installed (it does not exist)." ; echo "") - # -- install -d $(MANDIR)/man1 -- install -d $(MANDIR)/man5 -- [ ! -f procmeter3 ] || install -m 644 man/procmeter3.1 $(MANDIR)/man1 -- [ ! -f procmeter3-log ] || install -m 644 man/procmeter3-log.1 $(MANDIR)/man1 -- [ ! -f procmeter3-lcd ] || install -m 644 man/procmeter3-lcd.1 $(MANDIR)/man1 -- [ ! -f gprocmeter3 ] || install -m 644 man/gprocmeter3.1 $(MANDIR)/man1 -- install -m 644 man/procmeterrc.5 $(MANDIR)/man5 -- install -m 644 man/procmeter3_modules.1 $(MANDIR)/man1 -+ install -d $(DESTDIR)$(MANDIR)/man1 -+ install -d $(DESTDIR)$(MANDIR)/man5 -+ [ ! -f procmeter3 ] || install -m 644 man/procmeter3.1 $(DESTDIR)$(MANDIR)/man1 -+ [ ! -f procmeter3-log ] || install -m 644 man/procmeter3-log.1 $(DESTDIR)$(MANDIR)/man1 -+ [ ! -f procmeter3-lcd ] || install -m 644 man/procmeter3-lcd.1 $(DESTDIR)$(MANDIR)/man1 -+ [ ! -f gprocmeter3 ] || install -m 644 man/gprocmeter3.1 $(DESTDIR)$(MANDIR)/man1 -+ install -m 644 man/procmeterrc.5 $(DESTDIR)$(MANDIR)/man5 -+ install -m 644 man/procmeter3_modules.1 $(DESTDIR)$(MANDIR)/man1 - # -- [ ! -f $(RC_PATH)/.procmeterrc ] || mv $(RC_PATH)/.procmeterrc $(RC_PATH)/procmeterrc -- @[ ! -f $(RC_PATH)/procmeterrc ] || (echo "" ; echo "*** The $(RC_PATH)/procmeterrc file has not been installed (it already exists)." ; echo "") -- [ -f $(RC_PATH)/procmeterrc ] || install -m 644 procmeterrc.install $(RC_PATH)/procmeterrc -- install -m 644 procmeterrc.install $(RC_PATH) -+ [ ! -f $(DESTDIR)$(RC_PATH)/.procmeterrc ] || mv $(DESTDIR)$(RC_PATH)/.procmeterrc $(DESTDIR)$(RC_PATH)/procmeterrc -+ @[ ! -f $(DESTDIR)$(RC_PATH)/procmeterrc ] || (echo "" ; echo "*** The $(DESTDIR)$(RC_PATH)/procmeterrc file has not been installed (it already exists)." ; echo "") -+ [ -f $(DESTDIR)$(RC_PATH)/procmeterrc ] || install -m 644 procmeterrc.install $(DESTDIR)$(RC_PATH)/procmeterrc -+ install -m 644 procmeterrc.install $(DESTDIR)$(RC_PATH) - # -- install -d $(LIB_PATH)/include -- install -m 644 procmeter.h $(LIB_PATH)/include -+ install -d $(DESTDIR)$(LIB_PATH)/include -+ install -m 644 procmeter.h $(DESTDIR)$(LIB_PATH)/include --- modules/Makefile +++ modules/Makefile @@ -14,8 +14,8 @@ @@ -106,24 +48,6 @@ LDFLAGS= # Compilation targets -@@ -61,10 +61,12 @@ - .PHONY : install - - install : -- install -d $(MOD_PATH) -- install -d $(LIB_PATH)/example -+ install -d $(DESTDIR)$(MOD_PATH) -+ install -d $(DESTDIR)$(LIB_PATH)/example - for module in *.so ; do \ -- [ $$module = template.so ] || install -m 755 $$module $(MOD_PATH) ;\ -+ [ $$module = template.so ] || install -m 755 $$module $(DESTDIR)$(MOD_PATH) ;\ - done -- install -m 644 README $(LIB_PATH)/example -- install -m 644 template.c $(LIB_PATH)/example -+ install -m 644 README $(DESTDIR)$(LIB_PATH)/example -+ install -m 644 template.c $(DESTDIR)$(LIB_PATH)/example -+ -+ --- procmeterp.h +++ procmeterp.h @@ -29,7 +29,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pidgin-sipe for openSUSE:Factory
by root＠Hilbert.suse.de 30 Dec '09

30 Dec '09

Hello community, here is the log from the commit of package pidgin-sipe for openSUSE:Factory checked in at Wed Dec 30 00:29:01 CET 2009. -------- --- GNOME/pidgin-sipe/pidgin-sipe.changes 2009-09-25 19:14:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/pidgin-sipe/pidgin-sipe.changes 2009-12-27 00:49:21.000000000 +0100 @@ -1,0 +2,36 @@ +Sun Dec 27 00:30:08 CET 2009 - vuntz(a)opensuse.org + +- Clean up packaging. +- Remove gconf_schemas_prereq macro, since there's nothing + involving gconf. +- Rename purple-sipe subpackage to libpurple-plugin-sipe. +- Add pidgin BuildRequires for directory ownership. +- Add pidgin Requires for pidgin-sipe. +- Add libpurple Enhances for libpurple-plugin-sipe. + +------------------------------------------------------------------- +Thu Nov 26 09:54:24 UTC 2009 - john(a)redux.org.uk + +- Update to version 1.7.1: + + See ChangeLog for the full list of changes since version 1.3.3. + + Support for Reuters Messaging environment. + + Support for message formatting. + + Invisible mode. + + Full support for presence. + + Better support of protocol. + + New security framework. + + Multi-party conversation. + + Add telepathy-haze support. + + Add integration with PBX (external phones). + + New Idle status. + + Many improvements and bug fixes. + + Fix crashes. + + Build fixes. + + Updated translations. +- Split the package into pidgin-sipe and purple-sipe packages. +- Add gettext-devel, libtool BuildRequires. +- Remove pidgin, pidgin-devel, zlib-devel BuildRequires. +- Pass --with-krb5 to configure. +- Enable parallel build. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pidgin-sipe-1.3.3.tar.bz2 New: ---- pidgin-sipe-1.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pidgin-sipe.spec ++++++ --- /var/tmp/diff_new_pack.qGj6rs/_old 2009-12-30 00:28:52.000000000 +0100 +++ /var/tmp/diff_new_pack.qGj6rs/_new 2009-12-30 00:28:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package pidgin-sipe (Version 1.3.3) +# spec file for package pidgin-sipe (Version 1.7.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,55 +15,76 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: pidgin-sipe -Summary: Pidgin plugin for connecting to LCS -Version: 1.3.3 -Release: 5 -License: GPL v2 or later -Group: Productivity/Networking/Instant Messenger +Version: 1.7.1 +Release: 1 +License: GPLv2+ +Summary: Pidgin third-party plugin for Microsoft LCS/OCS Url: http://sipe.sourceforge.net/ -Source: pidgin-sipe-1.3.3.tar.bz2 -AutoReqProv: on -BuildRequires: intltool pidgin pidgin-devel -BuildRequires: libpurple-devel -BuildRequires: krb5-devel zlib-devel +Group: Productivity/Networking/Instant Messenger +Source: %{name}-%{version}.tar.bz2 +BuildRequires: gettext-devel +BuildRequires: intltool +BuildRequires: krb5-devel +BuildRequires: libpurple-devel >= 2.3.1 +BuildRequires: libtool +# For directory ownership +BuildRequires: pidgin +Requires: libpurple-plugin-sipe = %{version} +Requires: pidgin +Supplements: packageand(libpurple-plugin-sipe:pidgin} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libpurple >= 2.0.0 -%gconf_schemas_prereq %description -Microsoft Live Communication Server (LCS) plugin for Pidgin. - +A third-party plugin for the Pidgin multi-protocol instant messenger. It +implements the extended version of SIP/SIMPLE used by various products: + * Microsoft Office Communications Server (OCS 2007 and newer) + * Microsoft Live Communications Server (LCS 2003/2005) + * Reuters Messaging + +This package provides the icon set for Pidgin. + +%package -n libpurple-plugin-sipe +License: GPLv2+ +Summary: Libpurple third-party plugin for Microsoft LCS/OCS +Group: Productivity/Networking/Instant Messenger +Enhances: libpurple -Authors: --------- - Anibal Avelar "fixxxer" <debianmx(a)gmail.com> +%description -n libpurple-plugin-sipe +A third-party plugin for the libpurple multi-protocol instant messaging core. +It implements the extended version of SIP/SIMPLE used by various products: + + * Microsoft Office Communications Server (OCS 2007 and newer) + * Microsoft Live Communications Server (LCS 2003/2005) + * Reuters Messaging %prep %setup -q %build %{?env_options} -%configure -make +%configure --with-krb5 +make %{_smp_mflags} %install %makeinstall -%find_lang pidgin-sipe +find %{buildroot} -type f -name "*.la" -delete -print +%find_lang %{name} %clean -rm -rf "$RPM_BUILD_ROOT" +rm -rf %{buildroot} -%files -f pidgin-sipe.lang -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README -/usr/share/pixmaps/pidgin/protocols/16/sipe.png -/usr/share/pixmaps/pidgin/protocols/22/sipe.png -/usr/share/pixmaps/pidgin/protocols/48/sipe.png -%{_libdir}/pidgin/libsipe.* +%files -n libpurple-plugin-sipe -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{_libdir}/purple-2/libsipe.so + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_datadir}/pixmaps/pidgin/protocols/*/sipe.png %changelog ++++++ pidgin-sipe-1.3.3.tar.bz2 -> pidgin-sipe-1.7.1.tar.bz2 ++++++ ++++ 91582 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit orca for openSUSE:Factory
by root＠Hilbert.suse.de 30 Dec '09

30 Dec '09

Hello community, here is the log from the commit of package orca for openSUSE:Factory checked in at Wed Dec 30 00:28:55 CET 2009. -------- --- GNOME/orca/orca.changes 2009-12-09 00:14:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/orca/orca.changes 2009-12-23 15:29:45.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Dec 23 15:27:13 CET 2009 - vuntz(a)opensuse.org + +- Update to version 2.29.4: + + General: + - bgo#601657 - Preferences cannot be saved. + - bgo#603520 - Need to add script mapping to check for Pidgin + with a capital "P" + - bgo#604492 - Orca doesn't work well with Packagemanager's new + Recent Searches feature + - bgo#604956 - Certain speech settings get improperly restored + to default when setting up Orca initially + - bgo#604964 - Orca doesn't present the section headings in + PackageManager's new "Featured Packages" start + page + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- orca-2.29.2.tar.bz2 New: ---- orca-2.29.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orca.spec ++++++ --- /var/tmp/diff_new_pack.mg65bU/_old 2009-12-30 00:28:46.000000000 +0100 +++ /var/tmp/diff_new_pack.mg65bU/_new 2009-12-30 00:28:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package orca (Version 2.29.2) +# spec file for package orca (Version 2.29.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -34,8 +34,8 @@ BuildRequires: python-gnome-devel BuildRequires: python-gtk-devel BuildRequires: update-desktop-files -Version: 2.29.2 -Release: 2 +Version: 2.29.4 +Release: 1 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: LGPLv2.1+ ++++++ orca-2.29.2.tar.bz2 -> orca-2.29.4.tar.bz2 ++++++ ++++ 7822 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-xulrunner192 for openSUSE:Factory
by root＠Hilbert.suse.de 30 Dec '09

30 Dec '09

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:Factory checked in at Wed Dec 30 00:28:52 CET 2009. -------- --- mozilla-xulrunner192/mozilla-xulrunner192.changes 2009-11-11 08:19:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner192/mozilla-xulrunner192.changes 2009-12-28 19:11:34.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Dec 24 14:21:02 CET 2009 - wr(a)rosenauer.org + +- update to 1.9.2b5 +- removed upstreamed mozilla-abi.patch +- integrated mozilla-kde.patch +- use .autoreg file for autoregistration when needed (bnc#440872) +- enable libproxy support from 11.2 on +- renamed -gnomevfs subpackage to -gnome +- readded lockdown patches and preferences +- fix baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- FIXME gconf-backend.patch.bz2 l10n-1.9.2b2.tar.bz2 mozilla-abi.patch xulrunner-source-1.9.2b2.tar.bz2 New: ---- l10n-1.9.2b5.tar.bz2 mozilla-breakpad.patch mozilla-gconf-backend.patch toolkit-lockdown.js xulrunner-source-1.9.2b5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,8 +1,8 @@ # -# spec file for package mozilla-xulrunner192 (Version 1.9.2b2) +# spec file for package mozilla-xulrunner192 (Version 1.9.2b5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2006-2009 Wolfgang Rosenauer +# 2006-2009 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: mozilla-xulrunner192 -BuildRequires: autoconf213 gcc-c++ libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip +BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip # needed for brp-check-bytecode-version (jar, fastjar would do as well) BuildRequires: unzip %if %suse_version > 1020 @@ -34,17 +34,27 @@ %endif %if %suse_version > 1110 BuildRequires: libiw-devel -#BuildRequires: libproxy-devel +BuildRequires: libproxy-devel %else BuildRequires: wireless-tools %endif -License: GPLv2+ ; LGPLv2.1+ ; MPL 1.1 or later -Version: 1.9.2b2 +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +Version: 1.9.2b5 Release: 1 +%define releasedate 2009120400 +%define version_internal 1.9.2b5 +%define apiversion 1.9.2 +%define uaweight 191999 Summary: Mozilla Runtime Environment 1.9.2 Url: http://www.mozilla.org Group: Productivity/Other Provides: gecko192 +%if %suse_version >= 1110 +# this is needed to match this package with the kde4 helper package without the main package +# having a hard requirement on the kde4 package +%define kde_helper_version 6 +Provides: mozilla-kde4-version = %{kde_helper_version} +%endif %ifarch %ix86 Provides: mozilla-xulrunner192-32bit = %{version}-%{release} %endif @@ -55,26 +65,32 @@ Source4: xulrunner-openSUSE-prefs.js Source5: add-plugins.sh.in Source6: create-tar.sh +Source7: baselibs.conf +Source8: toolkit-lockdown.js Patch1: toolkit-download-folder.patch Patch2: mozilla-libproxy.patch Patch3: mozilla-pkgconfig.patch Patch4: idldir.patch -Patch7: mozilla-nongnome-proxies.patch -Patch8: mozilla-helper-app.patch -Patch10: mozilla-abi.patch -Patch12: mozilla-prefer_plugin_pref.patch -# PATCH-FEATURE-SLED FATE#302023, FATE#302024 - hfiguiere(a)novell.com -# --- disabled for now -Patch16: gconf-backend.patch.bz2 -Patch17: gecko-lockdown.patch -Patch18: toolkit-ui-lockdown.patch +Patch5: mozilla-nongnome-proxies.patch +Patch6: mozilla-helper-app.patch +Patch7: mozilla-prefer_plugin_pref.patch +Patch8: mozilla-shared-nss-db.patch +Patch9: mozilla-startup-notification.patch +Patch10: mozilla-kde.patch +# PATCH-FEATURE-SLED FATE#302023, FATE#302024 +Patch11: mozilla-gconf-backend.patch +Patch12: gecko-lockdown.patch +Patch13: toolkit-ui-lockdown.patch # --- -Patch22: mozilla-shared-nss-db.patch -Patch23: mozilla-kde.patch -Patch24: mozilla-startup-notification.patch +Patch14: mozilla-breakpad.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives coreutils ### build configuration ### +%ifarch %ix86 +%define crashreporter 0 +%else +%define crashreporter 0 +%endif %define has_system_nspr 0 %define has_system_nss 0 %define has_system_cairo 0 @@ -86,10 +102,6 @@ %if %suse_version > 1110 %define has_system_cairo 1 %endif -%define releasedate 2009110900 -%define version_internal 1.9.2b2 -%define apiversion 1.9.2 -%define uaweight 191999 ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} @@ -103,7 +115,7 @@ BuildRequires: mozilla-nss-devel >= 3.12.3 Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) %endif -Recommends: %{name}-gnomevfs +Recommends: %{name}-gnome %description XULRunner is a single installable package that can be used to bootstrap @@ -112,7 +124,7 @@ %package devel -License: GPLv2+ ; LGPLv2.1+ ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: XULRunner/Gecko SDK 1.9.2 Group: Development/Libraries/Other %if %has_system_nspr @@ -128,7 +140,7 @@ %package translations-common -License: GPLv2+ ; LGPLv2.1+ ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Common translations for XULRunner 1.9.2 Group: System/Localization PreReq: %{name} = %{version} @@ -145,11 +157,11 @@ %package translations-other -License: GPLv2+ ; LGPLv2.1+ ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Extra translations for XULRunner 1.9.2 Group: System/Localization PreReq: %{name} = %{version} -Provides: locale(%{name}:be;bn_BD;el;et;eu;fa;fy_NL;ga_IE;gl;he;hi_IN;id;is;lt;lv;mr;or;pa_IN;rm;ro;sk;sq;ta;te;tr;uk) +Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -160,41 +172,64 @@ This package contains rarely used languages. -%package gnomevfs -License: GPLv2+ ; LGPLv2.1+ ; MPL 1.1 or later +%package gnome +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: XULRunner components depending on gnome-vfs Group: Productivity/Other PreReq: %{name} = %{version}-%{release} -%description gnomevfs +%description gnome This subpackage contains the Necko Gnome-VFS and Gnome components which rely on the gnome-vfs subsystem to be installed. They are recommended for full desktop integration but not mandatory for small disk footprint KDE installations for example. +%if %crashreporter + +%package buildsymbols +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +Summary: Breakpad buildsymbols for %{name} +Group: Development/Debug + +%description buildsymbols +This subpackage contains the Breakpad created and compatible debugging +symbols meant for upload to Mozilla's crash collector database. +%endif + %prep %setup -n mozilla -q -b 1 %patch1 -p1 -#%patch2 -p1 +%patch2 -p1 %patch3 -p1 -%patch4 -%patch7 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %patch8 -p1 +%patch9 -p1 +%if %suse_version >= 1110 %patch10 -p1 +%endif +%patch11 -p1 %patch12 -p1 -# BEGIN lockdown - currently broken (see bnc#508611) -#%patch16 -p1 -#%patch17 -#%patch18 -p1 -# END lockdown -%patch22 -p1 -%patch24 -p1 +%patch13 -p1 +%patch14 -p1 %build +%if %suse_version >= 1110 +kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) +if test "$kdehelperversion" != %{kde_helper_version}; then + echo fix kde helper version in the .spec file + exit 1 +fi +%endif MOZ_APP_DIR=%{_libdir}/xulrunner-%{version_internal} export MOZ_BUILD_DATE=%{releasedate} export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" +%if %crashreporter +export CFLAGS="$CFLAGS -gstabs+" +%endif %ifarch ppc64 export CFLAGS="$CFLAGS -mminimal-toc" %endif @@ -237,7 +272,6 @@ ac_add_options --disable-installer ac_add_options --disable-updater ac_add_options --disable-javaxpcom -ac_add_options --disable-crashreporter ac_add_options --enable-startup-notification ac_add_options --enable-url-classifier #ac_add_options --enable-debug @@ -267,11 +301,16 @@ #ac_add_options --enable-system-sqlite #EOF #%endif -#%if %suse_version > 1110 -#cat << EOF >> $MOZCONFIG -#ac_add_options --enable-libproxy -#EOF -#%endif +%if %suse_version > 1110 +cat << EOF >> $MOZCONFIG +ac_add_options --enable-libproxy +EOF +%endif +%if ! %crashreporter +cat << EOF >> $MOZCONFIG +ac_add_options --disable-crashreporter +EOF +%endif make -f client.mk build %install @@ -294,6 +333,7 @@ #cp -rL dist/xpi-stage/simple $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version_internal}/ # preferences cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js +cp %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js # install add-plugins.sh sed "s:%%PROGDIR:%{_libdir}/xulrunner-%{version_internal}:g" \ %{SOURCE5} > $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh @@ -344,11 +384,21 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/LICENSE rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/README.txt rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/dictionaries/en-US* +# autoreg +touch $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/.autoreg # fdupes %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal}/ %fdupes $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/ %endif +# create breakpad debugsymbols +%if %crashreporter +make buildsymbols +if [ -e dist/*.crashreporter-symbols.zip ]; then + mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/ + cp dist/*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/ +fi +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -389,6 +439,10 @@ %{_libdir}/xulrunner-%{version_internal}/add-plugins.sh > /dev/null 2>&1 exit 0 +%post gnome +touch %{_libdir}/xulrunner-%{version_internal}/.autoreg +exit 0 + %files %defattr(-,root,root) %dir %{_libdir}/xulrunner-%{version_internal}/ @@ -410,31 +464,32 @@ %{_libdir}/xulrunner-%{version_internal}/greprefs/security-prefs.js %{_libdir}/xulrunner-%{version_internal}/greprefs/xpinstall.js %{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js +%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js %{_libdir}/xulrunner-%{version_internal}/icons/ %{_libdir}/xulrunner-%{version_internal}/modules/ %{_libdir}/xulrunner-%{version_internal}/plugins/ %{_libdir}/xulrunner-%{version_internal}/res/ %{_libdir}/xulrunner-%{version_internal}/*.so +%{_libdir}/xulrunner-%{version_internal}/.autoreg %{_libdir}/xulrunner-%{version_internal}/add-plugins.sh %{_libdir}/xulrunner-%{version_internal}/dependentlibs.list %{_libdir}/xulrunner-%{version_internal}/mozilla-xremote-client -%if !%has_system_nss -%{_libdir}/xulrunner-%{version_internal}/libsoftokn3.chk -%{_libdir}/xulrunner-%{version_internal}/libfreebl3.chk -%endif %{_libdir}/xulrunner-%{version_internal}/run-mozilla.sh %{_libdir}/xulrunner-%{version_internal}/xulrunner %{_libdir}/xulrunner-%{version_internal}/xulrunner-bin %{_libdir}/xulrunner-%{version_internal}/xulrunner-stub %{_libdir}/xulrunner-%{version_internal}/platform.ini -#%{_libdir}/xulrunner-%{version_internal}/javaxpcom.jar +# crashreporter files +%if %crashreporter +%{_libdir}/xulrunner-%{version_internal}/crashreporter +%{_libdir}/xulrunner-%{version_internal}/crashreporter.ini +%{_libdir}/xulrunner-%{version_internal}/Throbber-small.gif +%endif # ghosts %ghost %{_libdir}/xulrunner-%{version_internal}/global.reginfo # GRE %dir %{_sysconfdir}/gre.d/ %attr(644,root,root) %{_sysconfdir}/gre.d/* -# example -#%{_libdir}/xulrunner-%{version_internal}/simple/ # API symlink %{_libdir}/xulrunner-%{apiversion} # compat symlinks @@ -444,7 +499,6 @@ %files devel %defattr(-,root,root) -#%{_libdir}/xulrunner-%{version_internal}/MozillaInterfaces* %{_libdir}/xulrunner-%{version_internal}/xpcshell %{_libdir}/xulrunner-%{version_internal}/xpidl %{_libdir}/xulrunner-%{version_internal}/xpt_dump @@ -454,7 +508,7 @@ %attr(644,root,root) %{_libdir}/pkgconfig/* %{_includedir}/xulrunner-%{version_internal}/ -%files gnomevfs +%files gnome %defattr(-,root,root) %{_libdir}/xulrunner-%{version_internal}/components/libmozgnome.so %{_libdir}/xulrunner-%{version_internal}/components/libnkgnomevfs.so @@ -466,5 +520,11 @@ %files translations-other -f %{_tmppath}/translations.other %defattr(-,root,root) %endif +%if %crashreporter + +%files buildsymbols +%defattr(-,root,root) +%{_datadir}/mozilla/ +%endif %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,13 +1,18 @@ -mozilla-xulrunner191 +mozilla-xulrunner192 +/usr/lib(64)?/xulrunner-.* +/etc/gre.d/.* - recommends "mozilla-xulrunner191-gnomevfs-<targettype>" + recommends "mozilla-xulrunner192-gnome-<targettype>" -mozilla-xulrunner191-translations +mozilla-xulrunner192-translations-common +/usr/lib(64)?/xulrunner-.* - prereq "mozilla-xulrunner191-<targettype> = <version>" - supplements "packageand(mozilla-xulrunner191-translations:mozilla-xulrunner191-<targettype>)" + prereq "mozilla-xulrunner192-<targettype> = <version>" + supplements "packageand(mozilla-xulrunner192-translations-common:mozilla-xulrunner192-<targettype>)" -mozilla-xulrunner191-gnomevfs +mozilla-xulrunner192-translations-other +/usr/lib(64)?/xulrunner-.* - prereq "mozilla-xulrunner191-<targettype> = <version>" + prereq "mozilla-xulrunner192-<targettype> = <version>" + supplements "packageand(mozilla-xulrunner192-translations-other:mozilla-xulrunner192-<targettype>)" + +mozilla-xulrunner192-gnome + +/usr/lib(64)?/xulrunner-.* + prereq "mozilla-xulrunner192-<targettype> = <version>" ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6b2_RELEASE" -VERSION="1.9.2b2" +RELEASE_TAG="FIREFOX_3_6b5_RELEASE" +VERSION="1.9.2b5" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ gecko-lockdown.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,13 +1,27 @@ -From: Robert O'Callahan -Subject: Lockdown feature for Gecko -References: +From: various contributors +Subject: lockdown hooks for Gecko - -Index: extensions/cookie/nsCookiePermission.cpp -=================================================================== ---- extensions/cookie/nsCookiePermission.cpp.orig -+++ extensions/cookie/nsCookiePermission.cpp -@@ -86,6 +86,7 @@ static const char kCookiesPrefsMigrated[ +diff --git a/extensions/cookie/nsCookiePermission.cpp b/extensions/cookie/nsCookiePermission.cpp +--- a/extensions/cookie/nsCookiePermission.cpp ++++ b/extensions/cookie/nsCookiePermission.cpp +@@ -1,10 +1,10 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +-/* vim:ts=2:sw=2:et: */ ++/* vim: set ts=2 sw=2 et: */ + /* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * +@@ -81,16 +81,17 @@ static const PRBool kDefaultPolicy = PR_ + static const char kCookiesLifetimePolicy[] = "network.cookie.lifetimePolicy"; + static const char kCookiesLifetimeDays[] = "network.cookie.lifetime.days"; + static const char kCookiesAlwaysAcceptSession[] = "network.cookie.alwaysAcceptSessionCookies"; + + static const char kCookiesPrefsMigrated[] = "network.cookie.prefsMigrated"; // obsolete pref names for migration static const char kCookiesLifetimeEnabled[] = "network.cookie.lifetime.enabled"; static const char kCookiesLifetimeBehavior[] = "network.cookie.lifetime.behavior"; @@ -15,26 +29,56 @@ static const char kCookiesAskPermission[] = "network.cookie.warnAboutCookies"; static const char kPermissionType[] = "cookie"; -@@ -125,6 +126,7 @@ nsCookiePermission::Init() + + #ifdef MOZ_MAIL_NEWS + // returns PR_TRUE if URI appears to be the URI of a mailnews protocol + // XXXbz this should be a protocol flag, not a scheme list, dammit! + static PRBool +@@ -120,16 +121,17 @@ nsCookiePermission::Init() + + // failure to access the pref service is non-fatal... + nsCOMPtr<nsIPrefBranch2> prefBranch = + do_GetService(NS_PREFSERVICE_CONTRACTID); + if (prefBranch) { prefBranch->AddObserver(kCookiesLifetimePolicy, this, PR_FALSE); prefBranch->AddObserver(kCookiesLifetimeDays, this, PR_FALSE); prefBranch->AddObserver(kCookiesAlwaysAcceptSession, this, PR_FALSE); + prefBranch->AddObserver(kCookiesHonorExceptions, this, PR_FALSE); - #ifdef MOZ_MAIL_NEWS - prefBranch->AddObserver(kCookiesDisabledForMailNews, this, PR_FALSE); - #endif -@@ -182,6 +184,10 @@ nsCookiePermission::PrefChanged(nsIPrefB + PrefChanged(prefBranch, nsnull); + + // migration code for original cookie prefs + PRBool migrated; + rv = prefBranch->GetBoolPref(kCookiesPrefsMigrated, &migrated); + if (NS_FAILED(rv) || !migrated) { + PRBool warnAboutCookies = PR_FALSE; + prefBranch->GetBoolPref(kCookiesAskPermission, &warnAboutCookies); +@@ -173,16 +175,20 @@ nsCookiePermission::PrefChanged(nsIPrefB + if (PREF_CHANGED(kCookiesLifetimeDays) && + NS_SUCCEEDED(aPrefBranch->GetIntPref(kCookiesLifetimeDays, &val))) + // save cookie lifetime in seconds instead of days + mCookiesLifetimeSec = val * 24 * 60 * 60; + + if (PREF_CHANGED(kCookiesAlwaysAcceptSession) && NS_SUCCEEDED(aPrefBranch->GetBoolPref(kCookiesAlwaysAcceptSession, &val))) mCookiesAlwaysAcceptSession = val; - ++ + if (PREF_CHANGED(kCookiesHonorExceptions) && + NS_SUCCEEDED(aPrefBranch->GetBoolPref(kCookiesHonorExceptions, &val))) + mCookiesHonorExceptions = val; -+ - #ifdef MOZ_MAIL_NEWS - if (PREF_CHANGED(kCookiesDisabledForMailNews) && - NS_SUCCEEDED(aPrefBranch->GetBoolPref(kCookiesDisabledForMailNews, &val))) -@@ -232,6 +238,11 @@ nsCookiePermission::CanAccess(nsIURI + } + + NS_IMETHODIMP + nsCookiePermission::SetAccess(nsIURI *aURI, + nsCookieAccess aAccess) + { + // + // NOTE: nsCookieAccess values conveniently match up with +@@ -202,16 +208,21 @@ nsCookiePermission::CanAccess(nsIURI + // it. + if (IsFromMailNews(aURI)) { + *aResult = ACCESS_DENY; + return NS_OK; + } #endif // MOZ_MAIL_NEWS // finally, check with permission manager... @@ -46,32 +90,56 @@ nsresult rv = mPermMgr->TestPermission(aURI, kPermissionType, (PRUint32 *) aResult); if (NS_SUCCEEDED(rv)) { switch (*aResult) { -Index: extensions/cookie/nsCookiePermission.h -=================================================================== ---- extensions/cookie/nsCookiePermission.h.orig -+++ extensions/cookie/nsCookiePermission.h -@@ -61,6 +61,7 @@ public: - #ifdef MOZ_MAIL_NEWS - , mCookiesDisabledForMailNews(PR_TRUE) - #endif + // if we have one of the publicly-available values, just return it + case nsIPermissionManager::UNKNOWN_ACTION: // ACCESS_DEFAULT + case nsIPermissionManager::ALLOW_ACTION: // ACCESS_ALLOW + case nsIPermissionManager::DENY_ACTION: // ACCESS_DENY + break; +diff --git a/extensions/cookie/nsCookiePermission.h b/extensions/cookie/nsCookiePermission.h +--- a/extensions/cookie/nsCookiePermission.h ++++ b/extensions/cookie/nsCookiePermission.h +@@ -54,30 +54,32 @@ public: + NS_DECL_ISUPPORTS + NS_DECL_NSICOOKIEPERMISSION + NS_DECL_NSIOBSERVER + + nsCookiePermission() + : mCookiesLifetimeSec(LL_MAXINT) + , mCookiesLifetimePolicy(0) // ACCEPT_NORMALLY + , mCookiesAlwaysAcceptSession(PR_FALSE) + , mCookiesHonorExceptions(PR_TRUE) {} virtual ~nsCookiePermission() {} -@@ -76,7 +77,7 @@ private: - #ifdef MOZ_MAIL_NEWS - PRPackedBool mCookiesDisabledForMailNews; - #endif -- + nsresult Init(); + void PrefChanged(nsIPrefBranch *, const char *); + + private: + PRBool InPrivateBrowsing(); + + nsCOMPtr<nsIPermissionManager> mPermMgr; + nsCOMPtr<nsIPrivateBrowsingService> mPBService; + + PRInt64 mCookiesLifetimeSec; // lifetime limit specified in seconds + PRUint8 mCookiesLifetimePolicy; // pref for how long cookies are stored + PRPackedBool mCookiesAlwaysAcceptSession; // don't prompt for session cookies + PRPackedBool mCookiesHonorExceptions; }; // {EF565D0A-AB9A-4A13-9160-0644CDFD859A} -Index: extensions/permissions/nsContentBlocker.cpp -=================================================================== ---- extensions/permissions/nsContentBlocker.cpp.orig -+++ extensions/permissions/nsContentBlocker.cpp -@@ -76,6 +76,7 @@ NS_IMPL_ISUPPORTS3(nsContentBlocker, + #define NS_COOKIEPERMISSION_CID \ + {0xEF565D0A, 0xAB9A, 0x4A13, {0x91, 0x60, 0x06, 0x44, 0xcd, 0xfd, 0x85, 0x9a }} + + #endif +diff --git a/extensions/permissions/nsContentBlocker.cpp b/extensions/permissions/nsContentBlocker.cpp +--- a/extensions/permissions/nsContentBlocker.cpp ++++ b/extensions/permissions/nsContentBlocker.cpp +@@ -71,32 +71,38 @@ static const char *kTypeString[NUMBER_OF + NS_IMPL_ISUPPORTS3(nsContentBlocker, + nsIContentPolicy, + nsIObserver, + nsSupportsWeakReference) + nsContentBlocker::nsContentBlocker() { memset(mBehaviorPref, BEHAVIOR_ACCEPT, NUMBER_OF_TYPES); @@ -79,7 +147,16 @@ } nsresult -@@ -92,6 +93,11 @@ nsContentBlocker::Init() + nsContentBlocker::Init() + { + nsresult rv; + mPermissionManager = do_GetService(NS_PERMISSIONMANAGER_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, rv); + + nsCOMPtr<nsIPrefService> prefService = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, rv); + + nsCOMPtr<nsIPrefBranch> prefBranch; rv = prefService->GetBranch("permissions.default.", getter_AddRefs(prefBranch)); NS_ENSURE_SUCCESS(rv, rv); @@ -91,7 +168,17 @@ // Migrate old image blocker pref nsCOMPtr<nsIPrefBranch> oldPrefBranch; oldPrefBranch = do_QueryInterface(prefService); -@@ -121,8 +127,15 @@ nsContentBlocker::Init() + PRInt32 oldPref; + rv = oldPrefBranch->GetIntPref("network.image.imageBehavior", &oldPref); + if (NS_SUCCEEDED(rv) && oldPref) { + PRInt32 newPref; + switch (oldPref) { +@@ -116,39 +122,49 @@ nsContentBlocker::Init() + + + // The branch is not a copy of the prefservice, but a new object, because + // it is a non-default branch. Adding obeservers to it will only work if + // we make sure that the object doesn't die. So, keep a reference to it. mPrefBranchInternal = do_QueryInterface(prefBranch, &rv); NS_ENSURE_SUCCESS(rv, rv); @@ -108,7 +195,8 @@ return rv; } -@@ -131,19 +144,22 @@ nsContentBlocker::Init() + + #undef LIMIT #define LIMIT(x, low, high, default) ((x) >= (low) && (x) <= (high) ? (x) : (default)) void @@ -142,7 +230,17 @@ } // nsIContentPolicy Implementation -@@ -268,11 +284,13 @@ nsContentBlocker::TestPermission(nsIURI + NS_IMETHODIMP + nsContentBlocker::ShouldLoad(PRUint32 aContentType, + nsIURI *aContentLocation, + nsIURI *aRequestingLocation, + nsISupports *aRequestingContext, +@@ -264,21 +280,23 @@ nsContentBlocker::TestPermission(nsIURI + // This default will also get used if there is an unknown value in the + // permission list, or if the permission manager returns unknown values. + *aPermission = PR_TRUE; + + // check the permission list first; if we find an entry, it overrides // default prefs. // Don't forget the aContentType ranges from 1..8, while the // array is indexed 0..7 @@ -161,7 +259,17 @@ // If there is nothing on the list, use the default. if (!permission) { -@@ -298,7 +316,7 @@ nsContentBlocker::TestPermission(nsIURI + permission = mBehaviorPref[aContentType - 1]; + *aFromPrefs = PR_TRUE; + } + + // Use the fact that the nsIPermissionManager values map to +@@ -294,17 +312,17 @@ nsContentBlocker::TestPermission(nsIURI + case BEHAVIOR_NOFOREIGN: + // Third party checking + + // Need a requesting uri for third party checks to work. + if (!aFirstURI) return NS_OK; PRBool trustedSource = PR_FALSE; @@ -170,21 +278,34 @@ NS_ENSURE_SUCCESS(rv,rv); if (!trustedSource) { rv = aFirstURI->SchemeIs("resource", &trustedSource); -@@ -363,8 +381,6 @@ nsContentBlocker::Observe(nsISupports + NS_ENSURE_SUCCESS(rv,rv); + } + if (trustedSource) + return NS_OK; + +@@ -360,12 +378,11 @@ nsContentBlocker::TestPermission(nsIURI + NS_IMETHODIMP + nsContentBlocker::Observe(nsISupports *aSubject, + const char *aTopic, + const PRUnichar *aData) { NS_ASSERTION(!strcmp(NS_PREFBRANCH_PREFCHANGE_TOPIC_ID, aTopic), "unexpected topic - we only deal with pref changes!"); -- + - if (mPrefBranchInternal) - PrefChanged(mPrefBranchInternal, NS_LossyConvertUTF16toASCII(aData).get()); + PrefChanged(NS_LossyConvertUTF16toASCII(aData).get()); return NS_OK; } -Index: extensions/permissions/nsContentBlocker.h -=================================================================== ---- extensions/permissions/nsContentBlocker.h.orig -+++ extensions/permissions/nsContentBlocker.h -@@ -66,7 +66,7 @@ public: +diff --git a/extensions/permissions/nsContentBlocker.h b/extensions/permissions/nsContentBlocker.h +--- a/extensions/permissions/nsContentBlocker.h ++++ b/extensions/permissions/nsContentBlocker.h +@@ -61,26 +61,28 @@ public: + NS_DECL_NSIOBSERVER + + nsContentBlocker(); + nsresult Init(); + private: ~nsContentBlocker() {} @@ -193,7 +314,8 @@ nsresult TestPermission(nsIURI *aCurrentURI, nsIURI *aFirstURI, PRInt32 aContentType, -@@ -75,7 +75,9 @@ private: + PRBool *aPermission, + PRBool *aFromPrefs); nsCOMPtr<nsIPermissionManager> mPermissionManager; nsCOMPtr<nsIPrefBranch2> mPrefBranchInternal; @@ -203,11 +325,20 @@ }; #define NS_CONTENTBLOCKER_CID \ -Index: modules/libpref/src/init/all.js -=================================================================== ---- modules/libpref/src/init/all.js.orig -+++ modules/libpref/src/init/all.js -@@ -798,6 +798,7 @@ pref("network.automatic-ntlm-auth.truste + { 0x4ca6b67b, 0x5cc7, 0x4e71, \ + { 0xa9, 0x8a, 0x97, 0xaf, 0x1c, 0x13, 0x48, 0x62 } } + + #define NS_CONTENTBLOCKER_CONTRACTID "@mozilla.org/permissions/contentblocker;1" + +diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js +--- a/modules/libpref/src/init/all.js ++++ b/modules/libpref/src/init/all.js +@@ -842,16 +842,17 @@ pref("network.automatic-ntlm-auth.truste + // response to a NTLM challenge. By default, this is disabled since servers + // should almost never need the LM hash, and the LM hash is what makes NTLM + // authentication less secure. See bug 250691 for further details. + // NOTE: automatic-ntlm-auth which leverages the OS-provided NTLM + // implementation will not be affected by this preference. pref("network.ntlm.send-lm-response", false); pref("permissions.default.image", 1); // 1-Accept, 2-Deny, 3-dontAcceptForeign @@ -215,67 +346,38 @@ #ifndef XP_MACOSX #ifdef XP_UNIX -@@ -825,6 +826,7 @@ pref("network.proxy.no_proxies_on", + pref("network.proxy.type", 5); + #else + pref("network.proxy.type", 0); + #endif + #else +@@ -869,16 +870,17 @@ pref("network.proxy.ssl_port", + pref("network.proxy.socks", ""); + pref("network.proxy.socks_port", 0); + pref("network.proxy.socks_version", 5); + pref("network.proxy.socks_remote_dns", false); + pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1"); pref("network.proxy.failover_timeout", 1800); // 30 minutes pref("network.online", true); //online/offline pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse +pref("network.cookie.honorExceptions", true); - pref("network.cookie.disableCookieForMailNews", true); // disable all cookies for mail pref("network.cookie.lifetimePolicy", 0); // accept normally, 1-askBeforeAccepting, 2-acceptForSession,3-acceptForNDays pref("network.cookie.alwaysAcceptSessionCookies", false); -Index: widget/src/gtk2/nsWindow.cpp -=================================================================== ---- widget/src/gtk2/nsWindow.cpp.orig -+++ widget/src/gtk2/nsWindow.cpp -@@ -81,6 +81,7 @@ - #include "nsIServiceManager.h" - #include "nsIStringBundle.h" - #include "nsGfxCIID.h" -+#include "nsIPrefService.h" - - #ifdef ACCESSIBILITY - #include "nsIAccessibilityService.h" -@@ -91,7 +92,6 @@ - static PRBool sAccessibilityChecked = PR_FALSE; - /* static */ - PRBool nsWindow::sAccessibilityEnabled = PR_FALSE; --static const char sSysPrefService [] = "@mozilla.org/system-preference-service;1"; - static const char sAccEnv [] = "GNOME_ACCESSIBILITY"; - static const char sAccessibilityKey [] = "config.use_system_prefs.accessibility"; - #endif -@@ -3992,18 +3992,18 @@ nsWindow::NativeCreate(nsIWidget - sAccessibilityEnabled = atoi(envValue) != 0; - LOG(("Accessibility Env %s=%s\n", sAccEnv, envValue)); - } -- //check gconf-2 setting -+ //check preference setting - else { -- nsCOMPtr<nsIPrefBranch> sysPrefService = -- do_GetService(sSysPrefService, &rv); -- if (NS_SUCCEEDED(rv) && sysPrefService) { -- -- // do the work to get gconf setting. -- // will be done soon later. -- sysPrefService->GetBoolPref(sAccessibilityKey, -+ nsCOMPtr<nsIPrefService> prefService = -+ do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); -+ if (NS_SUCCEEDED(rv) && prefService) { -+ nsCOMPtr<nsIPrefBranch> prefBranch; -+ rv = prefService->GetBranch(nsnull, getter_AddRefs(prefBranch)); -+ if (NS_SUCCEEDED(rv) && prefBranch) { -+ prefBranch->GetBoolPref(sAccessibilityKey, - &sAccessibilityEnabled); -+ } - } -- + pref("network.cookie.prefsMigrated", false); + pref("network.cookie.lifetime.days", 90); + + // The PAC file to load. Ignored unless network.proxy.type is 2. + pref("network.proxy.autoconfig_url", ""); + +diff --git a/xpinstall/src/nsXPInstallManager.cpp b/xpinstall/src/nsXPInstallManager.cpp +--- a/xpinstall/src/nsXPInstallManager.cpp ++++ b/xpinstall/src/nsXPInstallManager.cpp +@@ -300,36 +300,46 @@ nsXPInstallManager::InitManagerInternal( + packageList[j++] = item->GetSafeURLString(); + packageList[j++] = item->mIconURL.get(); + packageList[j++] = item->mCertName.get(); } - } - if (sAccessibilityEnabled) { -Index: xpinstall/src/nsXPInstallManager.cpp -=================================================================== ---- xpinstall/src/nsXPInstallManager.cpp.orig -+++ xpinstall/src/nsXPInstallManager.cpp -@@ -290,6 +290,7 @@ nsXPInstallManager::InitManagerInternal( + //----------------------------------------------------- // Get permission to install //----------------------------------------------------- @@ -283,37 +385,38 @@ #ifdef ENABLE_SKIN_SIMPLE_INSTALLATION_UI if ( mChromeType == CHROME_SKIN ) -@@ -299,17 +300,26 @@ nsXPInstallManager::InitManagerInternal( + { + // We may want to enable the simple installation UI once + // bug 343037 is fixed // skins get a simpler/friendlier dialog // XXX currently not embeddable - OKtoInstall = ConfirmChromeInstall( mParentWindow, packageList ); + PRBool themesDisabled = PR_FALSE; + if (pref) -+ pref->GetBoolPref("config.lockdown.disable_themes", &themesDisabled); ++ pref->GetBoolPref("config.lockdown.disable_themes", &themesDisabled); + OKtoInstall = !themesDisabled && -+ ConfirmChromeInstall( mParentWindow, packageList ); ++ ConfirmChromeInstall( mParentWindow, packageList ); } else { #endif -- rv = dlgSvc->ConfirmInstall( mParentWindow, -- packageList, -- numStrings, -- &OKtoInstall ); -- if (NS_FAILED(rv)) -- OKtoInstall = PR_FALSE; -+ PRBool extensionsDisabled = PR_FALSE; -+ if (pref) -+ pref->GetBoolPref("config.lockdown.disable_extensions", &extensionsDisabled); -+ if (!extensionsDisabled) { -+ rv = dlgSvc->ConfirmInstall( mParentWindow, -+ packageList, -+ numStrings, -+ &OKtoInstall ); -+ if (NS_FAILED(rv)) -+ OKtoInstall = PR_FALSE; -+ } ++ PRBool extensionsDisabled = PR_FALSE; ++ if (pref) ++ pref->GetBoolPref("config.lockdown.disable_extensions", &extensionsDisabled); ++ if (!extensionsDisabled) { + rv = dlgSvc->ConfirmInstall( mParentWindow, + packageList, + numStrings, + &OKtoInstall ); + if (NS_FAILED(rv)) + OKtoInstall = PR_FALSE; ++ } #ifdef ENABLE_SKIN_SIMPLE_INSTALLATION_UI } #endif + + if (OKtoInstall) + { + //----------------------------------------------------- + // Open the progress dialog ++++++ idldir.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,6 +1,5 @@ From: Wolfgang Rosenauer <stark(a)suse.de> Subject: fix IDL installation dir - This is only needed to get the correct path in xulrunner-config Index: config/autoconf.mk.in @@ -9,7 +8,7 @@ retrieving revision 3.449 diff -u -r3.449 autoconf.mk.in --- config/autoconf.mk.in 16 Feb 2008 22:23:08 -0000 3.449 -+++ config/autoconf.mk.in 19 Feb 2008 14:07:13 -0000 ++++ b/config/autoconf.mk.in 19 Feb 2008 14:07:13 -0000 @@ -62,7 +62,7 @@ libdir = @libdir@ datadir = @datadir@ ++++++ l10n-1.9.2b2.tar.bz2 -> l10n-1.9.2b5.tar.bz2 ++++++ mozilla-xulrunner192/l10n-1.9.2b2.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner192/l10n-1.9.2b5.tar.bz2 differ: char 11, line 1 ++++++ mozilla-breakpad.patch ++++++ From: Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: missing declaration with newer compilers diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc @@ -28,16 +28,17 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <signal.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> +#include <stdio.h> #include <cassert> #include <cstdlib> #include <ctime> #include <linux/limits.h> #include "client/linux/handler/exception_handler.h" #include "common/linux/guid_creator.h" diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc @@ -36,16 +36,17 @@ #include <sys/types.h> #include <unistd.h> #include <sys/utsname.h> #include <sys/wait.h> #include <cstdlib> #include <ctime> #include <string.h> +#include <stdio.h> #include "common/linux/file_id.h" #include "client/linux/handler/linux_thread.h" #include "client/minidump_file_writer.h" #include "client/minidump_file_writer-inl.h" #include "google_breakpad/common/minidump_format.h" #include "client/linux/handler/minidump_generator.h" diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc --- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc @@ -26,16 +26,17 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <a.out.h> #include <cstdarg> #include <cstdlib> #include <cxxabi.h> +#include <stdio.h> #include <elf.h> #include <errno.h> #include <fcntl.h> #include <link.h> #include <sys/mman.h> #include <stab.h> #include <sys/stat.h> #include <sys/types.h> ++++++ mozilla-gconf-backend.patch ++++++ ++++ 3516 lines (skipped) ++++++ mozilla-helper-app.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -4,7 +4,6 @@ https://bugzilla.novell.com/show_bug.cgi?id=406979 https://bugzilla.mozilla.org/show_bug.cgi?id=327323 - diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp ++++++ mozilla-kde.patch ++++++ ++++ 3371 lines (skipped) ++++ between mozilla-xulrunner192/mozilla-kde.patch ++++ and /mounts/work_src_done/STABLE/mozilla-xulrunner192/mozilla-kde.patch ++++++ mozilla-libproxy.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -3,11 +3,10 @@ References: https://bugzilla.mozilla.org/show_bug.cgi?id=517655 - diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -523,16 +523,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ +@@ -537,16 +537,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_LIBS = @FT2_LIBS@ MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ @@ -20,18 +19,18 @@ +MOZ_LIBPROXY_LIBS = @MOZ_LIBPROXY_LIBS@ +MOZ_ENABLE_LIBPROXY = @MOZ_ENABLE_LIBPROXY@ + + MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ + MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ + MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ + GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ - LIBIDL_LIBS = @LIBIDL_LIBS@ - STATIC_LIBIDL = @STATIC_LIBIDL@ - - MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ diff --git a/config/system-headers b/config/system-headers --- a/config/system-headers +++ b/config/system-headers -@@ -1028,8 +1028,12 @@ libsn/sn-monitor.h +@@ -1007,15 +1007,19 @@ libsn/sn-monitor.h libsn/sn-util.h #endif #if MOZ_NATIVE_HUNSPELL==1 @@ -44,10 +43,17 @@ +proxy.h +#endif + + #ifdef MOZ_PLATFORM_HILDON + hildon-uri.h + hildon-mime.h + #endif + #ifdef NS_OSSO + libosso.h + #endif diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -5179,16 +5179,39 @@ then +@@ -5280,16 +5280,39 @@ then AC_DEFINE(MOZ_ENABLE_DBUS) fi fi @@ -79,22 +85,22 @@ +AC_SUBST(MOZ_LIBPROXY_LIBS) + +dnl ======================================================== - dnl = Build Personal Security Manager + dnl = libnotify support dnl ======================================================== - MOZ_ARG_DISABLE_BOOL(crypto, - [ --disable-crypto Disable crypto support (Personal Security Manager)], - MOZ_PSM=, - MOZ_PSM=1 ) - dnl ======================================================== + if test "$MOZ_ENABLE_GTK2" + then + MOZ_ENABLE_LIBNOTIFY=1 + + MOZ_ARG_DISABLE_BOOL(libnotify, diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -242,16 +242,20 @@ EXTRA_DSO_LDOPTS += $(FT2_LIBS) +@@ -247,16 +247,20 @@ endif + ifdef MOZ_TREE_FREETYPE + EXTRA_DSO_LDOPTS += $(FT2_LIBS) endif - EXTRA_DSO_LDOPTS += $(MOZ_LOCATION_LIBS) - ifdef MOZ_ENABLE_STARTUP_NOTIFICATION EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS) endif ++++++ mozilla-nongnome-proxies.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,14 +1,13 @@ From: Wolfgang Rosenauer Subject: Do not use gconf for proxy settings if not running within Gnome - Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v retrieving revision 1.1 diff -u -p -6 -r1.1 nsUnixSystemProxySettings.cpp --- toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 29 Jan 2008 15:58:41 -0000 1.1 -+++ toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 17 Apr 2008 19:02:19 -0000 ++++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 17 Apr 2008 19:02:19 -0000 @@ -69,13 +69,19 @@ private: NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) ++++++ mozilla-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,7 +1,6 @@ From: Wolfgang Rosenauer Subject: pkgconfig tuning - diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in ++++++ mozilla-prefer_plugin_pref.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,7 +1,6 @@ From: Ubuntu Subject: introduce a pref to prefer certain plugins for mime-types - diff --git a/modules/plugin/base/src/nsPluginHost.cpp b/modules/plugin/base/src/nsPluginHost.cpp --- a/modules/plugin/base/src/nsPluginHost.cpp +++ b/modules/plugin/base/src/nsPluginHost.cpp ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -4,11 +4,15 @@ (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) References: - diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -535,6 +535,10 @@ LIBIDL_LIBS = @LIBIDL_LIBS@ +@@ -548,16 +548,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO + + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ + LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ LIBIDL_LIBS = @LIBIDL_LIBS@ STATIC_LIBIDL = @STATIC_LIBIDL@ @@ -18,16 +22,24 @@ + MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ - # Used for LD_LIBRARY_PATH + MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ + COMPILER_DEPEND = @COMPILER_DEPEND@ + MDDEPDIR := @MDDEPDIR@ + + MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@ + diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -7613,6 +7613,21 @@ dnl ==================================== +@@ -7756,16 +7756,31 @@ AC_SUBST(MOZ_CAIRO_LIBS) + + dnl qcms + dnl ======================================================== QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)' AC_SUBST(QCMS_LIBS) -+ -+dnl ======================================================== + + dnl ======================================================== +dnl Check for nss-shared-helper +dnl ======================================================== + @@ -41,13 +53,25 @@ +AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) - - dnl ======================================================== ++ ++dnl ======================================================== dnl disable xul + dnl ======================================================== + MOZ_ARG_DISABLE_BOOL(xul, + [ --disable-xul Disable XUL], + MOZ_XUL= ) + if test "$MOZ_XUL"; then + AC_DEFINE(MOZ_XUL) + else diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -137,12 +137,13 @@ DEFINES += -DNSS_ENABLE_ECC +@@ -133,19 +133,20 @@ REQUIRES = nspr \ + $(NULL) + + EXTRA_DEPS = $(NSS_DEP_LIBS) + + DEFINES += -DNSS_ENABLE_ECC # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's @@ -62,24 +86,41 @@ $(NSS_LIBS) \ $(NULL) + include $(topsrcdir)/config/rules.mk + diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -43,6 +43,13 @@ +@@ -39,16 +39,23 @@ + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -+ + +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include <nss-shared-helper.h> +#pragma GCC visibility pop +#include "prenv.h" +#endif - ++ #include "nsNSSComponent.h" #include "nsNSSCallbacks.h" -@@ -1602,7 +1609,21 @@ nsNSSComponent::InitializeNSS(PRBool sho + #include "nsNSSIOLayer.h" + #include "nsSSLThread.h" + #include "nsCertVerificationThread.h" + + #include "nsNetUtil.h" + #include "nsAppDirectoryServiceDefs.h" +@@ -1600,17 +1607,31 @@ nsNSSComponent::InitializeNSS(PRBool sho + // The call to ConfigureInternalPKCS11Token needs to be done before NSS is initialized, + // but affects only static data. + // If we could assume i18n will not change between profiles, one call per application + // run were sufficient. As I can't predict what happens in the future, let's repeat + // this call for every re-init of NSS. ConfigureInternalPKCS11Token(); @@ -102,10 +143,20 @@ if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); + + if (supress_warning_preference) { + which_nss_problem = problem_none; + } + else { diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -194,7 +194,7 @@ endif +@@ -189,17 +189,17 @@ else + EXTRA_DSO_LDOPTS += \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ + $(NULL) + endif DEFINES += -DIMPL_XREAPI @@ -114,3 +165,8 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) + EXTRA_DSO_LDOPTS += \ + -framework SystemConfiguration \ + -framework QuickTime \ + -framework IOKit \ + -lcrypto \ ++++++ mozilla-startup-notification.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,14 +1,14 @@ -From: Lubos Lunak <llunak(a)suse.cz> +From: Lubos Lunak <llunak(a)suse.cz>, Ginn Chen <ginn.chen(a)sun.com> Subject: Firefox 3.5 broken startup notification References: http://bugzilla.novell.com/show_bug.cgi?id=518603 https://bugzilla.mozilla.org/show_bug.cgi?id=416053 - +https://bugzilla.mozilla.org/show_bug.cgi?id=534845 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3342,23 +3342,16 @@ XRE_main(int argc, char* argv[], const n +@@ -3370,23 +3370,16 @@ XRE_main(int argc, char* argv[], const n } dirProvider.DoStartup(); @@ -32,7 +32,7 @@ cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1"); NS_ENSURE_TRUE(cmdLine, 1); -@@ -3376,16 +3369,23 @@ XRE_main(int argc, char* argv[], const n +@@ -3404,16 +3397,23 @@ XRE_main(int argc, char* argv[], const n NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow"); rv = appStartup->CreateHiddenWindow(); @@ -56,3 +56,41 @@ if (upgraded) { rv = em->CheckForMismatches(&needsRestart); if (NS_FAILED(rv)) { +@@ -3581,30 +3581,23 @@ XRE_main(int argc, char* argv[], const n + #ifdef XP_MACOSX + if (gBinaryPath) { + static char kEnvVar[MAXPATHLEN]; + sprintf(kEnvVar, "XRE_BINARY_PATH=%s", gBinaryPath); + PR_SetEnv(kEnvVar); + } + #endif + +-// XXXkt s/MOZ_TOOLKIT_GTK2/MOZ_WIDGET_GTK2/? +-// but the hidden window has been destroyed so toolkit is NULL anyway. +-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2) +- nsGTKToolkit* toolkit = GetGTKToolkit(); +- if (toolkit) { +- nsCAutoString currentDesktopStartupID; +- toolkit->GetDesktopStartupID(&currentDesktopStartupID); +- if (!currentDesktopStartupID.IsEmpty()) { +- nsCAutoString desktopStartupEnv; +- desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID="); +- desktopStartupEnv.Append(currentDesktopStartupID); +- // Leak it with extreme prejudice! +- PR_SetEnv(ToNewCString(desktopStartupEnv)); +- } ++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) ++ if (!desktopStartupID.IsEmpty()) { ++ nsCAutoString desktopStartupEnv; ++ desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID="); ++ desktopStartupEnv.Append(desktopStartupID); ++ // Leak it with extreme prejudice! ++ PR_SetEnv(ToNewCString(desktopStartupEnv)); + } + #endif + + #ifdef MOZ_WIDGET_GTK2 + MOZ_gdk_display_close(display); + #endif + + rv = LaunchChild(nativeApp, appInitiatedRestart); ++++++ toolkit-lockdown.js ++++++ pref("config.lockdown.showsavedpasswords", false); pref("config.lockdown.savepage", false); pref("config.lockdown.printing", false); ++++++ toolkit-ui-lockdown.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,11 +1,15 @@ -From: Robert O'Callahan -Subject: Lockdown feature for Toolkit UI -References: +From: various contributors +Subject: toolkit ui lockdown hooks diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/toolkit/components/passwordmgr/content/passwordManager.js --- a/toolkit/components/passwordmgr/content/passwordManager.js +++ b/toolkit/components/passwordmgr/content/passwordManager.js -@@ -120,8 +120,17 @@ function LoadSignons() { +@@ -119,19 +119,28 @@ function LoadSignons() { + // SignonColumnSort) assumes we want to toggle the sort + // direction but here we don't so we have to trick it + lastSignonSortAscending = !lastSignonSortAscending; + SignonColumnSort(lastSignonSortColumn); + // disable "remove all signons" button if there are no signons var element = document.getElementById("removeAllSignons"); var toggle = document.getElementById("togglePasswords"); @@ -18,12 +22,23 @@ + } if (signons.length == 0 || gSelectUserInUse) { element.setAttribute("disabled","true"); -+ toggle.setAttribute("disabled","true"); -+ } else if (viewLocked) { toggle.setAttribute("disabled","true"); ++ } else if (viewLocked) { ++ toggle.setAttribute("disabled","true"); } else { element.removeAttribute("disabled"); -@@ -167,6 +176,18 @@ function DeleteAllSignons() { + toggle.removeAttribute("disabled"); + } + + return true; + } + +@@ -166,16 +175,28 @@ function DeleteAllSignons() { + var syncNeeded = (signonsTreeView._filterSet.length != 0); + DeleteAllFromTree(signonsTree, signonsTreeView, + signonsTreeView._filterSet.length ? signonsTreeView._filterSet : signons, + deletedSignons, "removeSignon", "removeAllSignons"); + FinalizeSignonDeletions(syncNeeded); } function TogglePasswordVisible() { @@ -42,10 +57,20 @@ if (showingPasswords || ConfirmShowPasswords()) { showingPasswords = !showingPasswords; document.getElementById("togglePasswords").label = kSignonBundle.getString(showingPasswords ? "hidePasswords" : "showPasswords"); + document.getElementById("togglePasswords").accessKey = kSignonBundle.getString(showingPasswords ? "hidePasswordsAccessKey" : "showPasswordsAccessKey"); + document.getElementById("passwordCol").hidden = !showingPasswords; + _filterPasswords(); + } + diff --git a/toolkit/components/printing/content/printdialog.js b/toolkit/components/printing/content/printdialog.js --- a/toolkit/components/printing/content/printdialog.js +++ b/toolkit/components/printing/content/printdialog.js -@@ -50,6 +50,7 @@ var gWebBrowserPrint = null; +@@ -45,16 +45,17 @@ var printService = null; + var gOriginalNumCopies = 1; + + var paramBlock; + var gPrefs = null; + var gPrintSettings = null; var gWebBrowserPrint = null; var gPrintSetInterface = Components.interfaces.nsIPrintSettings; var doDebug = false; @@ -53,7 +78,17 @@ //--------------------------------------------------- function initDialog() -@@ -87,11 +88,23 @@ function initDialog() + { + dialog = new Object; + + dialog.propertiesButton = document.getElementById("properties"); + dialog.descText = document.getElementById("descText"); +@@ -82,21 +83,33 @@ function initDialog() + + dialog.printButton = document.documentElement.getButton("accept"); + + // <data> elements + dialog.printName = document.getElementById("printButton"); dialog.fpDialog = document.getElementById("fpDialog"); dialog.enabled = false; @@ -77,3 +112,8 @@ var value = element.value; if (value && value.length > 0) { value = value.replace(/[^0-9]/g,""); + if (!value) value = ""; + element.value = value; + } + if (!value || value < 1 || value > 999) + dialog.printButton.setAttribute("disabled","true"); ++++++ xulrunner-source-1.9.2b2.tar.bz2 -> xulrunner-source-1.9.2b5.tar.bz2 ++++++ mozilla-xulrunner192/xulrunner-source-1.9.2b2.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner192/xulrunner-source-1.9.2b5.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit net6 for openSUSE:Factory
by root＠Hilbert.suse.de 30 Dec '09

30 Dec '09

Hello community, here is the log from the commit of package net6 for openSUSE:Factory checked in at Wed Dec 30 00:28:41 CET 2009. -------- --- GNOME/net6/net6.changes 2009-12-08 09:45:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/net6/net6.changes 2009-12-24 12:14:09.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Dec 24 12:13:25 CET 2009 - vuntz(a)opensuse.org + +- Update to version 1.3.12: + + Allow non-blocking sockets on *nix. + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- net6-1.3.11.tar.bz2 New: ---- net6-1.3.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net6.spec ++++++ --- /var/tmp/diff_new_pack.CUboU7/_old 2009-12-30 00:28:28.000000000 +0100 +++ /var/tmp/diff_new_pack.CUboU7/_new 2009-12-30 00:28:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package net6 (Version 1.3.11) +# spec file for package net6 (Version 1.3.12) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ License: LGPLv2.1+ Group: Development/Libraries/GNOME AutoReqProv: on -Version: 1.3.11 +Version: 1.3.12 Release: 1 Summary: Network access framework for IPv4/IPv6 Source: %{name}-%{version}.tar.bz2 ++++++ net6-1.3.11.tar.bz2 -> net6-1.3.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/net6-1.3.11/ChangeLog new/net6-1.3.12/ChangeLog --- old/net6-1.3.11/ChangeLog 2009-12-07 22:31:06.000000000 +0100 +++ new/net6-1.3.12/ChangeLog 2009-12-23 15:55:59.000000000 +0100 @@ -1,3 +1,27 @@ +2009-12-23 Philipp Kern <phil(a)0x539.de> + + * configure.ac: add AC_CONFIG_MACRO_DIR for libtoolize + +2009-12-23 Philipp Kern <phil(a)0x539.de> + + * NEWS: + * po/LINGUAS: + * po/en_GB.po: + * po/ko.po: new translations from Launchpad: Korean and English + (Great Britain) + +2009-12-23 Philipp Kern <phil(a)0x539.de> + + * configure.ac: + * NEWS: bump version to 1.3.12 and document the changes + +2009-12-21 Armin Burgmeier <armin(a)arbur.net> + + * src/connection.cpp (on_sock_event): Allow non-blocking sockets by + not closing the connection on EAGAIN. We did that for Windows already, + since Windows requires sockets to be non-blocking when using + WSAEventSelect. + 2009-12-07 Philipp Kern <phil(a)0x539.de> * configure.ac: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/net6-1.3.11/NEWS new/net6-1.3.12/NEWS --- old/net6-1.3.11/NEWS 2009-12-07 22:30:33.000000000 +0100 +++ new/net6-1.3.12/NEWS 2009-12-23 15:53:24.000000000 +0100 @@ -1,6 +1,12 @@ net6 ==== +Version 1.3.12: + * Allow non-blocking sockets on *nix. + * New translations: + - Korean + - English (Great Britain) + Version 1.3.11: * Fix possible TLS lockup on Windows. * New translation: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/net6-1.3.11/configure new/net6-1.3.12/configure --- old/net6-1.3.11/configure 2009-12-07 22:32:08.000000000 +0100 +++ new/net6-1.3.12/configure 2009-12-23 15:56:47.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for net6 1.3.11. +# Generated by GNU Autoconf 2.64 for net6 1.3.12. # # Report bugs to <gobby(a)0x539.de>. # @@ -698,8 +698,8 @@ # Identity of this package. PACKAGE_NAME='net6' PACKAGE_TARNAME='net6' -PACKAGE_VERSION='1.3.11' -PACKAGE_STRING='net6 1.3.11' +PACKAGE_VERSION='1.3.12' +PACKAGE_STRING='net6 1.3.12' PACKAGE_BUGREPORT='gobby(a)0x539.de' PACKAGE_URL='' @@ -1455,7 +1455,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures net6 1.3.11 to adapt to many kinds of systems. +\`configure' configures net6 1.3.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1525,7 +1525,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of net6 1.3.11:";; + short | recursive ) echo "Configuration of net6 1.3.12:";; esac cat <<\_ACEOF @@ -1641,7 +1641,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -net6 configure 1.3.11 +net6 configure 1.3.12 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2133,7 +2133,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by net6 $as_me 1.3.11, which was +It was created by net6 $as_me 1.3.12, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2941,7 +2941,7 @@ # Define the identity of the package. PACKAGE='net6' - VERSION='1.3.11' + VERSION='1.3.12' cat >>confdefs.h <<_ACEOF @@ -3008,6 +3008,7 @@ ac_config_headers="$ac_config_headers inc/config.hpp" + # Extract host information. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -5520,13 +5521,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5523: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5524: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5526: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5527: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5529: output\"" >&5) + (eval echo "\"\$as_me:5530: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6718,7 +6719,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6721 "configure"' > conftest.$ac_ext + echo '#line 6722 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8636,11 +8637,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8639: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8640: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8643: \$? = $ac_status" >&5 + echo "$as_me:8644: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8975,11 +8976,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8978: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8979: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8982: \$? = $ac_status" >&5 + echo "$as_me:8983: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9080,11 +9081,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9083: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9084: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9087: \$? = $ac_status" >&5 + echo "$as_me:9088: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9135,11 +9136,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9138: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9139: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9142: \$? = $ac_status" >&5 + echo "$as_me:9143: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11518,7 +11519,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11521 "configure" +#line 11522 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11614,7 +11615,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11617 "configure" +#line 11618 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13570,11 +13571,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13573: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13574: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13577: \$? = $ac_status" >&5 + echo "$as_me:13578: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13669,11 +13670,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13672: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13673: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13676: \$? = $ac_status" >&5 + echo "$as_me:13677: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13721,11 +13722,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13724: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13725: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13728: \$? = $ac_status" >&5 + echo "$as_me:13729: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17294,7 +17295,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by net6 $as_me 1.3.11, which was +This file was extended by net6 $as_me 1.3.12, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17358,7 +17359,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -net6 config.status 1.3.11 +net6 config.status 1.3.12 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/net6-1.3.11/configure.ac new/net6-1.3.12/configure.ac --- old/net6-1.3.11/configure.ac 2009-12-07 22:29:52.000000000 +0100 +++ new/net6-1.3.12/configure.ac 2009-12-23 15:45:10.000000000 +0100 @@ -2,11 +2,12 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([net6], [1.3.11], [gobby(a)0x539.de] +AC_INIT([net6], [1.3.12], [gobby(a)0x539.de] AM_INIT_AUTOMAKE(1.9 check-news) AM_MAINTAINER_MODE AC_CONFIG_SRCDIR([inc/main.hpp]) AC_CONFIG_HEADER([inc/config.hpp]) +AC_CONFIG_MACRO_DIR([m4]) # Extract host information. AC_CANONICAL_HOST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/net6-1.3.11/po/LINGUAS new/net6-1.3.12/po/LINGUAS --- old/net6-1.3.11/po/LINGUAS 2009-11-15 14:02:46.000000000 +0100 +++ new/net6-1.3.12/po/LINGUAS 2009-12-23 15:53:02.000000000 +0100 @@ -1 +1 @@ -de fr sv es nl it pt he nb pt_BR ru sk uk zh_CN +de fr sv es nl it pt he nb pt_BR ru sk uk zh_CN en_GB ko Files old/net6-1.3.11/po/en_GB.gmo and new/net6-1.3.12/po/en_GB.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/net6-1.3.11/po/en_GB.po new/net6-1.3.12/po/en_GB.po --- old/net6-1.3.11/po/en_GB.po 1970-01-01 01:00:00.000000000 +0100 +++ new/net6-1.3.12/po/en_GB.po 2009-12-23 15:57:12.000000000 +0100 @@ -0,0 +1,294 @@ +# English (United Kingdom) translation for net6 +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the net6 package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: net6\n" +"Report-Msgid-Bugs-To: http://gobby.0x539.de/trac/\n" +"POT-Creation-Date: 2007-12-01 14:45+0100\n" +"PO-Revision-Date: 2009-01-27 10:45+0000\n" +"Last-Translator: Jen Ockwell <jenfraggleubuntu(a)googlemail.com>\n" +"Language-Team: English (United Kingdom) <en_GB(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-12-23 14:48+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: src/error.cpp:42 +msgid "Invalid name" +msgstr "Invalid name" + +#: src/error.cpp:44 +msgid "Name is already in use" +msgstr "Name is already in use" + +#: src/error.cpp:46 +msgid "An unknown login error occured" +msgstr "An unknown login error occured" + +#: src/error.cpp:394 +msgid "Interrupted function call" +msgstr "Interrupted function call" + +#: src/error.cpp:396 +msgid "Access denied" +msgstr "Access denied" + +#: src/error.cpp:398 +msgid "Bad address" +msgstr "Bad address" + +#: src/error.cpp:400 +msgid "Invalid argument" +msgstr "Invalid argument" + +#: src/error.cpp:402 +msgid "Too many open files" +msgstr "Too many open files" + +#: src/error.cpp:404 +msgid "Resource temporarily unavailable" +msgstr "Resource temporarily unavailable" + +#: src/error.cpp:406 +msgid "Operation already in progress" +msgstr "Operation already in progress" + +#: src/error.cpp:408 +msgid "Socket operation on non-socket" +msgstr "Socket operation on non-socket" + +#: src/error.cpp:410 +msgid "Destination address required" +msgstr "Destination address required" + +#: src/error.cpp:412 +msgid "Message too long" +msgstr "Message too long" + +#: src/error.cpp:414 +msgid "Protocol wrong type for socket" +msgstr "Protocol wrong type for socket" + +#: src/error.cpp:416 +msgid "Bad protocol option" +msgstr "Bad protocol option" + +#: src/error.cpp:418 +msgid "Protocol not supported" +msgstr "Protocol not supported" + +#: src/error.cpp:420 +msgid "Socket type not supported" +msgstr "Socket type not supported" + +#: src/error.cpp:422 +msgid "Operation not supported" +msgstr "Operation not supported" + +#: src/error.cpp:424 +msgid "Protocol family not supported" +msgstr "Protocol family not supported" + +#: src/error.cpp:426 +msgid "Address family not supported" +msgstr "Address family not supported" + +#: src/error.cpp:428 +msgid "Address is already in use" +msgstr "Address is already in use" + +#: src/error.cpp:430 +msgid "Cannot assign requested address" +msgstr "Cannot assign requested address" + +#: src/error.cpp:432 +msgid "Network is down" +msgstr "Network is down" + +#: src/error.cpp:434 +msgid "Network is unreachable" +msgstr "Network is unreachable" + +#: src/error.cpp:436 +msgid "Network dropped connection on reset" +msgstr "Network dropped connection on reset" + +#: src/error.cpp:438 +msgid "Software caused connection abort" +msgstr "Software caused connection abort" + +#: src/error.cpp:440 +msgid "Connection reset by peer" +msgstr "Connection reset by peer" + +#: src/error.cpp:442 +msgid "No buffer space available" +msgstr "No buffer space available" + +#: src/error.cpp:444 +msgid "Socket is already connected" +msgstr "Socket is already connected" + +#: src/error.cpp:446 +msgid "Socket is not connected" +msgstr "Socket is not connected" + +#: src/error.cpp:448 +msgid "Cannot send after socket shutdown" +msgstr "Cannot send after socket shutdown" + +#: src/error.cpp:450 +msgid "Connection timed out" +msgstr "Connection timed out" + +#: src/error.cpp:452 +msgid "Connection refused" +msgstr "Connection refused" + +#: src/error.cpp:454 +msgid "Host is down" +msgstr "Host is down" + +#: src/error.cpp:456 +msgid "No route to host" +msgstr "No route to host" + +#: src/error.cpp:458 +msgid "Too many processes" +msgstr "Too many processes" + +#: src/error.cpp:460 +msgid "Network subsystem is unavailable" +msgstr "Network subsystem is unavailable" + +#: src/error.cpp:462 +msgid "Winsock.dll version out of range" +msgstr "Winsock.dll version out of range" + +#: src/error.cpp:464 +msgid "Successful WSAStartup not yet performed" +msgstr "Successful WSAStartup not yet performed" + +#: src/error.cpp:466 +msgid "Graceful shutdown in progress" +msgstr "Graceful shutdown in progress" + +#: src/error.cpp:468 +msgid "Class type not found" +msgstr "Class type not found" + +#: src/error.cpp:470 +msgid "Host not found" +msgstr "Host not found" + +#: src/error.cpp:472 +msgid "Nonauthoritative host not found" +msgstr "Nonauthoritative host not found" + +#: src/error.cpp:474 +msgid "No data record of requested type" +msgstr "No data record of requested type" + +#: src/error.cpp:476 +msgid "Specified event object handle is invalid" +msgstr "Specified event object handle is invalid" + +#: src/error.cpp:478 +msgid "One or more parameters are invalid" +msgstr "One or more parameters are invalid" + +#: src/error.cpp:480 +msgid "No more memory is available" +msgstr "No more memory is available" + +#: src/error.cpp:482 +msgid "Broken pipe" +msgstr "Broken pipe" + +#: src/error.cpp:484 +msgid "No such device" +msgstr "No such device" + +#: src/error.cpp:486 +msgid "Decryption has failed" +msgstr "Decryption has failed" + +#: src/error.cpp:488 +msgid "" +"The Diffie Hellman prime sent by the server is not acceptable (not long " +"enough)" +msgstr "" +"The Diffie Hellman prime sent by the server is not acceptable (not long " +"enough)" + +#: src/error.cpp:491 +msgid "Encryption has failed" +msgstr "Encryption has failed" + +#: src/error.cpp:493 +msgid "TLS Application data were received, while expecting handshake data" +msgstr "TLS Application data were received, while expecting handshake data" + +#: src/error.cpp:496 +msgid "Insufficient credentials for that request" +msgstr "Insufficient credentials for that request" + +#: src/error.cpp:498 +msgid "The request is invalid" +msgstr "The request is invalid" + +#: src/error.cpp:500 +msgid "Key usage violation in certificate has been detected" +msgstr "Key usage violation in certificate has been detected" + +#: src/error.cpp:503 +msgid "The Message Authentication Code verification failed" +msgstr "The Message Authentication Code verification failed" + +#: src/error.cpp:506 +msgid "The peer did not send any certificate" +msgstr "The peer did not send any certificate" + +#: src/error.cpp:508 +msgid "No temporary DH parameters were found" +msgstr "No temporary DH parameters were found" + +#: src/error.cpp:510 +msgid "No temporary RSA parameters were found" +msgstr "No temporary RSA parameters were found" + +#: src/error.cpp:512 +msgid "Error in the pull function" +msgstr "Error in the pull function" + +#: src/error.cpp:514 +msgid "Error in the push function" +msgstr "Error in the push function" + +#: src/error.cpp:516 +msgid "Failed to acquire random data" +msgstr "Failed to acquire random data" + +#: src/error.cpp:518 +msgid "Rehandshake was requested by the peer" +msgstr "Rehandshake was requested by the peer" + +#: src/error.cpp:520 +msgid "An unexpected TLS handshake packet was received" +msgstr "An unexpected TLS handshake packet was received" + +#: src/error.cpp:523 +msgid "An unexpected TLS packet was received" +msgstr "An unexpected TLS packet was received" + +#: src/error.cpp:525 +msgid "A TLS packet with unexpected length was received." +msgstr "A TLS packet with unexpected length was received." + +#: src/error.cpp:528 +msgid "A nonrecoverable error has occured" +msgstr "A nonrecoverable error has occured" Files old/net6-1.3.11/po/ko.gmo and new/net6-1.3.12/po/ko.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/net6-1.3.11/po/ko.po new/net6-1.3.12/po/ko.po --- old/net6-1.3.11/po/ko.po 1970-01-01 01:00:00.000000000 +0100 +++ new/net6-1.3.12/po/ko.po 2009-12-23 15:57:12.000000000 +0100 @@ -0,0 +1,292 @@ +# Korean translation for net6 +# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007 +# This file is distributed under the same license as the net6 package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: net6\n" +"Report-Msgid-Bugs-To: http://gobby.0x539.de/trac/\n" +"POT-Creation-Date: 2007-12-01 14:45+0100\n" +"PO-Revision-Date: 2009-09-29 21:13+0000\n" +"Last-Translator: sungyup nham <Unknown>\n" +"Language-Team: Korean <ko(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-12-23 14:48+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: src/error.cpp:42 +msgid "Invalid name" +msgstr "잘못된 이름" + +#: src/error.cpp:44 +msgid "Name is already in use" +msgstr "이미 사용되고 있는 이름" + +#: src/error.cpp:46 +msgid "An unknown login error occured" +msgstr "알 수 없는 로그인 오류 발생" + +#: src/error.cpp:394 +msgid "Interrupted function call" +msgstr "인터럽트 함수 호출" + +#: src/error.cpp:396 +msgid "Access denied" +msgstr "접근이 거부됨" + +#: src/error.cpp:398 +msgid "Bad address" +msgstr "잘못된 주소" + +#: src/error.cpp:400 +msgid "Invalid argument" +msgstr "잘못된 인자값" + +#: src/error.cpp:402 +msgid "Too many open files" +msgstr "너무 많은 파일을 엽니다" + +#: src/error.cpp:404 +msgid "Resource temporarily unavailable" +msgstr "일시적으로 사용할 수 없는 리소스" + +#: src/error.cpp:406 +msgid "Operation already in progress" +msgstr "이미 진행중인 동작" + +#: src/error.cpp:408 +msgid "Socket operation on non-socket" +msgstr "non-소켓에서의 소켓 동작" + +#: src/error.cpp:410 +msgid "Destination address required" +msgstr "목적지 주소 필요" + +#: src/error.cpp:412 +msgid "Message too long" +msgstr "너무 긴 메시지" + +#: src/error.cpp:414 +msgid "Protocol wrong type for socket" +msgstr "소켓에 부적합한 프로토콜 타입" + +#: src/error.cpp:416 +msgid "Bad protocol option" +msgstr "잘못된 프로토콜 옵션" + +#: src/error.cpp:418 +msgid "Protocol not supported" +msgstr "지원되지 않는 프로토콜" + +#: src/error.cpp:420 +msgid "Socket type not supported" +msgstr "지원되지 않는 소켓 형식" + +#: src/error.cpp:422 +msgid "Operation not supported" +msgstr "지원되지 않는 동작" + +#: src/error.cpp:424 +msgid "Protocol family not supported" +msgstr "지원되지 않는 프로토콜 체계" + +#: src/error.cpp:426 +msgid "Address family not supported" +msgstr "지원되지 않는 주소 체계" + +#: src/error.cpp:428 +msgid "Address is already in use" +msgstr "이미 사용되고 있는 주소" + +#: src/error.cpp:430 +msgid "Cannot assign requested address" +msgstr "요구한 주소를 할당할 수 없음" + +#: src/error.cpp:432 +msgid "Network is down" +msgstr "네트워크 멈춤" + +#: src/error.cpp:434 +msgid "Network is unreachable" +msgstr "접근할 수 없는 네트워크" + +#: src/error.cpp:436 +msgid "Network dropped connection on reset" +msgstr "네트워크 연결이 끊어짐" + +#: src/error.cpp:438 +msgid "Software caused connection abort" +msgstr "소프트웨어로 인한 접속 취소" + +#: src/error.cpp:440 +msgid "Connection reset by peer" +msgstr "Peer에 의해 연결이 초기화 됨" + +#: src/error.cpp:442 +msgid "No buffer space available" +msgstr "가용한 버퍼 공간 없음" + +#: src/error.cpp:444 +msgid "Socket is already connected" +msgstr "이미 접속된 소켓" + +#: src/error.cpp:446 +msgid "Socket is not connected" +msgstr "접속 할 수 없는 소켓" + +#: src/error.cpp:448 +msgid "Cannot send after socket shutdown" +msgstr "소켓 폐쇄 이후에 보낼 수 없음" + +#: src/error.cpp:450 +msgid "Connection timed out" +msgstr "연결 시간 초과" + +#: src/error.cpp:452 +msgid "Connection refused" +msgstr "연결 거부됨" + +#: src/error.cpp:454 +msgid "Host is down" +msgstr "호스트 멈춤" + +#: src/error.cpp:456 +msgid "No route to host" +msgstr "호스트를 위한 경로 없음" + +#: src/error.cpp:458 +msgid "Too many processes" +msgstr "너무 많은 프로세스" + +#: src/error.cpp:460 +msgid "Network subsystem is unavailable" +msgstr "네트워크 서브 시스템을 사용할 수 없음" + +#: src/error.cpp:462 +msgid "Winsock.dll version out of range" +msgstr "Winsock.dll 버전의 범위를 벗어남" + +#: src/error.cpp:464 +msgid "Successful WSAStartup not yet performed" +msgstr "성공적인 WSAStartup이 아직 수행되지 않음" + +#: src/error.cpp:466 +msgid "Graceful shutdown in progress" +msgstr "진행 중 적절한 폐쇄" + +#: src/error.cpp:468 +msgid "Class type not found" +msgstr "클래스 타입을 찾을 수 없음" + +#: src/error.cpp:470 +msgid "Host not found" +msgstr "호스트를 찾을 수 없음" + +#: src/error.cpp:472 +msgid "Nonauthoritative host not found" +msgstr "미인증 호스트를 찾을 수 없음" + +#: src/error.cpp:474 +msgid "No data record of requested type" +msgstr "요청된 형식의 데이터 레코드 없음" + +#: src/error.cpp:476 +msgid "Specified event object handle is invalid" +msgstr "정의 된 이벤트 객체 핸들이 유효하지 않음" + +#: src/error.cpp:478 +msgid "One or more parameters are invalid" +msgstr "하나 또는 그 이상의 유효하지 않은 매개변수" + +#: src/error.cpp:480 +msgid "No more memory is available" +msgstr "가용한 메모리 없음" + +#: src/error.cpp:482 +msgid "Broken pipe" +msgstr "깨어진 파이프" + +#: src/error.cpp:484 +msgid "No such device" +msgstr "장치를 찾을 수 없음" + +#: src/error.cpp:486 +msgid "Decryption has failed" +msgstr "복호화 실패" + +#: src/error.cpp:488 +msgid "" +"The Diffie Hellman prime sent by the server is not acceptable (not long " +"enough)" +msgstr "" + +#: src/error.cpp:491 +msgid "Encryption has failed" +msgstr "암호화 실패" + +#: src/error.cpp:493 +msgid "TLS Application data were received, while expecting handshake data" +msgstr "" + +#: src/error.cpp:496 +msgid "Insufficient credentials for that request" +msgstr "" + +#: src/error.cpp:498 +msgid "The request is invalid" +msgstr "해당 요청은 타당하지 않습니다" + +#: src/error.cpp:500 +msgid "Key usage violation in certificate has been detected" +msgstr "" + +#: src/error.cpp:503 +msgid "The Message Authentication Code verification failed" +msgstr "" + +#: src/error.cpp:506 +msgid "The peer did not send any certificate" +msgstr "" + +#: src/error.cpp:508 +msgid "No temporary DH parameters were found" +msgstr "임시 DH 파라미터를 찾을 수 없음" + +#: src/error.cpp:510 +msgid "No temporary RSA parameters were found" +msgstr "임시 RSA 파라미터를 찾을 수 없음" + +#: src/error.cpp:512 +msgid "Error in the pull function" +msgstr "Pull 함수안의 오류" + +#: src/error.cpp:514 +msgid "Error in the push function" +msgstr "Push 함수안의 오류" + +#: src/error.cpp:516 +msgid "Failed to acquire random data" +msgstr "랜덤 데이터를 얻는데 실패 함" + +#: src/error.cpp:518 +msgid "Rehandshake was requested by the peer" +msgstr "Peer에 의해 Rehandshake(재 신호변경)이 요청 됨" + +#: src/error.cpp:520 +msgid "An unexpected TLS handshake packet was received" +msgstr "예기치 않은 TLS 핸드쉐이크(신호변경) 패킷이 수신 됨" + +#: src/error.cpp:523 +msgid "An unexpected TLS packet was received" +msgstr "예기치 않은 TLS 패킷이 수신 됨" + +#: src/error.cpp:525 +msgid "A TLS packet with unexpected length was received." +msgstr "예기치 않은 길이의 TLS 패킷이 수신 됨" + +#: src/error.cpp:528 +msgid "A nonrecoverable error has occured" +msgstr "치명적인 에러 발생" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/net6-1.3.11/src/connection.cpp new/net6-1.3.12/src/connection.cpp --- old/net6-1.3.11/src/connection.cpp 2009-11-15 14:02:46.000000000 +0100 +++ new/net6-1.3.12/src/connection.cpp 2009-12-23 15:42:31.000000000 +0100 @@ -233,14 +233,11 @@ } catch(net6::error& e) { - // Asynchronous send/recv on WIN32 requires that one - // reads/writes from/to the socket until WSAEWOULDBLOCK - // occurs. We catch this case here to allow - // asynchronous selection on WIN32. -#ifdef WIN32 + // Allow users to set sockets to non-blocking in which case + // we might get EAGAIN here. if(e.get_code() == error::WOULD_BLOCK) return; -#endif + // We should not throw any error here because it would fall // through to the selector. If something went wrong, then // we have to handle it here. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nautilus for openSUSE:Factory
by root＠Hilbert.suse.de 30 Dec '09

30 Dec '09

Hello community, here is the log from the commit of package nautilus for openSUSE:Factory checked in at Wed Dec 30 00:28:36 CET 2009. -------- --- GNOME/nautilus/nautilus.changes 2009-12-15 14:41:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2009-12-18 09:48:43.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Dec 18 09:31:53 CET 2009 - vuntz(a)opensuse.org + +- Update to version 2.29.1: + + Make browser mode the default + + Add split view mode + + Browser UI reorganization + + Better background support on multi-monitor setups + + Support new "default location" on mounts (supported by ftp and + sftp) + + Add extension api to lookup NautilusFileInfo objects + + Make the search toolbar button a toggle button + + Ctrl+shift does multiple range selection in list view +- Rebase + nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff + to apply without fuzz. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nautilus-2.28.4.tar.bz2 New: ---- nautilus-2.29.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.4mkeiy/_old 2009-12-30 00:28:24.000000000 +0100 +++ /var/tmp/diff_new_pack.4mkeiy/_new 2009-12-30 00:28:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.28.4) +# spec file for package nautilus (Version 2.29.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -35,7 +35,7 @@ BuildRequires: update-desktop-files License: GPLv2+ Group: Productivity/File utilities -Version: 2.28.4 +Version: 2.29.1 Release: 1 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.… @@ -107,6 +107,9 @@ %{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* %{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* %endif +%if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +%endif rm $RPM_BUILD_ROOT/%{_libdir}/*.*a ### ln -s ../icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ # FIXME: this is probably wrong, but it enables the build to succeed for now ++++++ nautilus-2.28.4.tar.bz2 -> nautilus-2.29.1.tar.bz2 ++++++ ++++ 95480 lines of diff (skipped) ++++++ nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff ++++++ --- /var/tmp/diff_new_pack.4mkeiy/_old 2009-12-30 00:28:28.000000000 +0100 +++ /var/tmp/diff_new_pack.4mkeiy/_new 2009-12-30 00:28:28.000000000 +0100 @@ -15,11 +15,11 @@ 4 files changed, 4 insertions(+), 4 deletions(-) -Index: nautilus-2.27.1/data/nautilus-file-management-properties.desktop.in.in +Index: nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in =================================================================== ---- nautilus-2.27.1.orig/data/nautilus-file-management-properties.desktop.in.in -+++ nautilus-2.27.1/data/nautilus-file-management-properties.desktop.in.in -@@ -3,7 +3,7 @@ Encoding=UTF-8 +--- nautilus-2.29.1.orig/data/nautilus-file-management-properties.desktop.in.in ++++ nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in +@@ -2,7 +2,7 @@ _Name=File Management _Comment=Change the behaviour and appearance of file manager windows Exec=nautilus-file-management-properties @@ -28,12 +28,12 @@ Terminal=false Type=Application StartupNotify=true -Index: nautilus-2.27.1/data/nautilus.desktop.in.in +Index: nautilus-2.29.1/data/nautilus.desktop.in.in =================================================================== ---- nautilus-2.27.1.orig/data/nautilus.desktop.in.in -+++ nautilus-2.27.1/data/nautilus.desktop.in.in -@@ -2,7 +2,7 @@ - Encoding=UTF-8 +--- nautilus-2.29.1.orig/data/nautilus.desktop.in.in ++++ nautilus-2.29.1/data/nautilus.desktop.in.in +@@ -1,7 +1,7 @@ + [Desktop Entry] _Name=File Manager Exec=nautilus -Icon=system-file-manager @@ -41,10 +41,10 @@ Terminal=false Type=Application StartupNotify=true -Index: nautilus-2.27.1/src/nautilus-file-management-properties.c +Index: nautilus-2.29.1/src/nautilus-file-management-properties.c =================================================================== ---- nautilus-2.27.1.orig/src/nautilus-file-management-properties.c -+++ nautilus-2.27.1/src/nautilus-file-management-properties.c +--- nautilus-2.29.1.orig/src/nautilus-file-management-properties.c ++++ nautilus-2.29.1/src/nautilus-file-management-properties.c @@ -807,7 +807,7 @@ nautilus_file_management_properties_dial (GClosureNotify)g_object_unref, 0); @@ -54,11 +54,11 @@ if (window) { gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window)); -Index: nautilus-2.27.1/src/nautilus-navigation-window.c +Index: nautilus-2.29.1/src/nautilus-navigation-window.c =================================================================== ---- nautilus-2.27.1.orig/src/nautilus-navigation-window.c -+++ nautilus-2.27.1/src/nautilus-navigation-window.c -@@ -1285,7 +1285,7 @@ static NautilusIconInfo * +--- nautilus-2.29.1.orig/src/nautilus-navigation-window.c ++++ nautilus-2.29.1/src/nautilus-navigation-window.c +@@ -759,7 +759,7 @@ static NautilusIconInfo * real_get_icon (NautilusWindow *window, NautilusWindowSlot *slot) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mousetweaks for openSUSE:Factory
by root＠Hilbert.suse.de 30 Dec '09

30 Dec '09

Hello community, here is the log from the commit of package mousetweaks for openSUSE:Factory checked in at Wed Dec 30 00:28:16 CET 2009. -------- --- GNOME/mousetweaks/mousetweaks.changes 2009-12-01 20:28:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/mousetweaks/mousetweaks.changes 2009-12-22 04:46:41.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 22 04:41:53 CET 2009 - lmedinas(a)opensuse.org + +- Update to version 2.29.4: + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mousetweaks-2.29.3.tar.bz2 New: ---- mousetweaks-2.29.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mousetweaks.spec ++++++ --- /var/tmp/diff_new_pack.mXK5il/_old 2009-12-30 00:27:43.000000000 +0100 +++ /var/tmp/diff_new_pack.mXK5il/_new 2009-12-30 00:27:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mousetweaks (Version 2.29.3) +# spec file for package mousetweaks (Version 2.29.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: mousetweaks -Version: 2.29.3 +Version: 2.29.4 Release: 1 License: GPLv3 Summary: Tweak mouse settings in GNOME ++++++ mousetweaks-2.29.3.tar.bz2 -> mousetweaks-2.29.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mousetweaks-2.29.3/ChangeLog new/mousetweaks-2.29.4/ChangeLog --- old/mousetweaks-2.29.3/ChangeLog 2009-11-29 20:33:53.000000000 +0100 +++ new/mousetweaks-2.29.4/ChangeLog 2009-12-21 17:23:06.000000000 +0100 @@ -1,5 +1,51 @@ # Generated by Makefile. Do not edit. +commit 19db59eb2ae8692926a9ca38a25b6f4c8de6d9c7 +Author: Lucian Adrian Grijincu <lucian.grijincu(a)gmail.com> +Date: Sat Dec 19 12:33:13 2009 +0200 + + Update Romanian translation + + po/ro.po | 97 +++++++++++++++++++++++++++++++++++++------------------------- + 1 files changed, 58 insertions(+), 39 deletions(-) + +commit 757f14557fd64e08cb3900ba0d6c219161495125 +Author: Yair Hershkovitz <yairhr(a)gmail.com> +Date: Sat Dec 5 20:07:58 2009 +0200 + + Updated Hebrew translation + + po/he.po | 266 ++++++++++++++++++++++++++++++++++++++++++-------------------- + 1 files changed, 181 insertions(+), 85 deletions(-) + +commit cdb381045022403954b741a87937026d7ccfcef4 +Author: Daniel Nylander <po(a)danielnylander.se> +Date: Mon Nov 30 09:43:01 2009 +0100 + + Updated Swedish translation + + po/sv.po | 84 +++++++++++++++++++++++++++++++++++-------------------------- + 1 files changed, 48 insertions(+), 36 deletions(-) + +commit 5175acd465c3a4fcf8bbc6573b2c556a519c8d60 +Author: Francesco Fumanti <francesco.fumanti(a)gmx.net> +Date: Sun Nov 29 20:44:47 2009 +0100 + + Post release version bump to 2.29.4 + + README | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 050577991b47b2dfd326c2e7266ea5ac2cb585e7 +Author: Francesco Fumanti <francesco.fumanti(a)gmx.net> +Date: Sun Nov 29 20:37:34 2009 +0100 + + Prepare the 2.29.3 release + + NEWS | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + commit 8f422652a1ad84e5c76022bd4687961f914e1bef Author: Matej Urbančič <mateju(a)svn.gnome.org> Date: Wed Nov 18 07:08:17 2009 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mousetweaks-2.29.3/NEWS new/mousetweaks-2.29.4/NEWS --- old/mousetweaks-2.29.3/NEWS 2009-11-29 20:28:55.000000000 +0100 +++ new/mousetweaks-2.29.4/NEWS 2009-12-21 17:20:04.000000000 +0100 @@ -1,3 +1,12 @@ +Version 2.29.4 +--------------- + +New and updated translations: + + [he] Yaron Shahrabani + [ro] Lucian Adrian Grijincu + [sv] Daniel Nylander + Version 2.29.3 --------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mousetweaks-2.29.3/README new/mousetweaks-2.29.4/README --- old/mousetweaks-2.29.3/README 2009-11-16 15:56:29.000000000 +0100 +++ new/mousetweaks-2.29.4/README 2009-12-21 17:09:06.000000000 +0100 @@ -1,4 +1,4 @@ -Mousetweaks 2.29.3 +Mousetweaks 2.29.4 ------------------- Description: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mousetweaks-2.29.3/configure new/mousetweaks-2.29.4/configure --- old/mousetweaks-2.29.3/configure 2009-11-29 20:32:10.000000000 +0100 +++ new/mousetweaks-2.29.4/configure 2009-12-21 17:21:18.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for mousetweaks 2.29.3. +# Generated by GNU Autoconf 2.64 for mousetweaks 2.29.4. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=mousetweaks>. # @@ -550,8 +550,8 @@ # Identity of this package. PACKAGE_NAME='mousetweaks' PACKAGE_TARNAME='mousetweaks' -PACKAGE_VERSION='2.29.3' -PACKAGE_STRING='mousetweaks 2.29.3' +PACKAGE_VERSION='2.29.4' +PACKAGE_STRING='mousetweaks 2.29.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=mousetweaks' PACKAGE_URL='' @@ -1324,7 +1324,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mousetweaks 2.29.3 to adapt to many kinds of systems. +\`configure' configures mousetweaks 2.29.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1390,7 +1390,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mousetweaks 2.29.3:";; + short | recursive ) echo "Configuration of mousetweaks 2.29.4:";; esac cat <<\_ACEOF @@ -1511,7 +1511,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mousetweaks configure 2.29.3 +mousetweaks configure 2.29.4 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1882,7 +1882,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mousetweaks $as_me 2.29.3, which was +It was created by mousetweaks $as_me 2.29.4, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2697,7 +2697,7 @@ # Define the identity of the package. PACKAGE='mousetweaks' - VERSION='2.29.3' + VERSION='2.29.4' cat >>confdefs.h <<_ACEOF @@ -6904,7 +6904,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mousetweaks $as_me 2.29.3, which was +This file was extended by mousetweaks $as_me 2.29.4, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6968,7 +6968,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -mousetweaks config.status 2.29.3 +mousetweaks config.status 2.29.4 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mousetweaks-2.29.3/configure.ac new/mousetweaks-2.29.4/configure.ac --- old/mousetweaks-2.29.3/configure.ac 2009-11-16 15:56:52.000000000 +0100 +++ new/mousetweaks-2.29.4/configure.ac 2009-12-21 17:09:06.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ(2.57) AC_INIT([mousetweaks], - [2.29.3], + [2.29.4], [http://bugzilla.gnome.org/enter_bug.cgi?product=mousetweaks] AC_CONFIG_SRCDIR([src]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mousetweaks-2.29.3/po/he.po new/mousetweaks-2.29.4/po/he.po --- old/mousetweaks-2.29.3/po/he.po 2009-11-16 15:12:25.000000000 +0100 +++ new/mousetweaks-2.29.4/po/he.po 2009-12-21 17:09:06.000000000 +0100 @@ -6,8 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: 1\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mousetweaks&component=gener…" -"POT-Creation-Date: 2009-06-01 08:54+0000\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=mousetweaks&component=general\n" +"POT-Creation-Date: 2009-11-17 07:06+0000\n" "PO-Revision-Date: 2009-07-05 22:51+0200\n" "Last-Translator: Yaron Shahrabani <sh.yaron(a)gmail.com>\n" "Language-Team: he\n" @@ -28,29 +29,24 @@ msgid "Click Type Window" msgstr "חלון סוג לחיצה" -#: ../data/dwell-click-applet.ui.h:4 -#: ../data/mousetweaks.ui.h:1 +#: ../data/dwell-click-applet.ui.h:4 ../data/mousetweaks.ui.h:1 msgid "Double Click" msgstr "לחיצה כפולה" -#: ../data/dwell-click-applet.ui.h:5 -#: ../data/mousetweaks.ui.h:2 +#: ../data/dwell-click-applet.ui.h:5 ../data/mousetweaks.ui.h:2 msgid "Drag Click" msgstr "לחיצת גרירה" -#: ../data/dwell-click-applet.ui.h:6 -#: ../data/mousetweaks.schemas.in.h:12 -#: ../src/mt-main.c:873 +#: ../data/dwell-click-applet.ui.h:6 ../data/mousetweaks.schemas.in.h:12 +#: ../src/mt-main.c:876 msgid "Enable dwell click" msgstr "Enable dwell click" -#: ../data/dwell-click-applet.ui.h:7 -#: ../data/mousetweaks.ui.h:4 +#: ../data/dwell-click-applet.ui.h:7 ../data/mousetweaks.ui.h:4 msgid "Right Click" msgstr "לחיצה ימנית" -#: ../data/dwell-click-applet.ui.h:8 -#: ../data/mousetweaks.ui.h:8 +#: ../data/dwell-click-applet.ui.h:8 ../data/mousetweaks.ui.h:8 msgid "Single Click" msgstr "לחיצה בודדת" @@ -71,7 +67,6 @@ msgstr "C_trl" #: ../data/pointer-capture-applet.ui.h:5 -#| msgid "Capture Pointer" msgid "Capture Pointer" msgstr "לכידת הסמן" @@ -96,7 +91,6 @@ msgstr "מאפייני לכידת סמן" #: ../data/pointer-capture-applet.ui.h:11 -#| msgid "Release Pointer" msgid "Release Pointer" msgstr "שחרור vסמן" @@ -113,7 +107,6 @@ msgstr "Sh_ift" #: ../data/pointer-capture-applet.ui.h:15 -#| msgid "Size of capture area" msgid "Size of Capture Area" msgstr "גודל אזור הלכידה" @@ -145,8 +138,7 @@ msgid "Show Text only" msgstr "הצג טקסט בלבד" -#: ../data/DwellClick_Factory.server.in.in.h:1 -#: ../src/dwell-click-applet.c:561 +#: ../data/DwellClick_Factory.server.in.in.h:1 ../src/dwell-click-applet.c:561 msgid "Dwell Click" msgstr "לחיצת שהייה" @@ -159,22 +151,19 @@ msgstr "איזור לנעילת הסמן" #: ../data/PointerCapture_Factory.server.in.in.h:2 -#: ../src/pointer-capture-applet.c:549 +#: ../src/pointer-capture-applet.c:563 msgid "Pointer Capture" msgstr "לכידת סמן" -#: ../data/DwellClick.xml.h:1 -#: ../data/PointerCapture.xml.h:1 +#: ../data/DwellClick.xml.h:1 ../data/PointerCapture.xml.h:1 msgid "_About" msgstr "_אודות" -#: ../data/DwellClick.xml.h:2 -#: ../data/PointerCapture.xml.h:2 +#: ../data/DwellClick.xml.h:2 ../data/PointerCapture.xml.h:2 msgid "_Help" msgstr "_עזרה" -#: ../data/DwellClick.xml.h:3 -#: ../data/PointerCapture.xml.h:3 +#: ../data/DwellClick.xml.h:3 ../data/PointerCapture.xml.h:3 msgid "_Preferences" msgstr "_העדפות" @@ -187,24 +176,42 @@ msgstr "Button style" #: ../data/mousetweaks.schemas.in.h:3 -msgid "Button style in click type window (\"0\" = Text, \"1\" = Icon, \"2\" = Both)" -msgstr "Button style in click type window (\"0\" = Text, \"1\" = Icon, \"2\" = Both)" +msgid "" +"Button style in click type window (\"0\" = Text, \"1\" = Icon, \"2\" = Both)" +msgstr "" +"Button style in click type window (\"0\" = Text, \"1\" = Icon, \"2\" = Both)" #: ../data/mousetweaks.schemas.in.h:4 -msgid "Direction to perform a double click (\"0\" = Left, \"1\" = Right, \"2\" = Up, \"3\" = Down)" -msgstr "Direction to perform a double click (\"0\" = Left, \"1\" = Right, \"2\" = Up, \"3\" = Down)" +msgid "" +"Direction to perform a double click (\"0\" = Left, \"1\" = Right, \"2\" = " +"Up, \"3\" = Down)" +msgstr "" +"Direction to perform a double click (\"0\" = Left, \"1\" = Right, \"2\" = " +"Up, \"3\" = Down)" #: ../data/mousetweaks.schemas.in.h:5 -msgid "Direction to perform a drag click (\"0\" = Left, \"1\" = Right, \"2\" = Up, \"3\" = Down)" -msgstr "Direction to perform a drag click (\"0\" = Left, \"1\" = Right, \"2\" = Up, \"3\" = Down)" +msgid "" +"Direction to perform a drag click (\"0\" = Left, \"1\" = Right, \"2\" = Up, " +"\"3\" = Down)" +msgstr "" +"Direction to perform a drag click (\"0\" = Left, \"1\" = Right, \"2\" = Up, " +"\"3\" = Down)" #: ../data/mousetweaks.schemas.in.h:6 -msgid "Direction to perform a secondary click (\"0\" = Left, \"1\" = Right, \"2\" = Up, \"3\" = Down)" -msgstr "Direction to perform a secondary click (\"0\" = Left, \"1\" = Right, \"2\" = Up, \"3\" = Down)" +msgid "" +"Direction to perform a secondary click (\"0\" = Left, \"1\" = Right, \"2\" = " +"Up, \"3\" = Down)" +msgstr "" +"Direction to perform a secondary click (\"0\" = Left, \"1\" = Right, \"2\" = " +"Up, \"3\" = Down)" #: ../data/mousetweaks.schemas.in.h:7 -msgid "Direction to perform a single click (\"0\" = Left, \"1\" = Right, \"2\" = Up, \"3\" = Down)" -msgstr "Direction to perform a single click (\"0\" = Left, \"1\" = Right, \"2\" = Up, \"3\" = Down)" +msgid "" +"Direction to perform a single click (\"0\" = Left, \"1\" = Right, \"2\" = " +"Up, \"3\" = Down)" +msgstr "" +"Direction to perform a single click (\"0\" = Left, \"1\" = Right, \"2\" = " +"Up, \"3\" = Down)" #: ../data/mousetweaks.schemas.in.h:8 msgid "Distance in pixels before movement will be recognized" @@ -215,8 +222,9 @@ msgstr "Dwell click mode" #: ../data/mousetweaks.schemas.in.h:10 -msgid "Dwell click mode (\"0\" = Gesture mode, \"1\" = Window mode)" -msgstr "Dwell click mode (\"0\" = Gesture mode, \"1\" = Window mode)" +#| msgid "Dwell click mode (\"0\" = Gesture mode, \"1\" = Window mode)" +msgid "Dwell click mode (\"0\" = Window mode, \"1\" = Gesture mode)" +msgstr "Dwell click mode (\"0\" = Window mode, \"1\" = Gesture mode)" #: ../data/mousetweaks.schemas.in.h:11 msgid "Dwell click time" @@ -226,8 +234,7 @@ msgid "Enable secondary click" msgstr "Enable secondary click" -#: ../data/mousetweaks.schemas.in.h:14 -#: ../src/mt-main.c:875 +#: ../data/mousetweaks.schemas.in.h:14 ../src/mt-main.c:878 msgid "Enable simulated secondary click" msgstr "Enable simulated secondary click" @@ -256,7 +263,6 @@ msgstr "Secondary click time" #: ../data/mousetweaks.schemas.in.h:21 -#: ../src/mt-main.c:883 msgid "Show click type window" msgstr "Show click type window" @@ -309,90 +315,156 @@ msgstr "Size of capture area" #: ../data/pointer-capture-applet.schemas.in.h:10 -msgid "This mouse button must be pressed to release the pointer from the capture area. Valid values are \"1\" for left button, \"2\" for middle button, and \"3\" for right button." -msgstr "This mouse button must be pressed to release the pointer from the capture area. Valid values are \"1\" for left button, \"2\" for middle button, and \"3\" for right button." +msgid "" +"This mouse button must be pressed to release the pointer from the capture " +"area. Valid values are \"1\" for left button, \"2\" for middle button, and " +"\"3\" for right button." +msgstr "" +"This mouse button must be pressed to release the pointer from the capture " +"area. Valid values are \"1\" for left button, \"2\" for middle button, and " +"\"3\" for right button." #: ../data/pointer-capture-applet.schemas.in.h:11 -msgid "This mouse button must be pressed while the pointer is over the capture area in order to capture the pointer. Valid values are \"0\" if no button is needed, \"1\" for left button, \"2\" for middle button, and \"3\" for right button." -msgstr "This mouse button must be pressed while the pointer is over the capture area in order to capture the pointer. Valid values are \"0\" if no button is needed, \"1\" for left button, \"2\" for middle button, and \"3\" for right button." +msgid "" +"This mouse button must be pressed while the pointer is over the capture area " +"in order to capture the pointer. Valid values are \"0\" if no button is " +"needed, \"1\" for left button, \"2\" for middle button, and \"3\" for right " +"button." +msgstr "" +"This mouse button must be pressed while the pointer is over the capture area " +"in order to capture the pointer. Valid values are \"0\" if no button is " +"needed, \"1\" for left button, \"2\" for middle button, and \"3\" for right " +"button." #: ../data/pointer-capture-applet.schemas.in.h:12 -msgid "Whether the Alt key must be pressed for the pointer to be captured while it's over the capture area. If this option is set as true, and a mouse button is set in the \"capture_button\" key, then the Alt key must be pressed while the mouse button is pressed." -msgstr "Whether the Alt key must be pressed for the pointer to be captured while it's over the capture area. If this option is set as true, and a mouse button is set in the \"capture_button\" key, then the Alt key must be pressed while the mouse button is pressed." +msgid "" +"Whether the Alt key must be pressed for the pointer to be captured while " +"it's over the capture area. If this option is set as true, and a mouse " +"button is set in the \"capture_button\" key, then the Alt key must be " +"pressed while the mouse button is pressed." +msgstr "" +"Whether the Alt key must be pressed for the pointer to be captured while " +"it's over the capture area. If this option is set as true, and a mouse " +"button is set in the \"capture_button\" key, then the Alt key must be " +"pressed while the mouse button is pressed." #: ../data/pointer-capture-applet.schemas.in.h:13 -msgid "Whether the Alt key must be pressed with the mouse button set in \"release_button\" for the pointer to be released from the capture area." -msgstr "Whether the Alt key must be pressed with the mouse button set in \"release_button\" for the pointer to be released from the capture area." +msgid "" +"Whether the Alt key must be pressed with the mouse button set in " +"\"release_button\" for the pointer to be released from the capture area." +msgstr "" +"Whether the Alt key must be pressed with the mouse button set in " +"\"release_button\" for the pointer to be released from the capture area." #: ../data/pointer-capture-applet.schemas.in.h:14 -msgid "Whether the Ctrl key must be pressed for the pointer to be captured while it's over the capture area. If this option is set as true, and a mouse button is set in the \"capture_button\" key, then the Ctrl key must be pressed while the mouse button is pressed." -msgstr "Whether the Ctrl key must be pressed for the pointer to be captured while it's over the capture area. If this option is set as true, and a mouse button is set in the \"capture_button\" key, then the Ctrl key must be pressed while the mouse button is pressed." +msgid "" +"Whether the Ctrl key must be pressed for the pointer to be captured while " +"it's over the capture area. If this option is set as true, and a mouse " +"button is set in the \"capture_button\" key, then the Ctrl key must be " +"pressed while the mouse button is pressed." +msgstr "" +"Whether the Ctrl key must be pressed for the pointer to be captured while " +"it's over the capture area. If this option is set as true, and a mouse " +"button is set in the \"capture_button\" key, then the Ctrl key must be " +"pressed while the mouse button is pressed." #: ../data/pointer-capture-applet.schemas.in.h:15 -msgid "Whether the Ctrl key must be pressed with the mouse button set in \"release_button\" for the pointer to be released from the capture area." -msgstr "Whether the Ctrl key must be pressed with the mouse button set in \"release_button\" for the pointer to be released from the capture area." +msgid "" +"Whether the Ctrl key must be pressed with the mouse button set in " +"\"release_button\" for the pointer to be released from the capture area." +msgstr "" +"Whether the Ctrl key must be pressed with the mouse button set in " +"\"release_button\" for the pointer to be released from the capture area." #: ../data/pointer-capture-applet.schemas.in.h:16 -msgid "Whether the Shift key must be pressed for the pointer to be captured while it's over the capture area. If this option is set as true, and a mouse button is set in the \"capture_button\" key, then the Shift key must be pressed while the mouse button is pressed." -msgstr "Whether the Shift key must be pressed for the pointer to be captured while it's over the capture area. If this option is set as true, and a mouse button is set in the \"capture_button\" key, then the Shift key must be pressed while the mouse button is pressed." +msgid "" +"Whether the Shift key must be pressed for the pointer to be captured while " +"it's over the capture area. If this option is set as true, and a mouse " +"button is set in the \"capture_button\" key, then the Shift key must be " +"pressed while the mouse button is pressed." +msgstr "" +"Whether the Shift key must be pressed for the pointer to be captured while " +"it's over the capture area. If this option is set as true, and a mouse " +"button is set in the \"capture_button\" key, then the Shift key must be " +"pressed while the mouse button is pressed." #: ../data/pointer-capture-applet.schemas.in.h:17 -msgid "Whether the Shift key must be pressed with the mouse button set in \"release_button\" for the pointer to be released from the capture area." -msgstr "Whether the Shift key must be pressed with the mouse button set in \"release_button\" for the pointer to be released from the capture area." +msgid "" +"Whether the Shift key must be pressed with the mouse button set in " +"\"release_button\" for the pointer to be released from the capture area." +msgstr "" +"Whether the Shift key must be pressed with the mouse button set in " +"\"release_button\" for the pointer to be released from the capture area." #: ../data/pointer-capture-applet.schemas.in.h:18 msgid "Width of the capture area in pixels." msgstr "Width of the capture area in pixels." -#: ../src/mt-main.c:767 +#: ../src/mt-main.c:781 msgid "Assistive Technology Support is not Enabled" msgstr "תמיכה בטכנולוגיות מסייעות אינה מופעלת" -#: ../src/mt-main.c:768 +#: ../src/mt-main.c:782 msgid "" "Mousetweaks requires assistive technologies to be enabled in your session.\n" "\n" -"To enable support for assistive technologies and restart your session, press \"Enable and Log Out\"." +"To enable support for assistive technologies and restart your session, press " +"\"Enable and Log Out\"." msgstr "" "‏Mousetweaks דורשת שתמיכה בטכנולוגיות מסייעות תופעל בהפעלה שלך.\n" "\n" -"על מנת לאפשר תמיכה בטכנולוגיות מסייעות ולשתחול ההפעלה שלך, לחץ על \"אפשר והתנתק\". " +"על מנת לאפשר תמיכה בטכנולוגיות מסייעות ולשתחול ההפעלה שלך, לחץ על \"אפשר " +"והתנתק\". " -#: ../src/mt-main.c:877 +#: ../src/mt-main.c:880 msgid "Time to wait before a dwell click" msgstr "Time to wait before a dwell click" -#: ../src/mt-main.c:879 +#: ../src/mt-main.c:882 msgid "Time to wait before a simulated secondary click" msgstr "Time to wait before a simulated secondary click" -#: ../src/mt-main.c:881 -msgid "Dwell mode to use" -msgstr "Dwell mode to use" - -#: ../src/mt-main.c:885 -msgid "Window x position" -msgstr "Window x position" - -#: ../src/mt-main.c:887 -msgid "Window y position" -msgstr "Window y position" +#: ../src/mt-main.c:884 +msgid "Set the active dwell mode" +msgstr "Set the active dwell mode" + +#: ../src/mt-main.c:886 +#| msgid "Show click type window" +msgid "Show a click-type window" +msgstr "Show a click-type window" + +#: ../src/mt-main.c:888 +#| msgid "Window x position" +msgid "Click-type window X position" +msgstr "Click-type window X position" + +#: ../src/mt-main.c:890 +#| msgid "Window x position" +msgid "Click-type window Y position" +msgstr "Click-type window Y position" -#: ../src/mt-main.c:889 +#: ../src/mt-main.c:892 msgid "Ignore small pointer movements" msgstr "Ignore small pointer movements" -#: ../src/mt-main.c:891 -msgid "Show elapsed time as cursor overlay" -msgstr "Show elapsed time as cursor overlay" - -#: ../src/mt-main.c:893 +#: ../src/mt-main.c:894 msgid "Shut down mousetweaks" msgstr "Shut down mousetweaks" -#: ../src/mt-main.c:902 -msgid "- GNOME mousetweaks daemon" -msgstr "- GNOME mousetweaks daemon" +#: ../src/mt-main.c:896 +msgid "Disable cursor animations" +msgstr "Disable cursor animations" + +#: ../src/mt-main.c:898 +#| msgid "- GNOME mousetweaks daemon" +msgid "Start mousetweaks as a daemon" +msgstr "Start mousetweaks as a daemon" + +#. parse +#: ../src/mt-main.c:915 +#| msgid "- GNOME mousetweaks daemon" +msgid "- GNOME mouse accessibility daemon" +msgstr "- GNOME mouse accessibility daemon" #: ../src/mt-common.c:30 msgid "Failed to Display Help" @@ -402,20 +474,20 @@ msgid "Enable and Log Out" msgstr "אפשר והתנתק" -#: ../src/pointer-capture-applet.c:180 +#: ../src/pointer-capture-applet.c:213 msgid "Locked" msgstr "נעול" #. l10n: the first letter of 'Locked' -#: ../src/pointer-capture-applet.c:183 +#: ../src/pointer-capture-applet.c:216 msgid "L" msgstr "נ" -#: ../src/pointer-capture-applet.c:621 +#: ../src/pointer-capture-applet.c:640 msgid "Capture area" msgstr "איזור לכידה" -#: ../src/pointer-capture-applet.c:622 +#: ../src/pointer-capture-applet.c:641 msgid "Temporarily lock the mouse pointer" msgstr "נעל את סמן העכבר באופן זמני" @@ -423,38 +495,62 @@ msgid "Failed to Launch Mouse Preferences" msgstr "נכשל בשיגור מאפייני העכבר" +#~ msgid "Dwell mode to use" +#~ msgstr "Dwell mode to use" + +#~ msgid "Window y position" +#~ msgstr "Window y position" + +#~ msgid "Show elapsed time as cursor overlay" +#~ msgstr "Show elapsed time as cursor overlay" + #~ msgid "On" #~ msgstr "מופעל" + #~ msgid "Size of Capture Area" #~ msgstr "גודל איזור הלכידה" + #~ msgid "Capture modifier" #~ msgstr "Capture modifier" + #~ msgid "Capture modifier key (Alt)" #~ msgstr "Capture modifier key (Alt)" + #~ msgid "Capture modifier key (Ctrl)" #~ msgstr "Capture modifier key (Ctrl)" + #~ msgid "Capture modifier key (Shift)" #~ msgstr "Capture modifier key (Shift)" + #~ msgid "Capture mouse button" #~ msgstr "Capture mouse button" + #~ msgid "Mouse button to capture the pointer (\"0\" = Capture immediately)" #~ msgstr "Mouse button to capture the pointer (\"0\" = Capture immediately)" + #~ msgid "Release modifier" #~ msgstr "Release modifier" + #~ msgid "Release modifier key (Alt)" #~ msgstr "Release modifier key (Alt)" + #~ msgid "Release modifier key (Ctrl)" #~ msgstr "Release modifier key (Ctrl)" + #~ msgid "Release modifier key (Shift)" #~ msgstr "Release modifier key (Shift)" + #~ msgid "Release mouse button" #~ msgstr "Release mouse button" + #~ msgid "Pointer Capture Applet" #~ msgstr "יישומון לכידת סמן" + #~ msgid "Off" #~ msgstr "מכובה" + #~ msgid "Dwell Click Applet" #~ msgstr "יישומון לחיצת שהייה" + #~ msgid "Couldn't display help" #~ msgstr "לא ניתן להציג עזרה" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mousetweaks-2.29.3/po/ro.po new/mousetweaks-2.29.4/po/ro.po --- old/mousetweaks-2.29.3/po/ro.po 2009-11-16 15:12:25.000000000 +0100 +++ new/mousetweaks-2.29.4/po/ro.po 2009-12-21 17:09:06.000000000 +0100 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the mousetweaks package. # Adi Roiban https://launchpad.net/~adiroiban, 2008, 2009 # Lucian Adrian Grijincu <lucian.grijincu(a)gmail.com>, 2009 -# msgid "" msgstr "" "Project-Id-Version: mousetweaks\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=mousetweaks&component=general\n" -"POT-Creation-Date: 2009-10-05 11:15+0000\n" -"PO-Revision-Date: 2009-10-11 18:02+0300\n" +"POT-Creation-Date: 2009-11-18 06:08+0000\n" +"PO-Revision-Date: 2009-11-18 20:31+0300\n" "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu(a)gmail.com>\n" -"Language-Team: Gnome Romanian Team <gnomero-list(a)lists.sourceforge.net>\n" +"Language-Team: Romanian Gnome Team <gnomero-list(a)lists.sourceforge.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " -"== 0) && (n != 0))) ? 2: 1));\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2);;\n" +"X-Generator: Virtaal 0.4.0\n" #: ../data/dwell-click-applet.ui.h:1 msgid "" @@ -40,7 +41,7 @@ msgstr "Clic tragere" #: ../data/dwell-click-applet.ui.h:6 ../data/mousetweaks.schemas.in.h:12 -#: ../src/mt-main.c:873 +#: ../src/mt-main.c:876 msgid "Enable dwell click" msgstr "Activează clicul staționar" @@ -153,7 +154,7 @@ msgstr "Zonă de blocare cursor maus" #: ../data/PointerCapture_Factory.server.in.in.h:2 -#: ../src/pointer-capture-applet.c:549 +#: ../src/pointer-capture-applet.c:563 msgid "Pointer Capture" msgstr "Capturează cursorul mausului" @@ -224,8 +225,8 @@ msgstr "Mod clic staționar" #: ../data/mousetweaks.schemas.in.h:10 -msgid "Dwell click mode (\"0\" = Gesture mode, \"1\" = Window mode)" -msgstr "Mod clic stațioar („0” = Mod gesturi, „1” = Mod fereastră )" +msgid "Dwell click mode (\"0\" = Window mode, \"1\" = Gesture mode)" +msgstr "Mod clic staționar („0” = Mod fereastră, „1” = Mod gesturi)" #: ../data/mousetweaks.schemas.in.h:11 msgid "Dwell click time" @@ -235,7 +236,7 @@ msgid "Enable secondary click" msgstr "Activează clicul secundar" -#: ../data/mousetweaks.schemas.in.h:14 ../src/mt-main.c:875 +#: ../data/mousetweaks.schemas.in.h:14 ../src/mt-main.c:878 msgid "Enable simulated secondary click" msgstr "Activează clicul secundar simulat" @@ -263,7 +264,7 @@ msgid "Secondary click time" msgstr "Timp clic secundar" -#: ../data/mousetweaks.schemas.in.h:21 ../src/mt-main.c:883 +#: ../data/mousetweaks.schemas.in.h:21 msgid "Show click type window" msgstr "Afișează fereastra tip clic" @@ -402,13 +403,13 @@ #: ../data/pointer-capture-applet.schemas.in.h:18 msgid "Width of the capture area in pixels." -msgstr "Lățimea în pixeli a zonei de captură" +msgstr "Lățimea în pixeli a zonei de captură." -#: ../src/mt-main.c:767 +#: ../src/mt-main.c:781 msgid "Assistive Technology Support is not Enabled" msgstr "Suportul pentru tehnologii asistative nu este activat" -#: ../src/mt-main.c:768 +#: ../src/mt-main.c:782 msgid "" "Mousetweaks requires assistive technologies to be enabled in your session.\n" "\n" @@ -421,41 +422,50 @@ "Pentru a activa suportul pentru tehnologiile asistative și a reporni " "sesiunea, apăsați „Activează și închide sesiunea”." -#: ../src/mt-main.c:877 +#: ../src/mt-main.c:880 msgid "Time to wait before a dwell click" msgstr "Timp de așteptare înainte de un clic staționar" -#: ../src/mt-main.c:879 +#: ../src/mt-main.c:882 msgid "Time to wait before a simulated secondary click" msgstr "Timp de așteptare înainte de un clic secundar simulat" -#: ../src/mt-main.c:881 -msgid "Dwell mode to use" -msgstr "Mode staționar folosit" - -#: ../src/mt-main.c:885 -msgid "Window x position" -msgstr "Poziție x fereastră" - -#: ../src/mt-main.c:887 -msgid "Window y position" -msgstr "Poziție y fereastră" +#: ../src/mt-main.c:884 +msgid "Set the active dwell mode" +msgstr "Definește modul clicului staționar activ" + +#: ../src/mt-main.c:886 +msgid "Show a click-type window" +msgstr "Afișează o fereastră tip clic" + +#: ../src/mt-main.c:888 +msgid "Click-type window X position" +msgstr "Coordonata X a ferestrei tip clic" + +#: ../src/mt-main.c:890 +msgid "Click-type window Y position" +msgstr "Coordonata Y a ferestrei tip clic" -#: ../src/mt-main.c:889 +#: ../src/mt-main.c:892 msgid "Ignore small pointer movements" msgstr "Ignoră mișcările minore ale cursorului" -#: ../src/mt-main.c:891 -msgid "Show elapsed time as cursor overlay" -msgstr "Afișează timpul rămas ca suprapunere cursor" - -#: ../src/mt-main.c:893 +#: ../src/mt-main.c:894 msgid "Shut down mousetweaks" msgstr "Închide mousetweaks" -#: ../src/mt-main.c:902 -msgid "- GNOME mousetweaks daemon" -msgstr "- serviciu mousetweaks GNOME " +#: ../src/mt-main.c:896 +msgid "Disable cursor animations" +msgstr "Dezactivează animațiile cursorului" + +#: ../src/mt-main.c:898 +msgid "Start mousetweaks as a daemon" +msgstr "Pornește mousetweaks ca un serviciu de fundal" + +#. parse +#: ../src/mt-main.c:915 +msgid "- GNOME mouse accessibility daemon" +msgstr "- serviciul GNOME de accesibilitate a mausului" #: ../src/mt-common.c:30 msgid "Failed to Display Help" @@ -465,23 +475,32 @@ msgid "Enable and Log Out" msgstr "Activează și închide sesiunea" -#: ../src/pointer-capture-applet.c:180 +#: ../src/pointer-capture-applet.c:213 msgid "Locked" msgstr "Blocat" #. l10n: the first letter of 'Locked' -#: ../src/pointer-capture-applet.c:183 +#: ../src/pointer-capture-applet.c:216 msgid "L" msgstr "B" -#: ../src/pointer-capture-applet.c:621 +#: ../src/pointer-capture-applet.c:640 msgid "Capture area" msgstr "Zonă captură" -#: ../src/pointer-capture-applet.c:622 +#: ../src/pointer-capture-applet.c:641 msgid "Temporarily lock the mouse pointer" msgstr "Blochează temporar cursorul mausului" #: ../src/dwell-click-applet.c:334 msgid "Failed to Launch Mouse Preferences" msgstr "Lansarea preferințelor pentru mouse a eșuat" + +#~ msgid "Dwell mode to use" +#~ msgstr "Mode staționar folosit" + +#~ msgid "Window y position" +#~ msgstr "Poziție y fereastră" + +#~ msgid "Show elapsed time as cursor overlay" +#~ msgstr "Afișează timpul rămas ca suprapunere cursor" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mousetweaks-2.29.3/po/sv.po new/mousetweaks-2.29.4/po/sv.po --- old/mousetweaks-2.29.3/po/sv.po 2009-11-16 15:12:25.000000000 +0100 +++ new/mousetweaks-2.29.4/po/sv.po 2009-12-21 17:09:06.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: mousetweaks\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-07 12:49+0200\n" -"PO-Revision-Date: 2009-07-07 21:54+0100\n" +"POT-Creation-Date: 2009-11-30 09:40+0100\n" +"PO-Revision-Date: 2009-11-30 09:42+0100\n" "Last-Translator: Daniel Nylander <po(a)danielnylander.se>\n" "Language-Team: Swedish <tp-sv(a)listor.tp-sv.se>\n" "MIME-Version: 1.0\n" @@ -39,7 +39,7 @@ #: ../data/dwell-click-applet.ui.h:6 #: ../data/mousetweaks.schemas.in.h:12 -#: ../src/mt-main.c:873 +#: ../src/mt-main.c:876 msgid "Enable dwell click" msgstr "Aktivera uppehållsklick" @@ -155,7 +155,7 @@ msgstr "Område att låsa muspekaren" #: ../data/PointerCapture_Factory.server.in.in.h:2 -#: ../src/pointer-capture-applet.c:549 +#: ../src/pointer-capture-applet.c:563 msgid "Pointer Capture" msgstr "Muspekarfångst" @@ -211,8 +211,8 @@ msgstr "Läge för uppehållsklick" #: ../data/mousetweaks.schemas.in.h:10 -msgid "Dwell click mode (\"0\" = Gesture mode, \"1\" = Window mode)" -msgstr "Läge för uppehållsklick (\"0\" = Gestläge, \"1\" = Fönsterläge)" +msgid "Dwell click mode (\"0\" = Window mode, \"1\" = Gesture mode)" +msgstr "Läge för uppehållsklick (\"0\" = Fönsterläge, \"1\" = Gestläge)" #: ../data/mousetweaks.schemas.in.h:11 msgid "Dwell click time" @@ -223,7 +223,7 @@ msgstr "Aktivera sekundärklick" #: ../data/mousetweaks.schemas.in.h:14 -#: ../src/mt-main.c:875 +#: ../src/mt-main.c:878 msgid "Enable simulated secondary click" msgstr "Aktivera simulerat sekundärklick" @@ -252,7 +252,6 @@ msgstr "Tid för sekundärklick" #: ../data/mousetweaks.schemas.in.h:21 -#: ../src/mt-main.c:883 msgid "Show click type window" msgstr "Visa klicktypsfönster" @@ -340,11 +339,11 @@ msgid "Width of the capture area in pixels." msgstr "Bredd för fångstområde i bildpunkter." -#: ../src/mt-main.c:767 +#: ../src/mt-main.c:781 msgid "Assistive Technology Support is not Enabled" msgstr "Stöd för hjälpmedelsteknik är inte aktiverat" -#: ../src/mt-main.c:768 +#: ../src/mt-main.c:782 msgid "" "Mousetweaks requires assistive technologies to be enabled in your session.\n" "\n" @@ -354,41 +353,50 @@ "\n" "Tryck på \"Aktivera och logga ut\" för att aktivera stöd för hjälpmedelstekniker och starta om din session." -#: ../src/mt-main.c:877 +#: ../src/mt-main.c:880 msgid "Time to wait before a dwell click" msgstr "Tid att vänta innan ett uppehållsklick" -#: ../src/mt-main.c:879 +#: ../src/mt-main.c:882 msgid "Time to wait before a simulated secondary click" msgstr "Tid att vänta innan en simulerad sekundärklickning" -#: ../src/mt-main.c:881 -msgid "Dwell mode to use" -msgstr "Läge för uppehållsklick att använda" - -#: ../src/mt-main.c:885 -msgid "Window x position" -msgstr "Fönstrets x-position" - -#: ../src/mt-main.c:887 -msgid "Window y position" -msgstr "Fönstrets y-position" +#: ../src/mt-main.c:884 +msgid "Set the active dwell mode" +msgstr "Ställ in aktivt uppehållsläge" + +#: ../src/mt-main.c:886 +msgid "Show a click-type window" +msgstr "Visa ett klicktypsfönster" + +#: ../src/mt-main.c:888 +msgid "Click-type window X position" +msgstr "Klicktypsfönstrets x-position" + +#: ../src/mt-main.c:890 +msgid "Click-type window Y position" +msgstr "Klicktypsfönstrets y-position" -#: ../src/mt-main.c:889 +#: ../src/mt-main.c:892 msgid "Ignore small pointer movements" msgstr "Ignorera mindre muspekarrörelser" -#: ../src/mt-main.c:891 -msgid "Show elapsed time as cursor overlay" -msgstr "Visa åtgången tid som markörtext" - -#: ../src/mt-main.c:893 +#: ../src/mt-main.c:894 msgid "Shut down mousetweaks" msgstr "Stäng av musjusteringar" -#: ../src/mt-main.c:902 -msgid "- GNOME mousetweaks daemon" -msgstr "- GNOME-musjusteringsdemon" +#: ../src/mt-main.c:896 +msgid "Disable cursor animations" +msgstr "Inaktivera pekaranimeringar" + +#: ../src/mt-main.c:898 +msgid "Start mousetweaks as a daemon" +msgstr "Starta musjusteringar som en bakgrundsprocess" + +#. parse +#: ../src/mt-main.c:915 +msgid "- GNOME mouse accessibility daemon" +msgstr "- GNOME-mustillgänglighetsdemon" #: ../src/mt-common.c:30 msgid "Failed to Display Help" @@ -398,20 +406,20 @@ msgid "Enable and Log Out" msgstr "Aktivera och logga ut" -#: ../src/pointer-capture-applet.c:180 +#: ../src/pointer-capture-applet.c:213 msgid "Locked" msgstr "Låst" #. l10n: the first letter of 'Locked' -#: ../src/pointer-capture-applet.c:183 +#: ../src/pointer-capture-applet.c:216 msgid "L" msgstr "L" -#: ../src/pointer-capture-applet.c:621 +#: ../src/pointer-capture-applet.c:640 msgid "Capture area" msgstr "Fångstområde" -#: ../src/pointer-capture-applet.c:622 +#: ../src/pointer-capture-applet.c:641 msgid "Temporarily lock the mouse pointer" msgstr "Lås muspekaren temporärt" @@ -419,6 +427,12 @@ msgid "Failed to Launch Mouse Preferences" msgstr "Misslyckades med att starta musinställningar" +#~ msgid "Dwell mode to use" +#~ msgstr "Läge för uppehållsklick att använda" +#~ msgid "Window y position" +#~ msgstr "Fönstrets y-position" +#~ msgid "Show elapsed time as cursor overlay" +#~ msgstr "Visa åtgången tid som markörtext" #~ msgid "On" #~ msgstr "På" #~ msgid "Size of Capture Area" @@ -457,8 +471,6 @@ #~ msgstr "K_napp:" #~ msgid "_Button:" #~ msgstr "_Knapp:" -#~ msgid "Use dwell mode" -#~ msgstr "Använd uppehållsläget" #~ msgid "Mousetweaks requires Assistive Technologies." #~ msgstr "Musjusteringar kräver hjälpmedelstekniker." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit m17n-db for openSUSE:Factory
by root＠Hilbert.suse.de 30 Dec '09

30 Dec '09

Hello community, here is the log from the commit of package m17n-db for openSUSE:Factory checked in at Wed Dec 30 00:27:36 CET 2009. -------- --- m17n-db/m17n-db.changes 2008-11-17 23:27:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/m17n-db/m17n-db.changes 2009-12-18 00:40:21.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 18 00:40:01 CET 2009 - jengelh(a)medozas.de + +- enable parallel building + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ m17n-db.spec ++++++ --- /var/tmp/diff_new_pack.dHsKTB/_old 2009-12-30 00:27:29.000000000 +0100 +++ /var/tmp/diff_new_pack.dHsKTB/_new 2009-12-30 00:27:29.000000000 +0100 @@ -20,8 +20,8 @@ Name: m17n-db BuildRequires: glibc-i18ndata Version: 1.5.3 -Release: 1 -License: GPL v2 or later; LGPL v2.1 or later; Public Domain, Freeware; X11/MIT +Release: 2 +License: GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware ; MIT Group: System/I18n/Japanese AutoReqProv: on Url: http://www.m17n.org/m17n-lib/ @@ -59,7 +59,7 @@ --prefix=/usr \ --sysconfdir=%{_sysconfdir} \ --libdir=%{_libdir} -make +make %{?jobs:-j%jobs}; %install make DESTDIR=${RPM_BUILD_ROOT} install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0