Hello community,
here is the log from the commit of package hamster-time-tracker for
openSUSE:Factory checked in at 2019-10-23 15:51:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hamster-time-tracker (Old)
and /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hamster-time-tracker"
Wed Oct 23 15:51:35 2019 rev:3 rq:741921 version:unknown
Changes:
--------
---
/work/SRC/openSUSE:Factory/hamster-time-tracker/hamster-time-tracker.changes
2019-05-12 11:44:19.415792170 +0200
+++
/work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2352/hamster-time-tracker.changes
2019-10-23 15:51:40.358747938 +0200
@@ -1,0 +2,20 @@
+Tue Oct 22 18:58:23 UTC 2019 - Martin Wilck <mwi...@suse.com>
+
+- Added a Provides: for gnome-shell-extension-hamster for proper
+ package renaming
+
+-------------------------------------------------------------------
+Tue Oct 22 15:14:44 UTC 2019 - Martin Wilck <mwi...@suse.com>
+
+- Make hamster-shell-extension compatible with GNOME 3.34 for TW
+ (gh#projecthamster/hamster-shell-extension#316)
+ * added 0019-factsBox-use-GObject.registerClass.patch
+ * added 0020-panelWidget-fix-object.actor-is-deprecated-warning.patch
+ * added 0021-metadata.json-mark-GNOME-3.34-as-supported.patch
+- Renamed gnome-shell-extension-hamster to
gnome-shell-extension-hamster-time-tracker
+ and changed version number scheme which was broken before
+ * coded "maximum GNOME shell version" in
+ * don't use hamster main package version, as the extension has an
+ independent code base and the hamster API is stable
+
+-------------------------------------------------------------------
New:
----
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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hamster-time-tracker.spec ++++++
--- /var/tmp/diff_new_pack.4knSlb/_old 2019-10-23 15:51:41.674749360 +0200
+++ /var/tmp/diff_new_pack.4knSlb/_new 2019-10-23 15:51:41.678749365 +0200
@@ -17,6 +17,7 @@
%global ext_version 0.10.0
+%global ext_gnome_version 3.34
%global ext_uuid cont...@projecthamster.org
%bcond_without extension
@@ -59,6 +60,9 @@
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
BuildRequires: fdupes
BuildRequires: intltool
# For detecting typelib() dependencies
@@ -130,8 +134,8 @@
%patch104 -p1
%patch105 -p1
%patch106 -p1
-# Tumbleweed: GNOME 3.32 support for shell extension
-# https://github.com/projecthamster/hamster-shell-extension/pull/312
+# 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
%patch108 -p1
@@ -145,6 +149,9 @@
%patch116 -p1
%patch117 -p1
%patch118 -p1
+%patch119 -p1
+%patch120 -p1
+%patch121 -p1
%endif
mkdir build
cp %{SOURCE2} build
@@ -214,8 +221,8 @@
%dir %{_datadir}/help
%{_datadir}/help/C
-%package -n gnome-shell-extension-hamster
-Version: 2.2.2%{ext_version}
+%package -n gnome-shell-extension-hamster-time-tracker
+Version: %{ext_version}_%{ext_gnome_version}
Release: 0
Summary: Hamster time tracker for GNOME Shell status menu
License: GPL-3.0-only
@@ -228,17 +235,21 @@
%endif
Requires: %{name}
Supplements: packageand(gnome-shell:%{name})
+# The predecessor package had a broken version number.
+Obsoletes: gnome-shell-extension-hamster < 2.2.20.10.1
+Provides: gnome-shell-extension-hamster = 2.2.20.10.1
-%description -n gnome-shell-extension-hamster
-GNOME Shell extension to track activities quickly and efficiently via
-the main GNOME shell menu. Packaged for openSUSE Factory because the
+%description -n gnome-shell-extension-hamster-time-tracker
+
+GNOME Shell extension to track activities in hamster via the main
+GNOME shell menu. Packaged for openSUSE Factory because the
upstream version on extensions.gnome.org often leaks behind current
GNOME shell development.
%files lang -f %{name}.lang
%if %{with extension}
-%files -n gnome-shell-extension-hamster
+%files -n gnome-shell-extension-hamster-time-tracker
%defattr(-, root, root)
%dir %{_datadir}/gnome-shell
%{_datadir}/gnome-shell/extensions
++++++ 0019-factsBox-use-GObject.registerClass.patch ++++++
>From 69af56aff2e49cf8888f70a761bfa281ad48ef95 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwi...@suse.com>
Date: Tue, 22 Oct 2019 16:50:13 +0200
Subject: [PATCH 19/21] 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").
Handle them like all others.
Fixes this problem:
gnome-shell[9973]: TypeError: this.factsBox.refresh is not a function
Signed-off-by: Martin Wilck <mwi...@suse.com>
---
extension/widgets/factsBox.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/extension/widgets/factsBox.js b/extension/widgets/factsBox.js
index 5deb703..e524781 100644
--- a/extension/widgets/factsBox.js
+++ b/extension/widgets/factsBox.js
@@ -43,10 +43,10 @@ const TodaysFactsWidget =
Me.imports.widgets.todaysFactsWidget.TodaysFactsWidget
* well as todays facts.
* @class
*/
-var FactsBox =
+const FactsBox = GObject.registerClass(
class FactsBox extends PopupMenu.PopupBaseMenuItem {
- constructor(controller, panelWidget) {
- super({reactive: false});
+ _init(controller, panelWidget) {
+ super._init({reactive: false});
this._controller = controller;
@@ -106,4 +106,4 @@ class FactsBox extends PopupMenu.PopupBaseMenuItem {
unfocus() {
global.stage.set_key_focus(null);
}
-};
+});
--
2.23.0
++++++ 0020-panelWidget-fix-object.actor-is-deprecated-warning.patch ++++++
>From 5c88b3c79f192acc69a8e13d19be7469752fb01b Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwi...@suse.com>
Date: Tue, 22 Oct 2019 16:54:26 +0200
Subject: [PATCH 20/21] 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 <mwi...@suse.com>
---
extension/widgets/panelWidget.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/extension/widgets/panelWidget.js b/extension/widgets/panelWidget.js
index 905623a..9288f06 100644
--- a/extension/widgets/panelWidget.js
+++ b/extension/widgets/panelWidget.js
@@ -76,8 +76,10 @@ class PanelWidget extends PanelMenu.Button {
// Setup the main layout container for the part of the extension
// visible in the panel.
let panelContainer = new St.BoxLayout({style_class: "panel-box"});
- this.actor.add_actor(panelContainer);
- this.actor.add_style_class_name('panel-status-button');
+
+ let _actor = (this instanceof Clutter.Actor ? this : this.actor);
+ _actor.add_actor(panelContainer);
+ _actor.add_style_class_name('panel-status-button');
this.panelLabel = new St.Label({
text: _("Loading..."),
--
2.23.0
++++++ 0021-metadata.json-mark-GNOME-3.34-as-supported.patch ++++++
>From 627243b7b06691f518e40dc62636081eefa397f2 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwi...@suse.com>
Date: Tue, 22 Oct 2019 16:55:54 +0200
Subject: [PATCH 21/21] metadata.json: mark GNOME 3.34 as supported
Signed-off-by: Martin Wilck <mwi...@suse.com>
---
data/metadata.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/metadata.json b/data/metadata.json
index edf6099..4bd7a90 100644
--- a/data/metadata.json
+++ b/data/metadata.json
@@ -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": "cont...@projecthamster.org",
--
2.23.0
