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 <[email protected]>
+
+- 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 <[email protected]>
+
+- 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 <[email protected]>
+
+- 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 [email protected]
%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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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": "[email protected]",
--
-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 <[email protected]>
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/[email protected] ./*
- cd $(BUILDDIR); tar -czf ../dist/[email protected] *
+ cd $(BUILDDIR); tar -czf ../dist/[email protected] *
@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 ``[email protected]`` 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/[email protected]
+ # Create directory
+ mkdir -p ~/.local/share/gnome-shell/extensions/[email protected]
+ # Unpack build
+ tar xfz dist/[email protected] -C
~/.local/share/gnome-shell/extensions/[email protected]
+
+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 <[email protected]>
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_740134
---
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": "[email protected]",
- "version": "0.10.0"
+ "uuid": "[email protected]"
}
--
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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": "[email protected]",
+ "uuid": "[email protected]"
--
-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 <[email protected]>
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 <[email protected]>.
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 <[email protected]>
---
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>.
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 <[email protected]>
---
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
---
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 <[email protected]>
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 <[email protected]>
---
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 <[email protected]>
-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": "[email protected]",
+ "uuid": "[email protected]"
--
-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 <[email protected]>
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/[email protected] ./*
+ cd $(BUILDDIR); zip -rq ../dist/[email protected] ./* ||
true
cd $(BUILDDIR); tar -czf ../dist/[email protected] *
@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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date: Mon, 27 Apr 2020 12:52:58 +0200
Subject: [PATCH 127/130] Makefile: configurable extension UUID
We seem to have issues with the [email protected] 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 [email protected]
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: [email protected]
+UUID := [email protected]
# 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/[email protected] ./* ||
true
- cd $(BUILDDIR); tar -czf ../dist/[email protected] *
+ 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": "[email protected]"
+ "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 <[email protected]>
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 <[email protected]>
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/[email protected] -C
~/.local/share/gnome-shell/extensions/[email protected]
-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 <[email protected]>
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 "[email protected]"
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
+``[email protected]`` 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="[email protected]"
+
+The rest of the build procedure is like above, except that you have to replace
+``[email protected]`` 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 <[email protected]>
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 <[email protected]>
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/d3d165243c8457cc65e8864cee493f27fca15d59/
---
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
