Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hamster-time-tracker for
openSUSE:Factory checked in at 2024-04-09 16:48:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hamster-time-tracker (Old)
and /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.29460 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hamster-time-tracker"
Tue Apr 9 16:48:39 2024 rev:13 rq:1166456 version:unknown
Changes:
--------
---
/work/SRC/openSUSE:Factory/hamster-time-tracker/hamster-time-tracker.changes
2024-04-04 22:26:05.854955211 +0200
+++
/work/SRC/openSUSE:Factory/.hamster-time-tracker.new.29460/hamster-time-tracker.changes
2024-04-09 16:54:33.772305186 +0200
@@ -1,0 +2,9 @@
+Tue Apr 9 13:22:49 UTC 2024 - Martin Wilck <mwi...@suse.com>
+
+- Re-add GNOME 45 compatibility (gh#projecthamster/hamster-shell-extension#368)
+ * update code to GitHub develop branch (e3a4cb1)
+ * add 0177-metadata.json-re-add-GNOME-45-support.patch
+ * add 0178-todaysFactsWidget-Fix-broken-layout-in-GNOME-45.patch
+ * add 0179-todaysFactsWidget-Fix-broken-layout-in-GNOME-45-and-.patch
+
+-------------------------------------------------------------------
New:
----
0177-metadata.json-re-add-GNOME-45-support.patch
0178-todaysFactsWidget-Fix-broken-layout-in-GNOME-45.patch
0179-todaysFactsWidget-Fix-broken-layout-in-GNOME-45-and-.patch
BETA DEBUG BEGIN:
New: * update code to GitHub develop branch (e3a4cb1)
* add 0177-metadata.json-re-add-GNOME-45-support.patch
* add 0178-todaysFactsWidget-Fix-broken-layout-in-GNOME-45.patch
New: * add 0177-metadata.json-re-add-GNOME-45-support.patch
* add 0178-todaysFactsWidget-Fix-broken-layout-in-GNOME-45.patch
* add 0179-todaysFactsWidget-Fix-broken-layout-in-GNOME-45-and-.patch
New: * add 0178-todaysFactsWidget-Fix-broken-layout-in-GNOME-45.patch
* add 0179-todaysFactsWidget-Fix-broken-layout-in-GNOME-45-and-.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hamster-time-tracker.spec ++++++
--- /var/tmp/diff_new_pack.2PXNUQ/_old 2024-04-09 16:54:35.096354031 +0200
+++ /var/tmp/diff_new_pack.2PXNUQ/_new 2024-04-09 16:54:35.100354178 +0200
@@ -141,6 +141,9 @@
Patch174: 0174-Fix-compatibility-issues-with-Gnome-shell-46.patch
Patch175: 0175-Change-README.rst-to-refer-to-metadata.json.in-for-g.patch
Patch176: 0176-metadata.json.in-change-compatible-gnome-shell-versi.patch
+Patch177: 0177-metadata.json-re-add-GNOME-45-support.patch
+Patch178: 0178-todaysFactsWidget-Fix-broken-layout-in-GNOME-45.patch
+Patch179: 0179-todaysFactsWidget-Fix-broken-layout-in-GNOME-45-and-.patch
BuildRequires: fdupes
BuildRequires: intltool
@@ -290,6 +293,9 @@
%patch -P 174 -p1
%patch -P 175 -p1
%patch -P 176 -p1
+%patch -P 177 -p1
+%patch -P 178 -p1
+%patch -P 179 -p1
%endif # suse_version >= 1600
%endif # sle_version >= 150400
++++++ 0177-metadata.json-re-add-GNOME-45-support.patch ++++++
>From 99d491a6e62b18a3745f85d93753cdab1a111c0a Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwi...@suse.com>
Date: Thu, 4 Apr 2024 23:17:39 +0200
Subject: [PATCH 177/179] metadata.json: re-add GNOME 45 support
GNOME 45 had been removed from metadata.json in
84ab675 ("metadata.json.in: change compatible gnome-shell version to 46").
Re-add it.
---
data/metadata.json.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/metadata.json.in b/data/metadata.json.in
index bdcdade..0fcf71d 100644
--- a/data/metadata.json.in
+++ b/data/metadata.json.in
@@ -10,7 +10,8 @@
"gettext-domain": "hamster-shell-extension",
"settings-schema": "org.gnome.shell.extensions.project-hamster",
"shell-version": [
- "46"
+ "45",
+ "46"
],
"url": "https://github.com/projecthamster/hamster-shell-extension.git";,
"uuid": @UUID@
--
2.44.0
++++++ 0178-todaysFactsWidget-Fix-broken-layout-in-GNOME-45.patch ++++++
>From cc353e25e01b0bbc51afe5067bf3df2b25c082ad Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwi...@suse.com>
Date: Fri, 5 Apr 2024 15:51:44 +0200
Subject: [PATCH 178/179] todaysFactsWidget: Fix broken layout in GNOME 45
Using St.ScrollView.add_child() instead of St.ScrollView.add_actor()
leads to broken layout in the ScrollView widget (zero vertical extension
of rows). See
https://github.com/projecthamster/hamster-shell-extension/issues/362#issuecomment-2038295073
and follow-up comments.
But unlike other St Widgets, ScrollView still supports the add_actor() method
in GNOME 46. So keep using it.
---
extension/widgets/todaysFactsWidget.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extension/widgets/todaysFactsWidget.js
b/extension/widgets/todaysFactsWidget.js
index 1734cde..fe35ba2 100644
--- a/extension/widgets/todaysFactsWidget.js
+++ b/extension/widgets/todaysFactsWidget.js
@@ -48,7 +48,7 @@ class TodaysFactsWidget extends St.ScrollView {
reactive: true
});
this.factsBox.add_child(this.facts_widget);
- this.add_child(this.factsBox);
+ this.add_actor(this.factsBox);
}
--
2.44.0
++++++ 0179-todaysFactsWidget-Fix-broken-layout-in-GNOME-45-and-.patch ++++++
>From e3a4cb15063ab8ab6839fecee805a42b27914a2a Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwi...@suse.com>
Date: Tue, 9 Apr 2024 15:09:59 +0200
Subject: [PATCH 179/179] todaysFactsWidget: Fix broken layout in GNOME 45 and
46
It turns out that cc353e2 worked on GNOME 46 for me, but not
for everyone. So use the GNOME shell version check instead.
---
extension/widgets/todaysFactsWidget.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/extension/widgets/todaysFactsWidget.js
b/extension/widgets/todaysFactsWidget.js
index fe35ba2..29b9bbd 100644
--- a/extension/widgets/todaysFactsWidget.js
+++ b/extension/widgets/todaysFactsWidget.js
@@ -28,6 +28,7 @@ import GObject from 'gi://GObject';
import { gettext as _ } from
'resource:///org/gnome/shell/extensions/extension.js';
import * as Stuff from '../stuff.js';
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';
/**
* A widget that lists all facts for *today*.
@@ -48,7 +49,10 @@ class TodaysFactsWidget extends St.ScrollView {
reactive: true
});
this.factsBox.add_child(this.facts_widget);
- this.add_actor(this.factsBox);
+ if (Config.PACKAGE_VERSION.substring(0, 2) == "45")
+ this.add_actor(this.factsBox);
+ else
+ this.add_child(this.factsBox);
}
--
2.44.0
