September 2013 - openSUSE Commits - openSUSE Mailing Lists

commit nagios for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '13

02 Sep '13

Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2013-09-02 15:00:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nagios" Changes: -------- --- /work/SRC/openSUSE:Factory/nagios/nagios.changes 2013-08-05 20:48:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2013-09-02 15:00:50.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Aug 30 23:14:55 UTC 2013 - schneemann(a)b1-systems.de + +- update to 3.5.1: + + Added handler for SIGXFSZ signal (Eric Stanley) + + Fixed bug #444: Nagios 3.5.0 problem with macro $ADMINEMAIL$ : + @ is converted to %40 after 2 nagios reload (Duplicate of bug #407) + + Fixed bug #407: Reloading nagios config causes spaces in notifications + to become plus signs (Alexey Dvoryanchikov) + + Fixed bug #445: Adding triggered downtime for child hosts causes a + SIGSEGV on restart/reload (Eric Stanley) + + Fixed bug #375: Freshness expiration never reached and bug #427: + freshness threshold doesn't work if it is set long + (Scott Wilkerson, Eric Stanley) + + Fixed bug #432: Downtime scheduled as "Nagios Process" and not + the Users name (Sam Lansing, Eric Stanley) + +------------------------------------------------------------------- Old: ---- nagios-3.5.0.tar.bz2 New: ---- nagios-3.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.EVytA3/_old 2013-09-02 15:00:51.000000000 +0200 +++ /var/tmp/diff_new_pack.EVytA3/_new 2013-09-02 15:00:51.000000000 +0200 @@ -20,7 +20,7 @@ Summary: The Nagios Network Monitor License: GPL-2.0+ Group: System/Monitoring -Version: 3.5.0 +Version: 3.5.1 Release: 0 Url: http://www.nagios.org/ Source0: %{name}-%{version}.tar.bz2 ++++++ nagios-3.5.0.tar.bz2 -> nagios-3.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/Changelog new/nagios/Changelog --- old/nagios/Changelog 2013-03-15 12:14:02.000000000 +0100 +++ new/nagios/Changelog 2013-08-30 19:46:14.000000000 +0200 @@ -2,6 +2,15 @@ Nagios 3.x Change Log ##################### +3.5.1 - 08/30/2013 +------------------ +* Added handler for SIGXFSZ signal (Eric Stanley) +* Fixed bug #444: Nagios 3.5.0 problem with macro $ADMINEMAIL$ : @ is converted to %40 after 2 nagios reload (Duplicate of bug #407) +* Fixed bug #407: Reloading nagios config causes spaces in notifications to become plus signs (Alexey Dvoryanchikov) +* Fixed bug #445: Adding triggered downtime for child hosts causes a SIGSEGV on restart/reload (Eric Stanley) +* Fixed bug #375: Freshness expiration never reached and bug #427: freshness threshold doesn't work if it is set long (Scott Wilkerson, Eric Stanley) +* Fixed bug #432: Downtime scheduled as "Nagios Process" and not the Users name (Sam Lansing, Eric Stanley) + 3.5.0 - 03/15/2013 ------------------ * Fixed bug #403: The "configuration" page of the webui doesn't use entity encoding when displaying the "command expansion" item (Eric Stanley, Phil Randal) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/base/checks.c new/nagios/base/checks.c --- old/nagios/base/checks.c 2013-03-09 22:46:35.000000000 +0100 +++ new/nagios/base/checks.c 2013-08-30 19:46:14.000000000 +0200 @@ -2086,7 +2086,7 @@ */ if(temp_service->check_type == SERVICE_CHECK_PASSIVE) { if(temp_service->last_check < event_start && - event_start - last_program_stop < freshness_threshold * 0.618) { + event_start - last_program_stop > freshness_threshold * 0.618) { expiration_time = event_start + freshness_threshold; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/base/nagios.c new/nagios/base/nagios.c --- old/nagios/base/nagios.c 2013-03-15 12:14:02.000000000 +0100 +++ new/nagios/base/nagios.c 2013-08-30 19:46:14.000000000 +0200 @@ -3,7 +3,7 @@ * NAGIOS.C - Core Program Code For Nagios * * Program: Nagios Core - * Version: 3.5.0 + * Version: 3.5.1 * License: GPL * Copyright (c) 2009-2010 Nagios Core Development Team and Community Contributors * Copyright (c) 1999-2009 Ethan Galstad @@ -438,6 +438,12 @@ exit(ERROR); } + /* + * Set the signal handler for the SIGXFSZ signal here because + * we may encounter this signal before the other signal handlers + * are set. + */ + signal(SIGXFSZ, handle_sigxfsz); /* config file is last argument specified */ config_file = (char *)strdup(argv[optind]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/base/nagiostats.c new/nagios/base/nagiostats.c --- old/nagios/base/nagiostats.c 2013-03-15 12:14:02.000000000 +0100 +++ new/nagios/base/nagiostats.c 2013-08-30 19:46:14.000000000 +0200 @@ -3,7 +3,7 @@ * NAGIOSTATS.C - Displays Nagios Statistics * * Program: Nagiostats - * Version: 3.5.0 + * Version: 3.5.1 * License: GPL * Copyright (c) 2003-2008 Ethan Galstad (egalstad(a)nagios.org) * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/base/utils.c new/nagios/base/utils.c --- old/nagios/base/utils.c 2013-03-09 22:46:35.000000000 +0100 +++ new/nagios/base/utils.c 2013-08-30 19:46:14.000000000 +0200 @@ -53,6 +53,13 @@ extern char *auth_file; extern char *p1_file; +extern char *xodtemplate_cache_file; +extern char *xodtemplate_precache_file; +extern char *xsddefault_status_log; +extern char *xrddefault_retention_file; +extern char *xpddefault_host_perfdata_file; +extern char *xpddefault_service_perfdata_file; + extern char *nagios_user; extern char *nagios_group; @@ -282,6 +289,7 @@ #endif +static long long check_file_size(char *, unsigned long, struct rlimit); /******************************************************************/ /******************** SYSTEM COMMAND FUNCTIONS ********************/ @@ -1798,6 +1806,7 @@ signal(SIGHUP, SIG_DFL); signal(SIGSEGV, SIG_DFL); signal(SIGPIPE, SIG_DFL); + signal(SIGXFSZ, SIG_DFL); return; } @@ -1838,6 +1847,127 @@ return; } +/* Handle the SIGXFSZ signal. A SIGXFSZ signal is received when a file exceeds + the maximum allowable size either as dictated by the fzise paramater in + /etc/security/limits.conf (ulimit -f) or by the maximum size allowed by + the filesystem */ +void handle_sigxfsz(int sig) { + + static time_t lastlog_time = (time_t)0; /* Save the last log time so we + don't log too often. */ + unsigned long log_interval = 300; /* How frequently to log messages + about receiving the signal */ + struct rlimit rlim; + time_t now; + char *files[] = { + log_file, + debug_file, + xpddefault_host_perfdata_file, + xpddefault_service_perfdata_file, + xodtemplate_cache_file, + xodtemplate_precache_file, + xsddefault_status_log, + xrddefault_retention_file, + }; + int x; + char **filep; + long long size; + long long max_size = 0LL; + char *max_name = NULL; + + if(SIGXFSZ == sig) { /* Make sure we're handling the correct signal */ + /* Check the current time and if less time has passed since the last + time the signal was received, ignore it */ + time(&now); + if((unsigned long)(now - lastlog_time) < log_interval) return; + + /* Get the current file size limit */ + if(getrlimit(RLIMIT_FSIZE, &rlim) != 0) { + /* Attempt to log the error, realizing that the logging may fail + if it is the log file that is over the size limit. */ + logit(NSLOG_RUNTIME_ERROR, TRUE, + "Unable to determine current resoure limits: %s\n", + strerror(errno)); + } + + /* Try to figure out which file caused the signal and react + appropriately */ + for(x = 0, filep = files; x < (sizeof(files) / sizeof(files[0])); + x++, filep++) { + if((*filep != NULL) && strcmp(*filep, "/dev/null")) { + if((size = check_file_size(*filep, 1024, rlim)) == -1) { + lastlog_time = now; + return; + } + else if(size > max_size) { + max_size = size; + max_name = log_file; + } + } + } + /* TODO: Perhaps add check of the check results files in + check_results_path. This is likely not needed because these + files aren't very big */ + if((max_size > 0) && (max_name != NULL)) { + logit(NSLOG_RUNTIME_ERROR, TRUE, "SIGXFSZ received because a " + "file's size may have exceeded the file size limits of " + "the filesystem. The largest file checked, '%s', has a " + "size of %lld bytes", max_name, max_size); + + } + else { + logit(NSLOG_RUNTIME_ERROR, TRUE, "SIGXFSZ received but unable to " + "determine which file may have caused it."); + } + } + return; + } + +/* Checks a file to determine whether it exceeds resource limit imposed + limits. Returns the file size if file is OK, 0 if it's status could not + be determined, or -1 if not OK. fudge is the fudge factor (in bytes) for + checking the file size */ +static long long check_file_size(char *path, unsigned long fudge, + struct rlimit rlim) { + + struct stat status; + + /* Make sure we were passed a legitimate file path */ + if(NULL == path) { + return 0; + } + + /* Get the status of the file */ + if(stat(path, &status) == 0) { + /* Make sure it is a file */ + if(S_ISREG(status.st_mode)) { + /* If the file size plus the fudge factor exceeds the + current resource limit imposed size limit, log an error */ + if(status.st_size + fudge > rlim.rlim_cur) { + logit(NSLOG_RUNTIME_ERROR, TRUE, "Size of file '%s' (%llu) " + "exceeds (or nearly exceeds) size imposed by resource " + "limits (%llu). Consider increasing limits with " + "ulimit(1).\n", path, + (unsigned long long)status.st_size, + (unsigned long long)rlim.rlim_cur); + return -1; + } + else { + return status.st_size; + } + } + else { + return 0; + } + } + else { + /* If we could not determine the file status, log an error message */ + logit(NSLOG_RUNTIME_ERROR, TRUE, + "Unable to determine status of file %s: %s\n", + log_file, strerror(errno)); + return 0; + } + } /* handle timeouts when executing service checks */ /* 07/16/08 EG also called when parent process gets a TERM signal */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/cgi/getcgi.c new/nagios/cgi/getcgi.c --- old/nagios/cgi/getcgi.c 2013-03-09 22:46:35.000000000 +0100 +++ new/nagios/cgi/getcgi.c 2013-08-30 19:46:14.000000000 +0200 @@ -320,7 +320,8 @@ snprintf(locale_string, sizeof(locale_string), "%s_%s.%s", accept_langs->languages[ x]->language, accept_langs->languages[ x]->locality, "utf8"); - locale = setlocale(LC_ALL, locale_string); + locale = setlocale(LC_CTYPE, locale_string); + if(NULL != locale) break; } free_accept_languages(accept_langs); @@ -329,7 +330,7 @@ /* Try the fail safe locales */ for(x = 0; ((x < (sizeof(locale_failsafe) / sizeof(char *))) && (NULL == locale)); x++) { - locale = setlocale(LC_ALL, locale_failsafe[ x]); + locale = setlocale(LC_CTYPE, locale_failsafe[ x]); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/common/downtime.c new/nagios/common/downtime.c --- old/nagios/common/downtime.c 2013-03-09 22:46:35.000000000 +0100 +++ new/nagios/common/downtime.c 2013-08-30 19:46:14.000000000 +0200 @@ -328,9 +328,9 @@ /* add a non-persistent comment to the host or service regarding the scheduled outage */ if(temp_downtime->type == SERVICE_DOWNTIME) - add_new_comment(SERVICE_COMMENT, DOWNTIME_COMMENT, svc->host_name, svc->description, time(NULL), "(Nagios Process)", temp_buffer, 0, COMMENTSOURCE_INTERNAL, FALSE, (time_t)0, &(temp_downtime->comment_id)); + add_new_comment(SERVICE_COMMENT, DOWNTIME_COMMENT, svc->host_name, svc->description, time(NULL), ( NULL == temp_downtime->author ? "(Nagios Process)" : temp_downtime->author), temp_buffer, 0, COMMENTSOURCE_INTERNAL, FALSE, (time_t)0, &(temp_downtime->comment_id)); else - add_new_comment(HOST_COMMENT, DOWNTIME_COMMENT, hst->name, NULL, time(NULL), "(Nagios Process)", temp_buffer, 0, COMMENTSOURCE_INTERNAL, FALSE, (time_t)0, &(temp_downtime->comment_id)); + add_new_comment(HOST_COMMENT, DOWNTIME_COMMENT, hst->name, NULL, time(NULL), ( NULL == temp_downtime->author ? "(Nagios Process)" : temp_downtime->author), temp_buffer, 0, COMMENTSOURCE_INTERNAL, FALSE, (time_t)0, &(temp_downtime->comment_id)); my_free(temp_buffer); @@ -360,6 +360,14 @@ } } + /* If the downtime is triggered and was in effect, mark it as not in + effect so it gets scheduled correctly */ + if((temp_downtime->triggered_by != 0) && + (TRUE == temp_downtime->is_in_effect)) { + was_in_effect = temp_downtime->is_in_effect; + temp_downtime->is_in_effect = FALSE; + } + if((FALSE == temp_downtime->fixed) && (FALSE == was_in_effect)) { /* increment pending flex downtime counter */ if(temp_downtime->type == HOST_DOWNTIME) @@ -1111,6 +1119,39 @@ static int downtime_compar(const void *p1, const void *p2) { scheduled_downtime *d1 = *(scheduled_downtime **)p1; scheduled_downtime *d2 = *(scheduled_downtime **)p2; + + /* + If the start times of two downtimes are equal and one is triggered but + but the other is not, the triggered downtime should be later in the + list than the untriggered one. This is so they are written to the + retention.dat and status.dat in the correct order. + + Previously the triggered downtime always appeared before its + triggering downtime in those files. When the downtimes were read + from those files, either on a core restart or by the CGIs, the + triggered downtime would be discarded because the triggering + downtime did not yet exist. + + The most common case for this is when a downtime is created and + the option is selected to create triggered downtimes on all child + objects. This change in the sort order does NOT resolve the + case where a manually created, triggered downtime is created with + a start time earlier than the triggering downtime. + + This would need to be resolved by comparing the triggered_by value + with the downtime ID regardless of the start time. However, this + should be a relatively rare case and only caused by intentional + scheduling by a human. This change was not implemented because it + would cause the downtime list to be out of time order and the + implications of this were not well understood. + */ + + if(d1->start_time == d2->start_time) { + if(( d1->triggered_by == 0 && d2->triggered_by != 0) || + ( d1->triggered_by != 0 && d2->triggered_by == 0)) { + return d1->triggered_by == 0 ? -1 : 1; + } + } return (d1->start_time < d2->start_time) ? -1 : (d1->start_time - d2->start_time); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/common/macros.c new/nagios/common/macros.c --- old/nagios/common/macros.c 2013-03-09 22:46:35.000000000 +0100 +++ new/nagios/common/macros.c 2013-08-30 19:46:14.000000000 +0200 @@ -2585,6 +2585,7 @@ for(x = 0; x < MACRO_X_COUNT; x++) { macro_keys[x].code = x; macro_keys[x].name = macro_x_names[x]; + macro_keys[x].clean_options = 0; /* host/service output/perfdata and author/comment macros should get cleaned */ if((x >= 16 && x <= 19) || (x >= 49 && x <= 52) || (x >= 99 && x <= 100) || (x >= 124 && x <= 127)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/configure new/nagios/configure --- old/nagios/configure 2013-03-15 12:14:02.000000000 +0100 +++ new/nagios/configure 2013-08-30 19:46:14.000000000 +0200 @@ -1314,9 +1314,9 @@ PKG_NAME=nagios -PKG_VERSION="3.5.0" +PKG_VERSION="3.5.1" PKG_HOME_URL="http://www.nagios.org/" -PKG_REL_DATE="03-15-2013" +PKG_REL_DATE="08-30-2013" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/configure.in new/nagios/configure.in --- old/nagios/configure.in 2013-03-15 12:14:02.000000000 +0100 +++ new/nagios/configure.in 2013-08-30 19:46:14.000000000 +0200 @@ -9,9 +9,9 @@ AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nagios -PKG_VERSION="3.5.0" +PKG_VERSION="3.5.1" PKG_HOME_URL="http://www.nagios.org/" -PKG_REL_DATE="03-15-2013" +PKG_REL_DATE="08-30-2013" dnl Figure out how to invoke "install" and what install options to use. AC_PROG_INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/contrib/p1.pl new/nagios/contrib/p1.pl --- old/nagios/contrib/p1.pl 2005-01-20 03:12:13.000000000 +0100 +++ new/nagios/contrib/p1.pl 2013-08-30 19:46:14.000000000 +0200 @@ -1,6 +1,6 @@ package Embed::Persistent; -# $Id: p1.pl 532 2005-01-20 02:12:13Z egalstad $ +# $Id$ # $Log$ # Revision 1.5 2005-01-18 13:52:15+11 anwsmh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/html/main.php new/nagios/html/main.php --- old/nagios/html/main.php 2013-03-15 12:14:02.000000000 +0100 +++ new/nagios/html/main.php 2013-08-30 19:46:14.000000000 +0200 @@ -1,7 +1,7 @@ <?php include_once(dirname(__FILE__).'/includes/utils.inc.php'); -$this_version="3.5.0"; +$this_version="3.5.1"; ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> @@ -38,9 +38,9 @@ <div id="currentversioninfo"> <div class="product">Nagios® Core™</div> -<div class="version">Version 3.5.0</div> -<div class="releasedate">March 15, 2013</div> -<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.5.0&product=nagioscore" target="_blank">Check for updates</a></div> +<div class="version">Version 3.5.1</div> +<div class="releasedate">August 30, 2013</div> +<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.5.1&product=nagioscore" target="_blank">Check for updates</a></div>  </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/include/common.h new/nagios/include/common.h --- old/nagios/include/common.h 2013-03-15 12:14:02.000000000 +0100 +++ new/nagios/include/common.h 2013-08-30 19:46:14.000000000 +0200 @@ -22,8 +22,8 @@ #include "shared.h" -#define PROGRAM_VERSION "3.5.0" -#define PROGRAM_MODIFICATION_DATE "03-15-2013" +#define PROGRAM_VERSION "3.5.1" +#define PROGRAM_MODIFICATION_DATE "08-30-2013" /*#define DEBUG_CHECK_IPC 1 */ /*#define DEBUG_CHECK_IPC2 1*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/include/nagios.h new/nagios/include/nagios.h --- old/nagios/include/nagios.h 2013-01-03 22:10:27.000000000 +0100 +++ new/nagios/include/nagios.h 2013-08-30 19:46:14.000000000 +0200 @@ -442,6 +442,7 @@ void init_timing_loop(void); /* setup the initial scheduling queue */ void setup_sighandler(void); /* trap signals */ void reset_sighandler(void); /* reset signals to default action */ +extern void handle_sigxfsz(int); /* handle SIGXFSZ */ int daemon_init(void); /* switches to daemon mode */ int drop_privileges(char *, char *); /* drops privileges before startup */ void display_scheduling_info(void); /* displays service check scheduling information */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/nagios.spec new/nagios/nagios.spec --- old/nagios/nagios.spec 2013-03-15 12:14:02.000000000 +0100 +++ new/nagios/nagios.spec 2013-08-30 19:46:14.000000000 +0200 @@ -1,5 +1,5 @@ %define name nagios -%define version 3.5.0 +%define version 3.5.1 %define release 1 %define nsusr nagios %define nsgrp nagios diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios/update-version new/nagios/update-version --- old/nagios/update-version 2013-03-15 12:14:02.000000000 +0100 +++ new/nagios/update-version 2013-08-30 19:46:14.000000000 +0200 @@ -10,10 +10,10 @@ fi # Current version number -CURRENTVERSION=3.5.0 +CURRENTVERSION=3.5.1 # Last date -LASTDATE=03-15-2013 +LASTDATE=08-30-2013 if [ "x$1" = "x" ] then -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozc for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '13

02 Sep '13

Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2013-09-02 15:00:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozc" Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2013-07-23 22:23:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-09-02 15:00:35.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Sep 1 05:41:09 UTC 2013 - ftake(a)geeko.jp + +- Upstream update to 1.11.1522.102 + * Enable to customize ibus-mozc + * Add session command for ConvertPrevPage and ConvertNextPage +- Update fcitx-mozc + * Support usage of conversion candidates + * Support paging +- Add a source archive of gyp removed from the Mozc tree +- Clean up the spec file + +------------------------------------------------------------------- Old: ---- fcitx-mozc-1.11.1502.102.1.patch mozc-1.11.1502.102.tar.bz2 New: ---- fcitx-mozc-1.11.1522.102.1.patch gyp-r1665.tar.bz2 mozc-1.11.1522.102.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.gBf9gB/_old 2013-09-02 15:00:38.000000000 +0200 +++ /var/tmp/diff_new_pack.gBf9gB/_new 2013-09-02 15:00:38.000000000 +0200 @@ -24,8 +24,13 @@ %define fcitx_lib_dir %{_libdir}/fcitx/ %endif +%define ibus_mozc_path %{_libdir}/ibus-mozc/ibus-engine-mozc +%define ibus_mozc_icon_path %{_datadir}/ibus-mozc/product_icon.png +%define document_dir %{_docdir}/ibus-mozc +%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model + Name: mozc -Version: 1.11.1502.102 +Version: 1.11.1522.102 Release: 0 Summary: Mozc - Japanese Input Method for Chromium OS, Mac and Linux License: BSD-3-Clause @@ -37,8 +42,12 @@ Source2: fcitx-mozc-icons.tar.gz %if %{with_fcitx} # PATCH-FEATURE-UPSTREAM i(a)marguerite.su - add fcitx as mozc module -Patch0: fcitx-mozc-1.11.1502.102.1.patch +Patch0: fcitx-mozc-1.11.1522.102.1.patch %endif +# gyp is not included from 1.11.1522.102 +# License: BSD-3-Clause +# svn export http://gyp.googlecode.com/svn/trunk/@r1665 gyp +Source3: gyp-r1665.tar.bz2 BuildRequires: libopenssl-devel BuildRequires: pkgconfig @@ -110,11 +119,13 @@ %patch0 -p2 %endif -cmp handwriting/zinnia_handwriting.cc handwriting/zinnia_handwriting.cc.back && exit 1 || true -cmp base/util.cc base/util.cc.back && exit 1 || true - cp %{SOURCE1} . +# extract gyp +pushd third_party +tar xvf %{SOURCE3} +popd + %build %define target Release export QTDIR=%{_libdir}/qt4 @@ -122,7 +133,8 @@ # -Wall from RPM_OPT_FLAGS overrides -Wno-* options from gyp. # gyp inserts -Wall to the head of release_extra_flags. flags=${RPM_OPT_FLAGS/-Wall/} -export GYP_DEFINES='use_libprotobuf=1 document_dir=%{_docdir}/%{name} zinnia_model_file=%{_datadir}/zinnia/model/tomoe/handwriting-ja.model release_extra_cflags="'$flags'"' + +export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path} ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=1 document_dir=%{document_dir} zinnia_model_file=%{zinnia_model_path} release_extra_cflags="'$flags'"' python build_mozc.py gyp --server_dir=%{_libdir}/mozc python build_mozc.py build_tools -c %{target} %{?_smp_mflags} @@ -143,11 +155,7 @@ install -m755 -d %{buildroot}%{_libdir}/ibus-mozc install -m755 %{output_dir}/ibus_mozc %{buildroot}%{_libdir}/ibus-mozc/ibus-engine-mozc install -m755 -d %{buildroot}%{_datadir}/ibus/component - -sed -i.back -e 's|/usr/libexec/ibus-engine-mozc|%{_libdir}/ibus-mozc/ibus-engine-mozc|' %{output_dir}/obj/gen/unix/ibus/mozc.xml -cmp %{output_dir}/obj/gen/unix/ibus/mozc.xml %{output_dir}/obj/gen/unix/ibus/mozc.xml.back && exit 1 || true install -m644 %{output_dir}/obj/gen/unix/ibus/mozc.xml %{buildroot}%{_datadir}/ibus/component/mozc.xml - install -m755 -d %{buildroot}%{_datadir}/ibus-mozc #{__install} -m755 -d %{buildroot}%{_datadir}/ibus-mozc/setup install -m644 data/images/unix/ime_product_icon_opensource-32.png %{buildroot}%{_datadir}/ibus-mozc/product_icon.png ++++++ fcitx-mozc-1.11.1502.102.1.patch -> fcitx-mozc-1.11.1522.102.1.patch ++++++ ++++ 704 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mozc/fcitx-mozc-1.11.1502.102.1.patch ++++ and /work/SRC/openSUSE:Factory/.mozc.new/fcitx-mozc-1.11.1522.102.1.patch ++++++ mozc-1.11.1502.102.tar.bz2 -> mozc-1.11.1522.102.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mozc/mozc-1.11.1502.102.tar.bz2 /work/SRC/openSUSE:Factory/.mozc.new/mozc-1.11.1522.102.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Mesa for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '13

02 Sep '13

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2013-09-02 15:00:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Mesa" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2013-08-28 21:22:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2013-09-02 15:00:26.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 30 09:10:22 UTC 2013 - idonmez(a)suse.com + +- Enable llvmpipe and xa on s390x + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.SRX1Kf/_old 2013-09-02 15:00:27.000000000 +0200 +++ /var/tmp/diff_new_pack.SRX1Kf/_new 2013-09-02 15:00:27.000000000 +0200 @@ -72,7 +72,7 @@ BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%ifarch %arm %ix86 x86_64 +%ifarch %arm s390x %ix86 x86_64 BuildRequires: llvm-devel %endif BuildRequires: libXvMC-devel @@ -594,10 +594,16 @@ --with-dri-drivers=nouveau,r200,radeon \ --with-gallium-drivers=r300,r600,nouveau,swrast \ %endif -%ifarch s390 s390x aarch64 +%ifarch s390 aarch64 --with-dri-drivers=swrast \ --with-gallium-drivers="" \ %endif +%ifarch s390x + --enable-xa \ + --enable-gallium-llvm \ + --with-dri-drivers=swrast \ + --with-gallium-drivers=swrast,svga \ +%endif CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT @@ -678,7 +684,7 @@ %postun -n libgbm1 -p /sbin/ldconfig -%ifnarch s390 s390x aarch64 +%ifnarch s390 aarch64 %post -n libxatracker1 -p /sbin/ldconfig @@ -832,7 +838,7 @@ %_libdir/libgbm.so %_libdir/pkgconfig/gbm.pc -%ifnarch s390 s390x ppc ppc64 aarch64 +%ifnarch s390 ppc ppc64 aarch64 %files -n libxatracker1 %defattr(-,root,root) @@ -878,24 +884,26 @@ %_libdir/vdpau/libvdpau_r600.so.1 %_libdir/vdpau/libvdpau_r600.so.1.0.0 -%files -n libXvMC_softpipe -%defattr(-,root,root) -%_libdir/libXvMCsoftpipe.so -%_libdir/libXvMCsoftpipe.so.1 -%_libdir/libXvMCsoftpipe.so.1.0.0 - %files -n libvdpau_nouveau %defattr(-,root,root) %_libdir/vdpau/libvdpau_nouveau.so %_libdir/vdpau/libvdpau_nouveau.so.1 %_libdir/vdpau/libvdpau_nouveau.so.1.0.0 +%endif + +%ifnarch s390 aarch64 +%files -n libXvMC_softpipe +%defattr(-,root,root) +%_libdir/libXvMCsoftpipe.so +%_libdir/libXvMCsoftpipe.so.1 +%_libdir/libXvMCsoftpipe.so.1.0.0 + %files -n libvdpau_softpipe %defattr(-,root,root) %_libdir/vdpau/libvdpau_softpipe.so %_libdir/vdpau/libvdpau_softpipe.so.1 %_libdir/vdpau/libvdpau_softpipe.so.1.0.0 - %endif %if %llvm_r600 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4 for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '13

02 Sep '13

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-09-02 15:00:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt4" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2013-08-12 14:22:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-09-02 15:00:14.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Aug 30 00:58:13 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Added patches from upstream for resolving QtDbus bugs and crashes: + 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch + (QTBUG#31932,kde#234484) + 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch + (QTBUG#27809) + 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch + (QTBUG#27809) + 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch + (QTBUG#27809) + 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch + (QTBUG#27809) +- Don't BuildRequire Mesa-devel, pkgconfig(gl) is enough, and it + doesn't pull the whole Mesa egl/gles stack + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: ---- 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.mJHxHi/_old 2013-09-02 15:00:19.000000000 +0200 +++ /var/tmp/diff_new_pack.mJHxHi/_new 2013-09-02 15:00:19.000000000 +0200 @@ -18,7 +18,6 @@ Name: libqt4-devel-doc -BuildRequires: Mesa-devel BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes @@ -27,6 +26,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: sqlite3-devel +BuildRequires: pkgconfig(gl) %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -101,6 +101,16 @@ Patch152: fix-moc-from-choking-on-boost-headers.patch # PATCH-FIX-OPENSUSE qlocale_icu-no-warning-output.patch -- qWarnings about icu libraries and symbols are now only emmited in debug builds Patch153: qlocale_icu-no-warning-output.patch +# PATCH-FIX-UPSTREAM 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch (QTBUG#31932,kde#234484) +Patch154: 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch +# PATCH-FIX-UPSTREAM 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch (QTBUG#27809) +Patch155: 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch +# PATCH-FIX-UPSTREAM 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch (QTBUG#27809) +Patch156: 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch +# PATCH-FIX-UPSTREAM 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch (QTBUG#27809) +Patch157: 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch +# PATCH-FIX-UPSTREAM 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch (QTBUG#27809) +Patch158: 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -177,6 +187,11 @@ %patch151 %patch152 -p1 %patch153 -p1 +%patch154 -p1 +%patch155 -p1 +%patch156 -p1 +%patch157 -p1 +%patch158 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.mJHxHi/_old 2013-09-02 15:00:19.000000000 +0200 +++ /var/tmp/diff_new_pack.mJHxHi/_new 2013-09-02 15:00:19.000000000 +0200 @@ -23,7 +23,6 @@ %define with_phonon_backend 0 %define with_qtwebkit 0 -BuildRequires: Mesa-devel BuildRequires: alsa-devel BuildRequires: clucene-core-devel BuildRequires: cups-devel @@ -42,6 +41,7 @@ BuildRequires: sqlite3-devel BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel +BuildRequires: pkgconfig(gl) %if %with_phonon && %with_phonon_backend BuildRequires: gstreamer-0_10-plugins-base-devel @@ -119,6 +119,16 @@ Patch152: fix-moc-from-choking-on-boost-headers.patch # PATCH-FIX-OPENSUSE qlocale_icu-no-warning-output.patch -- qWarnings about icu libraries and symbols are now only emmited in debug builds Patch153: qlocale_icu-no-warning-output.patch +# PATCH-FIX-UPSTREAM 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch (QTBUG#31932,kde#234484) +Patch154: 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch +# PATCH-FIX-UPSTREAM 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch (QTBUG#27809) +Patch155: 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch +# PATCH-FIX-UPSTREAM 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch (QTBUG#27809) +Patch156: 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch +# PATCH-FIX-UPSTREAM 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch (QTBUG#27809) +Patch157: 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch +# PATCH-FIX-UPSTREAM 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch (QTBUG#27809) +Patch158: 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -151,7 +161,6 @@ Group: Development/Libraries/X11 Requires: %{name} = %{version} Requires: %{name}-linguist = %{version} -Requires: Mesa-devel Requires: c++_compiler Requires: dbus-1-devel Requires: freetype2-devel @@ -166,6 +175,7 @@ Requires: sqlite3-devel Requires: xorg-x11-devel Requires: zlib-devel +Requires: pkgconfig(gl) # bug437293 %ifarch ppc64 Obsoletes: qt-devel-64bit @@ -417,6 +427,11 @@ %patch151 %patch152 -p1 %patch153 -p1 +%patch154 -p1 +%patch155 -p1 +%patch156 -p1 +%patch157 -p1 +%patch158 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch ++++++ >From c776e155a904527a36a1ba9c788c344ca171780c Mon Sep 17 00:00:00 2001 From: Thiago Macieira <thiago.macieira(a)intel.com> Date: Sun, 23 Jun 2013 16:39:56 -0700 Subject: [PATCH 1/6] Don't crash if the relayed signal was emitted from the wrong thread Under normal circumstances, this should never happen. Signals exported to D-Bus should only be emitted from the object's own thread. That's the only way for the receiver (the QDBusAdaptorConnector object) to know what the sender object and signal were. If they are emitted from another thread, the sender will be null. Task-number: QTBUG-31932 Change-Id: Ia5a45d648985e0645bffd4abc0881fca9da64f79 (cherry-picked from qtbase commit d94961d08f91696824d9035f666af5fe28d59ef6) Reviewed-by: Peter Seiderer <ps.report(a)gmx.net> Reviewed-by: Thiago Macieira <thiago.macieira(a)intel.com> --- src/dbus/qdbusabstractadaptor.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index 84c30cd..9ce843e 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -267,7 +267,15 @@ void QDBusAdaptorConnector::polish() void QDBusAdaptorConnector::relaySlot(void **argv) { QObjectPrivate *d = static_cast<QObjectPrivate *>(d_ptr.data()); - relay(d->currentSender->sender, d->currentSender->signal, argv); + if (Q_LIKELY(d->currentSender)) { + relay(d->currentSender->sender, d->currentSender->signal, argv); + } else { + qWarning("QtDBus: cannot relay signals from parent %s(%p \"%s\") unless they are emitted in the object's thread %s(%p \"%s\"). " + "Current thread is %s(%p \"%s\").", + parent()->metaObject()->className(), parent(), qPrintable(parent()->objectName()), + parent()->thread()->metaObject()->className(), parent()->thread(), qPrintable(parent()->thread()->objectName()), + QThread::currentThread()->metaObject()->className(), QThread::currentThread(), qPrintable(QThread::currentThread()->objectName())); + } } void QDBusAdaptorConnector::relay(QObject *senderObj, int lastSignalIdx, void **argv) -- 1.8.3.1 ++++++ 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch ++++++ >From 44f3fb1eec2041c6587d3347f103ca6fa0a17dad Mon Sep 17 00:00:00 2001 From: Marc Mutz <marc.mutz(a)kdab.com> Date: Fri, 24 Aug 2012 10:27:02 +0200 Subject: [PATCH 2/6] QDBusPendingCall: add a missing QWaitCondition::wakeAll() call In QDBusConnectionPrivate::waitForFinished(), threads that see pcall->waitingForFinished == true go to sleep on pcall->waitForFinishedCondition, but there was no call to waitForFinishedCondition.wakeAll() anywhere in the code, so add it. Change-Id: I8d068dc0cc4f20786eb40fd7e2bb9840d8b70c7f (cherry-picked from qtbase commit 20d7763b19400c062a07f440cc601f486be4039b) Reviewed-by: Peter Seiderer <ps.report(a)gmx.net> Reviewed-by: Thiago Macieira <thiago.macieira(a)intel.com> --- src/dbus/qdbusintegrator.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 96e4a12..15278b2 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1782,6 +1782,7 @@ void QDBusConnectionPrivate::waitForFinished(QDBusPendingCallPrivate *pcall) // QDBusConnectionPrivate::processFinishedCall() is called automatically } pcall->mutex.lock(); + pcall->waitForFinishedCondition.wakeAll(); } } -- 1.8.3.1 ++++++ 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch ++++++ >From a9b48e98b8e90a0ccc729b00336e59acc86ad9ca Mon Sep 17 00:00:00 2001 From: Peter Seiderer <ps.report(a)gmx.net> Date: Mon, 17 Jun 2013 20:17:08 +0200 Subject: [PATCH 3/6] Fix unprotected access to QDBusPendingCallPrivate::pending. In QDBusConnectionPrivate::waitForFinished() pcall->pending was used after the protection by pcall->mutex was released. A simultaneous call to QDBusConnectionPrivate::processFinishedCall() was able to reset pcall->pending to null before it was used for the q_dbus_pending_call_block(pcall->pending) call. Fixed by releasing (and setting to 0) of pcall->pending in processFinishedCall() only in case no one is waiting yet, otherwise release pcall->pending by the first thread waiting in waitForFinished(). There is still a race condition about deleting QDBusPendingCallPrivate (too early) which will be fixed in the next two commits. Task-number: QTBUG-27809 Change-Id: I040173810ad90653fe1bd1915f22d8dd70d47d8c (cherry-picked from qtbase commit 64e3bd481e5d54d555959ceecbd5c4576c571241) Reviewed-by: Peter Seiderer <ps.report(a)gmx.net> Reviewed-by: Thiago Macieira <thiago.macieira(a)intel.com> --- src/dbus/qdbusintegrator.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 15278b2..ae67079 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1782,6 +1782,12 @@ void QDBusConnectionPrivate::waitForFinished(QDBusPendingCallPrivate *pcall) // QDBusConnectionPrivate::processFinishedCall() is called automatically } pcall->mutex.lock(); + + if (pcall->pending) { + q_dbus_pending_call_unref(pcall->pending); + pcall->pending = 0; + } + pcall->waitForFinishedCondition.wakeAll(); } } @@ -1821,9 +1827,10 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call) qDBusDebug() << "Deliver failed!"; } - if (call->pending) + if (call->pending && !call->waitingForFinished) { q_dbus_pending_call_unref(call->pending); - call->pending = 0; + call->pending = 0; + } locker.unlock(); -- 1.8.3.1 ++++++ 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch ++++++ >From b638c7bf7309ea6b29f4043c86d790fbc20c006e Mon Sep 17 00:00:00 2001 From: Peter Seiderer <ps.report(a)gmx.net> Date: Mon, 17 Jun 2013 20:56:08 +0200 Subject: [PATCH 4/6] Remove QDBusPendingCallPrivate::autoDelete logic. First step to fix race condition about deleting QDBusPendingCallPrivate. In a multithreaded application on a slow/single core cpu the following race (and segmentation fault) can occur: First thread A is running: A: QDBusPendingReply<> reply = pi->asyncCallWithArgumentList(method, argumentList); Then when the dbus answer arrives thread B will call: B: QDBusConnectionPrivate::processFinishedCall() B: ... B: locker.unlock() and runs until here, go on with thread A: A: reply.waitForFinished(); A: QDBusPendingCallPrivate::waitForFinished() A: { A: QMutexLocker locker(&mutex); A: if (replyMessage.type() != QDBusMessage::InvalidMessage) A: return; which returns immediately (mutex acquired, replyMessage alread set), now reply goes out of scope (destructor called) and QDBusPendingCall::d's destructor of type QExplicitlySharedDataPointer<QDBusPendingCallPrivate> deletes the reference counted object QDBusPendingCallPrivate. Now thread B continues, still in processFinishedCall() B: if (call->watcherHelper) B: call->watcherHelper->emitSignals(msg, call->sentMessage); B: B: if (msg.type() == QDBusMessage::ErrorMessage) B: emit connection->callWithCallbackFailed(QDBusError(msg), B: call->sentMessage); accessing alread deleted object QDBusPendingCallPrivate via call->... Fixed QDBusPendingCallPrivate deletion by proper reference counting will be done in the next commit. Task-number: QTBUG-27809 Change-Id: I15b3f0242471b62eaafadc763fb6a33339ff2fe1 (cherry-picked from qtbase commit 72ecf5a7ecb688a7e19cbc2f70e358a94d02edf7) Reviewed-by: Peter Seiderer <ps.report(a)gmx.net> Reviewed-by: Thiago Macieira <thiago.macieira(a)intel.com> --- src/dbus/qdbusintegrator.cpp | 7 ------- src/dbus/qdbuspendingcall_p.h | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index ae67079..a91ba0e 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1766,7 +1766,6 @@ static void qDBusResultReceived(DBusPendingCall *pending, void *user_data) void QDBusConnectionPrivate::waitForFinished(QDBusPendingCallPrivate *pcall) { Q_ASSERT(pcall->pending); - Q_ASSERT(!pcall->autoDelete); //Q_ASSERT(pcall->mutex.isLocked()); // there's no such function if (pcall->waitingForFinished) { @@ -1840,11 +1839,6 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call) if (msg.type() == QDBusMessage::ErrorMessage) emit connection->callWithCallbackFailed(QDBusError(msg), call->sentMessage); - - if (call->autoDelete) { - Q_ASSERT(!call->waitingForFinished); // can't wait on a call with autoDelete! - delete call; - } } int QDBusConnectionPrivate::send(const QDBusMessage& message) @@ -2063,7 +2057,6 @@ int QDBusConnectionPrivate::sendWithReplyAsync(const QDBusMessage &message, QObj return 1; } - pcall->autoDelete = true; pcall->ref.ref(); pcall->setReplyCallback(receiver, returnMethod); diff --git a/src/dbus/qdbuspendingcall_p.h b/src/dbus/qdbuspendingcall_p.h index 46861ec..d797b5f 100644 --- a/src/dbus/qdbuspendingcall_p.h +++ b/src/dbus/qdbuspendingcall_p.h @@ -85,7 +85,6 @@ public: QList<int> metaTypes; int methodIdx; - bool autoDelete; // } mutable QMutex mutex; @@ -103,7 +102,7 @@ public: // } QDBusPendingCallPrivate(const QDBusMessage &sent, QDBusConnectionPrivate *connection) - : sentMessage(sent), connection(connection), autoDelete(false), watcherHelper(0), pending(0), waitingForFinished(false) + : sentMessage(sent), connection(connection), watcherHelper(0), pending(0), waitingForFinished(false) { } ~QDBusPendingCallPrivate(); bool setReplyCallback(QObject *target, const char *member); -- 1.8.3.1 ++++++ 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch ++++++ >From 8234f5171a20628d6384d10a45d0437a0ab791ee Mon Sep 17 00:00:00 2001 From: Peter Seiderer <ps.report(a)gmx.net> Date: Mon, 17 Jun 2013 22:44:30 +0200 Subject: [PATCH 5/6] Change QDBusPendingCallPrivate to full reference counting for deletion. Fixes race between QDBusConnectionPrivate::processFinishedCall() releasing the mutex before emitting signals (using various members of QDBusPendingCallPrivate) and deletion of the QDBusPendingCallPrivate object through QDBusPendingCall::d's destructor (a member of type QExplicitlySharedDataPointer<QDBusPendingCallPrivate>) leeds to segmentation fault with CrashTest example on slow/single core arm cpu). Task-number: QTBUG-27809 Change-Id: I3590d74d1cfa5816ede764b50b83a7008ec780ff (cherry-picked from qtbase commit 6c21f42657b494e24112c90d8b9fff719f1f8791) Reviewed-by: Peter Seiderer <ps.report(a)gmx.net> Reviewed-by: Thiago Macieira <thiago.macieira(a)intel.com> --- src/dbus/qdbusconnection.cpp | 3 +- src/dbus/qdbusconnection_p.h | 5 +-- src/dbus/qdbusintegrator.cpp | 87 ++++++++++++++++++++++++------------------- src/dbus/qdbuspendingcall.cpp | 6 +++ 4 files changed, 58 insertions(+), 43 deletions(-) diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index bb03c00..7ff09e9 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -53,6 +53,7 @@ #include "qdbusinterface_p.h" #include "qdbusutil_p.h" #include "qdbusconnectionmanager_p.h" +#include "qdbuspendingcall_p.h" #include "qdbusthreaddebug_p.h" @@ -625,7 +626,7 @@ QDBusPendingCall QDBusConnection::asyncCall(const QDBusMessage &message, int tim return QDBusPendingCall(0); // null pointer -> disconnected } - QDBusPendingCallPrivate *priv = d->sendWithReplyAsync(message, timeout); + QDBusPendingCallPrivate *priv = d->sendWithReplyAsync(message, 0, 0, 0, timeout); return QDBusPendingCall(priv); } diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 04f22d3..e11997f 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -194,9 +194,8 @@ public: int send(const QDBusMessage &message); QDBusMessage sendWithReply(const QDBusMessage &message, int mode, int timeout = -1); QDBusMessage sendWithReplyLocal(const QDBusMessage &message); - QDBusPendingCallPrivate *sendWithReplyAsync(const QDBusMessage &message, int timeout = -1); - int sendWithReplyAsync(const QDBusMessage &message, QObject *receiver, - const char *returnMethod, const char *errorMethod, int timeout = -1); + QDBusPendingCallPrivate *sendWithReplyAsync(const QDBusMessage &message, QObject *receiver, + const char *returnMethod, const char *errorMethod,int timeout = -1); bool connectSignal(const QString &service, const QString &path, const QString& interface, const QString &name, const QStringList &argumentMatch, const QString &signature, QObject *receiver, const char *slot); diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index a91ba0e..081a947 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1839,6 +1839,9 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call) if (msg.type() == QDBusMessage::ErrorMessage) emit connection->callWithCallbackFailed(QDBusError(msg), call->sentMessage); + + if (!call->ref.deref()) + delete call; } int QDBusConnectionPrivate::send(const QDBusMessage& message) @@ -1921,7 +1924,7 @@ QDBusMessage QDBusConnectionPrivate::sendWithReply(const QDBusMessage &message, return amsg; } else { // use the event loop - QDBusPendingCallPrivate *pcall = sendWithReplyAsync(message, timeout); + QDBusPendingCallPrivate *pcall = sendWithReplyAsync(message, 0, 0, 0, timeout); Q_ASSERT(pcall); if (pcall->replyMessage.type() == QDBusMessage::InvalidMessage) { @@ -1937,6 +1940,10 @@ QDBusMessage QDBusConnectionPrivate::sendWithReply(const QDBusMessage &message, QDBusMessage reply = pcall->replyMessage; lastError = reply; // set or clear error + bool r = pcall->ref.deref(); + Q_ASSERT(!r); + Q_UNUSED(r); + delete pcall; return reply; } @@ -1976,19 +1983,55 @@ QDBusMessage QDBusConnectionPrivate::sendWithReplyLocal(const QDBusMessage &mess } QDBusPendingCallPrivate *QDBusConnectionPrivate::sendWithReplyAsync(const QDBusMessage &message, - int timeout) + QObject *receiver, const char *returnMethod, + const char *errorMethod, int timeout) { if (isServiceRegisteredByThread(message.service())) { // special case for local calls QDBusPendingCallPrivate *pcall = new QDBusPendingCallPrivate(message, this); pcall->replyMessage = sendWithReplyLocal(message); + if (receiver && returnMethod) + pcall->setReplyCallback(receiver, returnMethod); + + if (errorMethod) { + pcall->watcherHelper = new QDBusPendingCallWatcherHelper; + connect(pcall->watcherHelper, SIGNAL(error(QDBusError,QDBusMessage)), receiver, errorMethod, + Qt::QueuedConnection); + pcall->watcherHelper->moveToThread(thread()); + } + if ((receiver && returnMethod) || errorMethod) { + // no one waiting, will delete pcall in processFinishedCall() + pcall->ref = 1; + } else { + // set double ref to prevent race between processFinishedCall() and ref counting + // by QDBusPendingCall::QExplicitlySharedDataPointer<QDBusPendingCallPrivate> + pcall->ref = 2; + } + processFinishedCall(pcall); return pcall; } checkThread(); QDBusPendingCallPrivate *pcall = new QDBusPendingCallPrivate(message, this); - pcall->ref = 0; + if (receiver && returnMethod) + pcall->setReplyCallback(receiver, returnMethod); + + if (errorMethod) { + pcall->watcherHelper = new QDBusPendingCallWatcherHelper; + connect(pcall->watcherHelper, SIGNAL(error(QDBusError,QDBusMessage)), receiver, errorMethod, + Qt::QueuedConnection); + pcall->watcherHelper->moveToThread(thread()); + } + + if ((receiver && returnMethod) || errorMethod) { + // no one waiting, will delete pcall in processFinishedCall() + pcall->ref = 1; + } else { + // set double ref to prevent race between processFinishedCall() and ref counting + // by QDBusPendingCall::QExplicitlySharedDataPointer<QDBusPendingCallPrivate> + pcall->ref = 2; + } QDBusError error; DBusMessage *msg = QDBusMessagePrivate::toDBusMessage(message, capabilities, &error); @@ -1999,6 +2042,7 @@ QDBusPendingCallPrivate *QDBusConnectionPrivate::sendWithReplyAsync(const QDBusM qPrintable(error.message())); pcall->replyMessage = QDBusMessage::createError(error); lastError = error; + processFinishedCall(pcall); return pcall; } @@ -2024,45 +2068,10 @@ QDBusPendingCallPrivate *QDBusConnectionPrivate::sendWithReplyAsync(const QDBusM q_dbus_message_unref(msg); pcall->replyMessage = QDBusMessage::createError(error); + processFinishedCall(pcall); return pcall; } -int QDBusConnectionPrivate::sendWithReplyAsync(const QDBusMessage &message, QObject *receiver, - const char *returnMethod, const char *errorMethod, - int timeout) -{ - QDBusPendingCallPrivate *pcall = sendWithReplyAsync(message, timeout); - Q_ASSERT(pcall); - - // has it already finished with success (dispatched locally)? - if (pcall->replyMessage.type() == QDBusMessage::ReplyMessage) { - pcall->setReplyCallback(receiver, returnMethod); - processFinishedCall(pcall); - delete pcall; - return 1; - } - - // either it hasn't finished or it has finished with error - if (errorMethod) { - pcall->watcherHelper = new QDBusPendingCallWatcherHelper; - connect(pcall->watcherHelper, SIGNAL(error(QDBusError,QDBusMessage)), receiver, errorMethod, - Qt::QueuedConnection); - pcall->watcherHelper->moveToThread(thread()); - } - - // has it already finished and is an error reply message? - if (pcall->replyMessage.type() == QDBusMessage::ErrorMessage) { - processFinishedCall(pcall); - delete pcall; - return 1; - } - - pcall->ref.ref(); - pcall->setReplyCallback(receiver, returnMethod); - - return 1; -} - bool QDBusConnectionPrivate::connectSignal(const QString &service, const QString &path, const QString &interface, const QString &name, const QStringList &argumentMatch, const QString &signature, diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp index 5485a4b..56cf45a 100644 --- a/src/dbus/qdbuspendingcall.cpp +++ b/src/dbus/qdbuspendingcall.cpp @@ -260,6 +260,11 @@ QDBusPendingCall::QDBusPendingCall(const QDBusPendingCall &other) QDBusPendingCall::QDBusPendingCall(QDBusPendingCallPrivate *dd) : d(dd) { + if (dd) { + bool r = dd->ref.deref(); + Q_ASSERT(r); + Q_UNUSED(r); + } } /*! @@ -465,6 +470,7 @@ QDBusPendingCall QDBusPendingCall::fromCompletedCall(const QDBusMessage &msg) msg.type() == QDBusMessage::ReplyMessage) { d = new QDBusPendingCallPrivate(QDBusMessage(), 0); d->replyMessage = msg; + d->ref = 1; } return QDBusPendingCall(d); -- 1.8.3.1 ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.mJHxHi/_old 2013-09-02 15:00:19.000000000 +0200 +++ /var/tmp/diff_new_pack.mJHxHi/_new 2013-09-02 15:00:19.000000000 +0200 @@ -17,7 +17,7 @@ # nodebuginfo Name: libqt4-devel-doc -BuildRequires: Mesa-devel +BuildRequires: pkgconfig(gl) BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.mJHxHi/_old 2013-09-02 15:00:20.000000000 +0200 +++ /var/tmp/diff_new_pack.mJHxHi/_new 2013-09-02 15:00:20.000000000 +0200 @@ -17,7 +17,7 @@ # nodebuginfo Name: libqt4-sql-plugins -BuildRequires: Mesa-devel +BuildRequires: pkgconfig(gl) BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: gtk2-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit liblinebreak for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '13

02 Sep '13

Hello community, here is the log from the commit of package liblinebreak for openSUSE:Factory checked in at 2013-09-02 14:59:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liblinebreak (Old) and /work/SRC/openSUSE:Factory/.liblinebreak.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "liblinebreak" Changes: -------- --- /work/SRC/openSUSE:Factory/liblinebreak/liblinebreak.changes 2011-09-23 02:08:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.liblinebreak.new/liblinebreak.changes 2013-09-02 14:59:56.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 19 13:50:22 UTC 2013 - schwab(a)suse.de + +- Move configure run into %build section to allow running + config.sub/config.guess update hook + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liblinebreak.spec ++++++ --- /var/tmp/diff_new_pack.163LpJ/_old 2013-09-02 14:59:56.000000000 +0200 +++ /var/tmp/diff_new_pack.163LpJ/_new 2013-09-02 14:59:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package liblinebreak # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -16,14 +16,13 @@ # - Name: liblinebreak Version: 2.1 -Release: 3 -License: Zlib +Release: 0 Summary: Unicode line-breaking library -Url: http://sourceforge.net/projects/vimgadgets/ +License: Zlib Group: Development/Libraries/C and C++ +Url: http://sourceforge.net/projects/vimgadgets/ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,8 +32,6 @@ at http://www.unicode.org/reports/tr14/tr14-26.html %package devel - - Summary: Development files for liblinebreak Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -44,8 +41,6 @@ developing applications that use liblinebreak. %package -n liblinebreak2 - - Summary: Unicode line-breaking library Group: Development/Libraries/C and C++ Provides: %{name} = %{version} @@ -58,9 +53,9 @@ %prep %setup -q -%configure --disable-static %build +%configure --disable-static make %{?_smp_mflags} %install -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '13

02 Sep '13

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at 2013-09-02 14:59:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-openSUSE/kdebase4-openSUSE.changes 2013-08-27 20:49:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new/kdebase4-openSUSE.changes 2013-09-02 14:59:47.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Aug 30 12:43:24 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Updated tar from github + * New KTP tray icons + * Added weatherstation svg + * Tweaked scrollbar + * Added OpenSUSEdarkalternate colorcheme (bnc#802707) + * Configuration updates + * Added apper and ktp presence applet plasma scripts + * Added plasma-cache cleaning scripts +- Removed plasma-cache cleaning scripts from the package + +------------------------------------------------------------------- Old: ---- plasma-cache.sh plasma-cache.upd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.yzqASU/_old 2013-09-02 14:59:48.000000000 +0200 +++ /var/tmp/diff_new_pack.yzqASU/_new 2013-09-02 14:59:48.000000000 +0200 @@ -26,8 +26,6 @@ Url: http://www.opensuse.org/ Source0: kdebase4-openSUSE-%{version}.tar.bz2 Source2: plasma-change-defaults.diff -Source3: plasma-cache.upd -Source4: plasma-cache.sh BuildRequires: fdupes BuildRequires: hwinfo-devel BuildRequires: kdebase4-runtime-branding-upstream @@ -108,9 +106,7 @@ gzip %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svg mv %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svg.gz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svgz chmod og-w -R %{buildroot} - install -m644 -p %{SOURCE3} %{buildroot}%{_kde4_appsdir}/kconf_update/ - install -m755 -p %{SOURCE4} %{buildroot}%{_kde4_appsdir}/kconf_update/ - chmod a+x %{buildroot}/usr/share/kde4/apps/kconf_update/sysinfo_to_kinfocenter.sh + chmod a+x %{buildroot}/usr/share/kde4/apps/kconf_update/*.sh %suse_update_desktop_file -u SUSEgreeter System Documentation %fdupes -s %{buildroot}%{_kde4_configdir}/SuSE/default/ %kde_post_install ++++++ kdebase4-openSUSE-13.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/etc/kde4/share/config/activitymanager-pluginsrc new/kdebase4-openSUSE/config-files/etc/kde4/share/config/activitymanager-pluginsrc --- old/kdebase4-openSUSE/config-files/etc/kde4/share/config/activitymanager-pluginsrc 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/etc/kde4/share/config/activitymanager-pluginsrc 2013-08-30 14:40:31.000000000 +0200 @@ -0,0 +1,3 @@ +[Plugin-org.kde.kactivitymanager.resourcescoring] +blocked-by-default=true +what-to-remember=2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/etc/kde4/share/config/akonadi_nepomuk_feederrc new/kdebase4-openSUSE/config-files/etc/kde4/share/config/akonadi_nepomuk_feederrc --- old/kdebase4-openSUSE/config-files/etc/kde4/share/config/akonadi_nepomuk_feederrc 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/etc/kde4/share/config/akonadi_nepomuk_feederrc 2013-08-30 14:40:31.000000000 +0200 @@ -0,0 +1,2 @@ +[akonadi_nepomuk_email_feeder] +Enabled=false \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdedrc new/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdedrc --- old/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdedrc 2013-03-01 17:24:54.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdedrc 2013-08-30 14:40:31.000000000 +0200 @@ -1,2 +1,6 @@ [General] DelayedCheck=true + +# bnc#803536 -- will be effective with 4.10.95 +[Notification Messages] +phonon_always_forget_devices=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdeglobals new/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdeglobals --- old/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdeglobals 2013-03-01 17:24:54.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdeglobals 2013-08-30 14:40:31.000000000 +0200 @@ -96,6 +96,7 @@ ColorScheme=openSUSE Name=openSUSE shadeSortColumn=true +BrowserApplication=firefox [KDE] contrast=5 @@ -125,7 +126,3 @@ [KFileDialog Settings] Breadcrumb Navigation=true - -[General] -BrowserApplication=firefox -ColorScheme=openSUSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/etc/kde4/share/config/konversationrc new/kdebase4-openSUSE/config-files/etc/kde4/share/config/konversationrc --- old/kdebase4-openSUSE/config-files/etc/kde4/share/config/konversationrc 2013-03-01 17:24:54.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/etc/kde4/share/config/konversationrc 2013-08-30 14:40:31.000000000 +0200 @@ -9,3 +9,6 @@ AutoJoinChannels=Channel 0 ServerList=Server 0 Name=openSUSE IRC + +[General Options] +ShowTrayIcon=true \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/etc/kde4/share/config/krunnerrc new/kdebase4-openSUSE/config-files/etc/kde4/share/config/krunnerrc --- old/kdebase4-openSUSE/config-files/etc/kde4/share/config/krunnerrc 2013-03-01 17:24:54.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/etc/kde4/share/config/krunnerrc 2013-08-30 14:40:31.000000000 +0200 @@ -3,4 +3,3 @@ kabccontactsEnabled=false kopete_runnerEnabled=false org.kde.windowedwidgetsEnabled=false - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/etc/kde4/share/config/nepomukserverrc new/kdebase4-openSUSE/config-files/etc/kde4/share/config/nepomukserverrc --- old/kdebase4-openSUSE/config-files/etc/kde4/share/config/nepomukserverrc 2013-03-07 19:22:26.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/etc/kde4/share/config/nepomukserverrc 2013-08-30 14:40:31.000000000 +0200 @@ -2,12 +2,9 @@ Configured repositories=main Start Nepomuk=true -[Service-nepomukstrigiservice] -autostart=false - [Service-nepomukfileindexer] autostart=false [main Settings] Used Soprano Backend=virtuosobackend -rebuilt index for type indexing=true +Maximum memory=20 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/etc/kde4/share/config/nepomukstrigirc new/kdebase4-openSUSE/config-files/etc/kde4/share/config/nepomukstrigirc --- old/kdebase4-openSUSE/config-files/etc/kde4/share/config/nepomukstrigirc 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/etc/kde4/share/config/nepomukstrigirc 2013-08-30 14:40:31.000000000 +0200 @@ -0,0 +1,2 @@ + [General] +disable initial update=true \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/color-schemes/OpenSUSEdarkalternate.colors new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/color-schemes/OpenSUSEdarkalternate.colors --- old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/color-schemes/OpenSUSEdarkalternate.colors 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/color-schemes/OpenSUSEdarkalternate.colors 2013-08-30 14:40:31.000000000 +0200 @@ -0,0 +1,105 @@ +[ColorEffects:Disabled] +Color=56,56,56 +ColorAmount=0 +ColorEffect=0 +ContrastAmount=0.65 +ContrastEffect=1 +IntensityAmount=0.1 +IntensityEffect=2 + +[ColorEffects:Inactive] +ChangeSelectionColor=true +Color=112,111,110 +ColorAmount=-0.9 +ColorEffect=1 +ContrastAmount=0.25 +ContrastEffect=2 +Enable=true +IntensityAmount=0 +IntensityEffect=0 + +[Colors:Button] +BackgroundAlternate=224,223,222 +BackgroundNormal=28,33,34 +DecorationFocus=126,221,127 +DecorationHover=82,111,88 +ForegroundActive=255,128,224 +ForegroundInactive=190,207,210 +ForegroundLink=60,147,86 +ForegroundNegative=191,3,3 +ForegroundNeutral=176,128,0 +ForegroundNormal=182,215,221 +ForegroundPositive=0,110,40 +ForegroundVisited=100,74,155 + +[Colors:Selection] +BackgroundAlternate=62,138,204 +BackgroundNormal=114,147,125 +DecorationFocus=126,221,127 +DecorationHover=82,111,88 +ForegroundActive=255,128,224 +ForegroundInactive=190,207,210 +ForegroundLink=60,147,86 +ForegroundNegative=156,14,14 +ForegroundNeutral=255,221,0 +ForegroundNormal=255,255,255 +ForegroundPositive=128,255,128 +ForegroundVisited=69,40,134 + +[Colors:Tooltip] +BackgroundAlternate=196,224,255 +BackgroundNormal=190,207,210 +DecorationFocus=126,221,127 +DecorationHover=82,111,88 +ForegroundActive=255,128,224 +ForegroundInactive=170,200,239 +ForegroundLink=60,147,86 +ForegroundNegative=191,3,3 +ForegroundNeutral=176,128,0 +ForegroundNormal=28,33,34 +ForegroundPositive=0,110,40 +ForegroundVisited=100,74,155 + +[Colors:View] +BackgroundAlternate=26,33,34 +BackgroundNormal=28,33,34 +DecorationFocus=126,221,127 +DecorationHover=82,111,88 +ForegroundActive=255,128,224 +ForegroundInactive=170,200,239 +ForegroundLink=60,147,86 +ForegroundNegative=191,3,3 +ForegroundNeutral=176,128,0 +ForegroundNormal=190,207,210 +ForegroundPositive=0,110,40 +ForegroundVisited=100,74,155 + +[Colors:Window] +BackgroundAlternate=194,208,223 +BackgroundNormal=28,33,34 +DecorationFocus=126,221,127 +DecorationHover=82,111,88 +ForegroundActive=255,128,224 +ForegroundInactive=170,200,239 +ForegroundLink=60,147,86 +ForegroundNegative=191,3,3 +ForegroundNeutral=176,128,0 +ForegroundNormal=190,207,210 +ForegroundPositive=0,110,40 +ForegroundVisited=100,74,155 + +[General] +ColorScheme=openSUSEdarkalternate +Name=openSUSEdarkalternate +shadeSortColumn=true + +[KDE] +contrast=10 + +[WM] +activeBackground=98,255,255 +activeBlend=255,255,255 +activeForeground=255,255,255 +inactiveBackground=224,223,222 +inactiveBlend=75,71,67 +inactiveForeground=75,71,67 Files old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/icons/presence-applet.svgz and new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/icons/presence-applet.svgz differ Files old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/weatherstation/lcd2.svgz and new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/weatherstation/lcd2.svgz differ Files old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/widgets/scrollbar.svgz and new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/widgets/scrollbar.svgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/kconf_update/plasma-cache.sh new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/kconf_update/plasma-cache.sh --- old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/kconf_update/plasma-cache.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/kconf_update/plasma-cache.sh 2013-08-30 14:40:31.000000000 +0200 @@ -0,0 +1,6 @@ +#!/bin/sh + +rm -fv "`kde4-config --path cache`"*.kcache +rm -fv "`kde4-config --path cache`"plasma-svgelements-* +exit 0 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/kconf_update/plasma-cache.upd new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/kconf_update/plasma-cache.upd --- old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/kconf_update/plasma-cache.upd 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/kconf_update/plasma-cache.upd 2013-08-30 14:40:31.000000000 +0200 @@ -0,0 +1,2 @@ +Id=0.6plasma-cache +Script=plasma-cache.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/plasma-desktop/updates/10-opensuse-apper.js new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/plasma-desktop/updates/10-opensuse-apper.js --- old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/plasma-desktop/updates/10-opensuse-apper.js 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/plasma-desktop/updates/10-opensuse-apper.js 2013-08-30 14:40:31.000000000 +0200 @@ -0,0 +1,55 @@ +/* + 10-opensuse-apper.js - Add apper plasmoid to the systray + lifted and adapted from fedora by Alin M Elena <alinm.elena(a)gmail.com> + Copyright (C) 2010 Kevin Kofler <kevin.kofler(a)chello.at> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + With contributions from + Dan Vrátil <dvratil(a)redhat.com> + + Portions lifted from 01-kubuntu-10.04.js: + Harald Sitter, apachelogger(a)ubuntu.com 2010-04-02 + Jonathan Riddell, jriddell(a)ubuntu.com 2010-02-18 + Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later +*/ + +systrayFound = false; +pids = panelIds; +for (i = 0; i < pids.length; ++i) { + p = panelById(pids[i]); + if (!p) continue; + ids = p.widgetIds; + for (j = 0; j < ids.length; ++j) { + w = p.widgetById(ids[j]); + if (!w || w.type != "systemtray") continue; + systrayFound = true; + var shown = w.readConfig("alwaysShown", Array()); + shown.push("updater"); + w.writeConfig("alwaysShown", shown); + w.currentConfigGroup = new Array("Applets"); + max = 0; + for (k = 0; k < w.configGroups.length; ++k) + if (parseInt(w.configGroups[k]) > max) + max = parseInt(w.configGroups[k]); + w.currentConfigGroup = new Array("Applets", max + 1); + w.writeConfig("plugin", "updater"); + print("apper plasmoid added to the systray"); + break; + } + if (systrayFound) break; +} +if (!systrayFound) + print("No systray found"); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/plasma-desktop/updates/10-opensuse-presence.js new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/plasma-desktop/updates/10-opensuse-presence.js --- old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/plasma-desktop/updates/10-opensuse-presence.js 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/plasma-desktop/updates/10-opensuse-presence.js 2013-08-30 14:40:31.000000000 +0200 @@ -0,0 +1,55 @@ +/* + 10-opensuse-presence.js - Add ktp-presence-applet to the systray + lifted and adapted from fedora by Alin M Elena <alinm.elena(a)gmail.com> + Copyright (C) 2010 Kevin Kofler <kevin.kofler(a)chello.at> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + With contributions from + Dan Vrátil <dvratil(a)redhat.com> + + Portions lifted from 01-kubuntu-10.04.js: + Harald Sitter, apachelogger(a)ubuntu.com 2010-04-02 + Jonathan Riddell, jriddell(a)ubuntu.com 2010-02-18 + Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later +*/ + +systrayFound = false; +pids = panelIds; +for (i = 0; i < pids.length; ++i) { + p = panelById(pids[i]); + if (!p) continue; + ids = p.widgetIds; + for (j = 0; j < ids.length; ++j) { + w = p.widgetById(ids[j]); + if (!w || w.type != "systemtray") continue; + systrayFound = true; + var shown = w.readConfig("alwaysShown", Array()); + shown.push("org.kde.ktp-presence"); + w.writeConfig("alwaysShown", shown); + w.currentConfigGroup = new Array("Applets"); + max = 0; + for (k = 0; k < w.configGroups.length; ++k) + if (parseInt(w.configGroups[k]) > max) + max = parseInt(w.configGroups[k]); + w.currentConfigGroup = new Array("Applets", max + 1); + w.writeConfig("plugin", "org.kde.ktp-presence"); + print("ktp-presence-applet added to the systray"); + break; + } + if (systrayFound) break; +} +if (!systrayFound) + print("No systray found"); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/config/SuSE/default/clock-no-events.js.live new/kdebase4-openSUSE/config-files/usr/share/kde4/config/SuSE/default/clock-no-events.js.live --- old/kdebase4-openSUSE/config-files/usr/share/kde4/config/SuSE/default/clock-no-events.js.live 2013-03-01 17:24:54.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/config/SuSE/default/clock-no-events.js.live 2013-08-30 14:40:31.000000000 +0200 @@ -5,6 +5,7 @@ if (widget.type == "digital-clock") { widget.currentConfigGroup = new Array(); widget.writeConfig('showEvents', 'false'); + widget.writeConfig('displayEvents', 'false'); widget.reloadConfig(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/po/es/kde4-openSUSE.po new/kdebase4-openSUSE/po/es/kde4-openSUSE.po --- old/kdebase4-openSUSE/po/es/kde4-openSUSE.po 2013-01-28 10:35:34.000000000 +0100 +++ new/kdebase4-openSUSE/po/es/kde4-openSUSE.po 2013-03-02 13:50:13.000000000 +0100 @@ -5,34 +5,35 @@ # Jorge Mata <matamax123(a)gmail.com>, 2009. # Alex Rodriguez <alexio44(a)opensuse.org.ni>, 2010. # Javier Llorente <javier(a)opensuse.org>, 2010. +# Ricardo Varas Santana <ricardoivaras(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: kde4-openSUSE\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-25 16:08+0100\n" -"PO-Revision-Date: 2010-05-29 21:48+0200\n" -"Last-Translator: Javier Llorente <javier(a)opensuse.org>\n" -"Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n" +"PO-Revision-Date: 2013-03-01 16:31-0300\n" +"Last-Translator: Ricardo Varas Santana <ricardoivaras(a)gmail.com>\n" +"Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ApperKCM/Settings/Settings.cpp:57 msgid "A repository was changed, it's highly recommended to refresh the cache" -msgstr "" +msgstr "Se cambió un repositorio, es altamente recomendado actualizar el caché" #: Apper/main.cpp:58 msgid "(C) 2008-2013 Daniel Nicoletti" -msgstr "" +msgstr "(C) 2008-2013 Daniel Nicoletti" #. i18n: file: ApperKCM/ApperKCM.ui:127 #. i18n: ectx: property (text), widget (QPushButton, changesPB) #: rc.cpp:59 msgid "Pending changes" -msgstr "" +msgstr "Cambios pendietes" #. i18n: file: ApperKCM/ApperKCM.ui:195 #. i18n: ectx: property (text), widget (QPushButton, generalSettingsPB) @@ -44,28 +45,30 @@ #. i18n: ectx: property (text), widget (QPushButton, repoSettingsPB) #: rc.cpp:68 msgid "Repositories" -msgstr "" +msgstr "Repositorios" #: libapper/PkTransactionWidget.cpp:229 libapper/PkTransactionWidget.cpp:242 #, kde-format msgid "%1 (%2%)" -msgstr "" +msgstr "%1 (%2%)" #: libapper/PkStrings.cpp:573 msgid "" "The software repository was not found.\n" "You may need to enable it in Settings->Repositories." msgstr "" +"No se encontró el repositorio de software.\n" +"Necesita ser activado en Configuración->Repositorios." #: libapper/Requirements.cpp:200 #, kde-format msgctxt "how many bytes are required for download" msgid "Need to get %1 of archives" -msgstr "" +msgstr "Es necesario obtener %1 de archivos" #: libapper/ApplicationLauncher.cpp:37 msgid "Application Installed" -msgstr "" +msgstr "Aplicación instalada" #: backend-xine/xinemediawidget.cpp:878 suseinstall/ksuseinstall.cpp:145 msgctxt "@action:button" @@ -73,8 +76,12 @@ msgstr "Instalar" #: backend-xine/xinemediawidget.cpp:880 -msgid "Kaffeine currently cannot play some file formats. Do you want to install additional support?" -msgstr "Actualmente Kaffeine no puede reproducir algunos formatos de archivo. ¿Quiere que se instale el soporte adicional?" +msgid "" +"Kaffeine currently cannot play some file formats. Do you want to install " +"additional support?" +msgstr "" +"Actualmente Kaffeine no puede reproducir algunos formatos de archivo. ¿Quiere " +"que se instale el soporte adicional?" #: backend-xine/xinemediawidget.cpp:881 msgid "Install Additional Codecs" @@ -91,12 +98,16 @@ msgstr "Reiniciar más tarde" #: backend-xine/xinemediawidget.cpp:894 -msgid "The necessary support has been successfully installed. It may be necessary to restart the application for the support to be activated." -msgstr "El soporte necesario se ha instalado correctamente. Puede que sea necesario reiniciar la aplicación para que el soporte sea activado." +msgid "" +"The necessary support has been successfully installed. It may be necessary to " +"restart the application for the support to be activated." +msgstr "" +"El soporte necesario se ha instalado correctamente. Puede que sea necesario " +"reiniciar la aplicación para que el soporte sea activado." #: infosum.cpp:62 msgid "KDE Platform Version" -msgstr "" +msgstr "Versión de plataforma KDE" #: kdmshutdown.cpp:533 kdmshutdown.cpp:550 msgid "&Suspend Computer" @@ -138,8 +149,12 @@ #: suseinstall/ksuseinstall.cpp:51 #, kde-format -msgid "<qt>The application or utility %1 is required but it does not appear to be installed.Do you want to try to install it?</qt>" -msgstr "<qt>Se necesita la aplicación o utilidad %1 pero parece que no está instalada.¿Quiere tratar de instalarla?</qt>" +msgid "" +"<qt>The application or utility %1 is required but it does not " +"appear to be installed.Do you want to try to install it?</qt>" +msgstr "" +"<qt>Se necesita la aplicación o utilidad %1 pero parece que no está " +"instalada.¿Quiere tratar de instalarla?</qt>" #: suseinstall/ksuseinstall.cpp:53 suseinstall/ksuseinstall.cpp:146 #: suseinstall/ksuseinstall.cpp:200 @@ -148,13 +163,26 @@ #: suseinstall/ksuseinstall.cpp:134 #, kde-format -msgid "<qt>There is no specialized application for files of the type %1.The file can be opened in a more generic application as file type %2, or you can try to install a specialized application for file type %1.Do you want to try to install a specialized application?" -msgstr "<qt>No hay ninguna aplicación especializada para archivos del tipo %1.El archivo se puede abrir con una aplicación genérica como archivo del tipo %2, o puedes intentar instalar una aplicación especializada para el archivo del tipo %1.¿Quiere tratar de instalar una aplicación especializada?" +msgid "" +"<qt>There is no specialized application for files of the type %1.<" +"/p>The file can be opened in a more generic application as file type %" +"2, or you can try to install a specialized application for file type %" +"1.Do you want to try to install a specialized application?" +msgstr "" +"<qt>No hay ninguna aplicación especializada para archivos del tipo %1<" +"/b>.El archivo se puede abrir con una aplicación genérica como archivo " +"del tipo %2, o puedes intentar instalar una aplicación especializada " +"para el archivo del tipo %1.¿Quiere tratar de instalar una " +"aplicación especializada?" #: suseinstall/ksuseinstall.cpp:141 #, kde-format -msgid "<qt>There is no application installed that can open files of the type %1.Do you want to try to install one?</qt>" -msgstr "<qt>No hay ninguna aplicación instalada que pueda abrir archivos del tipo %1.¿Quiere tratar de instalar alguna?</qt>" +msgid "" +"<qt>There is no application installed that can open files of the type %" +"1.Do you want to try to install one?</qt>" +msgstr "" +"<qt>No hay ninguna aplicación instalada que pueda abrir archivos del tipo " +"%1.¿Quiere tratar de instalar alguna?</qt>" #: suseinstall/ksuseinstall.cpp:201 msgid "Checking for additional software to install" @@ -163,14 +191,29 @@ #: suseinstall/ksuseinstall.cpp:303 #, kde-format msgctxt "added text is URL" -msgid "<qt>Some of the software to install could not be found in the currently enabled software repositories.It may be located in other repositories.See %1 for details.Do you want to configure your repositories now?</qt>" -msgstr "<qt>Algunos de los programas que se van a instalar no se pudieron encontrar en los repositorios de programas actualmente activados. Puede que esté en otros repositorios.Vea %1 para más detalles.¿Quiere configurar los repositorios ahora?</qt>" +msgid "" +"<qt>Some of the software to install could not be found in the currently " +"enabled software repositories.It may be located in other repositories." +"See %1 for details.Do you want to configure your repositories now?" +"</qt>" +msgstr "" +"<qt>Algunos de los programas que se van a instalar no se pudieron " +"encontrar en los repositorios de programas actualmente activados. Puede que " +"esté en otros repositorios.Vea %1 para más detalles.¿Quiere " +"configurar los repositorios ahora?</qt>" #: suseinstall/ksuseinstall.cpp:311 #, kde-format msgctxt "added text is URL" -msgid "<qt>The software to install could not be found in the currently enabled software repositories.It may be located in other repositories.See %1 for details.Do you want to configure your repositories?</qt>" -msgstr "<qt>El programa a instalar no se ha encontrado en los repositorios de programas actualmente instalados. Puede que esté en otros repositorios . Vea %1 para más detalles.¿Desea configurar los repositorios?</qt>" +msgid "" +"<qt>The software to install could not be found in the currently enabled " +"software repositories.It may be located in other repositories.See %1 " +"for details.Do you want to configure your repositories?</qt>" +msgstr "" +"<qt>El programa a instalar no se ha encontrado en los repositorios de " +"programas actualmente instalados. Puede que esté en otros repositorios . " +"Vea %1 para más detalles.¿Desea configurar los repositorios?<" +"/qt>" #: suseinstall/ksuseinstall.cpp:317 msgid "Configure Software Repositories" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/po/fr/kde4-openSUSE.po new/kdebase4-openSUSE/po/fr/kde4-openSUSE.po --- old/kdebase4-openSUSE/po/fr/kde4-openSUSE.po 2013-01-28 09:45:46.000000000 +0100 +++ new/kdebase4-openSUSE/po/fr/kde4-openSUSE.po 2013-08-13 11:24:10.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kde4-openSUSE\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-25 16:08+0100\n" -"PO-Revision-Date: 2013-01-28 09:45+0100\n" +"PO-Revision-Date: 2013-08-13 11:24+0200\n" "Last-Translator: Guillaume GARDET <guillaume.gardet(a)opensuse.org>\n" "Language-Team: French <opensuse-fr(a)opensuse.org>\n" "Language: fr\n" @@ -58,7 +58,7 @@ "Vous pouvez avoir besoin de l'activer via Paramètres->Dépôts." #: libapper/Requirements.cpp:200 -#, fuzzy, kde-format +#, kde-format msgctxt "how many bytes are required for download" msgid "Need to get %1 of archives" msgstr "Il est nécessaire d'obtenir %1 des archives" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/po/ro/SUSEgreeter.po new/kdebase4-openSUSE/po/ro/SUSEgreeter.po --- old/kdebase4-openSUSE/po/ro/SUSEgreeter.po 2013-03-01 12:51:05.000000000 +0100 +++ new/kdebase4-openSUSE/po/ro/SUSEgreeter.po 2013-03-02 07:53:33.000000000 +0100 @@ -16,76 +16,35 @@ # Comunitatea romana openSUSE - www.suseromania.ro msgid "" msgstr "" +"X-Generator: Narro 2.0 on http://tradu.softwareliber.ro\n" "Project-Id-Version: OpenSUSE\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2013-01-24 10:21+0100\n" -"PO-Revision-Date: 2012-11-19 14:59+0200\n" +"Content-Type: text/plain; charset=UTF-8\n" "Last-Translator: Lucian Oprea <oprea.luci(a)gmail.com>\n" "Language-Team: Romanian <LL(a)li.org>\n" -"Language: ro\n" +"PO-Revision-Date: 2012-11-19 14:59+0200\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Narro 2.0 on http://tradu.softwareliber.ro\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" "X-Generator: Narro 2.0 on http://tradu.softwareliber.ro\n" -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "" - -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "" - -#: greet.xml:4 -msgid "openSUSE Project" -msgstr "Proiectul openSUSE" - -#: greet.xml:6 -msgid " <a href=\"https://en.opensuse.org/openSUSE:About\">We are</a> a global community promoting and developing openSUSE Linux. We believe in building great technology through open collaboration, without barriers or bureaucrats. We make computers useful tools, stable but not outdated. Learn more <a href=\"http://en.opensuse.org/\">about openSUSE here</a> and get <a href=\"http://news.opensuse.org\">the latest openSUSE news here</a>. " -msgstr "" - -#: greet.xml:9 -msgid "Community Support" -msgstr "Suport din partea comunității" - -#: greet.xml:11 -msgid "openSUSE means participating fairly in Free and Open Source Software. We contribute to projects like the Linux kernel, GNU gcc, Samba, KDE and GNOME. Our tools are useful to all, like <a href=\"http://openbuildservice.org\">Open Build Service</a>, the filesystem snapshot and recovery tool <a href=\"http://snapper.io\">Snapper</a>, and the distribution testing tool <a href=\"http://openqa.opensuse.org/\">openQA</a>. openSUSE meets a wide range of needs thanks to initiatives like our Rolling Release <a href=\"http://opensuse.org/Tumbleweed\">Tumbleweed</a> and the easy custom OS builder <a href=\"http://susestudio.com\">SUSE Studio</a>." -msgstr "" - -#: greet.xml:14 -msgid "Build Service" -msgstr "Serviciu de construire" - -#: greet.xml:16 -msgid " We want you to have a great openSUSE experience. Our <a href=\"http://help.opensuse.org/\">Online Help</a> site provides a lot of information and you can find answers and ask questions on our <a href=\"http://forums.opensuse.org/\">openSUSE Forums</a>. Look <a href=\"https://en.opensuse.org/openSUSE:Communication_channels\">here</a> to find more openSUSE communication channels." -msgstr "" - -#: greetings.cpp:48 greetings.cpp:62 greetings.cpp:75 greetings.cpp:79 -#: greetings.cpp:116 -#, kde-format +#: greetings.cpp:51 greetings.cpp:68 greetings.cpp:84 greetings.cpp:90 +#: greetings.cpp:131 msgid "Error loading %1" msgstr "Eroare la încărcarea %1" -#: greetings.cpp:123 +#: greetings.cpp:140 msgid "Have a lot of fun!" msgstr "Distracție plăcută!" -#: greetings.cpp:124 +#: greetings.cpp:141 msgid "CLOSE" msgstr "ÎNCHIDE" -#: greetings.cpp:125 +#: greetings.cpp:142 msgid "Show Introduction to KDE4" msgstr "Arată Introducerea în KDE4" -#: greetings.cpp:126 -#, fuzzy -#| msgid "Show Introduction to KDE4" -msgid "Show Video Introduction to KDE4" -msgstr "Arată Introducerea în KDE4" - #: main.cpp:34 main.cpp:35 msgid "SUSEgreeter" msgstr "SUSEgreeter" @@ -98,8 +57,55 @@ msgid "Adrian Schroeter" msgstr "Adrian Schroeter" -#~ msgid "The openSUSE community are helpful people. Various ways exist to contact other openSUSE members, ask questions, discuss openSUSE and Linux. The official <a href=\"http://forums.opensuse.org/\">openSUSE Forums</a> are very accessible. Other ways including online chat are described on our <a href=\"http://help.opensuse.org/\">Online Help</a> site." -#~ msgstr "Comunitatea openSUSE are oameni care ajută. Există metode variate de a contacta alți membrii openSUSE, de a pune întrebări, de a discuta despre openSUSE și Linux. Forumul oficial <a href=\"http://forums.opensuse.org/\">openSUSE</a> este foarte accesibil. Alte căi incluzând chat-ul online sunt descrise în site-ul cu <a href=\"http://help.opensuse.org/\">Ajutor Online</a>." +#: rc.cpp:2 +msgid "openSUSE Project" +msgstr "Proiectul openSUSE" + +msgid "" +"The <a href=\"http://www.opensuse.org/\">openSUSE project</a> is a community " +"program sponsored by <a href=\"http://www.suse.com/\">SUSE</a>. Promoting the " +"use of Linux everywhere, openSUSE.org provides free, easy access to the " +"world's most usable Linux distribution, openSUSE. You'll find more " +"information available in many languages on the <a href=\"http://en.opensuse." +"org/\">project wiki</a>. For the latest news, visit our <a href=\"http://news." +"opensuse.org/\">openSUSE News</a> portal." +msgstr "" + +#: rc.cpp:6 +msgid "Community Support" +msgstr "Suport din partea comunității" + +#: rc.cpp:8 +msgid "" +"The openSUSE community are helpful people. Various ways exist to contact " +"other openSUSE members, ask questions, discuss openSUSE and Linux. The " +"official <a href=\"http://forums.opensuse.org/\">openSUSE Forums</a> are very " +"accessible. Other ways including online chat are described on our <a href=" +"\"http://help.opensuse.org/\">Online Help</a> site." +msgstr "" +"Comunitatea openSUSE are oameni care ajută. Există metode variate de a " +"contacta alți membrii openSUSE, de a pune întrebări, de a discuta despre " +"openSUSE și Linux. Forumul oficial <a href=\"http://forums.opensuse.org/" +"\">openSUSE</a> este foarte accesibil. Alte căi incluzând chat-ul online sunt " +"descrise în site-ul cu <a href=\"http://help.opensuse.org/\">Ajutor Online</" +"a>." -#~ msgid "The <a href=\"http://en.opensuse.org/Build_Service\">openSUSE Build Service</a> is an open and complete distribution development platform. It provides software developers with a tool to compile, release and publish their software for a broad user audience. For non-developers it offers a large collection of easy to install software packages. Just visit the <a href=\"http://software.opensuse.org/\">openSUSE Software</a> site." -#~ msgstr "<a href=\"http://en.opensuse.org/Build_Service\">Serviciul openSUSE Build</a> este o platformă liberă și completă de dezvoltare. Oferă dezvoltatorilor de programe o unealtă pentru a compila, crea și publica propriile programe pentru o mare categorie de utilizatori. Pentru utilizatorii obișnuiți oferă o colecție largă de pachete de programe ușor de instalat. Vizitează site-ul <a href=\"http://software.opensuse.org/\">Programe openSUSE</a>." +#: rc.cpp:10 +msgid "Build Service" +msgstr "Serviciu de construire" + +#: rc.cpp:12 +msgid "" +"The <a href=\"http://en.opensuse.org/Build_Service\">openSUSE Build Service</" +"a> is an open and complete distribution development platform. It provides " +"software developers with a tool to compile, release and publish their " +"software for a broad user audience. For non-developers it offers a large " +"collection of easy to install software packages. Just visit the <a href=" +"\"http://software.opensuse.org/\">openSUSE Software</a> site." +msgstr "" +"<a href=\"http://en.opensuse.org/Build_Service\">Serviciul openSUSE Build</a> " +"este o platformă liberă și completă de dezvoltare. Oferă dezvoltatorilor de " +"programe o unealtă pentru a compila, crea și publica propriile programe " +"pentru o mare categorie de utilizatori. Pentru utilizatorii obișnuiți oferă o " +"colecție largă de pachete de programe ușor de instalat. Vizitează site-ul <a " +"href=\"http://software.opensuse.org/\">Programe openSUSE</a>." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/po/ro/kde4-openSUSE.po new/kdebase4-openSUSE/po/ro/kde4-openSUSE.po --- old/kdebase4-openSUSE/po/ro/kde4-openSUSE.po 2013-03-01 12:44:55.000000000 +0100 +++ new/kdebase4-openSUSE/po/ro/kde4-openSUSE.po 2013-03-02 07:53:33.000000000 +0100 @@ -22,183 +22,250 @@ # Comunitatea romana openSUSE - www.suseromania.ro msgid "" msgstr "" +"X-Generator: Narro 2.0 on http://tradu.softwareliber.ro\n" "Project-Id-Version: OpenSUSE\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-25 16:08+0100\n" -"PO-Revision-Date: 2012-11-19 15:00+0200\n" +"Content-Type: text/plain; charset=UTF-8\n" "Last-Translator: Lucian Oprea <oprea.luci(a)gmail.com>\n" "Language-Team: Romanian <LL(a)li.org>\n" -"Language: ro\n" +"PO-Revision-Date: 2012-11-19 15:00+0200\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Narro 2.0 on http://tradu.softwareliber.ro\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" "X-Generator: Narro 2.0 on http://tradu.softwareliber.ro\n" -#: ApperKCM/Settings/Settings.cpp:57 -msgid "A repository was changed, it's highly recommended to refresh the cache" -msgstr "" +#: plasma.cpp:56 +msgid "Default Panel" +msgstr "Panou implicit" + +#: plasma.cpp:57 +msgid "Empty Panel" +msgstr "Panou vid" + +#: plasma.cpp:58 +msgid "Do you want a panel with the default widgets or an empty panel?" +msgstr "Doriți un panou cu setările implicite sau un panou vid?" -#: Apper/main.cpp:58 -msgid "(C) 2008-2013 Daniel Nicoletti" -msgstr "" - -#. i18n: file: ApperKCM/ApperKCM.ui:127 -#. i18n: ectx: property (text), widget (QPushButton, changesPB) -#: rc.cpp:59 -msgid "Pending changes" +#: App.cpp:120 +msgid "" +"IRC:\n" +"irc.freenode.net - #amarok, #amarok.de, #amarok.es, #amarok.fr\n" +"\n" +"Feedback:\n" +"amarok(a)kde.org" msgstr "" +"IRC:\n" +"irc.freenode.net - #amarok, #amarok.de, #amarok.es, #amarok.fr\n" +"\n" +"Feedback:\n" +"amarok(a)kde.org" -#. i18n: file: ApperKCM/ApperKCM.ui:195 -#. i18n: ectx: property (text), widget (QPushButton, generalSettingsPB) -#: rc.cpp:65 -msgid "General" -msgstr "General" - -#. i18n: file: ApperKCM/ApperKCM.ui:214 -#. i18n: ectx: property (text), widget (QPushButton, repoSettingsPB) -#: rc.cpp:68 -msgid "Repositories" -msgstr "" +#: EngineController.cpp:287 backend-xine/xinemediawidget.cpp:841 +msgctxt "@action:button" +msgid "Restart Now" +msgstr "Repornește acum" -#: libapper/PkTransactionWidget.cpp:229 libapper/PkTransactionWidget.cpp:242 -#, kde-format -msgid "%1 (%2%)" -msgstr "" +#: EngineController.cpp:289 backend-xine/xinemediawidget.cpp:843 +msgctxt "@action:button" +msgid "Restart Later" +msgstr "Repornește mai târziu" -#: libapper/PkStrings.cpp:573 +#: EngineController.cpp:291 backend-xine/xinemediawidget.cpp:845 msgid "" -"The software repository was not found.\n" -"You may need to enable it in Settings->Repositories." +"The necessary support has been successfully installed. It may be necessary to " +"restart the application for the support to be activated." msgstr "" +"Suportul necesar a fost instalat cu succes. Ar putea fi necesar să reporniți " +"aplicația ca suportul să devină activ." -#: libapper/Requirements.cpp:200 -#, kde-format -msgctxt "how many bytes are required for download" -msgid "Need to get %1 of archives" -msgstr "" - -#: libapper/ApplicationLauncher.cpp:37 -#, fuzzy -#| msgid "Recently Installed" -msgid "Application Installed" -msgstr "Instalate recent" - -#: backend-xine/xinemediawidget.cpp:878 suseinstall/ksuseinstall.cpp:145 +#: backend-xine/xinemediawidget.cpp:829 suseinstall/ksuseinstall.cpp:145 msgctxt "@action:button" msgid "Install" msgstr "Instalează" -#: backend-xine/xinemediawidget.cpp:880 -msgid "Kaffeine currently cannot play some file formats. Do you want to install additional support?" -msgstr "Kaffeine nu poate reda unele formate de fișiere. Doriți să instalați suport pentru formate adiționale?" +#: backend-xine/xinemediawidget.cpp:831 +msgid "" +"Kaffeine currently cannot play some file formats. Do you want to install " +"additional support?" +msgstr "" +"Kaffeine nu poate reda unele formate de fișiere. Doriți să instalați suport " +"pentru formate adiționale?" -#: backend-xine/xinemediawidget.cpp:881 +#: backend-xine/xinemediawidget.cpp:832 msgid "Install Additional Codecs" msgstr "Instalează codecuri adiționale" -#: backend-xine/xinemediawidget.cpp:890 -msgctxt "@action:button" -msgid "Restart Now" -msgstr "Repornește acum" +#: panelcontroller.cpp:434 +msgid "Height" +msgstr "Înălțime" + +#: panelcontroller.cpp:434 +msgid "Left" +msgstr "Stânga" + +#: panelcontroller.cpp:434 +msgid "Center" +msgstr "Centrat" + +#: panelcontroller.cpp:434 +msgid "Right" +msgstr "Dreapta" + +#: folderview.cpp:434 +msgid "Location" +msgstr "Amplasare" + +#: folderview.cpp:434 +msgid "Small" +msgstr "Mic" + +#: folderview.cpp:434 +msgid "Large" +msgstr "Mare" + +#: folderview.cpp:434 +msgid "Deselect All" +msgstr "Deselectează tot" + +#: desktopsettings.cpp:434 +msgid "Slideshow" +msgstr "Diaporamă" + +#: desktopsettings.cpp:434 +msgid "Image" +msgstr "Imagine" + +#: desktopsettings.cpp:434 +msgid "Color:" +msgstr "Culoare:" -#: backend-xine/xinemediawidget.cpp:892 -msgctxt "@action:button" -msgid "Restart Later" -msgstr "Repornește mai târziu" +#: kdmshutdown.cpp:532 kdmshutdown.cpp:549 +msgid "&Suspend Computer" +msgstr "&Suspendă Calculatorul" -#: backend-xine/xinemediawidget.cpp:894 -msgid "The necessary support has been successfully installed. It may be necessary to restart the application for the support to be activated." -msgstr "Suportul necesar a fost instalat cu succes. Ar putea fi necesar să reporniți aplicația ca suportul să devină activ." +#: kdmshutdown.cpp:730 +msgid "Suspend Computer" +msgstr "Suspendă Calculatorul" -#: infosum.cpp:62 -msgid "KDE Platform Version" -msgstr "" +# password dialog title +#: kgreet_generic.cpp:197 +msgid "Password: " +msgstr "Parolă: " + +#: kgreet_generic.cpp:198 +msgid "Password or swipe finger: " +msgstr "Parolă sau amprentă digitală: " -#: kdmshutdown.cpp:533 kdmshutdown.cpp:550 -msgid "&Suspend Computer" -msgstr "&Suspendă Calculatorul" +#: core/systemmodel.cpp:84 +msgid "Administration" +msgstr "Administrare" -#: kdmshutdown.cpp:544 -msgid "Standby" -msgstr "" +#: core/systemmodel.cpp:231 +msgid "System Information" +msgstr "Informații despre sistem" + +#: core/applicationmodel.cpp:318 +msgid "Recently Installed" +msgstr "Instalate recent" #. i18n: file: applet/kickoffConfig.ui:126 #. i18n: ectx: property (text), widget (QLabel, label) -#: simpleapplet/simpleapplet.cpp:499 rc.cpp:17 +#: simpleapplet/simpleapplet.cpp:512 rc.cpp:17 msgid "Show 'Recently Installed':" msgstr "Afișează 'Instalate recent':" #. i18n: file: applet/kickoffConfig.ui:113 #. i18n: ectx: property (text), widget (QLabel, label_4) -#: simpleapplet/simpleapplet.cpp:505 rc.cpp:14 +#: simpleapplet/simpleapplet.cpp:518 rc.cpp:14 msgid "Reduce menu depth:" msgstr "Reduce adâncimea meniului:" -#: core/systemmodel.cpp:74 -msgid "Administration" -msgstr "Administrare" - -#: core/applicationmodel.cpp:316 -msgid "Recently Installed" -msgstr "Instalate recent" - -#: panelcontroller.cpp:666 panelcontroller.cpp:676 +#: panelcontroller.cpp:597 panelcontroller.cpp:607 #, kde-format msgid "Width: %1" msgstr "Lățime: %1" -#: panelcontroller.cpp:686 panelcontroller.cpp:698 +#: panelcontroller.cpp:617 panelcontroller.cpp:628 #, kde-format msgid "Height: %1" msgstr "Înălțime: %1" #: suseinstall/ksuseinstall.cpp:51 #, kde-format -msgid "<qt>The application or utility %1 is required but it does not appear to be installed.Do you want to try to install it?</qt>" -msgstr "<qt>Aplicația sau utilitarul %1 este necesar dar nu pare să fie instalat. Doriți să încercați să îl instalați?</qt>" +msgid "" +"<qt>The application or utility %1 is required but it does not " +"appear to be installed.Do you want to try to install it?</qt>" +msgstr "" +"<qt>Aplicația sau utilitarul %1 este necesar dar nu pare să fie " +"instalat. Doriți să încercați să îl instalați?</qt>" #: suseinstall/ksuseinstall.cpp:53 suseinstall/ksuseinstall.cpp:146 -#: suseinstall/ksuseinstall.cpp:200 +#: suseinstall/ksuseinstall.cpp:198 msgid "Install Additional Software" msgstr "Instalează Programe Adiționale" #: suseinstall/ksuseinstall.cpp:134 #, kde-format -msgid "<qt>There is no specialized application for files of the type %1.The file can be opened in a more generic application as file type %2, or you can try to install a specialized application for file type %1.Do you want to try to install a specialized application?" -msgstr "<qt>Nu există nici o aplicație specializată pentru fișierele de tip %1.Fișierul poate fi deschis cu o aplicație generică pentru fișierele de tip %2, sau puteți încerca să instalați o aplicație specializată pentru fișierele de tip %1. Doriți să instalați o aplicație specializată?" +msgid "" +"<qt>There is no specialized application for files of the type %1.</" +"p>The file can be opened in a more generic application as file type %2</" +"b>, or you can try to install a specialized application for file type %1</" +"b>.Do you want to try to install a specialized application?" +msgstr "" +"<qt>Nu există nici o aplicație specializată pentru fișierele de tip %1</" +"b>.Fișierul poate fi deschis cu o aplicație generică pentru fișierele " +"de tip %2, sau puteți încerca să instalați o aplicație specializată " +"pentru fișierele de tip %1. Doriți să instalați o aplicație " +"specializată?" #: suseinstall/ksuseinstall.cpp:141 #, kde-format -msgid "<qt>There is no application installed that can open files of the type %1.Do you want to try to install one?</qt>" -msgstr "<qt>Nu există nici o aplicație instalată care să poată deschide fișierele de tipul %1.Doriți să instalați o aplicație?</qt>" +msgid "" +"<qt>There is no application installed that can open files of the type %" +"1.Do you want to try to install one?</qt>" +msgstr "" +"<qt>Nu există nici o aplicație instalată care să poată deschide fișierele " +"de tipul %1.Doriți să instalați o aplicație?</qt>" -#: suseinstall/ksuseinstall.cpp:201 +#: suseinstall/ksuseinstall.cpp:199 msgid "Checking for additional software to install" msgstr "Se caută programe adiționale de instalat" -#: suseinstall/ksuseinstall.cpp:303 +#: suseinstall/ksuseinstall.cpp:301 #, kde-format msgctxt "added text is URL" -msgid "<qt>Some of the software to install could not be found in the currently enabled software repositories.It may be located in other repositories.See %1 for details.Do you want to configure your repositories now?</qt>" -msgstr "<qt>Unele programe nu au putut fi găsite în sursele de pachete active. Acestea pot fi localizate în alte surse de instalare.Vedeți %1 pentru detalii.Doriți să vă configurați sursele de pachete acum?</qt>" +msgid "" +"<qt>Some of the software to install could not be found in the currently " +"enabled software repositories.It may be located in other repositories.</" +"p>See %1 for details.Do you want to configure your repositories now?" +"</qt>" +msgstr "" +"<qt>Unele programe nu au putut fi găsite în sursele de pachete active. " +"Acestea pot fi localizate în alte surse de instalare.Vedeți %1 pentru " +"detalii.Doriți să vă configurați sursele de pachete acum?</qt>" -#: suseinstall/ksuseinstall.cpp:311 +#: suseinstall/ksuseinstall.cpp:309 #, kde-format msgctxt "added text is URL" -msgid "<qt>The software to install could not be found in the currently enabled software repositories.It may be located in other repositories.See %1 for details.Do you want to configure your repositories?</qt>" -msgstr "<qt>Programul dorit spre instalare nu a fost găsit în sursele de instalare activate. Poate fi localizat în cadrul altor surse de instalare.Vedeți %1 pentru detalii.Doriți să vă configurați sursele de instalare?</qt>" +msgid "" +"<qt>The software to install could not be found in the currently enabled " +"software repositories.It may be located in other repositories.See %1 " +"for details.Do you want to configure your repositories?</qt>" +msgstr "" +"<qt>Programul dorit spre instalare nu a fost găsit în sursele de instalare " +"activate. Poate fi localizat în cadrul altor surse de instalare.Vedeți " +"%1 pentru detalii.Doriți să vă configurați sursele de instalare?</" +"qt>" -#: suseinstall/ksuseinstall.cpp:317 +#: suseinstall/ksuseinstall.cpp:315 msgid "Configure Software Repositories" msgstr "Configurați sursele de instalare" -#: suseinstall/ksuseinstall.cpp:544 +#: suseinstall/ksuseinstall.cpp:537 msgid "Select package to install" msgstr "Selectați pachetul de instalat" -#: suseinstall/ksuseinstall.cpp:549 +#: suseinstall/ksuseinstall.cpp:542 msgid "" "There are several alternatives.\n" "\n" @@ -208,179 +275,205 @@ "\n" "Vă rugăm alegeți ce pachet doriți să instalați." -#: suseinstall/ksuseinstall.cpp:552 +#: suseinstall/ksuseinstall.cpp:545 msgid "Package name" msgstr "Nume pachet" -#: suseinstall/ksuseinstall.cpp:552 +#: suseinstall/ksuseinstall.cpp:545 msgid "Summary" msgstr "Rezumat" -#: suseinstall/ksuseinstall.cpp:552 +#: suseinstall/ksuseinstall.cpp:545 msgid "Version" msgstr "Versiune" -#~ msgid "Default Panel" -#~ msgstr "Panou implicit" - -#~ msgid "Empty Panel" -#~ msgstr "Panou vid" - -#~ msgid "Do you want a panel with the default widgets or an empty panel?" -#~ msgstr "Doriți un panou cu setările implicite sau un panou vid?" - -#~ msgid "" -#~ "IRC:\n" -#~ "irc.freenode.net - #amarok, #amarok.de, #amarok.es, #amarok.fr\n" -#~ "\n" -#~ "Feedback:\n" -#~ "amarok(a)kde.org" -#~ msgstr "" -#~ "IRC:\n" -#~ "irc.freenode.net - #amarok, #amarok.de, #amarok.es, #amarok.fr\n" -#~ "\n" -#~ "Feedback:\n" -#~ "amarok(a)kde.org" - -#~ msgid "Height" -#~ msgstr "Înălțime" - -#~ msgid "Left" -#~ msgstr "Stânga" - -#~ msgid "Center" -#~ msgstr "Centrat" - -#~ msgid "Right" -#~ msgstr "Dreapta" - -#~ msgid "Location" -#~ msgstr "Amplasare" - -#~ msgid "Small" -#~ msgstr "Mic" - -#~ msgid "Large" -#~ msgstr "Mare" - -#~ msgid "Deselect All" -#~ msgstr "Deselectează tot" - -#~ msgid "Slideshow" -#~ msgstr "Diaporamă" - -#~ msgid "Image" -#~ msgstr "Imagine" - -#~ msgid "Color:" -#~ msgstr "Culoare:" - -#~ msgid "Suspend Computer" -#~ msgstr "Suspendă Calculatorul" - -# password dialog title -#~ msgid "Password: " -#~ msgstr "Parolă: " - -#~ msgid "Password or swipe finger: " -#~ msgstr "Parolă sau amprentă digitală: " - -#~ msgid "System Information" -#~ msgstr "Informații despre sistem" - -#~ msgid "Disable automatic startup on login" -#~ msgstr "Dezactivează pornire automată la autentificare" - -#~ msgid "Used by kmix_autostart.desktop" -#~ msgstr "Folosit de kmix_autostart.desktop" - -#~ msgid "Open" -#~ msgstr "Deschis" - -#~ msgid "Sort by Name" -#~ msgstr "Sortează după nume" +#: kmixprefdlg.cpp:84 +msgid "Disable automatic startup on login" +msgstr "Dezactivează pornire automată la autentificare" + +#: main.cpp:59 +msgid "Used by kmix_autostart.desktop" +msgstr "Folosit de kmix_autostart.desktop" + +#: label.cpp:44 +msgid "Open" +msgstr "Deschis" + +#: popupdialog.cpp:87 +msgid "Sort by Name" +msgstr "Sortează după nume" + +#: popupdialog.cpp:90 +msgid "Sort by Size" +msgstr "Sortează după dimensiune" + +#: popupdialog.cpp:93 +msgid "Sort by Last Modified" +msgstr "Sortează după data ultimei modificări" -#~ msgid "Sort by Size" -#~ msgstr "Sortează după dimensiune" - -#~ msgid "Sort by Last Modified" -#~ msgstr "Sortează după data ultimei modificări" - -#~ msgid "Sorry, but the \"applications:\" KIO slave is not supported, because it will crash QuickAccess/Plasma..." -#~ msgstr "Din păcate \"applications:\" KIO slave nu este suportată deoarece va împiedica funcționarea QuickAccess/Plasma..." - -#~ msgid "Form" -#~ msgstr "Formular " - -#~ msgid "Directory:" -#~ msgstr "Director:" - -#~ msgid "Filters:" -#~ msgstr "Filtre:" - -#~ msgid "Show hidden files" -#~ msgstr "Arată fișierele ascunse" - -#~ msgid "Show only folders" -#~ msgstr "Afișează doar directoarele" - -#~ msgid "Allow navigation" -#~ msgstr "Permite navigarea" - -#~ msgid "Appearance" -#~ msgstr "Aspect" - -#~ msgid "Custom icon:" -#~ msgstr "Iconiță personalizată:" - -#~ msgid "Icon size:" -#~ msgstr "Dimensiune iconiță:" - -#~ msgid "16" -#~ msgstr "16" - -#~ msgid "22" -#~ msgstr "22" - -#~ msgid "32" -#~ msgstr "32" - -#~ msgid "48" -#~ msgstr "48" +#: quickaccess.cpp:207 +msgid "" +"Sorry, but the \"applications:\" KIO slave is not supported, because it will " +"crash QuickAccess/Plasma..." +msgstr "" +"Din păcate \"applications:\" KIO slave nu este suportată deoarece va " +"împiedica funcționarea QuickAccess/Plasma..." -#~ msgid "64" -#~ msgstr "64" +#. i18n: file: pluginwidgetbase.ui:13 +#. i18n: ectx: property (windowTitle), widget (QWidget, PluginWidgetBase) +#. i18n: file: quickaccessConfig.ui:13 +#. i18n: ectx: property (windowTitle), widget (KTabWidget, QuickAccessConfig) +#: rc.cpp:3 rc.cpp:6 +msgid "Form" +msgstr "Formular " + +#. i18n: file: quickaccessConfig.ui:28 +#. i18n: ectx: attribute (title), widget (QWidget, general) +#: rc.cpp:9 +msgid "General" +msgstr "General" -#~ msgid "128" -#~ msgstr "128" +#. i18n: file: quickaccessConfig.ui:39 +#. i18n: ectx: property (text), widget (QLabel, selectLabel) +#: rc.cpp:12 +msgid "Directory:" +msgstr "Director:" + +#. i18n: file: quickaccessConfig.ui:62 +#. i18n: ectx: property (text), widget (QLabel, filterLabel) +#: rc.cpp:15 +msgid "Filters:" +msgstr "Filtre:" + +#. i18n: file: quickaccessConfig.ui:104 +#. i18n: ectx: property (text), widget (QCheckBox, hiddenBox) +#: rc.cpp:18 +msgid "Show hidden files" +msgstr "Arată fișierele ascunse" + +#. i18n: file: quickaccessConfig.ui:111 +#. i18n: ectx: property (text), widget (QCheckBox, onlyDirsBox) +#: rc.cpp:21 +msgid "Show only folders" +msgstr "Afișează doar directoarele" + +#. i18n: file: quickaccessConfig.ui:118 +#. i18n: ectx: property (text), widget (QCheckBox, navigationBox) +#: rc.cpp:24 +msgid "Allow navigation" +msgstr "Permite navigarea" + +#. i18n: file: quickaccessConfig.ui:147 +#. i18n: ectx: attribute (title), widget (QWidget, appearance) +#: rc.cpp:27 +msgid "Appearance" +msgstr "Aspect" + +#. i18n: file: quickaccessConfig.ui:170 +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: rc.cpp:30 +msgid "Custom icon:" +msgstr "Iconiță personalizată:" -#~ msgid "View mode:" -#~ msgstr "Mod de afișare:" +#. i18n: file: quickaccessConfig.ui:199 +#. i18n: ectx: property (text), widget (QLabel, label) +#: rc.cpp:33 +msgid "Icon size:" +msgstr "Dimensiune iconiță:" + +#. i18n: file: quickaccessConfig.ui:210 +#. i18n: ectx: property (text), item, widget (QComboBox, iconSizeCombo) +#: rc.cpp:36 +msgid "16" +msgstr "16" + +#. i18n: file: quickaccessConfig.ui:215 +#. i18n: ectx: property (text), item, widget (QComboBox, iconSizeCombo) +#: rc.cpp:39 +msgid "22" +msgstr "22" + +#. i18n: file: quickaccessConfig.ui:220 +#. i18n: ectx: property (text), item, widget (QComboBox, iconSizeCombo) +#: rc.cpp:42 +msgid "32" +msgstr "32" + +#. i18n: file: quickaccessConfig.ui:225 +#. i18n: ectx: property (text), item, widget (QComboBox, iconSizeCombo) +#: rc.cpp:45 +msgid "48" +msgstr "48" + +#. i18n: file: quickaccessConfig.ui:230 +#. i18n: ectx: property (text), item, widget (QComboBox, iconSizeCombo) +#: rc.cpp:48 +msgid "64" +msgstr "64" + +#. i18n: file: quickaccessConfig.ui:235 +#. i18n: ectx: property (text), item, widget (QComboBox, iconSizeCombo) +#: rc.cpp:51 +msgid "128" +msgstr "128" + +#. i18n: file: quickaccessConfig.ui:249 +#. i18n: ectx: property (text), widget (QLabel, label_3) +#: rc.cpp:54 +msgid "View mode:" +msgstr "Mod de afișare:" # video mode menu item -#~ msgid "List Mode" -#~ msgstr "Mod listă" - -#~ msgid "Icon Mode" -#~ msgstr "Mod iconițe" - -#~ msgid "Show tooltips" -#~ msgstr "Arată sugestiile" - -#~ msgid "Use a custom label" -#~ msgstr "Utilizează o etichetă personalizată" - -#~ msgid "Label:" -#~ msgstr "Etichetă:" - -#~ msgid "Preview" -#~ msgstr "Previzualizare" - -#~ msgid "Show previews" -#~ msgstr "Afișează previzualizările" - -#~ msgid "Preview plugins:" -#~ msgstr "Previzualizare module:" - -#~ msgid "Here you can enable/disable the plugins." -#~ msgstr "Aici puteți activa/dezactiva modulele." +#. i18n: file: quickaccessConfig.ui:260 +#. i18n: ectx: property (text), item, widget (QComboBox, viewModeCombo) +#: rc.cpp:57 +msgid "List Mode" +msgstr "Mod listă" + +#. i18n: file: quickaccessConfig.ui:265 +#. i18n: ectx: property (text), item, widget (QComboBox, viewModeCombo) +#: rc.cpp:60 +msgid "Icon Mode" +msgstr "Mod iconițe" + +#. i18n: file: quickaccessConfig.ui:275 +#. i18n: ectx: property (text), widget (QCheckBox, tooltipBox) +#: rc.cpp:63 +msgid "Show tooltips" +msgstr "Arată sugestiile" + +#. i18n: file: quickaccessConfig.ui:282 +#. i18n: ectx: property (text), widget (QCheckBox, customLabelBox) +#: rc.cpp:66 +msgid "Use a custom label" +msgstr "Utilizează o etichetă personalizată" + +#. i18n: file: quickaccessConfig.ui:307 +#. i18n: ectx: property (text), widget (QLabel, customLabel) +#: rc.cpp:69 +msgid "Label:" +msgstr "Etichetă:" + +#. i18n: file: quickaccessConfig.ui:357 +#. i18n: ectx: attribute (title), widget (QWidget, preview) +#: rc.cpp:72 +msgid "Preview" +msgstr "Previzualizare" + +#. i18n: file: quickaccessConfig.ui:363 +#. i18n: ectx: property (text), widget (QCheckBox, previewBox) +#: rc.cpp:75 +msgid "Show previews" +msgstr "Afișează previzualizările" + +#. i18n: file: quickaccessConfig.ui:377 +#. i18n: ectx: property (text), widget (QLabel, previewLabel1) +#: rc.cpp:78 +msgid "Preview plugins:" +msgstr "Previzualizare module:" + +#. i18n: file: quickaccessConfig.ui:386 +#. i18n: ectx: property (text), widget (QLabel, previewLabel2) +#: rc.cpp:81 +msgid "Here you can enable/disable the plugins." +msgstr "Aici puteți activa/dezactiva modulele." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/po/ro/krpmview.po new/kdebase4-openSUSE/po/ro/krpmview.po --- old/kdebase4-openSUSE/po/ro/krpmview.po 2013-03-01 12:45:13.000000000 +0100 +++ new/kdebase4-openSUSE/po/ro/krpmview.po 2013-03-02 07:53:33.000000000 +0100 @@ -1,18 +1,16 @@ # Comunitatea romana openSUSE - www.suseromania.ro msgid "" msgstr "" +"X-Generator: Narro 2.0 on http://tradu.softwareliber.ro\n" "Project-Id-Version: OpenSUSE\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-28 19:25+0200\n" -"PO-Revision-Date: 2012-11-19 15:00+0200\n" +"Content-Type: text/plain; charset=UTF-8\n" "Last-Translator: Lucian Oprea <oprea.luci(a)gmail.com>\n" "Language-Team: Romanian <LL(a)li.org>\n" -"Language: ro\n" +"PO-Revision-Date: 2012-11-19 15:00+0200\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Narro 2.0 on http://tradu.softwareliber.ro\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" "X-Generator: Narro 2.0 on http://tradu.softwareliber.ro\n" #: krpmview.cpp:56 @@ -129,8 +127,11 @@ msgstr "Vizualizare fișiere RPM" #: krpmview.cpp:370 -msgid "KRPMView views the content of RPM archives and can use YaST to install them" -msgstr "KRPMView afișează conținutul arhivelor RPM și poate folosi YaSt pentru a le instala" +msgid "" +"KRPMView views the content of RPM archives and can use YaST to install them" +msgstr "" +"KRPMView afișează conținutul arhivelor RPM și poate folosi YaSt pentru a le " +"instala" #: krpmview.cpp:373 msgid "Current Maintainer" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/po/zh_CN/SUSEgreeter.po new/kdebase4-openSUSE/po/zh_CN/SUSEgreeter.po --- old/kdebase4-openSUSE/po/zh_CN/SUSEgreeter.po 2013-01-31 20:36:24.000000000 +0100 +++ new/kdebase4-openSUSE/po/zh_CN/SUSEgreeter.po 2013-03-20 07:08:51.000000000 +0100 @@ -7,8 +7,8 @@ "Project-Id-Version: SUSEgreeter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2013-01-24 10:21+0100\n" -"PO-Revision-Date: 2013-02-01 03:06+0800\n" -"Last-Translator: \n" +"PO-Revision-Date: 2013-03-20 14:07+0800\n" +"Last-Translator: marguerite <i(a)marguerite.su>\n" "Language-Team: Chinese Traditional <opensuse-zh(a)opensuse.org>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -59,7 +59,7 @@ "opensuse.org/Tumbleweed\">Tumbleweed</a> and the easy custom OS builder <a " "href=\"http://susestudio.com\">SUSE Studio</a>." msgstr "" -"openSUSE 意味着平等地参与自由和开源软件。我们贡献的项目有 Linux 内和, GNU gcc, Samba, KDE 和 GNOME。" +"openSUSE 意味着平等地参与自由和开源软件。我们贡献的项目有 Linux 内核, GNU gcc, Samba, KDE 和 GNOME。" "我们的工具对全民有益，如<a href=\"http://openbuildservice.org\">开放式编译服务</a>，文件快照和恢复工具 <a " "href=" "\"http://snapper.io\">Snapper</a>，和发行版测试工具 <a " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/sysinfo/CMakeLists.txt new/kdebase4-openSUSE/sysinfo/CMakeLists.txt --- old/kdebase4-openSUSE/sysinfo/CMakeLists.txt 2013-03-01 17:24:54.000000000 +0100 +++ new/kdebase4-openSUSE/sysinfo/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -add_subdirectory(kio_sysinfo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/sysinfo/README new/kdebase4-openSUSE/sysinfo/README --- old/kdebase4-openSUSE/sysinfo/README 2013-03-01 17:24:54.000000000 +0100 +++ new/kdebase4-openSUSE/sysinfo/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -This is a sysinfo:/ KIO slave for KDE4, which shows basic -system information often requested by users. - -The code is from KDE SVN (trunk/playground/base/kio_sysinfo). - -Patches and feedback greatly appreciated. - -Dirk Mueller <dmueller(a)suse.de> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit goffice for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '13

02 Sep '13

Hello community, here is the log from the commit of package goffice for openSUSE:Factory checked in at 2013-09-02 14:56:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/goffice (Old) and /work/SRC/openSUSE:Factory/.goffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "goffice" Changes: -------- --- /work/SRC/openSUSE:Factory/goffice/goffice.changes 2013-08-27 20:48:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.goffice.new/goffice.changes 2013-09-02 14:56:29.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 28 07:31:43 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 0.10.6: + + Fix gtk+ 3.9 redraw problems (bgo#703124). + + Fix NULL pointer issue in line plots (bgo#706663). + +------------------------------------------------------------------- Old: ---- goffice-0.10.5.tar.xz New: ---- goffice-0.10.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ goffice.spec ++++++ --- /var/tmp/diff_new_pack.etydcp/_old 2013-09-02 14:56:30.000000000 +0200 +++ /var/tmp/diff_new_pack.etydcp/_new 2013-09-02 14:56:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: goffice -Version: 0.10.5 +Version: 0.10.6 Release: 0 Summary: GLib/GTK+ Set of Document-Centric Objects and Utilities License: GPL-2.0 or GPL-3.0 ++++++ goffice-0.10.5.tar.xz -> goffice-0.10.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/goffice-0.10.5/ChangeLog new/goffice-0.10.6/ChangeLog --- old/goffice-0.10.5/ChangeLog 2013-08-19 23:16:34.000000000 +0200 +++ new/goffice-0.10.6/ChangeLog 2013-08-28 00:36:36.000000000 +0200 @@ -1,3 +1,22 @@ +2013-08-27 Morten Welinder <terra(a)gnome.org> + + * Release 0.10.6 + +2013-08-23 Jean Brefort <jean.brefort(a)normalesup.org> + + * plugins/plot_barcol/gog-line.c (gog_line_view_render): always allocate + enough room for points. [#706663] + +2013-08-20 Morten Welinder <terra(a)gnome.org> + + * goffice/canvas/goc-canvas.c (goc_canvas_draw): Fix redraw issues + for gtk+ 3.9 and up. Patch from Alexander Larsson <alexl(a)redhat.com> + in bug 703124. + +2013-08-19 Morten Welinder <terra(a)gnome.org> + + * configure.ac: Post-release bump. + 2013-08-19 Morten Welinder <terra(a)gnome.org> * Release 0.10.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/goffice-0.10.5/NEWS new/goffice-0.10.6/NEWS --- old/goffice-0.10.5/NEWS 2013-08-15 02:29:03.000000000 +0200 +++ new/goffice-0.10.6/NEWS 2013-08-23 23:20:55.000000000 +0200 @@ -1,3 +1,12 @@ +goffice 0.10.6: + +Alexander Larsson: + * Fix gtk+ 3.9 redraw problems. [#703124] + +Jean: + * Fix NULL pointer issue in line plots. [#706663] + +-------------------------------------------------------------------------- goffice 0.10.5: Andreas: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/goffice-0.10.5/configure new/goffice-0.10.6/configure --- old/goffice-0.10.5/configure 2013-08-11 21:35:26.000000000 +0200 +++ new/goffice-0.10.6/configure 2013-08-22 23:25:47.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for goffice 0.10.5. +# Generated by GNU Autoconf 2.69 for goffice 0.10.6. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgoffice>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='goffice' PACKAGE_TARNAME='goffice' -PACKAGE_VERSION='0.10.5' -PACKAGE_STRING='goffice 0.10.5' +PACKAGE_VERSION='0.10.6' +PACKAGE_STRING='goffice 0.10.6' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libgoffice' PACKAGE_URL='' @@ -1487,7 +1487,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 goffice 0.10.5 to adapt to many kinds of systems. +\`configure' configures goffice 0.10.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1557,7 +1557,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of goffice 0.10.5:";; + short | recursive ) echo "Configuration of goffice 0.10.6:";; esac cat <<\_ACEOF @@ -1725,7 +1725,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -goffice configure 0.10.5 +goffice configure 0.10.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2140,7 +2140,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by goffice $as_me 0.10.5, which was +It was created by goffice $as_me 0.10.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2957,7 +2957,7 @@ # Define the identity of the package. PACKAGE='goffice' - VERSION='0.10.5' + VERSION='0.10.6' cat >>confdefs.h <<_ACEOF @@ -3000,7 +3000,7 @@ -VERSION_INFO=10:5:0 +VERSION_INFO=10:6:0 VERSION_IFACE=10 @@ -16614,7 +16614,7 @@ -$as_echo "#define GOFFICE_VERSION \"0.10.5\"" >>confdefs.h +$as_echo "#define GOFFICE_VERSION \"0.10.6\"" >>confdefs.h $as_echo "#define GO_VERSION_EPOCH 0" >>confdefs.h @@ -16623,7 +16623,7 @@ $as_echo "#define GO_VERSION_MAJOR 10" >>confdefs.h -$as_echo "#define GO_VERSION_MINOR 5" >>confdefs.h +$as_echo "#define GO_VERSION_MINOR 6" >>confdefs.h $as_echo "#define GO_VERSION_EXTRA \"\"" >>confdefs.h @@ -17542,7 +17542,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by goffice $as_me 0.10.5, which was +This file was extended by goffice $as_me 0.10.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17608,7 +17608,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -goffice config.status 0.10.5 +goffice config.status 0.10.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/goffice-0.10.5/configure.ac new/goffice-0.10.6/configure.ac --- old/goffice-0.10.5/configure.ac 2013-08-02 00:46:11.000000000 +0200 +++ new/goffice-0.10.6/configure.ac 2013-08-19 23:27:51.000000000 +0200 @@ -5,7 +5,7 @@ m4_define([goffice_version_epoch], [0]) m4_define([goffice_version_major], [10]) -m4_define([goffice_version_minor], [5]) +m4_define([goffice_version_minor], [6]) m4_define([goffice_version_extra], []) m4_define([goffice_full_version], [goffice_version_epoch.goffice_version_major.goffice_version_minor[]goffice_version_extra]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/goffice-0.10.5/docs/reference/version.xml new/goffice-0.10.6/docs/reference/version.xml --- old/goffice-0.10.5/docs/reference/version.xml 2013-08-11 21:35:42.000000000 +0200 +++ new/goffice-0.10.6/docs/reference/version.xml 2013-08-28 00:38:31.000000000 +0200 @@ -1 +1 @@ -0.10.5 +0.10.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/goffice-0.10.5/goffice/canvas/goc-canvas.c new/goffice-0.10.6/goffice/canvas/goc-canvas.c --- old/goffice-0.10.5/goffice/canvas/goc-canvas.c 2013-03-24 14:44:30.000000000 +0100 +++ new/goffice-0.10.6/goffice/canvas/goc-canvas.c 2013-08-22 23:25:33.000000000 +0200 @@ -48,39 +48,25 @@ { double x0, y0, x1, y1; double ax0, ay0, ax1, ay1; + double clip_x1, clip_y1, clip_x2, clip_y2; GocCanvas *canvas = GOC_CANVAS (widget); GdkEventExpose *event = (GdkEventExpose *) gtk_get_current_event (); - if (event && event->type == GDK_EXPOSE) { - if (event->count) - return TRUE; - goc_item_get_bounds (GOC_ITEM (canvas->root),&x0, &y0, &x1, &y1); - if (canvas->direction == GOC_DIRECTION_RTL) { - ax1 = (double) (canvas->width - event->area.x) / canvas->pixels_per_unit + canvas->scroll_x1; - ax0 = (double) (canvas->width - event->area.x - event->area.width) / canvas->pixels_per_unit + canvas->scroll_x1; - } else { - ax0 = (double) event->area.x / canvas->pixels_per_unit + canvas->scroll_x1; - ax1 = ((double) event->area.x + event->area.width) / canvas->pixels_per_unit + canvas->scroll_x1; - } - ay0 = (double) event->area.y / canvas->pixels_per_unit + canvas->scroll_y1; - ay1 = ((double) event->area.y + event->area.height) / canvas->pixels_per_unit + canvas->scroll_y1; - if (x0 <= ax1 && x1 >= ax0 && y0 <= ay1 && y1 >= ay0) { - canvas->cur_event = (GdkEvent *) event; - goc_item_draw_region (GOC_ITEM (canvas->root), cr, ax0, ay0, ax1, ay1); - } + cairo_clip_extents (cr, &clip_x1, &clip_y1, &clip_x2, &clip_y2); + + goc_item_get_bounds (GOC_ITEM (canvas->root),&x0, &y0, &x1, &y1); + if (canvas->direction == GOC_DIRECTION_RTL) { + ax1 = (double) (canvas->width - clip_x1) / canvas->pixels_per_unit + canvas->scroll_x1; + ax0 = (double) (canvas->width - clip_x2) / canvas->pixels_per_unit + canvas->scroll_x1; } else { - goc_item_get_bounds (GOC_ITEM (canvas->root),&x0, &y0, &x1, &y1); - if (canvas->direction == GOC_DIRECTION_RTL) { - ax1 = (double) canvas->width / canvas->pixels_per_unit + canvas->scroll_x1; - ax0 = canvas->scroll_x1; - } else { - ax0 = canvas->scroll_x1; - ax1 = (double) canvas->width / canvas->pixels_per_unit + canvas->scroll_x1; - } - ay0 = canvas->scroll_y1; - ay1 = (double) canvas->height / canvas->pixels_per_unit + canvas->scroll_y1; - if (x0 <= ax1 && x1 >= ax0 && y0 <= ay1 && y1 >= ay0) - goc_item_draw_region (GOC_ITEM (canvas->root), cr, ax0, ay0, ax1, ay1); + ax0 = (double) clip_x1 / canvas->pixels_per_unit + canvas->scroll_x1; + ax1 = ((double) clip_x1 + event->area.width) / canvas->pixels_per_unit + canvas->scroll_x1; + } + ay0 = (double) clip_y1 / canvas->pixels_per_unit + canvas->scroll_y1; + ay1 = (double) clip_y2 / canvas->pixels_per_unit + canvas->scroll_y1; + if (x0 <= ax1 && x1 >= ax0 && y0 <= ay1 && y1 >= ay0) { + canvas->cur_event = (GdkEvent *) event; + goc_item_draw_region (GOC_ITEM (canvas->root), cr, ax0, ay0, ax1, ay1); } return TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/goffice-0.10.5/goffice/goffice-features.h new/goffice-0.10.6/goffice/goffice-features.h --- old/goffice-0.10.5/goffice/goffice-features.h 2013-07-12 02:40:34.000000000 +0200 +++ new/goffice-0.10.6/goffice/goffice-features.h 2013-08-22 23:26:13.000000000 +0200 @@ -35,7 +35,7 @@ /* #undef GOFFICE_SUPPLIED_STRTOLD */ /* The version number of this release, possibly with additional suffix */ -#define GOFFICE_VERSION "0.10.5" +#define GOFFICE_VERSION "0.10.6" /* The Epoch of this release */ #define GO_VERSION_EPOCH 0 @@ -44,7 +44,7 @@ #define GO_VERSION_MAJOR 10 /* The Minor version number of this release */ -#define GO_VERSION_MINOR 5 +#define GO_VERSION_MINOR 6 /* Extra, possibly empty tag for this release */ #define GO_VERSION_EXTRA "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/goffice-0.10.5/plugins/plot_barcol/gog-line.c new/goffice-0.10.6/plugins/plot_barcol/gog-line.c --- old/goffice-0.10.5/plugins/plot_barcol/gog-line.c 2013-08-11 21:31:58.000000000 +0200 +++ new/goffice-0.10.6/plugins/plot_barcol/gog-line.c 2013-08-23 23:20:55.000000000 +0200 @@ -993,7 +993,7 @@ interpolations[i] = GO_LINE_INTERPOLATION_SPLINE; if (!is_area_plot) - points[i] = g_malloc (sizeof (Point) * (lengths[i])); + points[i] = g_malloc (sizeof (Point) * (type == GOG_1_5D_NORMAL? lengths[i]: num_elements)); errors[i] = series[i]->errors; if (gog_error_bar_is_visible (series[i]->errors)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/goffice-0.10.5/po/ChangeLog new/goffice-0.10.6/po/ChangeLog --- old/goffice-0.10.5/po/ChangeLog 2013-08-19 23:16:34.000000000 +0200 +++ new/goffice-0.10.6/po/ChangeLog 2013-08-28 00:36:37.000000000 +0200 @@ -1,3 +1,7 @@ +2013-08-27 Morten Welinder <terra(a)gnome.org> + + * Release 0.10.6 + 2013-08-19 Morten Welinder <terra(a)gnome.org> * Release 0.10.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/goffice-0.10.5/tools/ChangeLog new/goffice-0.10.6/tools/ChangeLog --- old/goffice-0.10.5/tools/ChangeLog 2013-08-19 23:16:34.000000000 +0200 +++ new/goffice-0.10.6/tools/ChangeLog 2013-08-28 00:36:37.000000000 +0200 @@ -1,3 +1,7 @@ +2013-08-27 Morten Welinder <terra(a)gnome.org> + + * Release 0.10.6 + 2013-08-19 Morten Welinder <terra(a)gnome.org> * Release 0.10.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnutls for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '13

02 Sep '13

Hello community, here is the log from the commit of package gnutls for openSUSE:Factory checked in at 2013-09-02 14:56:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnutls (Old) and /work/SRC/openSUSE:Factory/.gnutls.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnutls" Changes: -------- --- /work/SRC/openSUSE:Factory/gnutls/gnutls.changes 2013-08-01 17:15:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnutls.new/gnutls.changes 2013-09-02 14:56:16.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 30 00:31:19 CEST 2013 - ro(a)suse.de + +- buildrequire valgrind on the same arch list that valgrind builds + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnutls.spec ++++++ --- /var/tmp/diff_new_pack.NAifBr/_old 2013-09-02 14:56:17.000000000 +0200 +++ /var/tmp/diff_new_pack.NAifBr/_new 2013-09-02 14:56:17.000000000 +0200 @@ -46,7 +46,9 @@ BuildRequires: libnettle-devel >= 2.7 BuildRequires: libtasn1-devel >= 2.14 BuildRequires: libtool +%ifarch %ix86 x86_64 ppc ppc64 s390x armv7l armv7hl BuildRequires: valgrind +%endif %if %suse_version >= 1230 BuildRequires: makeinfo %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnumeric for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '13

02 Sep '13

Hello community, here is the log from the commit of package gnumeric for openSUSE:Factory checked in at 2013-09-02 14:55:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnumeric (Old) and /work/SRC/openSUSE:Factory/.gnumeric.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnumeric" Changes: -------- --- /work/SRC/openSUSE:Factory/gnumeric/gnumeric.changes 2013-08-27 20:48:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnumeric.new/gnumeric.changes 2013-09-02 14:55:47.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 28 07:37:14 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 1.12.6: + + Fix crash on corrupted files (bgo#706526, bgo#706413, + bgo#706417). + + Fix save style performance issue (bgo#699045). + +------------------------------------------------------------------- Old: ---- gnumeric-1.12.5.tar.xz New: ---- gnumeric-1.12.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnumeric.spec ++++++ --- /var/tmp/diff_new_pack.38i8Tt/_old 2013-09-02 14:55:48.000000000 +0200 +++ /var/tmp/diff_new_pack.38i8Tt/_new 2013-09-02 14:55:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnumeric -Version: 1.12.5 +Version: 1.12.6 Release: 0 Summary: Spreadsheet Application License: GPL-2.0 or GPL-3.0 ++++++ gnumeric-1.12.5.tar.xz -> gnumeric-1.12.6.tar.xz ++++++ /work/SRC/openSUSE:Factory/gnumeric/gnumeric-1.12.5.tar.xz /work/SRC/openSUSE:Factory/.gnumeric.new/gnumeric-1.12.6.tar.xz differ: char 27, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit giflib for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '13

02 Sep '13

Hello community, here is the log from the commit of package giflib for openSUSE:Factory checked in at 2013-09-02 14:55:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/giflib (Old) and /work/SRC/openSUSE:Factory/.giflib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "giflib" Changes: -------- --- /work/SRC/openSUSE:Factory/giflib/giflib.changes 2013-06-26 20:17:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.giflib.new/giflib.changes 2013-09-02 14:55:41.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Aug 31 10:42:33 UTC 2013 - jengelh(a)inai.de + +- Update to new upstream release 5.0.5 (bugfix release) +* This release sets the error return properly when a screen + descriptor read fails, and fixes minor API documentation bugs. + +------------------------------------------------------------------- Old: ---- giflib-5.0.4.tar.bz2 New: ---- giflib-5.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ giflib.spec ++++++ --- /var/tmp/diff_new_pack.diPPAB/_old 2013-09-02 14:55:42.000000000 +0200 +++ /var/tmp/diff_new_pack.diPPAB/_new 2013-09-02 14:55:42.000000000 +0200 @@ -18,7 +18,7 @@ Name: giflib %define lname libgif6 -Version: 5.0.4 +Version: 5.0.5 Release: 0 Summary: A Library for Working with GIF Images License: MIT @@ -95,7 +95,7 @@ rm -v $file.stamp done -mkdir m4;autoreconf -fiv +mkdir -p m4; autoreconf -fiv %configure --disable-static --with-pic --x-libraries=%{_libdir} make %{?_smp_mflags} V=1 ++++++ giflib-5.0.4.tar.bz2 -> giflib-5.0.5.tar.bz2 ++++++ ++++ 19778 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0