Hello community,
here is the log from the commit of package mate-screensaver for
openSUSE:Factory checked in at 2018-09-10 12:31:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-screensaver (Old)
and /work/SRC/openSUSE:Factory/.mate-screensaver.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-screensaver"
Mon Sep 10 12:31:47 2018 rev:21 rq:634513 version:1.20.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-screensaver/mate-screensaver.changes
2018-07-06 10:43:57.327114786 +0200
+++ /work/SRC/openSUSE:Factory/.mate-screensaver.new/mate-screensaver.changes
2018-09-10 12:31:47.446657105 +0200
@@ -1,0 +2,10 @@
+Sat Sep 8 21:47:07 UTC 2018 - sor.ale...@meowr.ru
+
+- Update to version 1.20.2:
+ * Fix more GdkScreen related deprecations (fixes boo#1098985).
+ * lock-plug: Only scale lock-screen widgets on older versions of
+ GTK+.
+ * Update translations.
+- Rebase mate-screensaver-gtk-3.20.patch.
+
+-------------------------------------------------------------------
Old:
----
mate-screensaver-1.20.1.tar.xz
New:
----
mate-screensaver-1.20.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.fAlgaO/_old 2018-09-10 12:31:48.386655682 +0200
+++ /var/tmp/diff_new_pack.fAlgaO/_new 2018-09-10 12:31:48.390655676 +0200
@@ -18,7 +18,7 @@
%define _version 1.20
Name: mate-screensaver
-Version: 1.20.1
+Version: 1.20.2
Release: 0
Summary: MATE Desktop screensaver
License: GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -113,11 +113,7 @@
%endif
%files
-%if 0%{?suse_version} >= 1500
%license COPYING COPYING.LIB
-%else
-%doc COPYING COPYING.LIB
-%endif
%doc README NEWS
%dir %{_sysconfdir}/xdg/menus/
%config %{_sysconfdir}/xdg/menus/mate-screensavers.menu
++++++ mate-screensaver-1.20.1.tar.xz -> mate-screensaver-1.20.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/ChangeLog
new/mate-screensaver-1.20.2/ChangeLog
--- old/mate-screensaver-1.20.1/ChangeLog 2018-06-16 17:03:01.000000000
+0200
+++ new/mate-screensaver-1.20.2/ChangeLog 2018-09-08 23:30:15.000000000
+0200
@@ -1,3 +1,50 @@
+commit 322a7c56d7bcd8fecce3ab95524f469024509130
+Author: raveit65 <m...@raveit.de>
+Date: Sat Sep 8 23:23:35 2018 +0200
+
+ release 1.20.2
+
+ NEWS | 6 ++++++
+ configure.ac | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+commit 1774853e8c21dbbcb969fb1eee797bf23c71e21d
+Author: raveit65 <m...@raveit.de>
+Date: Sat Sep 8 23:18:44 2018 +0200
+
+ sync with transifex
+
+ po/el.po | 2 +-
+ po/es.po | 12 ++++++------
+ po/it.po | 14 +++++++-------
+ po/lt.po | 24 ++++++++++++------------
+ po/pl.po | 2 +-
+ po/ru.po | 26 +++++++++++++-------------
+ po/sv.po | 14 +++++++-------
+ po/uk.po | 34 +++++++++++++++++-----------------
+ po/zh_CN.po | 2 +-
+ 9 files changed, 65 insertions(+), 65 deletions(-)
+
+commit 465734b765fcfa28a8b63a877bedd65cd2de959e
+Author: Alexei Sorokin <sor.ale...@meowr.ru>
+Date: Tue Aug 21 20:59:20 2018 +0300
+
+ fix more GdkScreen related deprecations
+
+ This is a follow-up to 5d4416a to fix #152
+
+ src/gs-manager.c | 136 +++++++++++++++++++++++++------------------------------
+ 1 file changed, 62 insertions(+), 74 deletions(-)
+
+commit 762ae73b4aefcb943b4b573789ea25cbb9f4cbd5
+Author: Victor Kareh <vka...@vkareh.net>
+Date: Mon Aug 13 12:17:32 2018 -0400
+
+ lock-plug: Only scale lock-screen widgets on older versions of GTK
+
+ src/gs-lock-plug.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
commit 0c12ca0958466c57021c80db3b3c02167aa3360d
Author: raveit65 <m...@raveit.de>
Date: Sat Jun 16 16:59:42 2018 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/NEWS
new/mate-screensaver-1.20.2/NEWS
--- old/mate-screensaver-1.20.1/NEWS 2018-06-16 16:25:36.000000000 +0200
+++ new/mate-screensaver-1.20.2/NEWS 2018-09-08 23:29:07.000000000 +0200
@@ -1,3 +1,9 @@
+### mate-screensaver 1.20.2
+
+ * sync with transifex
+ * fix more GdkScreen related deprecations
+ * lock-plug: Only scale lock-screen widgets on older versions of GTK
+
### mate-screensaver 1.20.1
* Translations update
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/configure
new/mate-screensaver-1.20.2/configure
--- old/mate-screensaver-1.20.1/configure 2018-06-16 17:02:29.000000000
+0200
+++ new/mate-screensaver-1.20.2/configure 2018-09-08 23:29:54.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mate-screensaver 1.20.1.
+# Generated by GNU Autoconf 2.69 for mate-screensaver 1.20.2.
#
# Report bugs to <http://www.mate-desktop.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='mate-screensaver'
PACKAGE_TARNAME='mate-screensaver'
-PACKAGE_VERSION='1.20.1'
-PACKAGE_STRING='mate-screensaver 1.20.1'
+PACKAGE_VERSION='1.20.2'
+PACKAGE_STRING='mate-screensaver 1.20.2'
PACKAGE_BUGREPORT='http://www.mate-desktop.org/'
PACKAGE_URL=''
@@ -1477,7 +1477,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 mate-screensaver 1.20.1 to adapt to many kinds of
systems.
+\`configure' configures mate-screensaver 1.20.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1552,7 +1552,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mate-screensaver 1.20.1:";;
+ short | recursive ) echo "Configuration of mate-screensaver 1.20.2:";;
esac
cat <<\_ACEOF
@@ -1745,7 +1745,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mate-screensaver configure 1.20.1
+mate-screensaver configure 1.20.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2114,7 +2114,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mate-screensaver $as_me 1.20.1, which was
+It was created by mate-screensaver $as_me 1.20.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2981,7 +2981,7 @@
# Define the identity of the package.
PACKAGE='mate-screensaver'
- VERSION='1.20.1'
+ VERSION='1.20.2'
cat >>confdefs.h <<_ACEOF
@@ -18807,7 +18807,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mate-screensaver $as_me 1.20.1, which was
+This file was extended by mate-screensaver $as_me 1.20.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18873,7 +18873,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mate-screensaver config.status 1.20.1
+mate-screensaver config.status 1.20.2
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/mate-screensaver-1.20.1/configure.ac
new/mate-screensaver-1.20.2/configure.ac
--- old/mate-screensaver-1.20.1/configure.ac 2018-06-16 16:24:51.000000000
+0200
+++ new/mate-screensaver-1.20.2/configure.ac 2018-09-08 23:29:07.000000000
+0200
@@ -2,7 +2,7 @@
AC_PREREQ(2.60)
AC_INIT([mate-screensaver],
- [1.20.1],
+ [1.20.2],
[http://www.mate-desktop.org/])
AC_CONFIG_SRCDIR(src/mate-screensaver.c)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/doc/mate-screensaver.xml
new/mate-screensaver-1.20.2/doc/mate-screensaver.xml
--- old/mate-screensaver-1.20.1/doc/mate-screensaver.xml 2018-06-16
17:02:41.000000000 +0200
+++ new/mate-screensaver-1.20.2/doc/mate-screensaver.xml 2018-09-08
23:30:01.000000000 +0200
@@ -3,8 +3,8 @@
<book id="index">
<bookinfo>
- <title>MATE Screensaver 1.20.1 Documentation</title>
- <releaseinfo>Version 1.20.1</releaseinfo>
+ <title>MATE Screensaver 1.20.2 Documentation</title>
+ <releaseinfo>Version 1.20.2</releaseinfo>
<date>6 June, 2006</date>
<authorgroup>
<author>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/po/el.po
new/mate-screensaver-1.20.2/po/el.po
--- old/mate-screensaver-1.20.1/po/el.po 2018-06-16 16:16:44.000000000
+0200
+++ new/mate-screensaver-1.20.2/po/el.po 2018-09-08 23:28:56.000000000
+0200
@@ -10,7 +10,7 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-17 15:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Γιώργος Μηντζιλώνης <gi_orgos1...@hotmail.com>, 2018\n"
+"Last-Translator: George M, 2018\n"
"Language-Team: Greek (https://www.transifex.com/mate/teams/13566/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/po/es.po
new/mate-screensaver-1.20.2/po/es.po
--- old/mate-screensaver-1.20.1/po/es.po 2018-06-16 16:16:44.000000000
+0200
+++ new/mate-screensaver-1.20.2/po/es.po 2018-09-08 23:28:56.000000000
+0200
@@ -643,8 +643,8 @@
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
#: ../src/mate-screensaver-preferences.c:952
#: ../src/mate-screensaver-preferences.c:961
@@ -657,15 +657,15 @@
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
#: ../src/mate-screensaver-preferences.c:955
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
#. hour:minutes
#. minutes:seconds
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/po/it.po
new/mate-screensaver-1.20.2/po/it.po
--- old/mate-screensaver-1.20.1/po/it.po 2018-06-16 16:16:44.000000000
+0200
+++ new/mate-screensaver-1.20.2/po/it.po 2018-09-08 23:28:56.000000000
+0200
@@ -10,7 +10,7 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-17 15:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Marco Bartolucci <nap...@live.it>, 2018\n"
+"Last-Translator: l3nn4rt, 2018\n"
"Language-Team: Italian (https://www.transifex.com/mate/teams/13566/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -645,8 +645,8 @@
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ora"
+msgstr[1] "%d ore"
#: ../src/mate-screensaver-preferences.c:952
#: ../src/mate-screensaver-preferences.c:961
@@ -659,15 +659,15 @@
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minuto"
+msgstr[1] "%d minuti"
#: ../src/mate-screensaver-preferences.c:955
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d secondo"
+msgstr[1] "%d secondi"
#. hour:minutes
#. minutes:seconds
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/po/lt.po
new/mate-screensaver-1.20.2/po/lt.po
--- old/mate-screensaver-1.20.1/po/lt.po 2018-06-16 16:16:44.000000000
+0200
+++ new/mate-screensaver-1.20.2/po/lt.po 2018-09-08 23:28:56.000000000
+0200
@@ -632,10 +632,10 @@
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d valanda"
+msgstr[1] "%d valandos"
+msgstr[2] "%d valandų"
+msgstr[3] "%d valanda"
#: ../src/mate-screensaver-preferences.c:952
#: ../src/mate-screensaver-preferences.c:961
@@ -648,19 +648,19 @@
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d minutė"
+msgstr[1] "%d minutės"
+msgstr[2] "%d minučių"
+msgstr[3] "%d minutė"
#: ../src/mate-screensaver-preferences.c:955
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d sekundė"
+msgstr[1] "%d sekundės"
+msgstr[2] "%d sekundžių"
+msgstr[3] "%d sekundė"
#. hour:minutes
#. minutes:seconds
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/po/pl.po
new/mate-screensaver-1.20.2/po/pl.po
--- old/mate-screensaver-1.20.1/po/pl.po 2018-06-16 16:16:44.000000000
+0200
+++ new/mate-screensaver-1.20.2/po/pl.po 2018-09-08 23:28:56.000000000
+0200
@@ -10,7 +10,7 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-17 15:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Piotr Kowalik <pietras...@gmail.com>, 2018\n"
+"Last-Translator: pietrasagh <pietras...@gmail.com>, 2018\n"
"Language-Team: Polish (https://www.transifex.com/mate/teams/13566/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/po/ru.po
new/mate-screensaver-1.20.2/po/ru.po
--- old/mate-screensaver-1.20.1/po/ru.po 2018-06-16 16:16:44.000000000
+0200
+++ new/mate-screensaver-1.20.2/po/ru.po 2018-09-08 23:28:56.000000000
+0200
@@ -10,7 +10,7 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-17 15:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: monsta <mon...@inbox.ru>, 2018\n"
+"Last-Translator: Alex Putz, 2018\n"
"Language-Team: Russian (https://www.transifex.com/mate/teams/13566/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -643,10 +643,10 @@
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d час"
+msgstr[1] "%d часов"
+msgstr[2] "%d часов"
+msgstr[3] "%d часов"
#: ../src/mate-screensaver-preferences.c:952
#: ../src/mate-screensaver-preferences.c:961
@@ -659,19 +659,19 @@
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d минута"
+msgstr[1] "%d минут"
+msgstr[2] "%d минут"
+msgstr[3] "%d минут"
#: ../src/mate-screensaver-preferences.c:955
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d секунда"
+msgstr[1] "%d секунд"
+msgstr[2] "%d секунд"
+msgstr[3] "%d секунд"
#. hour:minutes
#. minutes:seconds
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/po/sv.po
new/mate-screensaver-1.20.2/po/sv.po
--- old/mate-screensaver-1.20.1/po/sv.po 2018-06-16 16:16:44.000000000
+0200
+++ new/mate-screensaver-1.20.2/po/sv.po 2018-09-08 23:28:56.000000000
+0200
@@ -10,7 +10,7 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-17 15:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Tobias Lekare <lek...@linux.com>, 2018\n"
+"Last-Translator: Philip Andersen <renegad...@codeofmagi.net>, 2018\n"
"Language-Team: Swedish (https://www.transifex.com/mate/teams/13566/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -630,8 +630,8 @@
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d timme"
+msgstr[1] "%d timmar"
#: ../src/mate-screensaver-preferences.c:952
#: ../src/mate-screensaver-preferences.c:961
@@ -644,15 +644,15 @@
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minut"
+msgstr[1] "%d minuter"
#: ../src/mate-screensaver-preferences.c:955
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekunder"
#. hour:minutes
#. minutes:seconds
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/po/uk.po
new/mate-screensaver-1.20.2/po/uk.po
--- old/mate-screensaver-1.20.1/po/uk.po 2018-06-16 16:16:44.000000000
+0200
+++ new/mate-screensaver-1.20.2/po/uk.po 2018-09-08 23:28:56.000000000
+0200
@@ -297,7 +297,7 @@
#: ../savers/footlogo-floaters.desktop.in.in.h:1
msgid "Floating MATE"
-msgstr "Пляваючий MATE"
+msgstr "Плаваючий MATE"
#: ../savers/footlogo-floaters.desktop.in.in.h:2
msgid "Bubbles the MATE logo around the screen"
@@ -305,7 +305,7 @@
#: ../savers/gnomelogo-floaters.desktop.in.in.h:1
msgid "Floating GNOME"
-msgstr "Пляваючий GNOME"
+msgstr "Плаваючий GNOME"
#: ../savers/gnomelogo-floaters.desktop.in.in.h:2
msgid "Bubbles the GNOME logo around the screen"
@@ -481,7 +481,7 @@
#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
#: ../src/mate-screensaver.c:55
msgid "Version of this application"
-msgstr "Версія цієї проґрами"
+msgstr "Версія цієї програми"
#: ../src/mate-screensaver-command.c:352
#, c-format
@@ -633,10 +633,10 @@
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d година"
+msgstr[1] "%d години"
+msgstr[2] "%d годин"
+msgstr[3] "%d годин"
#: ../src/mate-screensaver-preferences.c:952
#: ../src/mate-screensaver-preferences.c:961
@@ -649,19 +649,19 @@
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d хвилина"
+msgstr[1] "%d хвилини"
+msgstr[2] "%d хвилин"
+msgstr[3] "%d хвилин"
#: ../src/mate-screensaver-preferences.c:955
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d секунда"
+msgstr[1] "%d секунди"
+msgstr[2] "%d секунд"
+msgstr[3] "%d секунд"
#. hour:minutes
#. minutes:seconds
@@ -759,7 +759,7 @@
#: ../src/gs-lock-plug.c:436
msgid "You have the Caps Lock key on."
-msgstr "Натиснута клявіша Caps Lock."
+msgstr "Натиснута клавіша Caps Lock."
#: ../src/gs-lock-plug.c:1652
msgid "S_witch User..."
@@ -776,4 +776,4 @@
#: ../src/gs-lock-plug.c:1889
msgid "_Password:"
-msgstr "_Потайслово:"
+msgstr "_Пароль:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/po/zh_CN.po
new/mate-screensaver-1.20.2/po/zh_CN.po
--- old/mate-screensaver-1.20.1/po/zh_CN.po 2018-06-16 16:16:44.000000000
+0200
+++ new/mate-screensaver-1.20.2/po/zh_CN.po 2018-09-08 23:28:56.000000000
+0200
@@ -10,7 +10,7 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-17 15:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: shuyu liu <liushuyu...@gmail.com>, 2018\n"
+"Last-Translator: liushuyu011 <liushuyu...@gmail.com>, 2018\n"
"Language-Team: Chinese (China)
(https://www.transifex.com/mate/teams/13566/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/src/gs-lock-plug.c
new/mate-screensaver-1.20.2/src/gs-lock-plug.c
--- old/mate-screensaver-1.20.1/src/gs-lock-plug.c 2018-06-16
16:09:50.000000000 +0200
+++ new/mate-screensaver-1.20.2/src/gs-lock-plug.c 2018-09-08
23:16:37.000000000 +0200
@@ -976,6 +976,7 @@
return TRUE;
}
+#if !GTK_CHECK_VERSION (3, 23, 0)
static void
gs_lock_plug_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint
*natural_width)
{
@@ -999,6 +1000,7 @@
*minimum_height /= scale;
*natural_height /= scale;
}
+#endif
static void
gs_lock_plug_show (GtkWidget *widget)
@@ -1274,8 +1276,10 @@
widget_class->style_set = gs_lock_plug_style_set;
widget_class->show = gs_lock_plug_show;
widget_class->hide = gs_lock_plug_hide;
+#if !GTK_CHECK_VERSION (3, 23, 0)
widget_class->get_preferred_width =
gs_lock_plug_get_preferred_width;
widget_class->get_preferred_height_for_width =
gs_lock_plug_get_preferred_height_for_width;
+#endif
klass->close = gs_lock_plug_close;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-screensaver-1.20.1/src/gs-manager.c
new/mate-screensaver-1.20.2/src/gs-manager.c
--- old/mate-screensaver-1.20.1/src/gs-manager.c 2018-06-16
16:09:50.000000000 +0200
+++ new/mate-screensaver-1.20.2/src/gs-manager.c 2018-09-08
23:16:37.000000000 +0200
@@ -1268,11 +1268,8 @@
GSWindow *window)
{
cairo_surface_t *surface;
- GdkDisplay *display;
- GdkScreen *screen;
int width;
int height;
- gint scale;
mate_bg_load_from_preferences (manager->priv->bg);
@@ -1282,11 +1279,8 @@
gs_window_set_background_surface (window, NULL);
}
- display = gs_window_get_display (window);
- screen = gdk_display_get_default_screen (display);
- scale = gdk_window_get_scale_factor (gdk_screen_get_root_window
(screen));
- width = WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale;
- height = HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale;
+ gtk_widget_get_preferred_width (GTK_WIDGET (window), &width, NULL);
+ gtk_widget_get_preferred_height (GTK_WIDGET (window), &height, NULL);
gs_debug ("Creating background w:%d h:%d", width, height);
surface = mate_bg_create_surface (manager->priv->bg,
gs_window_get_gdk_window (window),
@@ -1563,84 +1557,73 @@
}
static void
-on_screen_monitors_changed (GdkScreen *screen,
- GSManager *manager)
+on_display_monitor_added (GdkDisplay *display,
+ GdkMonitor *monitor,
+ GSManager *manager)
{
GSList *l;
- GdkDisplay *display;
int n_monitors;
- int n_windows;
- int i;
- display = gdk_screen_get_display (screen);
n_monitors = gdk_display_get_n_monitors (display);
- n_windows = g_slist_length (manager->priv->windows);
- gs_debug ("Monitors changed for display %s: num=%d",
- gdk_display_get_name (display),
- n_monitors);
+ gs_debug ("Monitor added on display %s, now there are %d",
+ gdk_display_get_name (display), n_monitors);
- if (n_monitors > n_windows)
+ /* Tear down the unlock dialog in case we want to move it
+ * to the new monitor
+ */
+ l = manager->priv->windows;
+ while (l != NULL)
{
+ gs_window_cancel_unlock_request (GS_WINDOW (l->data));
+ l = l->next;
+ }
- /* Tear down unlock dialog in case we want to move it
- * to a new monitor
- */
- l = manager->priv->windows;
- while (l != NULL)
- {
- gs_window_cancel_unlock_request (GS_WINDOW (l->data));
- l = l->next;
- }
+ /* add a new window */
+ gs_manager_create_window_for_monitor (manager, monitor);
- /* add more windows */
- for (i = n_windows; i < n_monitors; i++)
- {
- GdkMonitor *mon = gdk_display_get_monitor (display, i);
- gs_manager_create_window_for_monitor (manager, mon);
- }
+ /* and put unlock dialog up whereever it's supposed to be */
+ gs_manager_request_unlock (manager);
+}
- /* And put unlock dialog up where ever it's supposed to be
- */
- gs_manager_request_unlock (manager);
- }
- else
- {
+static void
+on_display_monitor_removed (GdkDisplay *display,
+ GdkMonitor *monitor,
+ GSManager *manager)
+{
+ GSList *l;
+ int n_monitors;
- gdk_x11_grab_server ();
+ n_monitors = gdk_display_get_n_monitors (display);
- /* remove the extra windows */
- l = manager->priv->windows;
- while (l != NULL)
- {
- GdkDisplay *this_display;
- GdkMonitor *this_monitor;
- GSList *next = l->next;
-
- this_display = gs_window_get_display (GS_WINDOW
(l->data));
- this_monitor = gs_window_get_monitor (GS_WINDOW
(l->data));
- if (this_display == display &&
- !GDK_IS_MONITOR (this_monitor))
- {
- manager_maybe_stop_job_for_window (manager,
GS_WINDOW (l->data));
- g_hash_table_remove (manager->priv->jobs,
l->data);
- gs_window_destroy (GS_WINDOW (l->data));
- manager->priv->windows = g_slist_delete_link
(manager->priv->windows, l);
- }
- l = next;
- }
+ gs_debug ("Monitor removed on display %s, now there are %d",
+ gdk_display_get_name (display), n_monitors);
- /* make sure there is a lock dialog on a connected monitor,
- * and that the keyboard is still properly grabbed after all
- * the windows above got destroyed*/
- if (n_windows > n_monitors)
+ gdk_x11_grab_server ();
+
+ /* remove the now extra window */
+ l = manager->priv->windows;
+ while (l != NULL)
+ {
+ GdkDisplay *this_display;
+ GdkMonitor *this_monitor;
+ GSList *next = l->next;
+
+ this_display = gs_window_get_display (GS_WINDOW (l->data));
+ this_monitor = gs_window_get_monitor (GS_WINDOW (l->data));
+ if (this_display == display && this_monitor == monitor)
{
- gs_manager_request_unlock (manager);
+ manager_maybe_stop_job_for_window (manager,
+ GS_WINDOW (l->data));
+ g_hash_table_remove (manager->priv->jobs, l->data);
+ gs_window_destroy (GS_WINDOW (l->data));
+ manager->priv->windows = g_slist_delete_link
(manager->priv->windows, l);
}
-
- gdk_flush ();
- gdk_x11_ungrab_server ();
+ l = next;
}
+
+ gdk_display_flush (display);
+ gdk_x11_ungrab_server ();
}
static void
@@ -1659,8 +1642,11 @@
display = gdk_display_get_default ();
- g_signal_handlers_disconnect_by_func (gdk_display_get_default_screen
(display),
- on_screen_monitors_changed,
+ g_signal_handlers_disconnect_by_func (display,
+ on_display_monitor_removed,
+ manager);
+ g_signal_handlers_disconnect_by_func (display,
+ on_display_monitor_added,
manager);
for (l = manager->priv->windows; l; l = l->next)
@@ -1753,9 +1739,11 @@
g_assert (manager->priv->windows == NULL);
display = gdk_display_get_default ();
- g_signal_connect (gdk_display_get_default_screen (display),
- "monitors-changed",
- G_CALLBACK (on_screen_monitors_changed),
+ g_signal_connect (display, "monitor-added",
+ G_CALLBACK (on_display_monitor_added),
+ manager);
+ g_signal_connect (display, "monitor-removed",
+ G_CALLBACK (on_display_monitor_removed),
manager);
gs_manager_create_windows_for_display (manager, display);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-screensaver-1.20.1/src/mate-screensaver.desktop.in
new/mate-screensaver-1.20.2/src/mate-screensaver.desktop.in
--- old/mate-screensaver-1.20.1/src/mate-screensaver.desktop.in 2018-06-16
17:02:41.000000000 +0200
+++ new/mate-screensaver-1.20.2/src/mate-screensaver.desktop.in 2018-09-08
23:30:01.000000000 +0200
@@ -11,4 +11,4 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=mate-screensaver
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.20.1
+X-MATE-Bugzilla-Version=1.20.2
++++++ mate-screensaver-gtk-3.20.patch ++++++
--- /var/tmp/diff_new_pack.fAlgaO/_old 2018-09-10 12:31:48.934654853 +0200
+++ /var/tmp/diff_new_pack.fAlgaO/_new 2018-09-10 12:31:48.934654853 +0200
@@ -65,7 +65,7 @@
gdk_flush ();
grabbed = FALSE;
-@@ -1530,14 +1550,26 @@ connect_window_signals (GSManager *manag
+@@ -1524,14 +1544,26 @@ connect_window_signals (GSManager *manag
static void
gs_manager_create_window_for_monitor (GSManager *manager,
@@ -92,56 +92,120 @@
gs_debug ("Creating a window for the monitor [%d,%d] (%dx%d)",
monitor, rect.x, rect.y, rect.width, rect.height);
-@@ -1573,7 +1605,11 @@ on_screen_monitors_changed (GdkScreen *s
- int i;
+@@ -1556,6 +1588,7 @@ gs_manager_create_window_for_monitor (GS
+ }
+ }
- display = gdk_screen_get_display (screen);
+#if GTK_CHECK_VERSION (3, 22, 0)
- n_monitors = gdk_display_get_n_monitors (display);
+ static void
+ on_display_monitor_added (GdkDisplay *display,
+ GdkMonitor *monitor,
+@@ -1625,6 +1658,85 @@ on_display_monitor_removed (GdkDisplay *
+ gdk_display_flush (display);
+ gdk_x11_ungrab_server ();
+ }
+#else
++static void
++on_screen_monitors_changed (GdkScreen *screen,
++ GSManager *manager)
++{
++ GSList *l;
++ GdkDisplay *display;
++ int n_monitors;
++ int n_windows;
++ int i;
++
++ display = gdk_screen_get_display (screen);
+ n_monitors = gdk_screen_get_n_monitors (screen);
-+#endif
- n_windows = g_slist_length (manager->priv->windows);
-
- gs_debug ("Monitors changed for display %s: num=%d",
-@@ -1596,8 +1632,13 @@ on_screen_monitors_changed (GdkScreen *s
- /* add more windows */
- for (i = n_windows; i < n_monitors; i++)
- {
-+#if GTK_CHECK_VERSION (3, 22, 0)
- GdkMonitor *mon = gdk_display_get_monitor (display, i);
- gs_manager_create_window_for_monitor (manager, mon);
-+#else
++ n_windows = g_slist_length (manager->priv->windows);
++
++ gs_debug ("Monitors changed for display %s: num=%d",
++ gdk_display_get_name (display),
++ n_monitors);
++
++ if (n_monitors > n_windows)
++ {
++ /* Tear down unlock dialog in case we want to move it
++ * to a new monitor
++ */
++ l = manager->priv->windows;
++ while (l != NULL)
++ {
++ gs_window_cancel_unlock_request (GS_WINDOW (l->data));
++ l = l->next;
++ }
++
++ /* Add more windows */
++ for (i = n_windows; i < n_monitors; ++i)
++ {
+ gs_manager_create_window_for_monitor (manager,
+ display, i);
-+#endif
- }
-
- /* And put unlock dialog up where ever it's supposed to be
-@@ -1614,13 +1655,22 @@ on_screen_monitors_changed (GdkScreen *s
- while (l != NULL)
- {
- GdkDisplay *this_display;
-+#if GTK_CHECK_VERSION (3, 22, 0)
- GdkMonitor *this_monitor;
-+#else
++ }
++
++ /* And put unlock dialog up where ever it's supposed to be */
++ gs_manager_request_unlock (manager);
++ }
++ else
++ {
++ gdk_x11_grab_server ();
++
++ /* Remove the extra windows */
++ l = manager->priv->windows;
++ while (l != NULL)
++ {
++ GdkDisplay *this_display;
+ int this_monitor;
++ GSList *next = l->next;
++
++ this_display = gs_window_get_display (GS_WINDOW
(l->data));
++ this_monitor = gs_window_get_monitor (GS_WINDOW
(l->data));
++ if (this_display == display && this_monitor >=
n_monitors)
++ {
++ manager_maybe_stop_job_for_window (manager,
GS_WINDOW (l->data));
++ g_hash_table_remove (manager->priv->jobs,
l->data);
++ gs_window_destroy (GS_WINDOW (l->data));
++ manager->priv->windows = g_slist_delete_link
(manager->priv->windows, l);
++ }
++ l = next;
++ }
++
++ /* Make sure there is a lock dialog on a connected monitor,
++ * and that the keyboard is still properly grabbed after all
++ * the windows above got destroyed
++ */
++ if (n_windows > n_monitors)
++ {
++ gs_manager_request_unlock (manager);
++ }
++
++ gdk_display_flush (display);
++ gdk_x11_ungrab_server ();
++ }
++}
+#endif
- GSList *next = l->next;
- this_display = gs_window_get_display (GS_WINDOW
(l->data));
- this_monitor = gs_window_get_monitor (GS_WINDOW
(l->data));
+ static void
+ gs_manager_destroy_windows (GSManager *manager)
+@@ -1642,12 +1756,18 @@ gs_manager_destroy_windows (GSManager *m
+
+ display = gdk_display_get_default ();
+
+#if GTK_CHECK_VERSION (3, 22, 0)
- if (this_display == display &&
- !GDK_IS_MONITOR (this_monitor))
+ g_signal_handlers_disconnect_by_func (display,
+ on_display_monitor_removed,
+ manager);
+ g_signal_handlers_disconnect_by_func (display,
+ on_display_monitor_added,
+ manager);
+#else
-+ if (this_display == display &&
-+ this_monitor >= n_monitors)
++ g_signal_handlers_disconnect_by_func (gdk_display_get_default_screen
(display),
++ on_screen_monitors_changed,
++ manager);
+#endif
- {
- manager_maybe_stop_job_for_window (manager,
GS_WINDOW (l->data));
- g_hash_table_remove (manager->priv->jobs,
l->data);
-@@ -1717,6 +1767,9 @@ static void
+
+ for (l = manager->priv->windows; l; l = l->next)
+ {
+@@ -1703,6 +1823,9 @@ static void
gs_manager_create_windows_for_display (GSManager *manager,
GdkDisplay *display)
{
@@ -151,7 +215,7 @@
int n_monitors;
int i;
-@@ -1727,15 +1780,25 @@ gs_manager_create_windows_for_display (G
+@@ -1713,15 +1836,25 @@ gs_manager_create_windows_for_display (G
g_object_ref (manager);
g_object_ref (display);
@@ -177,6 +241,26 @@
}
g_object_unref (display);
+@@ -1739,12 +1872,19 @@ gs_manager_create_windows (GSManager *ma
+ g_assert (manager->priv->windows == NULL);
+
+ display = gdk_display_get_default ();
++#if GTK_CHECK_VERSION (3, 22, 0)
+ g_signal_connect (display, "monitor-added",
+ G_CALLBACK (on_display_monitor_added),
+ manager);
+ g_signal_connect (display, "monitor-removed",
+ G_CALLBACK (on_display_monitor_removed),
+ manager);
++#else
++ g_signal_connect (gdk_display_get_default_screen (display),
++ "monitors-changed",
++ G_CALLBACK (on_screen_monitors_changed),
++ manager);
++#endif
+
+ gs_manager_create_windows_for_display (manager, display);
+ }
--- a/src/gs-window.h
+++ b/src/gs-window.h
@@ -62,8 +62,13 @@ gboolean gs_window_is_dialog_up
@@ -365,7 +449,7 @@
}
static void
-@@ -2548,7 +2610,11 @@ gs_window_finalize (GObject *object)
+@@ -2548,7 +2608,11 @@ gs_window_finalize (GObject *object)
GSWindow *
gs_window_new (GdkDisplay *display,
