openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2020
- 1 participants
- 4645 discussions
Hello community,
here is the log from the commit of package hamster-time-tracker for openSUSE:Factory checked in at 2020-05-01 11:09:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hamster-time-tracker (Old)
and /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hamster-time-tracker"
Fri May 1 11:09:45 2020 rev:5 rq:798968 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/hamster-time-tracker.changes 2020-03-31 17:16:58.267693360 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/hamster-time-tracker.changes 2020-05-01 11:10:48.939516337 +0200
@@ -1,0 +2,70 @@
+Tue Apr 28 15:34:47 UTC 2020 - Martin Wilck <mwilck(a)suse.com>
+
+- Fix malfunction of backspace key in GNOME extension (3.36)
+ * add patch: 0132-ongoingFactEntry-stop-using-deprecated-Clutter-key-s.patch
+
+-------------------------------------------------------------------
+Tue Apr 28 12:28:12 UTC 2020 - Martin Wilck <mwilck(a)suse.com>
+
+- Fix syntax error in metadata.json.in
+ * add patch: 0131-metadata.json.in-fix-json-syntax-error.patch
+
+-------------------------------------------------------------------
+Mon Apr 27 11:01:53 UTC 2020 - Martin Wilck <mwilck(a)suse.com>
+
+- Support GNOME 3.34 on SLE15-SP2/Leap15.2
+- Correctly set GNOME shell version depending on OS release
+- Update shell extension to GNOME-3.36 branch, and use upstream patch order
+ * renumber patch: 0101-Don-t-try-to-access-controller.activities-before-it-.patch
+ (was 0001-Don-t-try-to-access-controller.activities-before-it-.patch)
+ * renumber patch: 0102-Fix-disable-callback-gnome-shell-3.30-compatibility.patch
+ (was 0002-Fix-disable-callback-gnome-shell-3.30-compatibility.patch)
+ * renumber patch: 0103-convenience.js-has-been-removed-in-GNOME-extensions-.patch
+ (was 0003-convenience.js-has-been-removed-in-GNOME-extensions-.patch)
+ * renumber patch: 0104-Makefile-allow-shipping-convenience.js.patch
+ (was 0005-Makefile-allow-shipping-convenience.js.patch)
+ * renumber patch: 0105-metadata.json-mark-GNOME-3.30-as-supported.patch
+ (was 0004-metadata.json-mark-GNOME-3.30-as-supported.patch)
+ * remove patch: 0006-Makefile-don-t-zip.patch
+ * add patch: 0106-Fix-installation-instructions-matches-Ubuntu-18.04-T.patch
+ * add patch: 0107-metadata.json-remove-version-field.patch
+ * renumber patch: 0108-drop-convenience.js.patch
+ (was 0007-drop-convenience.js.patch)
+ * renumber patch: 0109-make-test-style-set-esversion-to-6-for-GNOME-3.32.patch
+ (was 0008-make-test-style-set-esversion-to-6-for-GNOME-3.32.patch)
+ * renumber patch: 0110-Mark-GNOME-3.32-as-supported-all-others-as-unsupport.patch
+ (was 0009-Mark-GNOME-3.32-as-supported-all-others-as-unsupport.patch)
+ * renumber patch: 0111-Port-GObject-classes-to-JS6-classes.patch
+ (was 0010-Port-GObject-classes-to-JS6-classes.patch)
+ * renumber patch: 0112-add-jshint-validthis-to-silence-warnings-about-stric.patch
+ (was 0011-add-jshint-validthis-to-silence-warnings-about-stric.patch)
+ * renumber patch: 0113-todaysFactsWidget-add-missing-bind.patch
+ (was 0012-todaysFactsWidget-add-missing-bind.patch)
+ * renumber patch: 0114-replace-Lang.bind-with-function-.bind.patch
+ (was 0013-replace-Lang.bind-with-function-.bind.patch)
+ * renumber patch: 0115-Port-non-GObject-class-to-JS6.patch
+ (was 0014-Port-non-GObject-class-to-JS6.patch)
+ * renumber patch: 0116-extension.js-add-jshint-validthis-hints.patch
+ (was 0015-extension.js-add-jshint-validthis-hints.patch)
+ * renumber patch: 0117-extension.js-fix-indentation-after-previous-change.patch
+ (was 0016-extension.js-fix-indentation-after-previous-change.patch)
+ * renumber patch: 0118-Don-t-log-ACTIVITIES-at-every-refresh.patch
+ (was 0017-Don-t-log-ACTIVITIES-at-every-refresh.patch)
+ * renumber patch: 0119-doc-remove-broken-link-to-usejsdoc.org.patch
+ (was 0018-doc-remove-broken-link-to-usejsdoc.org.patch)
+ * renumber patch: 0120-factsBox-use-GObject.registerClass.patch
+ (was 0019-factsBox-use-GObject.registerClass.patch)
+ * renumber patch: 0121-panelWidget-fix-object.actor-is-deprecated-warning.patch
+ (was 0020-panelWidget-fix-object.actor-is-deprecated-warning.patch)
+ * renumber patch: 0122-metadata.json-mark-GNOME-3.34-as-supported.patch
+ (was 0021-metadata.json-mark-GNOME-3.34-as-supported.patch)
+ * add patch: 0123-Makefile-don-t-fail-if-zip-is-unavailable.patch
+ * add patch: 0124-Makefile-collect-must-depend-on-build.patch
+ * add patch: 0125-todaysFactsWidget-replace-Clutter.TableLayout-with-C.patch
+ * add patch: 0126-Fix-GNOME-shell-error-message-about-factsBox.FactsBo.patch
+ * add patch: 0127-Makefile-configurable-extension-UUID.patch
+ * add patch: 0128-metadata.json.in-mark-GNOME-3.36-supported.patch
+ * add patch: 0129-README.rst-mention-the-GNOME-extensions-tool.patch
+ * add patch: 0130-README.rst-Add-a-section-about-UUID-changing.patch
+
+-------------------------------------------------------------------
@@ -4 +74 @@
-- Update to version v3.0.1+8:
+- Update to version v3.0.1+8:s
Old:
----
0001-Don-t-try-to-access-controller.activities-before-it-.patch
0002-Fix-disable-callback-gnome-shell-3.30-compatibility.patch
0003-convenience.js-has-been-removed-in-GNOME-extensions-.patch
0004-metadata.json-mark-GNOME-3.30-as-supported.patch
0005-Makefile-allow-shipping-convenience.js.patch
0006-Makefile-don-t-zip.patch
0007-drop-convenience.js.patch
0008-make-test-style-set-esversion-to-6-for-GNOME-3.32.patch
0009-Mark-GNOME-3.32-as-supported-all-others-as-unsupport.patch
0010-Port-GObject-classes-to-JS6-classes.patch
0011-add-jshint-validthis-to-silence-warnings-about-stric.patch
0012-todaysFactsWidget-add-missing-bind.patch
0013-replace-Lang.bind-with-function-.bind.patch
0014-Port-non-GObject-class-to-JS6.patch
0015-extension.js-add-jshint-validthis-hints.patch
0016-extension.js-fix-indentation-after-previous-change.patch
0017-Don-t-log-ACTIVITIES-at-every-refresh.patch
0018-doc-remove-broken-link-to-usejsdoc.org.patch
0019-factsBox-use-GObject.registerClass.patch
0020-panelWidget-fix-object.actor-is-deprecated-warning.patch
0021-metadata.json-mark-GNOME-3.34-as-supported.patch
New:
----
0101-Don-t-try-to-access-controller.activities-before-it-.patch
0102-Fix-disable-callback-gnome-shell-3.30-compatibility.patch
0103-convenience.js-has-been-removed-in-GNOME-extensions-.patch
0104-Makefile-allow-shipping-convenience.js.patch
0105-metadata.json-mark-GNOME-3.30-as-supported.patch
0106-Fix-installation-instructions-matches-Ubuntu-18.04-T.patch
0107-metadata.json-remove-version-field.patch
0108-drop-convenience.js.patch
0109-make-test-style-set-esversion-to-6-for-GNOME-3.32.patch
0110-Mark-GNOME-3.32-as-supported-all-others-as-unsupport.patch
0111-Port-GObject-classes-to-JS6-classes.patch
0112-add-jshint-validthis-to-silence-warnings-about-stric.patch
0113-todaysFactsWidget-add-missing-bind.patch
0114-replace-Lang.bind-with-function-.bind.patch
0115-Port-non-GObject-class-to-JS6.patch
0116-extension.js-add-jshint-validthis-hints.patch
0117-extension.js-fix-indentation-after-previous-change.patch
0118-Don-t-log-ACTIVITIES-at-every-refresh.patch
0119-doc-remove-broken-link-to-usejsdoc.org.patch
0120-factsBox-use-GObject.registerClass.patch
0121-panelWidget-fix-object.actor-is-deprecated-warning.patch
0122-metadata.json-mark-GNOME-3.34-as-supported.patch
0123-Makefile-don-t-fail-if-zip-is-unavailable.patch
0124-Makefile-collect-must-depend-on-build.patch
0125-todaysFactsWidget-replace-Clutter.TableLayout-with-C.patch
0126-Fix-GNOME-shell-error-message-about-factsBox.FactsBo.patch
0127-Makefile-configurable-extension-UUID.patch
0128-metadata.json.in-mark-GNOME-3.36-supported.patch
0129-README.rst-mention-the-GNOME-extensions-tool.patch
0130-README.rst-Add-a-section-about-UUID-changing.patch
0131-metadata.json.in-fix-json-syntax-error.patch
0132-ongoingFactEntry-stop-using-deprecated-Clutter-key-s.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hamster-time-tracker.spec ++++++
--- /var/tmp/diff_new_pack.eZrUF9/_old 2020-05-01 11:10:50.599519947 +0200
+++ /var/tmp/diff_new_pack.eZrUF9/_new 2020-05-01 11:10:50.599519947 +0200
@@ -16,7 +16,17 @@
#
%global ext_version 0.10.0
+
+%if 0%{?suse_version} >= 1550
+%global ext_gnome_version 3.36
+%else
+%if 0%{?sle_version} >= 150200
%global ext_gnome_version 3.34
+%else
+%global ext_gnome_version 3.26
+%endif
+%endif
+
%global ext_uuid contact(a)projecthamster.org
%bcond_without extension
@@ -35,27 +45,43 @@
Patch1: replace-env-python-invocation-by-direct-call.patch
Patch2: waf-skip-gsettings-schema-compilation.patch
# Patches for GNOME extension
-Patch101: 0001-Don-t-try-to-access-controller.activities-before-it-.patch
-Patch102: 0002-Fix-disable-callback-gnome-shell-3.30-compatibility.patch
-Patch103: 0003-convenience.js-has-been-removed-in-GNOME-extensions-.patch
-Patch104: 0004-metadata.json-mark-GNOME-3.30-as-supported.patch
-Patch105: 0005-Makefile-allow-shipping-convenience.js.patch
-Patch106: 0006-Makefile-don-t-zip.patch
-Patch107: 0007-drop-convenience.js.patch
-Patch108: 0008-make-test-style-set-esversion-to-6-for-GNOME-3.32.patch
-Patch109: 0009-Mark-GNOME-3.32-as-supported-all-others-as-unsupport.patch
-Patch110: 0010-Port-GObject-classes-to-JS6-classes.patch
-Patch111: 0011-add-jshint-validthis-to-silence-warnings-about-stric.patch
-Patch112: 0012-todaysFactsWidget-add-missing-bind.patch
-Patch113: 0013-replace-Lang.bind-with-function-.bind.patch
-Patch114: 0014-Port-non-GObject-class-to-JS6.patch
-Patch115: 0015-extension.js-add-jshint-validthis-hints.patch
-Patch116: 0016-extension.js-fix-indentation-after-previous-change.patch
-Patch117: 0017-Don-t-log-ACTIVITIES-at-every-refresh.patch
-Patch118: 0018-doc-remove-broken-link-to-usejsdoc.org.patch
-Patch119: 0019-factsBox-use-GObject.registerClass.patch
-Patch120: 0020-panelWidget-fix-object.actor-is-deprecated-warning.patch
-Patch121: 0021-metadata.json-mark-GNOME-3.34-as-supported.patch
+# GNOME up to 3.30
+Patch101: 0101-Don-t-try-to-access-controller.activities-before-it-.patch
+Patch102: 0102-Fix-disable-callback-gnome-shell-3.30-compatibility.patch
+Patch103: 0103-convenience.js-has-been-removed-in-GNOME-extensions-.patch
+Patch104: 0104-Makefile-allow-shipping-convenience.js.patch
+Patch105: 0105-metadata.json-mark-GNOME-3.30-as-supported.patch
+Patch106: 0106-Fix-installation-instructions-matches-Ubuntu-18.04-T.patch
+Patch107: 0107-metadata.json-remove-version-field.patch
+# GNOME 3.32
+Patch108: 0108-drop-convenience.js.patch
+Patch109: 0109-make-test-style-set-esversion-to-6-for-GNOME-3.32.patch
+Patch110: 0110-Mark-GNOME-3.32-as-supported-all-others-as-unsupport.patch
+Patch111: 0111-Port-GObject-classes-to-JS6-classes.patch
+Patch112: 0112-add-jshint-validthis-to-silence-warnings-about-stric.patch
+Patch113: 0113-todaysFactsWidget-add-missing-bind.patch
+Patch114: 0114-replace-Lang.bind-with-function-.bind.patch
+Patch115: 0115-Port-non-GObject-class-to-JS6.patch
+Patch116: 0116-extension.js-add-jshint-validthis-hints.patch
+Patch117: 0117-extension.js-fix-indentation-after-previous-change.patch
+Patch118: 0118-Don-t-log-ACTIVITIES-at-every-refresh.patch
+Patch119: 0119-doc-remove-broken-link-to-usejsdoc.org.patch
+# GNOME 3.34
+Patch120: 0120-factsBox-use-GObject.registerClass.patch
+Patch121: 0121-panelWidget-fix-object.actor-is-deprecated-warning.patch
+Patch122: 0122-metadata.json-mark-GNOME-3.34-as-supported.patch
+Patch123: 0123-Makefile-don-t-fail-if-zip-is-unavailable.patch
+Patch124: 0124-Makefile-collect-must-depend-on-build.patch
+# GNOME 3.36
+Patch125: 0125-todaysFactsWidget-replace-Clutter.TableLayout-with-C.patch
+Patch126: 0126-Fix-GNOME-shell-error-message-about-factsBox.FactsBo.patch
+Patch127: 0127-Makefile-configurable-extension-UUID.patch
+Patch128: 0128-metadata.json.in-mark-GNOME-3.36-supported.patch
+Patch129: 0129-README.rst-mention-the-GNOME-extensions-tool.patch
+Patch130: 0130-README.rst-Add-a-section-about-UUID-changing.patch
+Patch131: 0131-metadata.json.in-fix-json-syntax-error.patch
+Patch132: 0132-ongoingFactEntry-stop-using-deprecated-Clutter-key-s.patch
+
BuildRequires: fdupes
BuildRequires: intltool
# For detecting typelib() dependencies
@@ -73,6 +99,9 @@
BuildRequires: update-desktop-files
# For ownership on icon directories
BuildRequires: hicolor-icon-theme
+%if %{with extension}
+BuildRequires: zip
+%endif
# Note:
# - we do not have the gnomeapplet bindings anymore (it doesn't work with
# GNOME 3), so we don't add a Requires/Recommends for it.
@@ -119,10 +148,11 @@
%patch104 -p1
%patch105 -p1
%patch106 -p1
-# Tumbleweed: GNOME 3.32, 3.34 support for shell extension
-# https://github.com/projecthamster/hamster-shell-extension/pull/316
-%if 0%{?suse_version} >= 1550
%patch107 -p1
+# SLE15-SP2 / Leap 15.2:
+# GNOME 3.34 support for shell extension
+# https://github.com/projecthamster/hamster-shell-extension/pull/316
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
%patch108 -p1
%patch109 -p1
%patch110 -p1
@@ -137,7 +167,23 @@
%patch119 -p1
%patch120 -p1
%patch121 -p1
+%patch122 -p1
+%patch123 -p1
+%patch124 -p1
+# TW: GNOME 3.36 support
+# https://github.com/projecthamster/hamster-shell-extension/pull/323
+%if 0%{?suse_version} >= 1550
+%patch125 -p1
+%patch126 -p1
+%patch127 -p1
+%patch128 -p1
+%patch129 -p1
+%patch130 -p1
+%patch131 -p1
+%patch132 -p1
+%endif
%endif
+
mkdir build
cp %{SOURCE2} build
%endif
@@ -157,7 +203,7 @@
%if %{with extension}
mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions/%{ext_uuid}
-tar xz -f hamster-shell-extension-%{ext_version}/dist/%{ext_uuid}.tgz \
+tar xz -f hamster-shell-extension-%{ext_version}/dist/%{ext_uuid}.tar.gz \
-C %{buildroot}%{_datadir}/gnome-shell/extensions/%{ext_uuid}
%endif
@@ -198,11 +244,12 @@
Summary: Hamster time tracker for GNOME Shell status menu
License: GPL-3.0-only
Group: System/GUI/GNOME
-%if 0%{?suse_version} >= 1550
-Requires: gnome-shell >= 3.32
-%else
+Requires: gnome-shell >= %{ext_gnome_version}
+%if 0%{?sle_version} >= 150200 && 0%{?suse_version} < 1550
+Requires: gnome-shell < 3.36
+%endif
+%if 0%{?sle_version} < 150200 && 0%{?suse_version} < 1550
Requires: gnome-shell < 3.32
-Requires: gnome-shell >= 3.10
%endif
Requires: %{name}
Supplements: packageand(gnome-shell:%{name})
++++++ 0001-Don-t-try-to-access-controller.activities-before-it-.patch -> 0101-Don-t-try-to-access-controller.activities-before-it-.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0001-Don-t-try-to-access-controller.activities-before-it-.patch 2019-03-26 15:43:17.380214167 +0100
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0101-Don-t-try-to-access-controller.activities-before-it-.patch 2020-05-01 11:10:16.707446240 +0200
@@ -1,8 +1,8 @@
From f2d568919394346f020586c2a1bd98a434744f31 Mon Sep 17 00:00:00 2001
From: Hedayat Vatankhah <hedayat.fwd(a)gmail.com>
Date: Wed, 19 Dec 2018 15:20:36 +0330
-Subject: [PATCH 1/6] Don't try to access controller.activities before it is
- filled
+Subject: [PATCH 101/130] Don't try to access controller.activities before it
+ is filled
---
extension/extension.js | 10 +++-------
@@ -40,5 +40,5 @@
/**
--
-2.20.1
+2.26.1
++++++ 0002-Fix-disable-callback-gnome-shell-3.30-compatibility.patch -> 0102-Fix-disable-callback-gnome-shell-3.30-compatibility.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0002-Fix-disable-callback-gnome-shell-3.30-compatibility.patch 2019-03-26 15:43:17.400214155 +0100
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0102-Fix-disable-callback-gnome-shell-3.30-compatibility.patch 2020-05-01 11:10:18.179449442 +0200
@@ -1,7 +1,7 @@
From d748dccc794b9efbc8f81018be5b2a78d7d975c7 Mon Sep 17 00:00:00 2001
From: Hedayat Vatankhah <hedayat.fwd(a)gmail.com>
Date: Wed, 19 Dec 2018 15:24:42 +0330
-Subject: [PATCH 2/6] Fix disable callback: gnome shell 3.30 compatibility
+Subject: [PATCH 102/130] Fix disable callback: gnome shell 3.30 compatibility
---
extension/extension.js | 2 --
@@ -21,5 +21,5 @@
this.panelWidget = null;
this.apiProxy = null;
--
-2.20.1
+2.26.1
++++++ 0003-convenience.js-has-been-removed-in-GNOME-extensions-.patch -> 0103-convenience.js-has-been-removed-in-GNOME-extensions-.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0003-convenience.js-has-been-removed-in-GNOME-extensions-.patch 2019-03-26 15:43:17.464214118 +0100
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0103-convenience.js-has-been-removed-in-GNOME-extensions-.patch 2020-05-01 11:10:19.251451773 +0200
@@ -1,7 +1,8 @@
-From e3fadf3a419a4e6463ace40a335e9d399a10d9b2 Mon Sep 17 00:00:00 2001
+From 84840ae1392f70405fe0428cfd27fff3bb861c96 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Fri, 1 Mar 2019 14:28:28 +0100
-Subject: [PATCH 3/6] convenience.js has been removed in GNOME extensions >3.30
+Subject: [PATCH 103/130] convenience.js has been removed in GNOME extensions
+ >3.30
---
Makefile | 2 +-
@@ -21,5 +22,5 @@
compile: collect
glib-compile-schemas $(BUILDDIR)/schemas
--
-2.20.1
+2.26.1
++++++ 0005-Makefile-allow-shipping-convenience.js.patch -> 0104-Makefile-allow-shipping-convenience.js.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0005-Makefile-allow-shipping-convenience.js.patch 2019-03-26 15:43:17.524214084 +0100
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0104-Makefile-allow-shipping-convenience.js.patch 2020-05-01 11:10:19.783452930 +0200
@@ -1,7 +1,7 @@
-From 4cf894b1968700808f948ecb0ce6d8c7e73969eb Mon Sep 17 00:00:00 2001
+From 3e7549901148c5b4687cad21595041bb8d9e5dd3 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Fri, 1 Mar 2019 14:50:03 +0100
-Subject: [PATCH 5/6] Makefile: allow shipping convenience.js
+Subject: [PATCH 104/130] Makefile: allow shipping convenience.js
This is for build environments that are offline and can't
fetch convenience.js from the net.
@@ -42,5 +42,5 @@
# And for the extension to work extension.js etc. need to be at the root.
mkdir -p $(DISTDIR);
--
-2.20.1
+2.26.1
++++++ 0004-metadata.json-mark-GNOME-3.30-as-supported.patch -> 0105-metadata.json-mark-GNOME-3.30-as-supported.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0004-metadata.json-mark-GNOME-3.30-as-supported.patch 2019-03-26 15:43:17.480214109 +0100
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0105-metadata.json-mark-GNOME-3.30-as-supported.patch 2020-05-01 11:10:20.651454818 +0200
@@ -1,7 +1,7 @@
-From 66a717d66082a51cb2c528fed36a7675f5f265e1 Mon Sep 17 00:00:00 2001
+From 3015ec1b2ded250839ee390dc849227feebe29a0 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Fri, 1 Mar 2019 14:29:33 +0100
-Subject: [PATCH 4/6] metadata.json: mark GNOME 3.30 as supported
+Subject: [PATCH 105/130] metadata.json: mark GNOME 3.30 as supported
---
data/metadata.json | 3 ++-
@@ -22,5 +22,5 @@
"url": "https://github.com/projecthamster/hamster-shell-extension.git",
"uuid": "contact(a)projecthamster.org",
--
-2.20.1
+2.26.1
++++++ 0106-Fix-installation-instructions-matches-Ubuntu-18.04-T.patch ++++++
>From d59f3f3694c1c7b63c771e22ac04e5d7d87e9552 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin(a)overtag.dk>
Date: Tue, 7 May 2019 19:35:00 +0200
Subject: [PATCH 106/130] Fix installation instructions (matches Ubuntu 18.04
Tweak tool)
---
Makefile | 2 +-
README.rst | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 8892a93..5e43e2a 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ dist: compile
# And for the extension to work extension.js etc. need to be at the root.
mkdir -p $(DISTDIR);
cd $(BUILDDIR); zip -rq ../dist/contact(a)projecthamster.org.zip ./*
- cd $(BUILDDIR); tar -czf ../dist/contact(a)projecthamster.org.tgz *
+ cd $(BUILDDIR); tar -czf ../dist/contact(a)projecthamster.org.tar.gz *
@ls -l dist
docs:
diff --git a/README.rst b/README.rst
index b12e26e..d51dc00 100644
--- a/README.rst
+++ b/README.rst
@@ -65,12 +65,17 @@ Build a fresh distribution package::
make dist
-This will create a distributable archive.
-You can now use the ``tweaktool`` (at the bottom of the ``extensions`` tab)
-to install and activate the new ``zip`` file located in the ``dist`` directory.
+This will create a distributable archive located in the ``dist/`` folder.
-Alternatively you just can unpack the tar archive to ``~/.local/share/gnome-shell/extensions/``.
-As a result, a directory named ``contact(a)projecthamster.org`` should be there now.
+Installing directly from file::
-After that you can enable the extension and change the preferences using Tweak
-Tool, or on ``https://extensions.gnome.org/local/``
+ # Build
+ make dist
+ # Remove any old installation
+ rm -rf ~/.local/share/gnome-shell/extensions/contact(a)projecthamster.org
+ # Create directory
+ mkdir -p ~/.local/share/gnome-shell/extensions/contact(a)projecthamster.org
+ # Unpack build
+ tar xfz dist/contact(a)projecthamster.org.tar.gz -C ~/.local/share/gnome-shell/extensions/contact(a)projecthamster.org
+
+Afterwards, enable the extension and change the preferences using Tweak Tool, or on ``https://extensions.gnome.org/local/``
--
2.26.1
++++++ 0107-metadata.json-remove-version-field.patch ++++++
>From 3966e79156cdc38a705375c441f6e0eb8952d87b Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Mon, 16 Mar 2020 11:53:45 +0100
Subject: [PATCH 107/130] metadata.json: remove "version" field
The "version" field in the extension meta data is reserved for internal
use on extensions.gnome.org. If at all, the version should be set to a
value that can be used as an argument to python's int() function, which
is not the case for the string we currently use.
The general recommendation is not to use "version" in metadata.json.
See e.g. https://gitlab.gnome.org/Infrastructure/extensions-web/issues/102#note_7401…
---
data/metadata.json | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/data/metadata.json b/data/metadata.json
index 83f2915..27b0a75 100644
--- a/data/metadata.json
+++ b/data/metadata.json
@@ -23,6 +23,5 @@
"3.30"
],
"url": "https://github.com/projecthamster/hamster-shell-extension.git",
- "uuid": "contact(a)projecthamster.org",
- "version": "0.10.0"
+ "uuid": "contact(a)projecthamster.org"
}
--
2.26.1
++++++ 0007-drop-convenience.js.patch -> 0108-drop-convenience.js.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0007-drop-convenience.js.patch 2019-05-12 11:43:52.943714449 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0108-drop-convenience.js.patch 2020-05-01 11:10:26.827468249 +0200
@@ -1,7 +1,7 @@
-From 6d1bdaa5174056ceaba1178cec7d0e25fea57302 Mon Sep 17 00:00:00 2001
+From a4c9ef8826b7f44c1397ae20a6993aad1e8a47b1 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 23:09:38 +0200
-Subject: [PATCH 07/18] drop convenience.js
+Subject: [PATCH 108/130] drop convenience.js
This functionality is provided by ExtensionUtils in GNOME 3.32.
---
@@ -11,7 +11,7 @@
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
-index cbc0eaa..e2b52b4 100644
+index 5e43e2a..1db55aa 100644
--- a/Makefile
+++ b/Makefile
@@ -55,10 +55,7 @@ clean-test-docs:
@@ -77,5 +77,5 @@
let vbox, label;
--
-2.21.0
+2.26.1
++++++ 0008-make-test-style-set-esversion-to-6-for-GNOME-3.32.patch -> 0109-make-test-style-set-esversion-to-6-for-GNOME-3.32.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0008-make-test-style-set-esversion-to-6-for-GNOME-3.32.patch 2019-05-12 11:43:54.243718266 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0109-make-test-style-set-esversion-to-6-for-GNOME-3.32.patch 2020-05-01 11:10:28.207471250 +0200
@@ -1,7 +1,7 @@
-From cafdaf6c8735c9e2c66abfaff8dab4a276b773a0 Mon Sep 17 00:00:00 2001
+From b6642c8943a7184e4bae6ac98b1ccc9ef3d6c47f Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 23:15:07 +0200
-Subject: [PATCH 08/18] make test-style: set esversion to 6 for GNOME 3.32
+Subject: [PATCH 109/130] make test-style: set esversion to 6 for GNOME 3.32
---
.jshint.cfg | 3 ++-
@@ -18,5 +18,5 @@
+ "esversion": 6
}
--
-2.21.0
+2.26.1
++++++ 0009-Mark-GNOME-3.32-as-supported-all-others-as-unsupport.patch -> 0110-Mark-GNOME-3.32-as-supported-all-others-as-unsupport.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0009-Mark-GNOME-3.32-as-supported-all-others-as-unsupport.patch 2019-05-12 11:43:56.435724702 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0110-Mark-GNOME-3.32-as-supported-all-others-as-unsupport.patch 2020-05-01 11:10:29.763474634 +0200
@@ -1,7 +1,8 @@
-From a86f648624f0ffd3d0083c733c858212aaaceaad Mon Sep 17 00:00:00 2001
+From 0968afbfb809a05b2b95e3c7a8ad3d9e614583d2 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 23:54:48 +0200
-Subject: [PATCH 09/18] Mark GNOME 3.32 as supported, all others as unsupported
+Subject: [PATCH 110/130] Mark GNOME 3.32 as supported, all others as
+ unsupported
The class syntax is unsupported in pre-ES6 versions, and
using ExtensionUtils instead of convenience.js is only possible
@@ -11,7 +12,7 @@
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/data/metadata.json b/data/metadata.json
-index 83f2915..edf6099 100644
+index 27b0a75..fbe5740 100644
--- a/data/metadata.json
+++ b/data/metadata.json
@@ -10,17 +10,7 @@
@@ -32,7 +33,7 @@
+ "3.32"
],
"url": "https://github.com/projecthamster/hamster-shell-extension.git",
- "uuid": "contact(a)projecthamster.org",
+ "uuid": "contact(a)projecthamster.org"
--
-2.21.0
+2.26.1
++++++ 0010-Port-GObject-classes-to-JS6-classes.patch -> 0111-Port-GObject-classes-to-JS6-classes.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0010-Port-GObject-classes-to-JS6-classes.patch 2019-05-12 11:43:57.583728072 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0111-Port-GObject-classes-to-JS6-classes.patch 2020-05-01 11:10:30.739476757 +0200
@@ -1,7 +1,10 @@
-From e2a5edf3d768a0219e6cc4296e1a419b251a8f49 Mon Sep 17 00:00:00 2001
+From 86b61b5d552754b58960fcea1afd886112337e18 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 16:10:40 +0200
-Subject: [PATCH 10/18] Port GObject classes to JS6 classes
+Subject: [PATCH 111/130] Port GObject classes to JS6 classes
+
+This patch is heavily based on original work by
+Ernestas Kulik <ekulik(a)redhat.com>.
This patch is required to make hamster-shell-extension work on
GNOME 3.32. At the same time, it breaks compatibility with older
@@ -9,8 +12,6 @@
See https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/361
Fixes https://github.com/projecthamster/hamster-shell-extension/issues/307
-
-Heavily based on work by Ernestas Kulik <ekulik(a)redhat.com>
---
extension/prefs.js | 24 +++++------
extension/widgets/categoryTotalsWidget.js | 18 ++++-----
@@ -482,5 +483,5 @@
+ }
});
--
-2.21.0
+2.26.1
++++++ 0011-add-jshint-validthis-to-silence-warnings-about-stric.patch -> 0112-add-jshint-validthis-to-silence-warnings-about-stric.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0011-add-jshint-validthis-to-silence-warnings-about-stric.patch 2019-05-12 11:43:58.731731443 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0112-add-jshint-validthis-to-silence-warnings-about-stric.patch 2020-05-01 11:10:32.047479601 +0200
@@ -1,8 +1,8 @@
-From 3135c6e58ec533b28e695840273f9a84e0b194d2 Mon Sep 17 00:00:00 2001
+From 63e00c973ad0db634ea56a78c2bea16c31497d0d Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 16:50:25 +0200
-Subject: [PATCH 11/18] add "jshint validthis" to silence warnings about strict
- mode
+Subject: [PATCH 112/130] add "jshint validthis" to silence warnings about
+ strict mode
I haven't found a more elegant way to fix these warnings,
which break "make test-style".
@@ -44,5 +44,5 @@
// not interested in the new id - this shuts up the warning
}));
--
-2.21.0
+2.26.1
++++++ 0012-todaysFactsWidget-add-missing-bind.patch -> 0113-todaysFactsWidget-add-missing-bind.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0012-todaysFactsWidget-add-missing-bind.patch 2019-05-12 11:44:02.099741331 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0113-todaysFactsWidget-add-missing-bind.patch 2020-05-01 11:10:34.659485282 +0200
@@ -1,7 +1,7 @@
-From bd99b78b720acf12426a64399fbcf59b91b7b3eb Mon Sep 17 00:00:00 2001
+From d7fdafd900db8879e9a7a098445edb8fd4e5a0cc Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 18:59:03 +0200
-Subject: [PATCH 12/18] todaysFactsWidget: add missing bind()
+Subject: [PATCH 113/130] todaysFactsWidget: add missing bind()
Without this, Lang.bind() in constructRow() throws the error
"Error: first argument to Lang.bind() must be an object, not undefined"
@@ -23,5 +23,5 @@
layout.pack(component, rowComponents.indexOf(component), rowCount);
}
--
-2.21.0
+2.26.1
++++++ 0013-replace-Lang.bind-with-function-.bind.patch -> 0114-replace-Lang.bind-with-function-.bind.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0013-replace-Lang.bind-with-function-.bind.patch 2019-05-12 11:44:05.331750820 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0114-replace-Lang.bind-with-function-.bind.patch 2020-05-01 11:10:36.495489275 +0200
@@ -1,7 +1,7 @@
-From ab5df1123857b3b1b6efc463f7bba7aa448192b7 Mon Sep 17 00:00:00 2001
+From 40d60553c99c7bafd36268039aa6a93c76c5cdc4 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 22:35:44 +0200
-Subject: [PATCH 13/18] replace Lang.bind() with $(function).bind()
+Subject: [PATCH 114/130] replace Lang.bind() with $(function).bind()
Code cleanup. Mostly gets rid of the Lang module.
Don't use arrow functions just yet.
@@ -327,5 +327,5 @@
layout.pack(component, rowComponents.indexOf(component), rowCount);
}
--
-2.21.0
+2.26.1
++++++ 0014-Port-non-GObject-class-to-JS6.patch -> 0115-Port-non-GObject-class-to-JS6.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0014-Port-non-GObject-class-to-JS6.patch 2019-05-12 11:44:07.635757584 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0115-Port-non-GObject-class-to-JS6.patch 2020-05-01 11:10:37.923492380 +0200
@@ -1,14 +1,15 @@
-From 9386973450e23e6d619c35fe563eb6cc6afb6935 Mon Sep 17 00:00:00 2001
+From 19e534a037a3c6ac94e94f810eb03fff8c82b3fb Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 23:44:04 +0200
-Subject: [PATCH 14/18] Port non-GObject class to JS6
+Subject: [PATCH 115/130] Port non-GObject class to JS6
+
+This patch is heavily based on original work by
+Ernestas Kulik <ekulik(a)redhat.com>.
Continue port to ES6 by converting the Controller class, too.
This is not strictly necessary to make the extension work,
but allows dropping the "Lang" module.
This patch deliberately breaks indentation, for ease of review.
-
-Heavily based on work by Ernestas Kulik <ekulik(a)redhat.com>
---
extension/extension.js | 65 ++++++++++++++++++------------------------
1 file changed, 28 insertions(+), 37 deletions(-)
@@ -159,5 +160,5 @@
--
-2.21.0
+2.26.1
++++++ 0015-extension.js-add-jshint-validthis-hints.patch -> 0116-extension.js-add-jshint-validthis-hints.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0015-extension.js-add-jshint-validthis-hints.patch 2019-05-12 11:44:10.707766604 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0116-extension.js-add-jshint-validthis-hints.patch 2020-05-01 11:10:38.683494033 +0200
@@ -1,7 +1,7 @@
-From 0dcf885a16a77b00885049fdd21b1d24909415f9 Mon Sep 17 00:00:00 2001
+From bcd75c9778d6dd6525565645085b093f3d3b826c Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 23:47:25 +0200
-Subject: [PATCH 15/18] extension.js: add jshint validthis hints
+Subject: [PATCH 116/130] extension.js: add jshint validthis hints
---
extension/extension.js | 2 ++
@@ -28,5 +28,5 @@
Main.notify(_("hamster-shell-extension: 'hamster-windows-service' not running. Shutting down."));
this.disable();
--
-2.21.0
+2.26.1
++++++ 0016-extension.js-fix-indentation-after-previous-change.patch -> 0117-extension.js-fix-indentation-after-previous-change.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0016-extension.js-fix-indentation-after-previous-change.patch 2019-05-12 11:44:12.099770690 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0117-extension.js-fix-indentation-after-previous-change.patch 2020-05-01 11:10:39.391495573 +0200
@@ -1,7 +1,7 @@
-From f284c2d1d9c55aa6be35c98a2dd7b5e5f8dc4a0b Mon Sep 17 00:00:00 2001
+From b9dca0f0ab4734e85323f571f7c7848f5b213377 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 23:49:53 +0200
-Subject: [PATCH 16/18] extension.js: fix indentation after previous change
+Subject: [PATCH 117/130] extension.js: fix indentation after previous change
Patch "Port non-GObject class to JS6" introduced indentation
problems. Fix them.
@@ -326,5 +326,5 @@
--
-2.21.0
+2.26.1
++++++ 0017-Don-t-log-ACTIVITIES-at-every-refresh.patch -> 0118-Don-t-log-ACTIVITIES-at-every-refresh.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0017-Don-t-log-ACTIVITIES-at-every-refresh.patch 2019-05-12 11:44:14.179776797 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0118-Don-t-log-ACTIVITIES-at-every-refresh.patch 2020-05-01 11:10:39.967496825 +0200
@@ -1,7 +1,7 @@
-From e40ec94eeebea0bd3bd25f5aeb102f3071dba833 Mon Sep 17 00:00:00 2001
+From f64600629f190b244549193a4737a9fc4575f3cc Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 9 May 2019 23:53:41 +0200
-Subject: [PATCH 17/18] Don't log ACTIVITIES at every refresh
+Subject: [PATCH 118/130] Don't log ACTIVITIES at every refresh
---
extension/extension.js | 2 +-
@@ -21,5 +21,5 @@
}
--
-2.21.0
+2.26.1
++++++ 0018-doc-remove-broken-link-to-usejsdoc.org.patch -> 0119-doc-remove-broken-link-to-usejsdoc.org.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0018-doc-remove-broken-link-to-usejsdoc.org.patch 2019-05-12 11:44:16.331783115 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0119-doc-remove-broken-link-to-usejsdoc.org.patch 2020-05-01 11:10:40.335497626 +0200
@@ -1,7 +1,7 @@
-From 0fc670a1bfe83e2e2b4e96c3e172557227a71b6f Mon Sep 17 00:00:00 2001
+From 3c7aae17c1989be7ff2085c5520bbca273b907d3 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Fri, 10 May 2019 00:35:27 +0200
-Subject: [PATCH 18/18] doc: remove broken link to usejsdoc.org
+Subject: [PATCH 119/130] doc: remove broken link to usejsdoc.org
The site seems to be down, and no obvious replacement exists.
This breaks the CI.
@@ -23,5 +23,5 @@
- Headings should capitalise each word.
- Please use ``-`` for unordered lists and ``#.`` for ordered lists unless you
--
-2.21.0
+2.26.1
++++++ 0019-factsBox-use-GObject.registerClass.patch -> 0120-factsBox-use-GObject.registerClass.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0019-factsBox-use-GObject.registerClass.patch 2019-10-23 15:51:38.950746416 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0120-factsBox-use-GObject.registerClass.patch 2020-05-01 11:10:40.775498583 +0200
@@ -1,7 +1,7 @@
-From 69af56aff2e49cf8888f70a761bfa281ad48ef95 Mon Sep 17 00:00:00 2001
+From 066234ad4793ec79c3a83c84dff08af5502f91d2 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Tue, 22 Oct 2019 16:50:13 +0200
-Subject: [PATCH 19/21] factsBox: use GObject.registerClass()
+Subject: [PATCH 120/130] factsBox: use GObject.registerClass()
For some reason I don't remember, just this class had been handled
differently in e2a5edf ("Port GObject classes to JS6 classes").
@@ -9,8 +9,6 @@
Fixes this problem:
gnome-shell[9973]: TypeError: this.factsBox.refresh is not a function
-
-Signed-off-by: Martin Wilck <mwilck(a)suse.com>
---
extension/widgets/factsBox.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
@@ -40,5 +38,5 @@
-};
+});
--
-2.23.0
+2.26.1
++++++ 0020-panelWidget-fix-object.actor-is-deprecated-warning.patch -> 0121-panelWidget-fix-object.actor-is-deprecated-warning.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0020-panelWidget-fix-object.actor-is-deprecated-warning.patch 2019-10-23 15:51:39.170746654 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0121-panelWidget-fix-object.actor-is-deprecated-warning.patch 2020-05-01 11:10:41.515500192 +0200
@@ -1,13 +1,11 @@
-From 5c88b3c79f192acc69a8e13d19be7469752fb01b Mon Sep 17 00:00:00 2001
+From 9f5a7201c2d8c40c5308cabf9c6d8ad35a6d3b05 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Tue, 22 Oct 2019 16:54:26 +0200
-Subject: [PATCH 20/21] panelWidget: fix "object.actor is deprecated" warning
+Subject: [PATCH 121/130] panelWidget: fix "object.actor is deprecated" warning
Fixes: gnome-shell[9973]: Usage of object.actor is deprecated for PanelWidget
See https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/487
-
-Signed-off-by: Martin Wilck <mwilck(a)suse.com>
---
extension/widgets/panelWidget.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
@@ -30,5 +28,5 @@
this.panelLabel = new St.Label({
text: _("Loading..."),
--
-2.23.0
+2.26.1
++++++ 0004-metadata.json-mark-GNOME-3.30-as-supported.patch -> 0122-metadata.json-mark-GNOME-3.34-as-supported.patch ++++++
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/0004-metadata.json-mark-GNOME-3.30-as-supported.patch 2019-03-26 15:43:17.480214109 +0100
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2738/0122-metadata.json-mark-GNOME-3.34-as-supported.patch 2020-05-01 11:10:42.203501688 +0200
@@ -1,26 +1,26 @@
-From 66a717d66082a51cb2c528fed36a7675f5f265e1 Mon Sep 17 00:00:00 2001
+From cb3feb29bd4c38eef727463379cfa9481886197a Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
-Date: Fri, 1 Mar 2019 14:29:33 +0100
-Subject: [PATCH 4/6] metadata.json: mark GNOME 3.30 as supported
+Date: Tue, 22 Oct 2019 16:55:54 +0200
+Subject: [PATCH 122/130] metadata.json: mark GNOME 3.34 as supported
---
data/metadata.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/metadata.json b/data/metadata.json
-index 5001f30..83f2915 100644
+index fbe5740..8150290 100644
--- a/data/metadata.json
+++ b/data/metadata.json
-@@ -19,7 +19,8 @@
- "3.22",
- "3.24",
- "3.26",
-- "3.28"
-+ "3.28",
-+ "3.30"
+@@ -10,7 +10,8 @@
+ "gettext-domain": "hamster-shell-extension",
+ "settings-schema": "org.gnome.shell.extensions.project-hamster",
+ "shell-version": [
+- "3.32"
++ "3.32",
++ "3.34"
],
"url": "https://github.com/projecthamster/hamster-shell-extension.git",
- "uuid": "contact(a)projecthamster.org",
+ "uuid": "contact(a)projecthamster.org"
--
-2.20.1
+2.26.1
++++++ 0123-Makefile-don-t-fail-if-zip-is-unavailable.patch ++++++
>From 5f7560a7efb82cedb8ce5cfe380131db4b1cbb0c Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Mon, 17 Feb 2020 15:49:10 +0100
Subject: [PATCH 123/130] Makefile: don't fail if zip is unavailable
zip is only necessary for uploading to extensions.GNOME.org.
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 1db55aa..8a71be7 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ dist: compile
# We need to do this like this as 'zip' always uses the cwd as archive root.
# And for the extension to work extension.js etc. need to be at the root.
mkdir -p $(DISTDIR);
- cd $(BUILDDIR); zip -rq ../dist/contact(a)projecthamster.org.zip ./*
+ cd $(BUILDDIR); zip -rq ../dist/contact(a)projecthamster.org.zip ./* || true
cd $(BUILDDIR); tar -czf ../dist/contact(a)projecthamster.org.tar.gz *
@ls -l dist
--
2.26.1
++++++ 0124-Makefile-collect-must-depend-on-build.patch ++++++
>From 8d32843ec80c6e26ee1a1b7d576e8ac69462bf3d Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Mon, 17 Feb 2020 17:19:04 +0100
Subject: [PATCH 124/130] Makefile: "collect" must depend on "build"
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 8a71be7..c8af827 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ clean-test-docs:
$(BUILDDIR):
mkdir -p $@
-collect:
+collect: $(BUILDDIR)
cp -R extension/* $(BUILDDIR)
cp -R data/* $(BUILDDIR)
--
2.26.1
++++++ 0125-todaysFactsWidget-replace-Clutter.TableLayout-with-C.patch ++++++
>From 4354ef06062b9bf209668d499de016522dc7a33f Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Wed, 11 Mar 2020 23:43:43 +0100
Subject: [PATCH 125/130] todaysFactsWidget: replace Clutter.TableLayout with
Clutter.GridLayout
Clutter.TableLayout has been deprecated in Clutter 1.18 and is not available
in GNOME shell 3.36 any more. It needs to be replaced with Clutter.GridLayout.
---
extension/widgets/todaysFactsWidget.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/extension/widgets/todaysFactsWidget.js b/extension/widgets/todaysFactsWidget.js
index deafbdc..9f327f6 100644
--- a/extension/widgets/todaysFactsWidget.js
+++ b/extension/widgets/todaysFactsWidget.js
@@ -45,7 +45,7 @@ class TodaysFactsWidget extends St.ScrollView {
this.factsBox.set_vertical(true);
this.facts_widget = new St.Widget({
style_class: 'hamster-activities',
- layout_manager: new Clutter.TableLayout(),
+ layout_manager: new Clutter.GridLayout(),
reactive: true
});
this.factsBox.add(this.facts_widget);
@@ -177,7 +177,7 @@ class TodaysFactsWidget extends St.ScrollView {
for (let fact of facts) {
let rowComponents = constructRow.bind(this)(fact, ongoingFact, this._controller, this._panelWidget.menu);
for (let component of rowComponents) {
- layout.pack(component, rowComponents.indexOf(component), rowCount);
+ layout.attach(component, rowComponents.indexOf(component), rowCount, 1, 1);
}
rowCount += 1;
}
--
2.26.1
++++++ 0126-Fix-GNOME-shell-error-message-about-factsBox.FactsBo.patch ++++++
>From 844062c0b008d5221e89a042238421d8fa1af45e Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Wed, 11 Mar 2020 23:41:33 +0100
Subject: [PATCH 126/130] Fix GNOME shell error message about factsBox.FactsBox
Fixes this error message:
gnome-shell[13339]: Some code accessed the property 'FactsBox' on the module
'factsBox'. That property was defined with 'let' or 'const' inside the
module. This was previously supported, but is not correct according to the ES6
standard. Any symbols to be exported from a module must be defined with
'var'. The property access will work as previously for the time being, but
please fix your code anyway.
---
extension/widgets/factsBox.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extension/widgets/factsBox.js b/extension/widgets/factsBox.js
index e524781..68c74b9 100644
--- a/extension/widgets/factsBox.js
+++ b/extension/widgets/factsBox.js
@@ -43,7 +43,7 @@ const TodaysFactsWidget = Me.imports.widgets.todaysFactsWidget.TodaysFactsWidget
* well as todays facts.
* @class
*/
-const FactsBox = GObject.registerClass(
+var FactsBox = GObject.registerClass(
class FactsBox extends PopupMenu.PopupBaseMenuItem {
_init(controller, panelWidget) {
super._init({reactive: false});
--
2.26.1
++++++ 0127-Makefile-configurable-extension-UUID.patch ++++++
>From dd5fa6015b6aca38fcfe2b4a3dd8618d7dacaa15 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Mon, 27 Apr 2020 12:52:58 +0200
Subject: [PATCH 127/130] Makefile: configurable extension UUID
We seem to have issues with the contact(a)projecthamster.org UUID.
GNOME shell 3.36 looks it up on extensions.gnome.org, finds
it to be "blacklisted", disables and deletes (!) it.
move data/metadata.json to data/metadata.json.in
So, make it possible to choose another UUID during build.
Simply run:
make UUID=my-nice-uuid(a)some.domain
This requires to create metadata.json from metadata.json.in.
---
Makefile | 17 +++++++++++++----
data/{metadata.json => metadata.json.in} | 2 +-
2 files changed, 14 insertions(+), 5 deletions(-)
rename data/{metadata.json => metadata.json.in} (93%)
diff --git a/Makefile b/Makefile
index c8af827..0e31de5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,8 @@ SPHINX_TEST_SPHINX_BUILDDIR = _test_build
BUILDDIR = build
# Directory to save a 'ready to deploy extension' archive
DISTDIR = dist
+# Extension "UUID" to use, default: contact(a)projecthamster.org
+UUID := contact(a)projecthamster.org
# Script to lauch a browser in order to open passed path.
define BROWSER_PYSCRIPT
@@ -40,9 +42,12 @@ help:
@echo " (Requires JSHint)."
@echo " test-docs to run automated tests on the documentation."
-clean: clean-build clean-docs clean-test-docs
+clean: clean-build clean-docs clean-test-docs clean-data
rm -f dist/*
+clean-data:
+ rm -f data/metadata.json
+
clean-build:
rm -fr build
@@ -55,9 +60,13 @@ clean-test-docs:
$(BUILDDIR):
mkdir -p $@
-collect: $(BUILDDIR)
+data/metadata.json: data/metadata.json.in
+ sed 's/@UUID@/"$(UUID)"/' $< >$@
+
+collect: $(BUILDDIR) data/metadata.json
cp -R extension/* $(BUILDDIR)
cp -R data/* $(BUILDDIR)
+ rm -f $(BUILDDIR)/metadata.json.in
compile: collect
glib-compile-schemas $(BUILDDIR)/schemas
@@ -76,8 +85,8 @@ dist: compile
# We need to do this like this as 'zip' always uses the cwd as archive root.
# And for the extension to work extension.js etc. need to be at the root.
mkdir -p $(DISTDIR);
- cd $(BUILDDIR); zip -rq ../dist/contact(a)projecthamster.org.zip ./* || true
- cd $(BUILDDIR); tar -czf ../dist/contact(a)projecthamster.org.tar.gz *
+ cd $(BUILDDIR); zip -rq ../dist/$(UUID).zip ./* || true
+ cd $(BUILDDIR); tar -czf ../dist/$(UUID).tar.gz *
@ls -l dist
docs:
diff --git a/data/metadata.json b/data/metadata.json.in
similarity index 93%
rename from data/metadata.json
rename to data/metadata.json.in
index 8150290..6818eea 100644
--- a/data/metadata.json
+++ b/data/metadata.json.in
@@ -14,5 +14,5 @@
"3.34"
],
"url": "https://github.com/projecthamster/hamster-shell-extension.git",
- "uuid": "contact(a)projecthamster.org"
+ "uuid": @UUID@,
}
--
2.26.1
++++++ 0128-metadata.json.in-mark-GNOME-3.36-supported.patch ++++++
>From aa7bcbe35ff5673f7194916b57ea391530b7ec3d Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Wed, 11 Mar 2020 23:55:55 +0100
Subject: [PATCH 128/130] metadata.json.in: mark GNOME 3.36 supported
This code works fine on 3.34, too.
---
data/metadata.json.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/metadata.json.in b/data/metadata.json.in
index 6818eea..8581b60 100644
--- a/data/metadata.json.in
+++ b/data/metadata.json.in
@@ -10,8 +10,8 @@
"gettext-domain": "hamster-shell-extension",
"settings-schema": "org.gnome.shell.extensions.project-hamster",
"shell-version": [
- "3.32",
- "3.34"
+ "3.34",
+ "3.36"
],
"url": "https://github.com/projecthamster/hamster-shell-extension.git",
"uuid": @UUID@,
--
2.26.1
++++++ 0129-README.rst-mention-the-GNOME-extensions-tool.patch ++++++
>From 88a3939555ebe34bbbdf2d46616fd7631c40680f Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 12 Mar 2020 00:20:44 +0100
Subject: [PATCH 129/130] README.rst: mention the GNOME "extensions" tool
---
README.rst | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/README.rst b/README.rst
index d51dc00..a8b35c2 100644
--- a/README.rst
+++ b/README.rst
@@ -78,4 +78,7 @@ Installing directly from file::
# Unpack build
tar xfz dist/contact(a)projecthamster.org.tar.gz -C ~/.local/share/gnome-shell/extensions/contact(a)projecthamster.org
-Afterwards, enable the extension and change the preferences using Tweak Tool, or on ``https://extensions.gnome.org/local/``
+Afterwards, enable the extension and change the preferences using Tweak Tool,
+or on ``https://extensions.gnome.org/local/``. On GNOME 3.36 and later, you
+can also use the GNOME "Extensions" tool.
+
--
2.26.1
++++++ 0130-README.rst-Add-a-section-about-UUID-changing.patch ++++++
>From e3b2a7b4008dc8ec21cfd0e4f555b96aebfcbc69 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Thu, 12 Mar 2020 00:30:19 +0100
Subject: [PATCH 130/130] README.rst: Add a section about UUID changing
The auto-blacklisting issue has been figured out by now
(https://github.com/projecthamster/hamster-shell-extension/issues/324),
It was caused by our non-integer "version" tag in metadata.json,
plus the fact that two version of the "contact(a)projecthamster.org"
extension had been uploaded to extensions.gnome.org, but were never
approved by a reviewer, plus the "extension auto-upgrade" feature
of GNOME shell 3.36.
Nevertheless, being able to change the UUID may be useful in the
future.
---
README.rst | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/README.rst b/README.rst
index a8b35c2..599f15d 100644
--- a/README.rst
+++ b/README.rst
@@ -82,3 +82,20 @@ Afterwards, enable the extension and change the preferences using Tweak Tool,
or on ``https://extensions.gnome.org/local/``. On GNOME 3.36 and later, you
can also use the GNOME "Extensions" tool.
+Changing the extension UUID
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+It's possible to change the "UUID" of the extension from
+``contact(a)projecthamster.org`` to a name of your choice. If you do this,
+you have to obey the `UUID Guidelines
+<https://wiki.gnome.org/Projects/GnomeShell/Extensions/UUIDGuidelines>`.
+This may become necessary in some cases if there are problems with the
+official UUID on `https://extensions.gnome.org`.
+
+To change the UUID, pass it to ``make dist`` in the instructions above::
+
+ # Build
+ make dist UUID="my_uuid(a)my.domain"
+
+The rest of the build procedure is like above, except that you have to replace
+``contact(a)projecthamster.org`` by your new UUID everywhere.
--
2.26.1
++++++ 0131-metadata.json.in-fix-json-syntax-error.patch ++++++
>From f3cae0904c419146c1a9b0730953257506e04a49 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Tue, 28 Apr 2020 14:23:03 +0200
Subject: [PATCH] metadata.json.in: fix json syntax error
Fixes: 4bfd241ae541 ("Makefile: configurable extension UUID")
---
data/metadata.json.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/metadata.json.in b/data/metadata.json.in
index 8581b60..0eef4e1 100644
--- a/data/metadata.json.in
+++ b/data/metadata.json.in
@@ -14,5 +14,5 @@
"3.36"
],
"url": "https://github.com/projecthamster/hamster-shell-extension.git",
- "uuid": @UUID@,
+ "uuid": @UUID@
}
--
2.26.2
++++++ 0132-ongoingFactEntry-stop-using-deprecated-Clutter-key-s.patch ++++++
>From d217d6ef4f1d3a1659ab3a879530bb18e1ce257b Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Tue, 28 Apr 2020 16:56:00 +0200
Subject: [PATCH 132/133] ongoingFactEntry: stop using deprecated Clutter key
symbols
"Clutter.Backspace" must be replaced by "Clutter.KEY_BackSpace", etc.
See https://github.com/GNOME/gnome-shell/commit/d3d165243c8457cc65e8864cee493f2…
---
extension/widgets/ongoingFactEntry.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extension/widgets/ongoingFactEntry.js b/extension/widgets/ongoingFactEntry.js
index 688aa6b..00d24ac 100644
--- a/extension/widgets/ongoingFactEntry.js
+++ b/extension/widgets/ongoingFactEntry.js
@@ -88,7 +88,7 @@ class OngoingFactEntry extends St.Entry {
* Check if the passed key is on our list of keys to be ignored.
*/
function checkIfIgnoredKey(key) {
- let ignoreKeys = [Clutter.BackSpace, Clutter.Delete, Clutter.Escape];
+ let ignoreKeys = [Clutter.KEY_BackSpace, Clutter.KEY_Delete, Clutter.KEY_Escape];
// Looks like there is realy no ``Array.includes()`` available as
// of now.
let result = ignoreKeys.indexOf(key);
--
2.26.2
1
0
Hello community,
here is the log from the commit of package marble for openSUSE:Factory checked in at 2020-05-01 11:09:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/marble (Old)
and /work/SRC/openSUSE:Factory/.marble.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "marble"
Fri May 1 11:09:34 2020 rev:126 rq:797043 version:20.04.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/marble/marble.changes 2020-03-12 23:08:16.155228305 +0100
+++ /work/SRC/openSUSE:Factory/.marble.new.2738/marble.changes 2020-05-01 11:10:08.735428904 +0200
@@ -1,0 +2,28 @@
+Thu Apr 23 12:23:13 UTC 2020 - Luca Beltrame <lbeltrame(a)kde.org>
+
+- Update to 20.04.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2020-04-apps-update
+- No code change since 20.03.90
+
+-------------------------------------------------------------------
+Sun Apr 5 20:30:43 UTC 2020 - Luca Beltrame <lbeltrame(a)kde.org>
+
+- Update to 20.03.90
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/20.04-rc
+- Changes since 20.03.80:
+ * Fix build with Qt 5.15
+
+-------------------------------------------------------------------
+Sun Mar 22 09:17:40 UTC 2020 - Luca Beltrame <lbeltrame(a)kde.org>
+
+- Update to 20.03.80
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/20.04-beta
+- Too many changes to list here.
+
+-------------------------------------------------------------------
Old:
----
marble-19.12.3.tar.xz
marble-19.12.3.tar.xz.sig
New:
----
marble-20.04.0.tar.xz
marble-20.04.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ marble.spec ++++++
--- /var/tmp/diff_new_pack.pOhjlS/_old 2020-05-01 11:10:11.531434984 +0200
+++ /var/tmp/diff_new_pack.pOhjlS/_new 2020-05-01 11:10:11.535434993 +0200
@@ -1,7 +1,7 @@
#
# spec file for package marble
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: marble
-Version: 19.12.3
+Version: 20.04.0
Release: 0
Summary: Generic map viewer
# License note: the tools directory contains GPL-3 tools, but they are neither built nor installed by the package
@@ -31,30 +31,26 @@
Group: Amusements/Teaching/Other
URL: https://edu.kde.org
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{ve…
-%if %{with lang}
-Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{ve…
-Source2: applications.keyring
-%endif
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: gpsd-devel
+BuildRequires: kf5-filesystem
+BuildRequires: libqt5-qtlocation-devel
+BuildRequires: libshp-devel
+BuildRequires: perl
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5Crash)
BuildRequires: cmake(KF5DocTools)
-BuildRequires: kf5-filesystem
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5NewStuff)
BuildRequires: cmake(KF5Parts)
+BuildRequires: cmake(KF5Plasma)
BuildRequires: cmake(KF5Runner)
BuildRequires: cmake(KF5Service)
BuildRequires: cmake(KF5Wallet)
BuildRequires: cmake(KF5WindowSystem)
-BuildRequires: libqt5-qtlocation-devel
-BuildRequires: libshp-devel
-BuildRequires: perl
BuildRequires: cmake(Phonon4Qt5)
-BuildRequires: cmake(KF5Plasma)
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus)
@@ -75,13 +71,17 @@
Requires: libmarblewidget-qt5%{_so} = %{version}
Requires: marble-frontend = %{version}
Recommends: %{name}-doc = %{version}
+Recommends: %{name}-lang
Obsoletes: marble5 < %{version}
Provides: marble5 < %{version}
+%if %{with lang}
+Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{ve…
+Source2: applications.keyring
+%endif
%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64
# Only include WebEngine on platforms where it is available
BuildRequires: cmake(Qt5WebEngineWidgets)
%endif
-Recommends: %{name}-lang
%description
Marble is a viewer of map data.
@@ -100,7 +100,7 @@
Summary: The KDE optimized frontend for Marble and several Plasmoids/Wallpapers
Group: Amusements/Teaching/Other
Requires: %{name} = %{version}
-Supplements: packageand(marble:plasma5-desktop)
+Supplements: (marble and plasma5-desktop)
Conflicts: marble-frontend
Provides: marble-frontend = %{version}
++++++ marble-19.12.3.tar.xz -> marble-20.04.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/marble/marble-19.12.3.tar.xz /work/SRC/openSUSE:Factory/.marble.new.2738/marble-20.04.0.tar.xz differ: char 25, line 1
1
0
Hello community,
here is the log from the commit of package kmouth for openSUSE:Factory checked in at 2020-05-01 11:09:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmouth (Old)
and /work/SRC/openSUSE:Factory/.kmouth.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmouth"
Fri May 1 11:09:28 2020 rev:105 rq:796967 version:20.04.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmouth/kmouth.changes 2020-03-12 23:05:12.795155910 +0100
+++ /work/SRC/openSUSE:Factory/.kmouth.new.2738/kmouth.changes 2020-05-01 11:09:55.195399457 +0200
@@ -1,0 +2,33 @@
+Thu Apr 23 12:22:38 UTC 2020 - Luca Beltrame <lbeltrame(a)kde.org>
+
+- Update to 20.04.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2020-04-apps-update
+- No code change since 20.03.90
+
+-------------------------------------------------------------------
+Sun Apr 5 20:30:15 UTC 2020 - Luca Beltrame <lbeltrame(a)kde.org>
+
+- Update to 20.03.90
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/20.04-rc
+- No code change since 20.03.80
+
+-------------------------------------------------------------------
+Sun Mar 22 09:17:11 UTC 2020 - Luca Beltrame <lbeltrame(a)kde.org>
+
+- Update to 20.03.80
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/20.04-beta
+- Changes since 19.12.3:
+ * [ca]: Added Catalan phrasebooks
+ * Make it compile against qt5.15
+ * Don't use nullptr as flag value
+ * Fix link: ui.html -> menus.html
+ * Use the new connect syntax
+ * Use URLs with transport encryption
+
+-------------------------------------------------------------------
Old:
----
kmouth-19.12.3.tar.xz
kmouth-19.12.3.tar.xz.sig
New:
----
kmouth-20.04.0.tar.xz
kmouth-20.04.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmouth.spec ++++++
--- /var/tmp/diff_new_pack.xEKyRT/_old 2020-05-01 11:09:57.343404129 +0200
+++ /var/tmp/diff_new_pack.xEKyRT/_new 2020-05-01 11:09:57.343404129 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kmouth
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,19 +21,18 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: kmouth
-Version: 19.12.3
+Version: 20.04.0
Release: 0
Summary: Speech Synthesizer Frontend
License: GPL-2.0-or-later
Group: System/GUI/KDE
URL: https://www.kde.org
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{ve…
-%if %{with lang}
-Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{ve…
-Source2: applications.keyring
-%endif
BuildRequires: alsa-devel
BuildRequires: extra-cmake-modules
+BuildRequires: libspeechd-devel
+BuildRequires: sbl
+BuildRequires: update-desktop-files
BuildRequires: cmake(KF5Completion)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5ConfigWidgets)
@@ -44,9 +43,6 @@
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5XmlGui)
-BuildRequires: libspeechd-devel
-BuildRequires: sbl
-BuildRequires: update-desktop-files
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5PrintSupport)
BuildRequires: cmake(Qt5TextToSpeech)
@@ -55,6 +51,10 @@
Recommends: %{name}-lang
Provides: kde4-kmouth = 4.3.0
Obsoletes: kde4-kmouth < 4.3.0
+%if %{with lang}
+Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{ve…
+Source2: applications.keyring
+%endif
%description
The computer "speaks" the entered text for talking with people.
++++++ kmouth-19.12.3.tar.xz -> kmouth-20.04.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/CMakeLists.txt new/kmouth-20.04.0/CMakeLists.txt
--- old/kmouth-19.12.3/CMakeLists.txt 2020-03-03 01:16:24.000000000 +0100
+++ new/kmouth-20.04.0/CMakeLists.txt 2020-04-17 02:29:49.000000000 +0200
@@ -41,10 +41,7 @@
include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
- add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
- add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
-endif()
+
add_subdirectory( doc )
add_subdirectory( icons )
add_subdirectory( books )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/COPYING.DOC new/kmouth-20.04.0/COPYING.DOC
--- old/kmouth-19.12.3/COPYING.DOC 2020-01-31 08:22:07.000000000 +0100
+++ new/kmouth-20.04.0/COPYING.DOC 2020-04-09 10:57:11.000000000 +0200
@@ -355,7 +355,7 @@
of the GNU Free Documentation License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns. See
-http://www.gnu.org/copyleft/.
+https://www.gnu.org/copyleft/.
Each version of the License is given a distinguishing version number.
If the Document specifies that a particular numbered version of this
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/books/CMakeLists.txt new/kmouth-20.04.0/books/CMakeLists.txt
--- old/kmouth-19.12.3/books/CMakeLists.txt 2020-01-31 08:22:07.000000000 +0100
+++ new/kmouth-20.04.0/books/CMakeLists.txt 2020-04-09 10:57:11.000000000 +0200
@@ -1,4 +1,5 @@
+install( FILES ca.desktop ca-courteousness.phrasebook ca-greetings.phrasebook ca-howareyou.phrasebook ca-personal.phrasebook DESTINATION ${DATA_INSTALL_DIR}/kmouth/books/ca )
install( FILES de.desktop de-courteousness.phrasebook de-greetings.phrasebook de-howareyou.phrasebook de-personal.phrasebook DESTINATION ${DATA_INSTALL_DIR}/kmouth/books/de )
install( FILES sv.desktop sv-courteousness.phrasebook sv-greetings.phrasebook sv-howareyou.phrasebook sv-personal.phrasebook DESTINATION ${DATA_INSTALL_DIR}/kmouth/books/sv )
install( FILES en.desktop en-courteousness.phrasebook en-greetings.phrasebook en-howareyou.phrasebook en-personal.phrasebook DESTINATION ${DATA_INSTALL_DIR}/kmouth/books/en )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/books/ca-courteousness.phrasebook new/kmouth-20.04.0/books/ca-courteousness.phrasebook
--- old/kmouth-19.12.3/books/ca-courteousness.phrasebook 1970-01-01 01:00:00.000000000 +0100
+++ new/kmouth-20.04.0/books/ca-courteousness.phrasebook 2020-04-09 10:57:11.000000000 +0200
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE phrasebook>
+<phrasebook name="Cortesia">
+<phrase shortcut="">Gràcies!</phrase>
+<phrase shortcut="">Gràcies a tu!</phrase>
+<phrase shortcut="">Moltes gràcies!</phrase>
+<phrase shortcut="">És tot un detall!</phrase>
+<phrase shortcut="">Si us plau.</phrase>
+<phrase shortcut="">Aquí estàs!</phrase>
+<phrase shortcut="">Benvingut!</phrase>
+<phrase shortcut="">Bon profit!</phrase>
+<phrase shortcut="">No hi ha cap problema.</phrase>
+<phrase shortcut="">Disculpa'm.</phrase>
+<phrase shortcut="">Ho sento.</phrase>
+<phrase shortcut="">Perdó.</phrase>
+</phrasebook>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/books/ca-greetings.phrasebook new/kmouth-20.04.0/books/ca-greetings.phrasebook
--- old/kmouth-19.12.3/books/ca-greetings.phrasebook 1970-01-01 01:00:00.000000000 +0100
+++ new/kmouth-20.04.0/books/ca-greetings.phrasebook 2020-04-09 10:57:11.000000000 +0200
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE phrasebook>
+<phrasebook name="Salutacions">
+<phrase shortcut="">Hola.</phrase>
+<phrase shortcut="">Bon dia.</phrase>
+<phrase shortcut="">Bona tarda.</phrase>
+<phrase shortcut="">Bona nit.</phrase>
+<phrase shortcut="">Quina alegria! Vine, seu a la meva vora.</phrase>
+<phrase shortcut="">Déu vos guard.</phrase>
+<phrase shortcut="">Benvolgut amic.</phrase>
+<phrase shortcut="">Company.</phrase>
+<phrase shortcut="">Companya.</phrase>
+<phrase shortcut="">Adeu!</phrase>
+<phrase shortcut="">A reveure!</phrase>
+<phrase shortcut="">Passi-ho bé!</phrase>
+<phrase shortcut="">Salut!</phrase>
+<phrase shortcut="">Et veig després!</phrase>
+<phrase shortcut="">Cuida't!</phrase>
+<phrase shortcut="">No et menystinguis.</phrase>
+</phrasebook>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/books/ca-howareyou.phrasebook new/kmouth-20.04.0/books/ca-howareyou.phrasebook
--- old/kmouth-19.12.3/books/ca-howareyou.phrasebook 1970-01-01 01:00:00.000000000 +0100
+++ new/kmouth-20.04.0/books/ca-howareyou.phrasebook 2020-04-09 10:57:11.000000000 +0200
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE phrasebook>
+<phrasebook name="Com estàs?">
+<phrase shortcut="">Com estàs?</phrase>
+<phrase shortcut="">Com ho fas?</phrase>
+<phrase shortcut="">Estic bé.</phrase>
+<phrase shortcut="">És un bon dia.</phrase>
+<phrase shortcut="">Avui em sento incòmode.</phrase>
+<phrase shortcut="">M'avorreixo, però a part d'això estic bé.</phrase>
+<phrase shortcut="">Avui el dolor és força fort.</phrase>
+<phrase shortcut="">Avui realment em sento malament.</phrase>
+<phrase shortcut="">Què hi ha de nou?</phrase>
+</phrasebook>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/books/ca-personal.phrasebook new/kmouth-20.04.0/books/ca-personal.phrasebook
--- old/kmouth-19.12.3/books/ca-personal.phrasebook 1970-01-01 01:00:00.000000000 +0100
+++ new/kmouth-20.04.0/books/ca-personal.phrasebook 2020-04-09 10:57:11.000000000 +0200
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE phrasebook>
+<phrasebook name="Personal">
+<phrase shortcut="">Només puc parlar usant aquesta estúpida màquina.</phrase>
+<phrase shortcut="">Ho sento, estic força cansat i ara necessito descansar.</phrase>
+<phrase shortcut="">Gràcies per venir.</phrase>
+<phrase shortcut="">És bo veure't.</phrase>
+<phrase shortcut="">Va ser molt agradable conversar amb tu.</phrase>
+<phrase shortcut="">Quan vindràs de nou?</phrase>
+<phrase shortcut="">Vinga! Ja és hora de tornar al llit.</phrase>
+</phrasebook>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/books/ca.desktop new/kmouth-20.04.0/books/ca.desktop
--- old/kmouth-19.12.3/books/ca.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/kmouth-20.04.0/books/ca.desktop 2020-04-09 10:57:11.000000000 +0200
@@ -0,0 +1,27 @@
+# KDE Config File
+[Desktop Entry]
+Name=Catalan
+Name[ca]=Català
+Name[ca@valencia]=Català
+Name[cs]=Katalánský
+Name[da]=Catalansk
+Name[de]=Katalanisch
+Name[en_GB]=Catalan
+Name[es]=Catalán
+Name[et]=Katalaani
+Name[eu]=Katalana
+Name[fr]=Catalan
+Name[gl]=Catalán
+Name[it]=Catalano
+Name[ko]=카탈루냐어
+Name[nl]=Catalaans
+Name[nn]=Katalansk
+Name[pt]=Catalão
+Name[pt_BR]=Catalão
+Name[ru]=Каталонский
+Name[sk]=Katalánsky
+Name[sv]=Katalanska
+Name[uk]=Каталанська
+Name[x-test]=xxCatalanxx
+Name[zh_CN]=加泰罗尼亚语
+Name[zh_TW]=加泰隆尼亞語
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/doc/index.docbook new/kmouth-20.04.0/doc/index.docbook
--- old/kmouth-19.12.3/doc/index.docbook 2020-01-31 08:22:07.000000000 +0100
+++ new/kmouth-20.04.0/doc/index.docbook 2020-04-09 10:57:11.000000000 +0200
@@ -558,8 +558,8 @@
</variablelist>
<para>
&kmouth; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu>
-menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings"
->Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink>
+menu items, for more information read the sections about the <ulink url="help:/fundamentals/menus.html#menus-settings"
+>Settings Menu</ulink> and <ulink url="help:/fundamentals/menus.html#menus-help">Help Menu</ulink>
of the &kde; Fundamentals.
</para>
</sect2>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/doc/man-kmouth.1.docbook new/kmouth-20.04.0/doc/man-kmouth.1.docbook
--- old/kmouth-19.12.3/doc/man-kmouth.1.docbook 2020-01-31 08:22:07.000000000 +0100
+++ new/kmouth-20.04.0/doc/man-kmouth.1.docbook 2020-04-09 10:57:11.000000000 +0200
@@ -63,7 +63,7 @@
<parameter>help:/kmouth</parameter></userinput>).</para>
<para>There is also further information available at the <ulink
-url="http://accessibility.kde.org/">&kde; Accessibility project web
+url="https://community.kde.org/Accessibility">&kde; Accessibility project web
site</ulink>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/org.kde.kmouth.appdata.xml new/kmouth-20.04.0/org.kde.kmouth.appdata.xml
--- old/kmouth-19.12.3/org.kde.kmouth.appdata.xml 2020-01-31 08:22:07.000000000 +0100
+++ new/kmouth-20.04.0/org.kde.kmouth.appdata.xml 2020-04-09 10:57:11.000000000 +0200
@@ -4,6 +4,7 @@
<metadata_license>FSFAP</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>KMouth</name>
+ <name xml:lang="ast">KMouth</name>
<name xml:lang="ca">KMouth</name>
<name xml:lang="ca-valencia">KMouth</name>
<name xml:lang="cs">KMouth</name>
@@ -34,6 +35,7 @@
<name xml:lang="zh-CN">KMouth</name>
<name xml:lang="zh-TW">KMouth</name>
<summary>Speech Synthesizer Frontend</summary>
+ <summary xml:lang="ast">Frontal pa la sintetización de voz</summary>
<summary xml:lang="ca">Frontal del sintetitzador de veu</summary>
<summary xml:lang="ca-valencia">Frontal del sintetitzador de veu</summary>
<summary xml:lang="cs">Rozhraní hlasového syntezátoru</summary>
@@ -67,6 +69,7 @@
<p>
KMouth is a program which enables persons that cannot speak to let their computer speak, e.g. mute people or people who have lost their voice. It has a text input field and speaks the sentences that you enter. It also has support for user defined phrasebooks.
</p>
+ <p xml:lang="ast">Kmoth ye un programa que permite a les persones mudes usar l'ordenador como falante. Tien un campu pa introducir testu que se diz automáticamente al escribilu. Tamién sofita llibros de frases definíos pol usuariu.</p>
<p xml:lang="ca">El KMouth és un programa que habilita a les persones que no poden parlar a que ho faci el seu ordinador, p. ex. la gent muda o la gent que ha perdut la seva veu. Té un camp d'entrada de text i pronuncia les frases que s'introdueixen. També permet llibres de frases definits per l'usuari.</p>
<p xml:lang="ca-valencia">El KMouth és un programa que habilita a les persones que no poden parlar a que ho faça el seu ordinador, p. ex. la gent muda o la gent que ha perdut la seua veu. Té un camp d'entrada de text i pronuncia les frases que s'introdueixen. També permet llibres de frases definits per l'usuari.</p>
<p xml:lang="da">KMouth er et program som gør det muligt for personer der ikke kan tale, at lade deres computer tale. F.eks. stumme personer som har mistet stemmen. Den har et tekstindtastningsfelt og læser de sætninger du skriver op. Det understøttes også brugerdefinerede frasebøger.</p>
@@ -81,7 +84,7 @@
<p xml:lang="gl">KMouth é un programa que permite ás persoas que non poden falar que fagan que o seu computador fale, como a xente muda ou a xente que perdeu a voz. Ten un campo de entrada de texto e pronuncia as frases que se escriben. Tamén permite libros de frases definidos polo usuario.</p>
<p xml:lang="id">KMouth adalah program yang memungkinkan orang yang tidak dapat berbicara untuk membiarkan komputernya yang berbicara, misal orang bisu atau orang yang kehilangan suaranya. Ia memiliki bidang input teks dan mengucapkan kalimat yang kamu masukkan. Ia juga memiliki dukungan untuk buku ungkapan yang ditentukan pengguna.</p>
<p xml:lang="it">KMouth è un programma che permette alle persone che non possono parlare di farlo attraverso il computer, ad esempio le persone mute o quelle che hanno perso la voce. Ha un campo di inserimento testuale, e pronuncia le frasi che inserisci. Ha anche il supporto ad un frasario definito dall'utente.</p>
- <p xml:lang="ko">KMouth는 청각 장애인이나 목소리를 잃은 사람들이 하고 싶은 말을 컴퓨터가 대신 할 수 있도록 도와 줍니다. 입력하는 텍스트를 말해 주는 인터페이스를 가지고 있으며 사용자 정의 상용구를 설정할 수 있습니다.</p>
+ <p xml:lang="ko">KMouth는 청각 장애인이나 목소리를 잃은 사람이 하고 싶은 말을 컴퓨터가 대신 할 수 있도록 도와 줍니다. 입력하는 텍스트를 말해 주는 인터페이스를 가지고 있으며 사용자 정의 상용구를 설정할 수 있습니다.</p>
<p xml:lang="nl">KMouth is een programma die personen die niet kunnen spreken om hun computer te laten spreken, bijv. mensen zonder stem of mensen die hun stem hebben verloren. Het heeft een tekst invoerveld en spreekt de zinnen uit die u invoert. Het ondersteunt ook gebruikergedefinieerde boeken met frasen.</p>
<p xml:lang="nn">KMouth er eit program som gjer det mogleg for folk som ikkje sjølve kan tala å la datamaskina tala. Det har eit skrivefelt og les opp setningane du skriv inn. Det har òg støtte for brukardefinerte parlørar.</p>
<p xml:lang="pl">KMouth jest programem, który umożliwia mówienie ludziom nie mogącym mówić, np. niemym lub takim którzy utracili głos. Posiada pole do wpisywania tekstu i wypowiada zdania po ich wpisaniu. Obsługuje także książkę wyrażeń określoną przez użytkownika.</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/phrasebook/phrasebook.cpp new/kmouth-20.04.0/phrasebook/phrasebook.cpp
--- old/kmouth-19.12.3/phrasebook/phrasebook.cpp 2020-01-31 08:22:07.000000000 +0100
+++ new/kmouth-20.04.0/phrasebook/phrasebook.cpp 2020-04-09 10:57:11.000000000 +0200
@@ -159,7 +159,7 @@
{
PhraseBookParser parser;
QXmlSimpleReader reader;
- reader.setFeature(QStringLiteral("http://trolltech.com/xml/features/report-start-end-entity"), true);
+ reader.setFeature(QStringLiteral("http://qt-project.org/xml/features/report-start-end-entity"), true);
reader.setContentHandler(&parser);
if (reader.parse(source)) {
@@ -309,10 +309,10 @@
bool result;
if (fdlg.selectedNameFilter() == QLatin1String("*.phrasebook")) {
- if (url.fileName(nullptr).contains(QLatin1Char('.')) == 0) {
+ if (url.fileName(QUrl::PrettyDecoded).contains(QLatin1Char('.')) == 0) {
url = url.adjusted(QUrl::RemoveFilename);
- url.setPath(url.path() + url.fileName(nullptr) + QStringLiteral(".phrasebook"));
- } else if (url.fileName(nullptr).rightRef(11).contains(QLatin1String(".phrasebook"), Qt::CaseInsensitive) == 0) {
+ url.setPath(url.path() + url.fileName(QUrl::PrettyDecoded) + QStringLiteral(".phrasebook"));
+ } else if (url.fileName(QUrl::PrettyDecoded).rightRef(11).contains(QLatin1String(".phrasebook"), Qt::CaseInsensitive) == 0) {
int filetype = KMessageBox::questionYesNoCancel(nullptr, QStringLiteral("<qt>%1</qt>").arg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. "
"Do you wish to add <i>.phrasebook</i> to the filename?", url.fileName())), i18n("File Extension"), KGuiItem(i18n("Add")), KGuiItem(i18n("Do Not Add")));
if (filetype == KMessageBox::Cancel) {
@@ -320,12 +320,12 @@
}
if (filetype == KMessageBox::Yes) {
url = url.adjusted(QUrl::RemoveFilename);
- url.setPath(url.path() + url.fileName(nullptr) + QStringLiteral(".phrasebook"));
+ url.setPath(url.path() + url.fileName(QUrl::PrettyDecoded) + QStringLiteral(".phrasebook"));
}
}
result = save(url, true);
} else if (fdlg.selectedNameFilter() == QLatin1String("*.txt")) {
- if (url.fileName(nullptr).rightRef(11).contains(QLatin1String(".phrasebook"), Qt::CaseInsensitive) == 0) {
+ if (url.fileName(QUrl::PrettyDecoded).rightRef(11).contains(QLatin1String(".phrasebook"), Qt::CaseInsensitive) == 0) {
result = save(url, false);
} else {
int filetype = KMessageBox::questionYesNoCancel(nullptr, QStringLiteral("<qt>%1</qt>").arg(i18n("Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>. "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/ca/docs/kmouth/index.docbook new/kmouth-20.04.0/po/ca/docs/kmouth/index.docbook
--- old/kmouth-19.12.3/po/ca/docs/kmouth/index.docbook 2020-03-03 01:16:22.000000000 +0100
+++ new/kmouth-20.04.0/po/ca/docs/kmouth/index.docbook 2020-04-17 02:29:47.000000000 +0200
@@ -650,11 +650,11 @@
>Arranjament</guimenu
> i <guimenu
>Ajuda</guimenu
->, per obtenir més informació llegiu les seccions sobre <ulink url="help:/fundamentals/ui.html#menus-settings"
+>, per obtenir més informació llegiu les seccions sobre <ulink url="help:/fundamentals/menus.html#menus-settings"
>El menú Arranjament</ulink
-> i <ulink url="help:/fundamentals/ui.html#menus-help"
+> i <ulink url="help:/fundamentals/menus.html#menus-help"
>El menú Ajuda</ulink
-> dels fonaments del &kde;. </para>
+> dels Fonaments del &kde;. </para>
</sect2>
</sect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/ca/docs/kmouth/man-kmouth.1.docbook new/kmouth-20.04.0/po/ca/docs/kmouth/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/ca/docs/kmouth/man-kmouth.1.docbook 2020-03-03 01:16:22.000000000 +0100
+++ new/kmouth-20.04.0/po/ca/docs/kmouth/man-kmouth.1.docbook 2020-04-17 02:29:47.000000000 +0200
@@ -95,7 +95,7 @@
>).</para>
<para
->També hi ha informació disponible en la <ulink url="http://accessibility.kde.org/"
+>També hi ha informació disponible en la <ulink url="https://community.kde.org/Accessibility"
>pàgina principal del projecte d'accessibilitat del &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/ca/docs/man-kmouth.1.docbook new/kmouth-20.04.0/po/ca/docs/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/ca/docs/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/ca/docs/man-kmouth.1.docbook 2020-04-17 02:29:47.000000000 +0200
@@ -95,7 +95,7 @@
>).</para>
<para
->També hi ha informació disponible en la <ulink url="http://accessibility.kde.org/"
+>També hi ha informació disponible en la <ulink url="https://community.kde.org/Accessibility"
>pàgina principal del projecte d'accessibilitat del &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/de/docs/kmouth/index.docbook new/kmouth-20.04.0/po/de/docs/kmouth/index.docbook
--- old/kmouth-19.12.3/po/de/docs/kmouth/index.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/de/docs/kmouth/index.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -664,9 +664,9 @@
>Einstellungen</guimenu
> und <guimenu
>Hilfe</guimenu
->. Mehr dazu erfahren Sie in den Abschnitten zu den Menüs <ulink url="help:/fundamentals/ui.html#menus-settings"
+>. Mehr dazu erfahren Sie in den Abschnitten zu den Menüs <ulink url="help:/fundamentals/menus.html#menus-settings"
>Einstellungen</ulink
-> und <ulink url="help:/fundamentals/ui.html#menus-help"
+> und <ulink url="help:/fundamentals/menus.html#menus-help"
>Hilfe</ulink
> in den &kde;-Grundlagen. </para>
</sect2>
@@ -1076,8 +1076,7 @@
>Übersetzung Burkhard Lück <email
>lueck(a)hube-lueck.de</email
></para
->
-&underFDL; &underGPL; </chapter>
+> &underFDL; &underGPL; </chapter>
<!--
<appendix id="tts">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/de/docs/kmouth/man-kmouth.1.docbook new/kmouth-20.04.0/po/de/docs/kmouth/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/de/docs/kmouth/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/de/docs/kmouth/man-kmouth.1.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -97,7 +97,7 @@
>).</para>
<para
->Weitere Informationen finden Sie außerdem auf der <ulink url="http://accessibility.kde.org/"
+>Weitere Informationen finden Sie außerdem auf der <ulink url="https://community.kde.org/Accessibility"
>Homepage des Accessibility-Projekts von &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/de/docs/man-kmouth.1.docbook new/kmouth-20.04.0/po/de/docs/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/de/docs/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/de/docs/man-kmouth.1.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -97,7 +97,7 @@
>).</para>
<para
->Weitere Informationen finden Sie außerdem auf der <ulink url="http://accessibility.kde.org/"
+>Weitere Informationen finden Sie außerdem auf der <ulink url="https://community.kde.org/Accessibility"
>Homepage des Accessibility-Projekts von &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/en_GB/kmouth.po new/kmouth-20.04.0/po/en_GB/kmouth.po
--- old/kmouth-19.12.3/po/en_GB/kmouth.po 2020-03-03 01:16:21.000000000 +0100
+++ new/kmouth-20.04.0/po/en_GB/kmouth.po 2020-04-17 02:29:46.000000000 +0200
@@ -12,7 +12,7 @@
"POT-Creation-Date: 2019-09-19 02:49+0200\n"
"PO-Revision-Date: 2017-11-26 15:23+0000\n"
"Last-Translator: Steve Allewell <steve.allewell(a)gmail.com>\n"
-"Language-Team: British English <kde-i18n-doc(a)kde.org>\n"
+"Language-Team: British English <kde-l10n-en_gb(a)kde.org>\n"
"Language: en_GB\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/kmouth-19.12.3/po/es/docs/kmouth/index.docbook new/kmouth-20.04.0/po/es/docs/kmouth/index.docbook
--- old/kmouth-19.12.3/po/es/docs/kmouth/index.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/es/docs/kmouth/index.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -706,9 +706,9 @@
>Preferencias</guimenu
> y <guimenu
>Ayuda</guimenu
->, para más información, lea las secciones sobre el <ulink url="help:/fundamentals/ui.html#menus-settings"
+>, para más información, lea las secciones sobre el <ulink url="help:/fundamentals/menus.html#menus-settings"
>Menú de preferencias</ulink
-> y <ulink url="help:/fundamentals/ui.html#menus-help"
+> y <ulink url="help:/fundamentals/menus.html#menus-help"
>Menú de ayuda</ulink
> de los fundamentos de &kde;. </para>
</sect2>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/es/docs/kmouth/man-kmouth.1.docbook new/kmouth-20.04.0/po/es/docs/kmouth/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/es/docs/kmouth/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/es/docs/kmouth/man-kmouth.1.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -95,7 +95,7 @@
>).</para>
<para
->Existe más información disponible en <ulink url="http://accessibility.kde.org/"
+>Existe más información disponible en <ulink url="https://community.kde.org/Accessibility"
>el sitio web del proyecto de accesibilidad de &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/es/docs/man-kmouth.1.docbook new/kmouth-20.04.0/po/es/docs/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/es/docs/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/es/docs/man-kmouth.1.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -95,7 +95,7 @@
>).</para>
<para
->Existe más información disponible en <ulink url="http://accessibility.kde.org/"
+>Existe más información disponible en <ulink url="https://community.kde.org/Accessibility"
>el sitio web del proyecto de accesibilidad de &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/it/docs/kmouth/index.docbook new/kmouth-20.04.0/po/it/docs/kmouth/index.docbook
--- old/kmouth-19.12.3/po/it/docs/kmouth/index.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/it/docs/kmouth/index.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -674,9 +674,9 @@
>Impostazioni</guimenu
> e <guimenu
>Aiuto</guimenu
->; per maggiori informazioni leggi la sezione sul <ulink url="help:/fundamentals/ui.html#menus-settings"
+>; per maggiori informazioni leggi la sezione sul <ulink url="help:/fundamentals/menus.html#menus-settings"
>menu Impostazioni</ulink
-> e sul <ulink url="help:/fundamentals/ui.html#menus-help"
+> e sul <ulink url="help:/fundamentals/menus.html#menus-help"
>menu Aiuto</ulink
> dei fondamentali di &kde;. </para>
</sect2>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/it/docs/kmouth/man-kmouth.1.docbook new/kmouth-20.04.0/po/it/docs/kmouth/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/it/docs/kmouth/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/it/docs/kmouth/man-kmouth.1.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -95,7 +95,7 @@
>).</para>
<para
->Ci sono anche altre informazioni disponibili sulla <ulink url="http://accessibility.kde.org/"
+>Ci sono anche altre informazioni disponibili sulla <ulink url="https://community.kde.org/Accessibility"
>pagina Web del progetto di accessibilità di &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/it/docs/man-kmouth.1.docbook new/kmouth-20.04.0/po/it/docs/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/it/docs/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/it/docs/man-kmouth.1.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -95,7 +95,7 @@
>).</para>
<para
->Ci sono anche altre informazioni disponibili sulla <ulink url="http://accessibility.kde.org/"
+>Ci sono anche altre informazioni disponibili sulla <ulink url="https://community.kde.org/Accessibility"
>pagina Web del progetto di accessibilità di &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/ko/kmouth.po new/kmouth-20.04.0/po/ko/kmouth.po
--- old/kmouth-19.12.3/po/ko/kmouth.po 2020-03-03 01:16:22.000000000 +0100
+++ new/kmouth-20.04.0/po/ko/kmouth.po 2020-04-17 02:29:47.000000000 +0200
@@ -4,14 +4,14 @@
# Hongsoo Byun <hsbyun(a)haansoft.com>, 2005.
# Youngbin Park <shrike(a)nate.com>, 2005.
# Sung-Jae, Cho <jachin(a)hanafos.com>, 2005.
-# Shinjo Park <kde(a)peremen.name>, 2007, 2008, 2009, 2011, 2015, 2016, 2017.
+# Shinjo Park <kde(a)peremen.name>, 2007, 2008, 2009, 2011, 2015, 2016, 2017, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: kmouth\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2019-09-19 02:49+0200\n"
-"PO-Revision-Date: 2017-12-03 11:59+0100\n"
+"PO-Revision-Date: 2020-04-05 02:21+0200\n"
"Last-Translator: Shinjo Park <kde(a)peremen.name>\n"
"Language-Team: Korean <kde-kr(a)kde.org>\n"
"Language: ko\n"
@@ -19,7 +19,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.04.3\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -105,7 +105,7 @@
#: kmouth.cpp:140
#, kde-format
msgid "Copies the selected section to the clipboard"
-msgstr "선택한 부분을 클립보드로 복사"
+msgstr "선택한 부분을 클립보드에 복사"
#: kmouth.cpp:141
#, kde-format
@@ -114,9 +114,9 @@
"in the edit field it is copied to the clipboard. Otherwise the selected "
"sentences in the history (if any) are copied to the clipboard."
msgstr ""
-"선택한 부분을 클립보드로 복사합니다. 편집 영역에 선택된 텍스트가 있다면 클립"
-"보드로 복사합니다. 선택하지 않았을 경우, 과거 기록에 저장되었던 문장이 클립보"
-"드로 복사됩니다."
+"선택한 부분을 클립보드에 복사합니다. 편집 영역에 선택된 텍스트가 있다면 클립"
+"보드에 복사합니다. 선택하지 않았을 경우, 과거 기록에 저장되었던 문장이 클립보"
+"드에 복사됩니다."
#: kmouth.cpp:144 phrasebook/phrasebookdialog.cpp:288
#, kde-format
@@ -221,7 +221,7 @@
#: kmouth.cpp:212 kmouth.cpp:213
#, kde-format
msgid "Copies the currently selected phrases from the history to the clipboard"
-msgstr "히스토리로부터 현재 선택된 어구를 클립보드로 복사합니다"
+msgstr "히스토리로부터 현재 선택된 어구를 클립보드에 복사합니다"
#: kmouth.cpp:216
#, kde-format
@@ -553,7 +553,7 @@
#, kde-format
msgid ""
"Copies the currently selected entry from the phrase book to the clipboard"
-msgstr "현재 선택한 항목을 단어장에서 클립보드로 복사합니다"
+msgstr "현재 선택한 항목을 단어장에서 클립보드에 복사합니다"
#: phrasebook/phrasebookdialog.cpp:295 phrasebook/phrasebookdialog.cpp:296
#, kde-format
@@ -664,7 +664,7 @@
msgid ""
"If you select this option then the selected phrase will not be reachable by "
"a keyboard shortcut."
-msgstr "이 옵션을 선택하면 선택된 어구는 단축키로 연결될 수 없을 것입니다."
+msgstr "이 옵션을 선택하면 선택된 어구는 단축키로 연결될 수 없습니다."
#. i18n: ectx: property (text), widget (QRadioButton, noKey)
#: phrasebook/phrasebookdialog.ui:55
@@ -711,8 +711,8 @@
"This list contains the history of spoken sentences. You can select sentences "
"and press the speak button for re-speaking."
msgstr ""
-"이 목록은 발음된 문장의 히스토리를 포함하고 있습니다. 문장을 선택하여 발음 버"
-"튼을 누르면 다시 발음을 들을 수 있습니다."
+"이 목록은 과거에 발음했던 문장이 들어 있습니다. 문장을 선택하여 발음 버튼을 "
+"누르면 다시 발음을 들을 수 있습니다."
#: phraselist.cpp:80
#, kde-format
@@ -759,7 +759,7 @@
#: preferencesui.ui:52
#, kde-format
msgid "&Selection of phrases in the phrase book:"
-msgstr "어구 모음에서 어구 선택(&S)"
+msgstr "어구 모음에서 어구 선택(&S):"
#. i18n: ectx: property (text), item, widget (KComboBox, speakCombo)
#: preferencesui.ui:66
@@ -846,10 +846,10 @@
"%l -- the language code\n"
"%% -- a percent sign"
msgstr ""
-"이 영역에서 텍스트 발음하기에 쓰일 명령어와 파라미터를 정합니다. KMouth는 다"
-"음과 같은 파라미터들을 인식합니다:\n"
+"이 영역에서 텍스트 말하기에 사용할 명령과 인자를 지정합니다. KMouth는 다음 자"
+"리 비움자를 인식합니다:\n"
"%t -- 발음될 텍스트\n"
-"%f -- 텍스트를 포함하고 있는 파일명\n"
+"%f -- 텍스트가 들어 있는 파일 이름\n"
"%l -- 언어 코드\n"
"%% -- 퍼센트 표시"
@@ -883,7 +883,7 @@
"speech synthesizer."
msgstr ""
"이 체크 상자에서 음성 합성기에 텍스트를 표준 입력으로 보낼 것인지를 지정합니"
-"다. "
+"다."
#. i18n: ectx: property (text), widget (QCheckBox, stdInButton)
#: texttospeechconfigurationui.ui:152
@@ -917,7 +917,7 @@
"If you select this check box the words are spell-checked before they are "
"inserted into the new dictionary."
msgstr ""
-"이 체크 상자를 선택하면 단어들이 새 사전에 삽입되기 전에 맞춤범 검사를 받습니"
+"이 체크 상자를 선택하면 새 사전에 단어를 삽입하기 전에 맞춤범 검사를 받습니"
"다."
#. i18n: ectx: property (text), widget (QCheckBox, spellCheckBox)
@@ -925,7 +925,7 @@
#: wordcompletion/kdedocsourceui.ui:25
#, kde-format
msgid "C&ompare to OpenOffice.org dictionary:"
-msgstr "OpenOffice.org 사전과 비교하기(&C):"
+msgstr "OpenOffice.org 사전과 비교하기(&O):"
#. i18n: ectx: property (whatsThis), widget (QLabel, encodingLabel)
#. i18n: ectx: property (whatsThis), widget (KComboBox, encodingCombo)
@@ -970,8 +970,8 @@
"With this input field you select the OpenOffice.org directory that will be "
"used to spellcheck the words of the new dictionary."
msgstr ""
-"이 입력 영역을 통해 새 사전의 단어들을 Openoffice.org를 통해 맞춤법 검사를 "
-"할 것인지 선택합니다."
+"이 입력 상자에서 OpenOffice.org 사전에 있는 단어 중 새 사전의 맞춤법 검사에 "
+"사용할 단어를 선택합니다."
#. i18n: ectx: property (whatsThis), widget (QLabel, languageLabel)
#: wordcompletion/creationsourcedetailsui.ui:136
@@ -1001,8 +1001,8 @@
"If you select this box a new dictionary is created by either loading a "
"dictionary file or by counting the individual words in a text."
msgstr ""
-"이 상자를 선택하면 새 사전이 사전 파일을 불러오거나 텍스트에 있는 각각의 단어"
-"를 계수하여 생성됩니다."
+"이 상자를 선택하면 새 사전이 사전 파일을 불러오거나 텍스트에 있는 각각의 단"
+"어 개수를 세어서 생성합니다."
#. i18n: ectx: property (text), widget (QRadioButton, mergeButton)
#: wordcompletion/creationsourceui.ui:29
@@ -1016,13 +1016,13 @@
msgid ""
"If you select this box a new dictionary is created by merging existing "
"dictionaries."
-msgstr "이 박스를 체크하면 새 사전이 기존 사전의 병합을 통해 생성됩니다."
+msgstr "이 상자를 선택하면 기존 사전을 합쳐서 새 사전을 생성합니다."
#. i18n: ectx: property (text), widget (QRadioButton, fileButton)
#: wordcompletion/creationsourceui.ui:50
#, kde-format
msgid "From &file"
-msgstr "파일로 부터(&F)"
+msgstr "파일에서(&F)"
#. i18n: ectx: property (whatsThis), widget (QRadioButton, fileButton)
#: wordcompletion/creationsourceui.ui:53
@@ -1035,9 +1035,9 @@
"the occurrences of each word."
msgstr ""
"이 상자를 선택하면 파일을 불러와서 새 사전을 생성합니다. XML 파일이나 표준 텍"
-"스트 파일, 단어 완성 사전을 포함하고 있는 파일을 선택할 수 있을 것입니다. 표"
-"준 텍스트 파일이나 XML 파일을 선택하면, 각 개별 단어 빈도는 단순하게 각 단어"
-"의 등장 횟수를 계수함으로써 감지됩니다."
+"스트 파일, 단어 완성 사전이 들어 있는 파일을 선택할 수 있습니다. 표준 텍스트 "
+"파일이나 XML 파일을 선택하면, 각 개별 단어 빈도는 단순하게 각 단어의 등장 횟"
+"수를 세어서 감지합니다."
#. i18n: ectx: property (text), widget (QRadioButton, kdeDocButton)
#: wordcompletion/creationsourceui.ui:71
@@ -1054,13 +1054,13 @@
"counting the occurrences of each word."
msgstr ""
"이 상자를 선택하면, KDE 문서를 분석하여 새 사전을 생성합니다. 각 개별 단어 빈"
-"도는 단순하게 각 단어의 등장 횟수를 계수함으로써 감지됩니다."
+"도는 단순하게 각 단어의 등장 횟수를 세어서 감지합니다."
#. i18n: ectx: property (text), widget (QRadioButton, directoryButton)
#: wordcompletion/creationsourceui.ui:95
#, kde-format
msgid "From f&older"
-msgstr "디렉터리로부터(&O)"
+msgstr "디렉터리에서(&O)"
#. i18n: ectx: property (whatsThis), widget (QRadioButton, directoryButton)
#: wordcompletion/creationsourceui.ui:98
@@ -1093,7 +1093,7 @@
#: wordcompletion/dictionarycreationwizard.cpp:65
#, kde-format
msgid "Source of New Dictionary (1)"
-msgstr "새 사전의 원본 (1)"
+msgstr "새 사전의 원본(1)"
#: wordcompletion/dictionarycreationwizard.cpp:71
#: wordcompletion/dictionarycreationwizard.cpp:77
@@ -1101,7 +1101,7 @@
#: wordcompletion/dictionarycreationwizard.cpp:94
#, kde-format
msgid "Source of New Dictionary (2)"
-msgstr "새 사전의 원본 (2)"
+msgstr "새 사전의 원본(2)"
#: wordcompletion/dictionarycreationwizard.cpp:80
#, kde-format
@@ -1153,8 +1153,8 @@
"If you select this check box the words from the KDE documentation are spell-"
"checked before they are inserted into the new dictionary."
msgstr ""
-"이 체크 상자를 선택하면 KDE 문서로부터 단어가 새 사전에 삽입되기 전에 맞춤법 "
-"검사를 받게 됩니다."
+"이 옵션을 사용하면 KDE 문서에 있는 단어를 새 사전에 추가하기 전에 맞춤법 검사"
+"합니다."
#. i18n: ectx: property (whatsThis), widget (QLabel, languageLabel)
#: wordcompletion/kdedocsourceui.ui:64
@@ -1164,14 +1164,14 @@
"creating the new dictionary. KMouth will only parse documentation files of "
"this language."
msgstr ""
-"이 콤보 상자로 설치된 언어 중에서 새 사전을 생성하는데 사용될 언어를 선택합니"
+"이 콤보 상자로 설치된 언어 중에서 새 사전을 생성할 때 사용할 언어를 선택합니"
"다. KMouth는 이 언어의 문서 파일을 분석하기만 할 것입니다."
#. i18n: ectx: property (title), widget (QGroupBox, selectedDictionaryDetails)
#: wordcompletion/wordcompletionui.ui:32
#, kde-format
msgid "&Selected Dictionary"
-msgstr "선택된 사전(&S)"
+msgstr "선택한 사전(&S)"
#. i18n: ectx: property (whatsThis), widget (QLabel, languageLabel)
#: wordcompletion/wordcompletionui.ui:47
@@ -1179,7 +1179,7 @@
msgid ""
"With this combo box you select the language associated with the selected "
"dictionary."
-msgstr "이 콤보 상자에서 선택된 사전에 연결된 언어를 선택합니다."
+msgstr "이 콤보 상자에서 선택한 사전에 사용하는 언어를 선택합니다."
#. i18n: ectx: property (whatsThis), widget (QLabel, dictionaryNameLabel)
#. i18n: ectx: property (whatsThis), widget (KLineEdit, dictionaryName)
@@ -1200,7 +1200,7 @@
msgid ""
"With this button you can add a new dictionary to the list of available "
"dictionaries."
-msgstr "이 버튼을 통해 사용가능한 사전 목록에 새 사전을 추가할 수 있습니다."
+msgstr "이 단추를 누르면 사용 가능한 사전 목록에 새로운 사전을 추가합니다."
#. i18n: ectx: property (text), widget (QPushButton, addButton)
#: wordcompletion/wordcompletionui.ui:103
@@ -1212,7 +1212,7 @@
#: wordcompletion/wordcompletionui.ui:119
#, kde-format
msgid "With this button you delete the selected dictionary."
-msgstr "이 버튼을 통해 선택한 사전을 삭제합니다."
+msgstr "이 단추를 누르면 선택한 사전을 삭제합니다."
#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
#: wordcompletion/wordcompletionui.ui:122
@@ -1224,7 +1224,7 @@
#: wordcompletion/wordcompletionui.ui:138
#, kde-format
msgid "With this button you move the selected dictionary up."
-msgstr "이 버튼을 통해 선택한 사전을 위로 이동시킵니다."
+msgstr "이 단추를 누르면 선택한 사전을 위로 이동합니다."
#. i18n: ectx: property (text), widget (QPushButton, moveUpButton)
#: wordcompletion/wordcompletionui.ui:141
@@ -1236,7 +1236,7 @@
#: wordcompletion/wordcompletionui.ui:157
#, kde-format
msgid "With this button you move the selected dictionary down."
-msgstr "이 버튼을 통해 선택된 사전을 아래로 이동시킵니다."
+msgstr "이 단추를 누르면 선택한 사전을 아래로 이동합니다."
#. i18n: ectx: property (text), widget (QPushButton, moveDownButton)
#: wordcompletion/wordcompletionui.ui:160
@@ -1266,10 +1266,10 @@
"order to select the dictionary that actually gets used for the word "
"completion."
msgstr ""
-"이 목록은 단어 완성에 대해 사용가능한 모든 사전을 포함하고 있습니다. KMouth"
-"는 이 목록이 하나 이상의 사전을 포함하고 있다면 주요 창에서 편집 영역 옆에 콤"
-"보 상자를 표시할 것입니다. 실제 단어 완성에 사용될 사전을 선택하기 위해 이 콤"
-"보 상자를 사용할 수 있습니다."
+"이 목록에는 단어 자동 완성에 사용할 수 있는 모든 사전이 들어 있습니다. 목록"
+"에 두 개 이상의 사전이 있다면 KMouth 주 창의 편집 필드 옆에 콤보 상자를 표시"
+"합니다. 이 콤보 상자를 사용하여 실제로 단어 자동 완성에 사용할 사전을 선택하"
+"십시오."
#: wordcompletion/wordcompletionwidget.cpp:79
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/ml/kmouth.po new/kmouth-20.04.0/po/ml/kmouth.po
--- old/kmouth-19.12.3/po/ml/kmouth.po 2020-03-03 01:16:22.000000000 +0100
+++ new/kmouth-20.04.0/po/ml/kmouth.po 2020-04-17 02:29:47.000000000 +0200
@@ -11,7 +11,7 @@
"POT-Creation-Date: 2019-09-19 02:49+0200\n"
"PO-Revision-Date: 2009-02-07 16:42-0800\n"
"Last-Translator: Praveen Arimbrathodiyil <pravi.a(a)gmail.com>\n"
-"Language-Team: Malayalam <smc-discuss(a)googlegroups.com>\n"
+"Language-Team: SMC <smc.org.in>\n"
"Language: ml\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/kmouth-19.12.3/po/nb/kmouth.po new/kmouth-20.04.0/po/nb/kmouth.po
--- old/kmouth-19.12.3/po/nb/kmouth.po 2020-03-03 01:16:22.000000000 +0100
+++ new/kmouth-20.04.0/po/nb/kmouth.po 2020-04-17 02:29:47.000000000 +0200
@@ -12,7 +12,7 @@
"POT-Creation-Date: 2019-09-19 02:49+0200\n"
"PO-Revision-Date: 2010-12-24 08:26+0100\n"
"Last-Translator: Bjørn Steensrud <bjornst(a)skogkatt.homelinux.org>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb(a)lister.ping.uio.no>\n"
+"Language-Team: Norwegian Bokmål <l10n-no(a)lister.huftis.org>\n"
"Language: nb\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/kmouth-19.12.3/po/nl/docs/kmouth/index.docbook new/kmouth-20.04.0/po/nl/docs/kmouth/index.docbook
--- old/kmouth-19.12.3/po/nl/docs/kmouth/index.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/nl/docs/kmouth/index.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -652,9 +652,9 @@
>Instellingen</guimenu
> en <guimenu
>Help</guimenu
->, voor meer informatie lees de secties over het <ulink url="help:/fundamentals/ui.html#menus-settings"
+>, voor meer informatie lees de secties over het <ulink url="help:/fundamentals/menus.html#menus-settings"
>Menu instellingen</ulink
-> en <ulink url="help:/fundamentals/ui.html#menus-help"
+> en <ulink url="help:/fundamentals/menus.html#menus-help"
>Menu Help</ulink
> van &kde; Fundamentals. </para>
</sect2>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/nl/docs/kmouth/man-kmouth.1.docbook new/kmouth-20.04.0/po/nl/docs/kmouth/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/nl/docs/kmouth/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/nl/docs/kmouth/man-kmouth.1.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -95,8 +95,8 @@
> uit).</para>
<para
->Er is ook meer informatie verkrijgbaar van <ulink url="http://accessibility.kde.org/"
-> De startpagina van het Accessibility project van &kde;</ulink
+>Er is ook meer informatie verkrijgbaar van <ulink url="http://community.kde.org/"
+> De site van het Accessibility project van &kde;</ulink
>. </para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/nl/docs/man-kmouth.1.docbook new/kmouth-20.04.0/po/nl/docs/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/nl/docs/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/nl/docs/man-kmouth.1.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -95,8 +95,8 @@
> uit).</para>
<para
->Er is ook meer informatie verkrijgbaar van <ulink url="http://accessibility.kde.org/"
-> De startpagina van het Accessibility project van &kde;</ulink
+>Er is ook meer informatie verkrijgbaar van <ulink url="http://community.kde.org/"
+> De site van het Accessibility project van &kde;</ulink
>. </para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/nn/kmouth.po new/kmouth-20.04.0/po/nn/kmouth.po
--- old/kmouth-19.12.3/po/nn/kmouth.po 2020-03-03 01:16:22.000000000 +0100
+++ new/kmouth-20.04.0/po/nn/kmouth.po 2020-04-17 02:29:47.000000000 +0200
@@ -9,7 +9,7 @@
"POT-Creation-Date: 2019-09-19 02:49+0200\n"
"PO-Revision-Date: 2017-09-03 18:02+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl(a)huftis.org>\n"
-"Language-Team: Norwegian Nynorsk <i18n-nn(a)lister.ping.uio.no>\n"
+"Language-Team: Norwegian Nynorsk <l10n-no(a)lister.huftis.org>\n"
"Language: nn\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/kmouth-19.12.3/po/pt_BR/docs/kmouth/man-kmouth.1.docbook new/kmouth-20.04.0/po/pt_BR/docs/kmouth/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/pt_BR/docs/kmouth/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/pt_BR/docs/kmouth/man-kmouth.1.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -95,7 +95,7 @@
>).</para>
<para
->Existe também mais alguma informação disponível no <ulink url="http://accessibility.kde.org/"
+>Existe também mais alguma informação disponível no <ulink url="https://community.kde.org/Accessibility"
>site do projeto de acessibilidade do &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/pt_BR/docs/man-kmouth.1.docbook new/kmouth-20.04.0/po/pt_BR/docs/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/pt_BR/docs/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/pt_BR/docs/man-kmouth.1.docbook 2020-04-17 02:29:48.000000000 +0200
@@ -95,7 +95,7 @@
>).</para>
<para
->Existe também mais alguma informação disponível no <ulink url="http://accessibility.kde.org/"
+>Existe também mais alguma informação disponível no <ulink url="https://community.kde.org/Accessibility"
>site do projeto de acessibilidade do &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/sk/kmouth.po new/kmouth-20.04.0/po/sk/kmouth.po
--- old/kmouth-19.12.3/po/sk/kmouth.po 2020-03-03 01:16:22.000000000 +0100
+++ new/kmouth-20.04.0/po/sk/kmouth.po 2020-04-17 02:29:47.000000000 +0200
@@ -2,19 +2,20 @@
# Stanislav Visnovsky <visnovsky(a)kde.org>, 2003, 2004.
# Richard Fric <Richard.Fric(a)kdemail.net>, 2006, 2009.
# Roman Paholik <wizzardsk(a)gmail.com>, 2015, 2017.
+# Matej Mrenica <matejm98mthw(a)gmail.com>, 2019.
msgid ""
msgstr ""
"Project-Id-Version: kmouth\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2019-09-19 02:49+0200\n"
-"PO-Revision-Date: 2017-08-18 20:24+0100\n"
-"Last-Translator: Roman Paholik <wizzardsk(a)gmail.com>\n"
-"Language-Team: Slovak <kde-sk(a)linux.sk>\n"
+"PO-Revision-Date: 2019-11-18 11:00+0100\n"
+"Last-Translator: Matej Mrenica <matejm98mthw(a)gmail.com>\n"
+"Language-Team: Slovak <kde-i18n-doc(a)kde.org>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.11.80\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#, kde-format
@@ -270,7 +271,7 @@
#: kmouth.cpp:427
#, kde-format
msgid "Toggling menubar..."
-msgstr "Prepínam panel nástrojov..."
+msgstr "Prepínam panel ponuky..."
#: kmouth.cpp:439
#, kde-format
@@ -425,7 +426,7 @@
"phrasebook</i>. Do you wish to add <i>.phrasebook</i> to the filename?"
msgstr ""
"Vybrali ste meno súboru <i>%1</i>, ktoré má inú príponu ako <i>.phrasebook</"
-"i>. Chcete k menu pridať príponu <i>.phrasebook</i>?"
+"i>. Chcete k názvu pridať príponu <i>.phrasebook</i>?"
#: phrasebook/phrasebook.cpp:317 phrasebook/phrasebook.cpp:332
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/sv/docs/kmouth/index.docbook new/kmouth-20.04.0/po/sv/docs/kmouth/index.docbook
--- old/kmouth-19.12.3/po/sv/docs/kmouth/index.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/sv/docs/kmouth/index.docbook 2020-04-17 02:29:49.000000000 +0200
@@ -664,9 +664,9 @@
>Inställningar</guimenu
> och <guimenu
>Hjälp</guimenu
->. För mer information läs avsnitten om <ulink url="help:/fundamentals/ui.html#menus-settings"
+>. För mer information läs avsnitten om <ulink url="help:/fundamentals/menus.html#menus-settings"
>Menyn Inställningar</ulink
-> och <ulink url="help:/fundamentals/ui.html#menus-help"
+> och <ulink url="help:/fundamentals/menus.html#menus-help"
>Menyn Hjälp</ulink
> i &kde;:s grunder. </para>
</sect2>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/sv/docs/kmouth/man-kmouth.1.docbook new/kmouth-20.04.0/po/sv/docs/kmouth/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/sv/docs/kmouth/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/sv/docs/kmouth/man-kmouth.1.docbook 2020-04-17 02:29:49.000000000 +0200
@@ -95,7 +95,7 @@
>).</para>
<para
->Det finns också ytterligare information tillgänglig på <ulink url="http://accessibility.kde.org/"
+>Det finns också ytterligare information tillgänglig på <ulink url="https://community.kde.org/Accessibility"
>hemsidan för &kde;:s handikappstödsprojekt</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/sv/docs/man-kmouth.1.docbook new/kmouth-20.04.0/po/sv/docs/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/sv/docs/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/sv/docs/man-kmouth.1.docbook 2020-04-17 02:29:49.000000000 +0200
@@ -95,7 +95,7 @@
>).</para>
<para
->Det finns också ytterligare information tillgänglig på <ulink url="http://accessibility.kde.org/"
+>Det finns också ytterligare information tillgänglig på <ulink url="https://community.kde.org/Accessibility"
>hemsidan för &kde;:s handikappstödsprojekt</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/uk/docs/kmouth/index.docbook new/kmouth-20.04.0/po/uk/docs/kmouth/index.docbook
--- old/kmouth-19.12.3/po/uk/docs/kmouth/index.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/uk/docs/kmouth/index.docbook 2020-04-17 02:29:49.000000000 +0200
@@ -686,9 +686,9 @@
>Параметри</guimenu
> і <guimenu
>Довідка</guimenu
->. Щоб дізнатися більше, ознайомтеся з розділами щодо <ulink url="help:/fundamentals/ui.html#menus-settings"
+>. Щоб дізнатися більше, ознайомтеся з розділами щодо <ulink url="help:/fundamentals/menus.html#menus-settings"
>меню «Параметри»</ulink
-> та <ulink url="help:/fundamentals/ui.html#menus-help"
+> та <ulink url="help:/fundamentals/menus.html#menus-help"
>меню «Довідка»</ulink
> підручника з основ роботи у &kde;. </para>
</sect2>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/uk/docs/kmouth/man-kmouth.1.docbook new/kmouth-20.04.0/po/uk/docs/kmouth/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/uk/docs/kmouth/man-kmouth.1.docbook 2020-03-03 01:16:23.000000000 +0100
+++ new/kmouth-20.04.0/po/uk/docs/kmouth/man-kmouth.1.docbook 2020-04-17 02:29:49.000000000 +0200
@@ -95,8 +95,8 @@
>).</para>
<para
->Більше інформації можна знайти на <ulink url="http://accessibility.kde.org/"
->Вебсайті проєкту доступності в &kde;</ulink
+>Більше інформації можна знайти на <ulink url="https://community.kde.org/Accessibility"
+>вебсайті проєкту доступності в &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/uk/docs/man-kmouth.1.docbook new/kmouth-20.04.0/po/uk/docs/man-kmouth.1.docbook
--- old/kmouth-19.12.3/po/uk/docs/man-kmouth.1.docbook 2020-03-03 01:16:24.000000000 +0100
+++ new/kmouth-20.04.0/po/uk/docs/man-kmouth.1.docbook 2020-04-17 02:29:49.000000000 +0200
@@ -95,8 +95,8 @@
>).</para>
<para
->Більше інформації можна знайти на <ulink url="http://accessibility.kde.org/"
->Вебсайті проєкту доступності в &kde;</ulink
+>Більше інформації можна знайти на <ulink url="https://community.kde.org/Accessibility"
+>вебсайті проєкту доступності в &kde;</ulink
>.</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/po/zh_CN/kmouth.po new/kmouth-20.04.0/po/zh_CN/kmouth.po
--- old/kmouth-19.12.3/po/zh_CN/kmouth.po 2020-03-03 01:16:22.000000000 +0100
+++ new/kmouth-20.04.0/po/zh_CN/kmouth.po 2020-04-17 02:29:47.000000000 +0200
@@ -3,7 +3,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2019-09-19 02:49+0200\n"
-"PO-Revision-Date: 2020-01-20 21:58\n"
+"PO-Revision-Date: 2020-03-25 19:57\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/speech.cpp new/kmouth-20.04.0/speech.cpp
--- old/kmouth-19.12.3/speech.cpp 2020-01-31 08:22:07.000000000 +0100
+++ new/kmouth-20.04.0/speech.cpp 2020-04-09 10:57:11.000000000 +0200
@@ -188,7 +188,7 @@
else
fs.setCodec(codec);
fs << text;
- fs << endl;
+ fs << "\n";
QString filename = tempFile.fileName();
tempFile.flush();
@@ -196,7 +196,7 @@
command = prepareCommand(command, QLatin1String(encText), filename, language);
// 3. create a new process
- connect(&m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(processExited(int, QProcess::ExitStatus)));
+ connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &Speech::processExited);
//connect(&process, SIGNAL(wroteStdin(K3Process*)), this, SLOT(wroteStdin(K3Process*)));
//connect(&process, SIGNAL(receivedStdout(K3Process*, char*, int)), this, SLOT(receivedStdout(K3Process*, char*, int)));
//connect(&process, SIGNAL(receivedStderr(K3Process*, char*, int)), this, SLOT(receivedStderr(K3Process*, char*, int)));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-19.12.3/wordcompletion/wordlist.cpp new/kmouth-20.04.0/wordcompletion/wordlist.cpp
--- old/kmouth-19.12.3/wordcompletion/wordlist.cpp 2020-01-31 08:22:07.000000000 +0100
+++ new/kmouth-20.04.0/wordcompletion/wordlist.cpp 2020-04-09 10:57:11.000000000 +0200
@@ -185,7 +185,7 @@
QXmlInputSource source(&xmlfile);
XMLParser parser;
QXmlSimpleReader reader;
- reader.setFeature(QStringLiteral("http://trolltech.com/xml/features/report-start-end-entity"), true);
+ reader.setFeature(QStringLiteral("http://qt-project.org/xml/features/report-start-end-entity"), true);
reader.setContentHandler(&parser);
WordMap words;
1
0
Hello community,
here is the log from the commit of package python-pytest-bdd for openSUSE:Factory checked in at 2020-05-01 11:09:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-bdd (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-bdd.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-bdd"
Fri May 1 11:09:14 2020 rev:6 rq:798143 version:3.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest-bdd/python-pytest-bdd.changes 2020-04-21 13:09:58.660729762 +0200
+++ /work/SRC/openSUSE:Factory/.python-pytest-bdd.new.2738/python-pytest-bdd.changes 2020-05-01 11:09:33.815352962 +0200
@@ -1,0 +2,7 @@
+Mon Apr 27 10:28:54 UTC 2020 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 3.3.0:
+ * Require at least pytest 4.3
+- Remove merged test_flaky.patch
+
+-------------------------------------------------------------------
Old:
----
pytest-bdd-3.2.1.tar.gz
test_flaky.patch
New:
----
pytest-bdd-3.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-bdd.spec ++++++
--- /var/tmp/diff_new_pack.o782nf/_old 2020-05-01 11:09:34.767355032 +0200
+++ /var/tmp/diff_new_pack.o782nf/_new 2020-05-01 11:09:34.771355041 +0200
@@ -19,13 +19,12 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without python2
Name: python-pytest-bdd
-Version: 3.2.1
+Version: 3.3.0
Release: 0
Summary: BDD for pytest
License: MIT
URL: https://github.com/pytest-dev/pytest-bdd
Source: https://github.com/pytest-dev/pytest-bdd/archive/%{version}.tar.gz#/pytest-…
-Patch0: test_flaky.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -34,7 +33,7 @@
Requires: python-parse
Requires: python-parse_type
Requires: python-py
-Requires: python-pytest >= 3.0.0
+Requires: python-pytest >= 4.3.0
Requires: python-six >= 1.9.0
Requires(post): update-alternatives
Requires(postun): update-alternatives
@@ -46,7 +45,7 @@
BuildRequires: %{python_module mock}
BuildRequires: %{python_module parse_type}
BuildRequires: %{python_module parse}
-BuildRequires: %{python_module pytest >= 3.0.0}
+BuildRequires: %{python_module pytest >= 4.3.0}
BuildRequires: %{python_module py}
BuildRequires: %{python_module six >= 1.9.0}
%if %{with python2}
@@ -76,7 +75,6 @@
%prep
%setup -q -n pytest-bdd-%{version}
-%patch0 -p1
sed -i '/tox/d' setup.py
%build
@@ -89,7 +87,9 @@
%check
export LANG=en_US.UTF-8
-%pytest
+export PYTHONDONTWRITEBYTECODE=1
+# test_generate_with_quotes and test_unicode_characters require ptyest-bdd binary which we handle with u-a
+%pytest -k 'not test_generate_with_quotes and not test_unicode_characters'
%post
%python_install_alternative pytest-bdd
++++++ pytest-bdd-3.2.1.tar.gz -> pytest-bdd-3.3.0.tar.gz ++++++
++++ 5900 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-pytest-check-links for openSUSE:Factory checked in at 2020-05-01 11:09:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-check-links (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-check-links.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-check-links"
Fri May 1 11:09:07 2020 rev:4 rq:798142 version:0.3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest-check-links/python-pytest-check-links.changes 2020-04-04 12:26:37.376001820 +0200
+++ /work/SRC/openSUSE:Factory/.python-pytest-check-links.new.2738/python-pytest-check-links.changes 2020-05-01 11:09:28.415341218 +0200
@@ -1,0 +2,6 @@
+Mon Apr 27 10:25:16 UTC 2020 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 0.3.4:
+ * no changelog
+
+-------------------------------------------------------------------
Old:
----
pytest_check_links-0.3.2.tar.gz
New:
----
pytest_check_links-0.3.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-check-links.spec ++++++
--- /var/tmp/diff_new_pack.jcGq2C/_old 2020-05-01 11:09:29.611343818 +0200
+++ /var/tmp/diff_new_pack.jcGq2C/_new 2020-05-01 11:09:29.615343828 +0200
@@ -20,7 +20,7 @@
# Tests natually require internet
%bcond_with test
Name: python-pytest-check-links
-Version: 0.3.2
+Version: 0.3.4
Release: 0
Summary: Pytest plugin for checking links in files
License: BSD-3-Clause
++++++ pytest_check_links-0.3.2.tar.gz -> pytest_check_links-0.3.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/AUTHORS new/pytest_check_links-0.3.4/AUTHORS
--- old/pytest_check_links-0.3.2/AUTHORS 2020-03-30 11:50:04.000000000 +0200
+++ new/pytest_check_links-0.3.4/AUTHORS 2020-04-21 17:09:34.000000000 +0200
@@ -1,5 +1,6 @@
Ian Rose <ian.r.rose(a)gmail.com>
Min RK <benjaminrk(a)gmail.com>
+Nicholas Bollweg <nick.bollweg(a)gmail.com>
Steven Silvester <steven.silvester(a)ieee.org>
Steven Silvester <stslve(a)amazon.com>
Vidar Tonaas Fauske <vidartf(a)gmail.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/ChangeLog new/pytest_check_links-0.3.4/ChangeLog
--- old/pytest_check_links-0.3.2/ChangeLog 2020-03-30 11:50:04.000000000 +0200
+++ new/pytest_check_links-0.3.4/ChangeLog 2020-04-21 17:09:34.000000000 +0200
@@ -1,9 +1,16 @@
CHANGES
=======
-0.3.2
+0.3.4
-----
+* add checking of self- and local html anchors
+* Add rst to supported files
+* Update metadata for JupyterLab
+
+v0.3.2
+------
+
* Add note about pbr
0.3.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/LICENSE new/pytest_check_links-0.3.4/LICENSE
--- old/pytest_check_links-0.3.2/LICENSE 2020-03-30 11:40:43.000000000 +0200
+++ new/pytest_check_links-0.3.4/LICENSE 2020-04-11 23:53:26.000000000 +0200
@@ -1,4 +1,5 @@
-BSD 3-Clause License
+Copyright (c) 2019 Project Jupyter Contributors
+All rights reserved.
Copyright (c) 2017, Min RK
All rights reserved.
@@ -6,16 +7,16 @@
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/PKG-INFO new/pytest_check_links-0.3.4/PKG-INFO
--- old/pytest_check_links-0.3.2/PKG-INFO 2020-03-30 11:50:04.000000000 +0200
+++ new/pytest_check_links-0.3.4/PKG-INFO 2020-04-21 17:09:34.000000000 +0200
@@ -1,10 +1,10 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: pytest_check_links
-Version: 0.3.2
+Version: 0.3.4
Summary: Check links in files
-Home-page: https://github.com/minrk/pytest-check-links
-Author: Min RK
-Author-email: benjaminrk(a)gmail.com
+Home-page: https://github.com/jupyterlab/pytest-check-links
+Author: Jupyter Development Team
+Author-email: jupyter(a)googlegroups.com
License: BSD-3-Clause
Description: # pytest-check-links
@@ -13,6 +13,7 @@
Supported files:
- .html
+ - .rst
- .md (TODO: select renderer)
- .ipynb (requires nbconvert)
@@ -41,3 +42,4 @@
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
Classifier: Topic :: Software Development :: Testing
+Description-Content-Type: text/markdown
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/README.md new/pytest_check_links-0.3.4/README.md
--- old/pytest_check_links-0.3.2/README.md 2020-03-30 11:40:43.000000000 +0200
+++ new/pytest_check_links-0.3.4/README.md 2020-04-11 23:53:54.000000000 +0200
@@ -5,6 +5,7 @@
Supported files:
- .html
+- .rst
- .md (TODO: select renderer)
- .ipynb (requires nbconvert)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/examples/anchors_other.html new/pytest_check_links-0.3.4/examples/anchors_other.html
--- old/pytest_check_links-0.3.2/examples/anchors_other.html 1970-01-01 01:00:00.000000000 +0100
+++ new/pytest_check_links-0.3.4/examples/anchors_other.html 2020-04-21 17:04:48.000000000 +0200
@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+ <head></head>
+ <body>
+ <a href="./anchors_self.html#foo">foo is good</a>
+ <a href="./anchors_self.html#bar">bar is ambiguous</a>
+ <a href="./anchors_self.html#baz">baz is missing</a>
+ </body>
+</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/examples/anchors_self.html new/pytest_check_links-0.3.4/examples/anchors_self.html
--- old/pytest_check_links-0.3.2/examples/anchors_self.html 1970-01-01 01:00:00.000000000 +0100
+++ new/pytest_check_links-0.3.4/examples/anchors_self.html 2020-04-21 17:04:48.000000000 +0200
@@ -0,0 +1,13 @@
+<!doctype html>
+<html>
+ <head></head>
+ <body>
+ <a name="foo"></a><h1>FOO</h1>
+ <a name="bar"></a><h2>BAR</h2>
+ <a name="bar"></a><h3>ANOTHER BAR</h3>
+
+ <a href="#foo">foo is good</a>
+ <a href="#bar">bar is ambiguous</a>
+ <a href="#baz">baz is missing</a>
+ </body>
+</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/pytest_check_links/plugin.py new/pytest_check_links-0.3.4/pytest_check_links/plugin.py
--- old/pytest_check_links-0.3.2/pytest_check_links/plugin.py 2020-03-30 11:40:43.000000000 +0200
+++ new/pytest_check_links-0.3.4/pytest_check_links/plugin.py 2020-04-21 17:04:48.000000000 +0200
@@ -21,6 +21,8 @@
group = parser.getgroup("general")
group.addoption('--check-links', action='store_true',
help="Check links for validity")
+ group.addoption('--check-anchors', action='store_true',
+ help="Check link anchors for validity")
group.addoption('--links-ext', action=StoreExtensionsAction,
default=default_extensions,
help="Which file extensions to check links for, "
@@ -38,11 +40,15 @@
config = parent.config
if config.option.check_links:
if path.ext.lower() in config.option.links_ext:
- return CheckLinks(path, parent)
+ return CheckLinks(path, parent, config.option.check_anchors)
class CheckLinks(pytest.File):
"""Check the links in a file"""
+ def __init__(self, path, parent, check_anchors):
+ super(CheckLinks, self).__init__(path, parent)
+ self.check_anchors = check_anchors
+
def _html_from_html(self):
"""Return HTML from an HTML file"""
with io.open(str(self.fspath), encoding=_ENC) as f:
@@ -119,9 +125,10 @@
if tag == 'a':
attr = 'href'
url = element.get('href', '')
- if url.startswith('#'):
+ if url.startswith('#') and not parent.check_anchors:
# skip internal links
continue
+
elif tag in {'img', 'iframe'}:
attr = 'src'
else:
@@ -136,7 +143,7 @@
if proto.lower() not in {'http', 'https'}:
# ignore non-http links (mailto:, data:, etc.)
continue
- yield LinkItem(name, parent, url)
+ yield LinkItem(name, parent, url, parsed)
class LinkItem(pytest.Item):
@@ -146,12 +153,14 @@
name, parent: inherited from pytest.Item
target (str): The URL or path target for the link
+ parsed (xml.etree.ElementTree.Element): The parsed HTML
description (str, optional): The description to be used in the report header
"""
- def __init__(self, name, parent, target, description=''):
+ def __init__(self, name, parent, target, parsed, description=''):
super(LinkItem, self).__init__(name, parent)
self.target = target
self.retry_attempts = 0
+ self.parsed = parsed
self.description = description or '{}: {}'.format(self.fspath, target)
def repr_failure(self, excinfo):
@@ -183,6 +192,20 @@
raise BrokenLinkError(self.target, "%s %s" % (obj.code, obj.reason))
+ def handle_anchor(self, parsed, anchor):
+ anchors = parsed.findall('*//a[@name="{}"]'.format(anchor))
+
+ if not anchors:
+ raise BrokenLinkError(self.target, "Missing anchor: %s" % anchor)
+
+ if len(anchors) > 1:
+ raise BrokenLinkError(
+ self.target,
+ "Ambiguous anchor: %d (found %s)" % (
+ len(anchors), anchor
+ )
+ )
+
def runtest(self):
if ':' in self.target:
# external reference, download
@@ -206,10 +229,16 @@
raise BrokenLinkError(self.target, "absolute path link")
# relative URL
url = self.target
+ anchor = None
if '?' in url:
url = url.split('?')[0]
if '#' in url:
- url = url.split('#')[0]
+ url, anchor = url.split('#')
+
+ if not url and anchor:
+ if self.parent.check_anchors:
+ self.handle_anchor(self.parsed, anchor)
+ return
url_path = unquote(url).replace('/', os.path.sep)
dirpath = self.fspath.dirpath()
@@ -219,6 +248,11 @@
target_path = dirpath.join(rel_path)
if target_path.exists():
exists = True
+ # only check anchors in html for now
+ if ext == ".html" and anchor and self.parent.check_anchors:
+ with target_path.open() as fpt:
+ parsed = html5lib.parse(fpt, namespaceHTMLElements=False)
+ return self.handle_anchor(parsed, anchor)
break
if not exists:
target_path = dirpath.join(url_path)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/pytest_check_links.egg-info/PKG-INFO new/pytest_check_links-0.3.4/pytest_check_links.egg-info/PKG-INFO
--- old/pytest_check_links-0.3.2/pytest_check_links.egg-info/PKG-INFO 2020-03-30 11:50:04.000000000 +0200
+++ new/pytest_check_links-0.3.4/pytest_check_links.egg-info/PKG-INFO 2020-04-21 17:09:34.000000000 +0200
@@ -1,10 +1,10 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: pytest-check-links
-Version: 0.3.2
+Version: 0.3.4
Summary: Check links in files
-Home-page: https://github.com/minrk/pytest-check-links
-Author: Min RK
-Author-email: benjaminrk(a)gmail.com
+Home-page: https://github.com/jupyterlab/pytest-check-links
+Author: Jupyter Development Team
+Author-email: jupyter(a)googlegroups.com
License: BSD-3-Clause
Description: # pytest-check-links
@@ -13,6 +13,7 @@
Supported files:
- .html
+ - .rst
- .md (TODO: select renderer)
- .ipynb (requires nbconvert)
@@ -41,3 +42,4 @@
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
Classifier: Topic :: Software Development :: Testing
+Description-Content-Type: text/markdown
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/pytest_check_links.egg-info/SOURCES.txt new/pytest_check_links-0.3.4/pytest_check_links.egg-info/SOURCES.txt
--- old/pytest_check_links-0.3.2/pytest_check_links.egg-info/SOURCES.txt 2020-03-30 11:50:04.000000000 +0200
+++ new/pytest_check_links-0.3.4/pytest_check_links.egg-info/SOURCES.txt 2020-04-21 17:09:34.000000000 +0200
@@ -7,6 +7,8 @@
requirements.txt
setup.cfg
setup.py
+examples/anchors_other.html
+examples/anchors_self.html
examples/linkcheck.ipynb
examples/markdown.md
examples/rst.rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/pytest_check_links.egg-info/pbr.json new/pytest_check_links-0.3.4/pytest_check_links.egg-info/pbr.json
--- old/pytest_check_links-0.3.2/pytest_check_links.egg-info/pbr.json 2020-03-30 11:50:04.000000000 +0200
+++ new/pytest_check_links-0.3.4/pytest_check_links.egg-info/pbr.json 2020-04-21 17:09:34.000000000 +0200
@@ -1 +1 @@
-{"git_version": "9d4396b", "is_release": false}
\ No newline at end of file
+{"git_version": "5d62197", "is_release": false}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/setup.cfg new/pytest_check_links-0.3.4/setup.cfg
--- old/pytest_check_links-0.3.2/setup.cfg 2020-03-30 11:50:04.000000000 +0200
+++ new/pytest_check_links-0.3.4/setup.cfg 2020-04-21 17:09:34.000000000 +0200
@@ -3,11 +3,12 @@
[metadata]
name = pytest_check_links
-author = Min RK
-author-email = benjaminrk(a)gmail.com
+author = Jupyter Development Team
+author-email = jupyter(a)googlegroups.com
summary = Check links in files
description-file = README.md
-home-page = https://github.com/minrk/pytest-check-links
+long-description-content-type = text/markdown
+home-page = https://github.com/jupyterlab/pytest-check-links
license = BSD-3-Clause
classifier =
Intended Audience :: Developers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/setup.py new/pytest_check_links-0.3.4/setup.py
--- old/pytest_check_links-0.3.2/setup.py 2020-03-30 11:49:31.000000000 +0200
+++ new/pytest_check_links-0.3.4/setup.py 2020-04-11 23:53:26.000000000 +0200
@@ -3,7 +3,9 @@
from setuptools import setup
# This repository uses pbr - Python Build Reasonableness
+# https://docs.openstack.org/pbr/latest/
# The version is set by the current git tag + describe status.
+# The rest of the config data is in setup.cfg
setup(
setup_requires=['pbr>=1.9', 'setuptools>=17.1'],
pbr=True,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest_check_links-0.3.2/test/test_check_links.py new/pytest_check_links-0.3.4/test/test_check_links.py
--- old/pytest_check_links-0.3.2/test/test_check_links.py 2020-03-30 11:40:43.000000000 +0200
+++ new/pytest_check_links-0.3.4/test/test_check_links.py 2020-04-21 17:04:48.000000000 +0200
@@ -25,3 +25,14 @@
testdir.copy_example('markdown.md')
result = testdir.runpytest("-v", "--check-links", "--links-ext=.md,rst")
result.assert_outcomes(passed=15, failed=6)
+
+def test_anchors_self(testdir):
+ testdir.copy_example('anchors_self.html')
+ result = testdir.runpytest("-v", "--check-links", "--check-anchors")
+ result.assert_outcomes(passed=1, failed=2)
+
+def test_anchors_other(testdir):
+ testdir.copy_example('anchors_self.html')
+ testdir.copy_example('anchors_other.html')
+ result = testdir.runpytest("-v", "--check-links", "--check-anchors", "anchors_other.html")
+ result.assert_outcomes(passed=1, failed=2)
1
0
Hello community,
here is the log from the commit of package python-pytest-randomly for openSUSE:Factory checked in at 2020-05-01 11:08:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-randomly (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-randomly.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-randomly"
Fri May 1 11:08:58 2020 rev:8 rq:798133 version:3.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest-randomly/python-pytest-randomly.changes 2020-02-20 14:57:56.634589868 +0100
+++ /work/SRC/openSUSE:Factory/.python-pytest-randomly.new.2738/python-pytest-randomly.changes 2020-05-01 11:09:20.435323864 +0200
@@ -1,0 +2,7 @@
+Mon Apr 27 09:33:24 UTC 2020 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 3.3.1:
+ * Fix to work when pytest-xdist is not installed or active.
+ * Add pytest-xdist support.
+
+-------------------------------------------------------------------
Old:
----
3.2.1.tar.gz
New:
----
3.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-randomly.spec ++++++
--- /var/tmp/diff_new_pack.sM6mS0/_old 2020-05-01 11:09:22.019327308 +0200
+++ /var/tmp/diff_new_pack.sM6mS0/_new 2020-05-01 11:09:22.019327308 +0200
@@ -19,7 +19,7 @@
%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-pytest-randomly
-Version: 3.2.1
+Version: 3.3.1
Release: 0
Summary: Pytest plugin to randomly order tests and control random.seed
License: BSD-3-Clause
@@ -38,6 +38,7 @@
BuildRequires: %{python_module Faker}
BuildRequires: %{python_module factory_boy}
BuildRequires: %{python_module numpy}
+BuildRequires: %{python_module pytest-xdist}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module six}
# /SECTION
++++++ 3.2.1.tar.gz -> 3.3.1.tar.gz ++++++
++++ 2203 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package git for openSUSE:Factory checked in at 2020-05-01 11:08:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/git (Old)
and /work/SRC/openSUSE:Factory/.git.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git"
Fri May 1 11:08:45 2020 rev:250 rq:799281 version:2.26.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/git/git.changes 2020-04-29 20:44:28.643970379 +0200
+++ /work/SRC/openSUSE:Factory/.git.new.2738/git.changes 2020-05-01 11:09:14.267310450 +0200
@@ -4 +4 @@
-- Protocol v2 in_vain fixes (bsc#1170741).
+- Protocol v2 in_vain fixes (bsc#1170741, bsc#1170939).
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
1
0
Hello community,
here is the log from the commit of package yast2-sound for openSUSE:Factory checked in at 2020-05-01 11:08:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-sound (Old)
and /work/SRC/openSUSE:Factory/.yast2-sound.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-sound"
Fri May 1 11:08:44 2020 rev:97 rq:799139 version:4.2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-sound/yast2-sound.changes 2020-04-22 20:42:44.230187613 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-sound.new.2738/yast2-sound.changes 2020-05-01 11:09:09.863300872 +0200
@@ -1,0 +2,7 @@
+Wed Apr 29 14:19:50 UTC 2020 - jsrain(a)suse.com
+
+- avoid attempts to build sound card database if no kernel
+ available (related to jsc#SLE-11862)
+- 4.2.4
+
+-------------------------------------------------------------------
@@ -4 +11 @@
-- jsc#SLE-11873
+- jsc#SLE-11862
Old:
----
yast2-sound-4.2.3.tar.bz2
New:
----
yast2-sound-4.2.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-sound.spec ++++++
--- /var/tmp/diff_new_pack.m2Z601/_old 2020-05-01 11:09:11.139303647 +0200
+++ /var/tmp/diff_new_pack.m2Z601/_new 2020-05-01 11:09:11.139303647 +0200
@@ -17,7 +17,7 @@
Name: yast2-sound
-Version: 4.2.3
+Version: 4.2.4
Release: 0
Summary: YaST2 - Sound Configuration
License: GPL-2.0-or-later
@@ -29,7 +29,6 @@
BuildRequires: alsa-devel
BuildRequires: doxygen
BuildRequires: gcc-c++
-BuildRequires: kernel-default
BuildRequires: libtool
BuildRequires: perl-XML-Writer
BuildRequires: ruby
@@ -39,6 +38,11 @@
BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-testsuite
+# workaround for OS builds, see jsc#SLE-11862
+%ifnarch i586
+BuildRequires: kernel-default
+%endif
+
# Fixed handling of Kernel modules loaded on boot
Requires: alsa
# For proc_modules.scr
++++++ yast2-sound-4.2.3.tar.bz2 -> yast2-sound-4.2.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/data/generate_soundcard_db.rb new/yast2-sound-4.2.4/data/generate_soundcard_db.rb
--- old/yast2-sound-4.2.3/data/generate_soundcard_db.rb 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/data/generate_soundcard_db.rb 2020-04-30 09:40:41.000000000 +0200
@@ -4,9 +4,12 @@
require File.join(File.dirname(__FILE__), "alsa_drivers.rb")
require File.join(File.dirname(__FILE__), "sound_db_generator.rb")
-# generate the database for the first kernel found
-kernel_path = Dir['/lib/modules/*'].first + '/kernel/sound/'
-
-# write the database to a file
-puts SoundCardDBGenerator.generate_sound_card_db kernel_path
+if Dir['/lib/modules/*'].first.nil?
+ STDERR.puts "No kernel installed, skipping building of the sound card database"
+else
+ # generate the database for the first kernel found
+ kernel_path = Dir['/lib/modules/*'].first + '/kernel/sound/'
+ # write the database to a file
+ puts SoundCardDBGenerator.generate_sound_card_db kernel_path
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/package/yast2-sound.changes new/yast2-sound-4.2.4/package/yast2-sound.changes
--- old/yast2-sound-4.2.3/package/yast2-sound.changes 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/package/yast2-sound.changes 2020-04-30 09:40:41.000000000 +0200
@@ -1,7 +1,14 @@
-------------------------------------------------------------------
+Wed Apr 29 14:19:50 UTC 2020 - jsrain(a)suse.com
+
+- avoid attempts to build sound card database if no kernel
+ available (related to jsc#SLE-11862)
+- 4.2.4
+
+-------------------------------------------------------------------
Thu Apr 16 08:53:21 UTC 2020 - Michal Filka <mfilka(a)suse.com>
-- jsc#SLE-11873
+- jsc#SLE-11862
- dropped conditional build to unify SLE and OS builds
- 4.2.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/package/yast2-sound.spec new/yast2-sound-4.2.4/package/yast2-sound.spec
--- old/yast2-sound-4.2.3/package/yast2-sound.spec 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/package/yast2-sound.spec 2020-04-30 09:40:41.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-sound
-Version: 4.2.3
+Version: 4.2.4
Release: 0
Summary: YaST2 - Sound Configuration
License: GPL-2.0-or-later
@@ -29,7 +29,6 @@
BuildRequires: alsa-devel
BuildRequires: doxygen
BuildRequires: gcc-c++
-BuildRequires: kernel-default
BuildRequires: libtool
BuildRequires: perl-XML-Writer
BuildRequires: ruby
@@ -39,6 +38,11 @@
BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-testsuite
+# workaround for OS builds, see jsc#SLE-11862
+%ifnarch i586
+BuildRequires: kernel-default
+%endif
+
# Fixed handling of Kernel modules loaded on boot
Requires: alsa
# For proc_modules.scr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/Makefile.am new/yast2-sound-4.2.4/testsuite/Makefile.am
--- old/yast2-sound-4.2.3/testsuite/Makefile.am 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-#
-# Makefile.am for .../testsuite
-#
-# Do not edit this file (Makefile.am) as it will be overwritten!
-#
-
-AUTOMAKE_OPTIONS = dejagnu
-EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.rb)
-
-testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite
-
-all-local: $(testsuite_prepare)
- make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir)
-
-clean-local: $(testsuite_prepare)
- make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean
-
-check-local: $(testsuite_prepare)
- make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check
-
-# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/export_volume.out new/yast2-sound-4.2.4/testsuite/tests/export_volume.out
--- old/yast2-sound-4.2.3/testsuite/tests/export_volume.out 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/export_volume.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-Return []
-Return []
-Return [[$["mute":false, "name":"Master", "volume":80], $["mute":false, "name":"CD", "volume":90]]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/export_volume.rb new/yast2-sound-4.2.4/testsuite/tests/export_volume.rb
--- old/yast2-sound-4.2.3/testsuite/tests/export_volume.rb 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/export_volume.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class ExportVolumeClient < Client
- def main
- # testedfiles: Sound.ycp
- Yast.include self, "testsuite.rb"
-
- Yast.import "Sound"
-
- @input = [[["Master", 80, false], ["CD", 90, false]]]
- TEST(lambda { Sound.ExportVolumeSettings(nil) }, [], nil)
- TEST(lambda { Sound.ExportVolumeSettings([]) }, [], nil)
- TEST(lambda { Sound.ExportVolumeSettings(@input) }, [], nil)
-
- nil
- end
- end
-end
-
-Yast::ExportVolumeClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/filter_configured.out new/yast2-sound-4.2.4/testsuite/tests/filter_configured.out
--- old/yast2-sound-4.2.3/testsuite/tests/filter_configured.out 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/filter_configured.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-Return []
-Return [$["device":"SB Live! EMU10000", "unique_key":"CvwD.k1dGGUobcK9", "vendor":"Creative Labs", "vendor_id":69890]]
-Return []
-Return [$["device":"SB Live! EMU10000", "unique_key":"CvwD.k1dGGUobcK9", "vendor":"Creative Labs", "vendor_id":69890]]
-Return []
-Return [$["bus":"PCI", "class_id":4, "device":"SB Live! EMU10000", "device_id":65538, "drivers":[$["active":false, "modprobe":true, "modules":[["emu10k1", ""]]]], "resource":$["io":[$["active":true, "length":0, "mode":"rw", "start":49152]], "irq":[$["count":1146364, "enabled":true, "irq":10]]], "rev":"7", "sub_class_id":1, "sub_device":"CT4830 SBLive! Value", "sub_device_id":98342, "sub_vendor":"Creative Labs", "sub_vendor_id":69890, "unique_key":"CvwD.k1dGGUobcK9", "vendor":"Creative Labs", "vendor_id":69890]]
-Return [$["bus":"PCI", "class_id":4, "device":"SB Live! EMU10000", "device_id":65538, "drivers":[$["active":false, "modprobe":true, "modules":[["emu10k1", ""]]]], "resource":$["io":[$["active":true, "length":0, "mode":"rw", "start":49152]], "irq":[$["count":1146364, "enabled":true, "irq":10]]], "rev":"7", "sub_class_id":1, "sub_device":"CT4830 SBLive! Value", "sub_device_id":98342, "sub_vendor":"Creative Labs", "sub_vendor_id":69890, "unique_key":"CvwD.k1dGGUobcK9", "vendor":"Creative Labs", "vendor_id":69890], $["bus":"PCI", "class_id":4, "device":"AC97 Audio Controller", "device_id":77912, "drivers":[$["active":false, "modprobe":true, "modules":[["via82cxxx_audio", ""]]]], "resource":$["io":[$["active":true, "length":0, "mode":"rw", "start":55296], $["active":true, "length":0, "mode":"rw", "start":56320], $["active":true, "length":0, "mode":"rw", "start":57344]], "irq":[$["count":1146364, "enabled":true, "irq":10]]], "rev":"32", "sub_class_id":1, "sub_device_id":100613, "sub_vendor":"FIRST INTERNATIONAL Computer Inc", "sub_vendor_id":70921, "unique_key":"hB6S.CxYdteFTb8D", "vendor":"VIA Technologies, Inc.", "vendor_id":69894]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/filter_configured.rb new/yast2-sound-4.2.4/testsuite/tests/filter_configured.rb
--- old/yast2-sound-4.2.3/testsuite/tests/filter_configured.rb 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/filter_configured.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,167 +0,0 @@
-# encoding: utf-8
-
-# File:
-# test_routines.ycp
-#
-# Module:
-# Sound
-#
-# Summary:
-# Tests for sound includes.
-#
-# Authors:
-# Dan Meszaros <dmeszar(a)suse.cz>, 2001
-#
-# Tests for sound routines.
-module Yast
- class FilterConfiguredClient < Client
- def main
- Yast.import "UI"
- # testedfiles: Sound.ycp sound/routines.ycp
-
- Yast.include self, "testsuite.rb"
-
- @READ_I = { "target" => { "size" => -1, "tmpdir" => "/tmp" } }
-
- TESTSUITE_INIT([@READ_I], nil)
- Yast.include self, "sound/routines.rb"
-
- @save_info = []
- @cards = []
-
- # in card entries we care about nothing but unique_key
-
- # empty save_info, no cards
- TEST(lambda { filter_configured(@save_info, @cards) }, [], nil)
-
- # one detected, no configured cards
- @save_info = []
- @cards = [
- {
- "device" => "SB Live! EMU10000",
- "unique_key" => "CvwD.k1dGGUobcK9",
- "vendor" => "Creative Labs",
- "vendor_id" => 69890
- }
- ]
- TEST(lambda { filter_configured(@save_info, @cards) }, [], nil)
-
- # detected and configured card
- @save_info = [
- { "alias" => "", "module" => "", "unique_key" => "CvwD.k1dGGUobcK9" }
- ]
- TEST(lambda { filter_configured(@save_info, @cards) }, [], nil)
-
- # detected but different that configured
-
- @save_info = [
- { "alias" => "", "module" => "", "unique_key" => "cVWd.K1DgguOBCk9" }
- ]
- TEST(lambda { filter_configured(@save_info, @cards) }, [], nil)
-
- # two detected cards
-
- @cards = [
- {
- "bus" => "PCI",
- "class_id" => 4,
- "device" => "SB Live! EMU10000",
- "device_id" => 65538,
- "drivers" => [
- {
- "active" => false,
- "modprobe" => true,
- "modules" => [["emu10k1", ""]]
- }
- ],
- "resource" => {
- "io" => [
- {
- "active" => true,
- "length" => 0,
- "mode" => "rw",
- "start" => 49152
- }
- ],
- "irq" => [{ "count" => 1146364, "enabled" => true, "irq" => 10 }]
- },
- "rev" => "7",
- "sub_class_id" => 1,
- "sub_device" => "CT4830 SBLive! Value",
- "sub_device_id" => 98342,
- "sub_vendor" => "Creative Labs",
- "sub_vendor_id" => 69890,
- "unique_key" => "CvwD.k1dGGUobcK9",
- "vendor" => "Creative Labs",
- "vendor_id" => 69890
- },
- {
- "bus" => "PCI",
- "class_id" => 4,
- "device" => "AC97 Audio Controller",
- "device_id" => 77912,
- "drivers" => [
- {
- "active" => false,
- "modprobe" => true,
- "modules" => [["via82cxxx_audio", ""]]
- }
- ],
- "resource" => {
- "io" => [
- {
- "active" => true,
- "length" => 0,
- "mode" => "rw",
- "start" => 55296
- },
- {
- "active" => true,
- "length" => 0,
- "mode" => "rw",
- "start" => 56320
- },
- {
- "active" => true,
- "length" => 0,
- "mode" => "rw",
- "start" => 57344
- }
- ],
- "irq" => [{ "count" => 1146364, "enabled" => true, "irq" => 10 }]
- },
- "rev" => "32",
- "sub_class_id" => 1,
- "sub_device_id" => 100613,
- "sub_vendor" => "FIRST INTERNATIONAL Computer Inc",
- "sub_vendor_id" => 70921,
- "unique_key" => "hB6S.CxYdteFTb8D",
- "vendor" => "VIA Technologies, Inc.",
- "vendor_id" => 69894
- }
- ]
- # both configured
- @save_info = [
- { "unique_key" => "hB6S.CxYdteFTb8D" },
- { "unique_key" => "CvwD.k1dGGUobcK9" }
- ]
-
- TEST(lambda { filter_configured(@save_info, @cards) }, [], nil)
-
- # first not configured
- @save_info = [
- { "unique_key" => "hB6S.CxYdteFTb8D" },
- { "unique_key" => "cVWd.K1DgguOBCk9" }
- ]
- TEST(lambda { filter_configured(@save_info, @cards) }, [], nil)
-
- # none configured
- @save_info = []
- TEST(lambda { filter_configured(@save_info, @cards) }, [], nil)
-
- nil
- end
- end
-end
-
-Yast::FilterConfiguredClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/get_card_label.out new/yast2-sound-4.2.4/testsuite/tests/get_card_label.out
--- old/yast2-sound-4.2.3/testsuite/tests/get_card_label.out 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/get_card_label.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-Return
-Return CT4830 SBLive! Value
-Return CT4830 SBLive! Value
-Return Creative Labs
-Return CT4830 SBLive! Value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/get_card_label.rb new/yast2-sound-4.2.4/testsuite/tests/get_card_label.rb
--- old/yast2-sound-4.2.3/testsuite/tests/get_card_label.rb 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/get_card_label.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,168 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class GetCardLabelClient < Client
- def main
- Yast.import "UI"
- # testedfiles: Sound.ycp sound/routines.ycp
-
- Yast.include self, "testsuite.rb"
- @READ_I = { "target" => { "size" => -1, "tmpdir" => "/tmp" } }
-
- TESTSUITE_INIT([@READ_I], nil)
- Yast.include self, "sound/routines.rb"
-
- @card = {}
-
- TEST(lambda { get_card_label(@card) }, [], nil)
-
- @card = {
- "bus" => "PCI",
- "class_id" => 4,
- "device" => "SB Live! EMU10000",
- "device_id" => 65538,
- "drivers" => [
- {
- "active" => false,
- "modprobe" => true,
- "modules" => [["emu10k1", ""]]
- }
- ],
- "resource" => {
- "io" => [
- {
- "active" => true,
- "length" => 0,
- "mode" => "rw",
- "start" => 49152
- }
- ],
- "irq" => [{ "count" => 1146364, "enabled" => true, "irq" => 10 }]
- },
- "rev" => "7",
- "sub_class_id" => 1,
- "sub_device" => "CT4830 SBLive! Value",
- "sub_device_id" => 98342,
- "sub_vendor" => "Creative Labs",
- "sub_vendor_id" => 69890,
- "unique_key" => "CvwD.k1dGGUobcK9",
- "vendor" => "Creative Labs",
- "vendor_id" => 69890
- }
-
- TEST(lambda { get_card_label(@card) }, [], nil)
-
- @card = {
- "bus" => "PCI",
- "class_id" => 4,
- "device" => "",
- "device_id" => 65538,
- "drivers" => [
- {
- "active" => false,
- "modprobe" => true,
- "modules" => [["emu10k1", ""]]
- }
- ],
- "resource" => {
- "io" => [
- {
- "active" => true,
- "length" => 0,
- "mode" => "rw",
- "start" => 49152
- }
- ],
- "irq" => [{ "count" => 1146364, "enabled" => true, "irq" => 10 }]
- },
- "rev" => "7",
- "sub_class_id" => 1,
- "sub_device" => "CT4830 SBLive! Value",
- "sub_device_id" => 98342,
- "sub_vendor" => "Creative Labs",
- "sub_vendor_id" => 69890,
- "unique_key" => "CvwD.k1dGGUobcK9",
- "vendor" => "Creative Labs",
- "vendor_id" => 69890
- }
-
- TEST(lambda { get_card_label(@card) }, [], nil)
-
- @card = {
- "bus" => "PCI",
- "class_id" => 4,
- "device" => "",
- "device_id" => 65538,
- "drivers" => [
- {
- "active" => false,
- "modprobe" => true,
- "modules" => [["emu10k1", ""]]
- }
- ],
- "resource" => {
- "io" => [
- {
- "active" => true,
- "length" => 0,
- "mode" => "rw",
- "start" => 49152
- }
- ],
- "irq" => [{ "count" => 1146364, "enabled" => true, "irq" => 10 }]
- },
- "rev" => "7",
- "sub_class_id" => 1,
- "sub_device" => "",
- "sub_device_id" => 98342,
- "sub_vendor" => "Creative Labs",
- "sub_vendor_id" => 69890,
- "unique_key" => "CvwD.k1dGGUobcK9",
- "vendor" => "Creative Labs",
- "vendor_id" => 69890
- }
-
- TEST(lambda { get_card_label(@card) }, [], nil)
-
- @card = {
- "bus" => "PCI",
- "class_id" => 4,
- "device" => "",
- "device_id" => 65538,
- "drivers" => [
- {
- "active" => false,
- "modprobe" => true,
- "modules" => [["emu10k1", ""]]
- }
- ],
- "resource" => {
- "io" => [
- {
- "active" => true,
- "length" => 0,
- "mode" => "rw",
- "start" => 49152
- }
- ],
- "irq" => [{ "count" => 1146364, "enabled" => true, "irq" => 10 }]
- },
- "rev" => "7",
- "sub_class_id" => 1,
- "sub_device" => "CT4830 SBLive! Value",
- "sub_device_id" => 98342,
- "sub_vendor" => "Creative Labs",
- "sub_vendor_id" => 69890,
- "unique_key" => "CvwD.k1dGGUobcK9",
- "vendor" => "Creative Labs",
- "vendor_id" => 69890
- }
-
- TEST(lambda { get_card_label(@card) }, [], nil)
-
- nil
- end
- end
-end
-
-Yast::GetCardLabelClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/import_volume.out new/yast2-sound-4.2.4/testsuite/tests/import_volume.out
--- old/yast2-sound-4.2.3/testsuite/tests/import_volume.out 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/import_volume.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-Return []
-Return []
-Return [[["Master", 80, false], ["CD", 90, false]]]
-Return [[["Master", 80, false], ["CD", 90, false]]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/import_volume.rb new/yast2-sound-4.2.4/testsuite/tests/import_volume.rb
--- old/yast2-sound-4.2.3/testsuite/tests/import_volume.rb 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/import_volume.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class ImportVolumeClient < Client
- def main
- # testedfiles: Sound.ycp
- Yast.include self, "testsuite.rb"
-
- Yast.import "Sound"
-
-
- # Important: import of the new and the old format must produce the same output!
-
- @input_old_format = [[["Master", 80, false], ["CD", 90, false]]]
-
- TEST(lambda { Sound.ImportVolumeSettings(nil) }, [], nil)
- TEST(lambda { Sound.ImportVolumeSettings([]) }, [], nil)
- TEST(lambda { Sound.ImportVolumeSettings(@input_old_format) }, [], nil)
-
- @input_new_format = [
- [
- { "mute" => false, "name" => "Master", "volume" => 80 },
- { "mute" => false, "name" => "CD", "volume" => 90 }
- ]
- ]
-
- TEST(lambda { Sound.ImportVolumeSettings(@input_new_format) }, [], nil)
-
- nil
- end
- end
-end
-
-Yast::ImportVolumeClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/is_snd_alias.out new/yast2-sound-4.2.4/testsuite/tests/is_snd_alias.out
--- old/yast2-sound-4.2.3/testsuite/tests/is_snd_alias.out 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/is_snd_alias.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-Return false
-Return true
-Return true
-Return false
-Return false
-Return false
-Return false
-Return false
-Return false
-Return false
-Return false
-Return false
-Return false
-Return false
-Return false
-Return false
-Return false
-Return true
-Return true
-Return false
-Return false
-Return false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/is_snd_alias.rb new/yast2-sound-4.2.4/testsuite/tests/is_snd_alias.rb
--- old/yast2-sound-4.2.3/testsuite/tests/is_snd_alias.rb 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/is_snd_alias.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class IsSndAliasClient < Client
- def main
- Yast.import "UI"
- # testedfiles: Sound.ycp sound/routines.ycp
- Yast.include self, "testsuite.rb"
-
- # initialization is needed because module Sound imports the module Arch
- # and Arch module does a SCR call .probe.system
- @READ = {
- "target" => { "size" => -1, "tmpdir" => "/tmp" },
- "probe" => { "system" => [] }
- }
-
- TESTSUITE_INIT([@READ], nil)
-
- Yast.import "Sound"
- Yast.include self, "sound/routines.rb"
-
- Builtins.foreach(
- [true, false] # check for both alsa and oss behaviour
- ) do |snd|
- Sound.use_alsa = snd
- TEST(lambda { is_snd_alias("") }, [], nil)
- TEST(lambda { is_snd_alias("snd-card-0") }, [], nil)
- TEST(lambda { is_snd_alias("snd-card-16") }, [], nil)
- TEST(lambda { is_snd_alias("snd-card-emu10k1") }, [], nil)
- TEST(lambda { is_snd_alias("snd-card-0a") }, [], nil)
- TEST(lambda { is_snd_alias("snd-card-a0") }, [], nil)
- TEST(lambda { is_snd_alias("sound-slot-1") }, [], nil)
- TEST(lambda { is_snd_alias("sound-slot-117") }, [], nil)
- TEST(lambda { is_snd_alias("sound-slot-0a") }, [], nil)
- TEST(lambda { is_snd_alias("sound-slot-asdf") }, [], nil)
- TEST(lambda { is_snd_alias(" sound-slot-0") }, [], nil)
- end
-
- nil
- end
- end
-end
-
-Yast::IsSndAliasClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/isa_uniq.out new/yast2-sound-4.2.4/testsuite/tests/isa_uniq.out
--- old/yast2-sound-4.2.3/testsuite/tests/isa_uniq.out 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/isa_uniq.out 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Return uniq.unknown_key
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.2.3/testsuite/tests/isa_uniq.rb new/yast2-sound-4.2.4/testsuite/tests/isa_uniq.rb
--- old/yast2-sound-4.2.3/testsuite/tests/isa_uniq.rb 2020-04-17 17:01:12.000000000 +0200
+++ new/yast2-sound-4.2.4/testsuite/tests/isa_uniq.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class IsaUniqClient < Client
- def main
- Yast.import "UI"
- # testedfiles: Sound.ycp sound/routines.ycp
- Yast.include self, "testsuite.rb"
- @READ_I = { "target" => { "size" => -1, "tmpdir" => "/tmp" } }
-
- TESTSUITE_INIT([@READ_I], nil)
- Yast.include self, "sound/routines.rb"
-
- TEST(lambda { isa_uniq }, [], nil)
-
- nil
- end
- end
-end
-
-Yast::IsaUniqClient.new.main
1
0
Hello community,
here is the log from the commit of package vlc for openSUSE:Factory checked in at 2020-05-01 11:08:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vlc (Old)
and /work/SRC/openSUSE:Factory/.vlc.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vlc"
Fri May 1 11:08:38 2020 rev:106 rq:798989 version:3.0.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/vlc/vlc.changes 2020-04-18 00:30:21.938044263 +0200
+++ /work/SRC/openSUSE:Factory/.vlc.new.2738/vlc.changes 2020-05-01 11:09:01.955283674 +0200
@@ -1,0 +2,6 @@
+Wed Apr 29 14:14:21 UTC 2020 - Dominique Leuenberger <dimstar(a)opensuse.org>
+
+- Update to version 3.0.10:
+ + Misc: Update Twitch & VLSub scripts.
+
+-------------------------------------------------------------------
@@ -144,0 +151,14 @@
+ + Security fixes included:
+ * Fix a buffer overflow in the MKV demuxer (CVE-2019-14970)
+ * Fix a read buffer overflow in the avcodec decoder (CVE-2019-13962)
+ * Fix a read buffer overflow in the FAAD decoder
+ * Fix a read buffer overflow in the OGG demuxer (CVE-2019-14437, CVE-2019-14438)
+ * Fix a read buffer overflow in the ASF demuxer (CVE-2019-14776)
+ * Fix a use after free in the MKV demuxer (CVE-2019-14777, CVE-2019-14778)
+ * Fix a use after free in the ASF demuxer (CVE-2019-14533)
+ * Fix a couple of integer underflows in the MP4 demuxer (CVE-2019-13602)
+ * Fix a null dereference in the dvdnav demuxer
+ * Fix a null dereference in the ASF demuxer (CVE-2019-14534)
+ * Fix a null dereference in the AVI demuxer
+ * Fix a division by zero in the CAF demuxer (CVE-2019-14498)
+ * Fix a division by zero in the ASF demuxer (CVE-2019-14535)
Old:
----
vlc-3.0.9.2.tar.xz
vlc-3.0.9.2.tar.xz.asc
New:
----
vlc-3.0.10.tar.xz
vlc-3.0.10.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vlc.spec ++++++
--- /var/tmp/diff_new_pack.FSEWvC/_old 2020-05-01 11:09:03.443286910 +0200
+++ /var/tmp/diff_new_pack.FSEWvC/_new 2020-05-01 11:09:03.443286910 +0200
@@ -33,7 +33,7 @@
%bcond_with faad
%bcond_with fdk_aac
Name: vlc
-Version: 3.0.9.2
+Version: 3.0.10
Release: 0
Summary: Graphical media player
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ vlc-3.0.9.2.tar.xz -> vlc-3.0.10.tar.xz ++++++
/work/SRC/openSUSE:Factory/vlc/vlc-3.0.9.2.tar.xz /work/SRC/openSUSE:Factory/.vlc.new.2738/vlc-3.0.10.tar.xz differ: char 26, line 1
1
0
Hello community,
here is the log from the commit of package webkit2gtk3 for openSUSE:Factory checked in at 2020-05-01 11:08:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/webkit2gtk3 (Old)
and /work/SRC/openSUSE:Factory/.webkit2gtk3.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webkit2gtk3"
Fri May 1 11:08:38 2020 rev:97 rq:799169 version:2.28.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/webkit2gtk3/webkit2gtk3.changes 2020-04-29 20:43:09.851764949 +0200
+++ /work/SRC/openSUSE:Factory/.webkit2gtk3.new.2738/webkit2gtk3.changes 2020-05-01 11:08:58.227275567 +0200
@@ -4 +4 @@
-- Update to version 2.28.2:
+- Update to version 2.28.2 (boo#1170643):
@@ -12,0 +13 @@
+ + Security fixes: CVE-2020-3899.
@@ -61 +62,3 @@
- + Security fixes: CVE-2020-10018.
+ + Security fixes: CVE-2020-10018, CVE-2020-3885, CVE-2020-3894,
+ CVE-2020-3895, CVE-2020-3897, CVE-2020-3900, CVE-2020-3901,
+ CVE-2020-3902.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
1
0