Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package workrave for openSUSE:Factory checked in at 2022-03-31 17:18:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/workrave (Old)
and /work/SRC/openSUSE:Factory/.workrave.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "workrave"
Thu Mar 31 17:18:42 2022 rev:12 rq:966158 version:1.10.49
Changes:
--------
--- /work/SRC/openSUSE:Factory/workrave/workrave.changes 2022-01-08 23:23:57.538248283 +0100
+++ /work/SRC/openSUSE:Factory/.workrave.new.1900/workrave.changes 2022-03-31 17:19:16.776872153 +0200
@@ -1,0 +2,8 @@
+Thu Mar 31 08:27:29 UTC 2022 - Timo Jyrinki
+
+- Add patches for GNOME 42 from upstream (boo#1197808):
+ - gnome42.patch
+ - gnome42-vertical-alignment.patch
+ - gnome42-fixapplet.patch
+
+-------------------------------------------------------------------
New:
----
gnome42-fixapplet.patch
gnome42-vertical-alignment.patch
gnome42.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ workrave.spec ++++++
--- /var/tmp/diff_new_pack.Uj7Uj1/_old 2022-03-31 17:19:17.400865115 +0200
+++ /var/tmp/diff_new_pack.Uj7Uj1/_new 2022-03-31 17:19:17.404865070 +0200
@@ -26,6 +26,12 @@
URL: http://www.workrave.org
Source: https://github.com/rcaelers/workrave/archive/v%{upstream_version}.tar.gz
Source2: %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM gnome42.patch -- support GNOME 42 in metadata boo#1197808
+Patch0: gnome42.patch
+# PATCH-FIX-UPSTREAM gnome42-vertical-alignment.patch -- fix vertical alignment of the applet boo#1197808
+Patch1: gnome42-vertical-alignment.patch
+# PATCH-FIX-UPSTREAM gnome42-fixapplet.patch -- fixes for the applet for GNOME 42 boo#1197808
+Patch2: gnome42-fixapplet.patch
BuildRequires: autoconf
BuildRequires: autoconf-archive
BuildRequires: automake
@@ -68,6 +74,9 @@
%prep
%setup -q -n %{name}-%{upstream_version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
./autogen.sh
++++++ gnome42-fixapplet.patch ++++++
From e4db430e455b9fedbf27043357c65ca54d333b95 Mon Sep 17 00:00:00 2001
From: Rob Caelers
Date: Thu, 24 Mar 2022 19:06:34 +0100
Subject: [PATCH] Fix GNOME shell applet on GNOME 42 (#396)
---
frontend/applets/gnome-shell/src/extension.js | 121 +++++++++---------
1 file changed, 60 insertions(+), 61 deletions(-)
diff --git a/frontend/applets/gnome-shell/src/extension.js b/frontend/applets/gnome-shell/src/extension.js
index 8a6388cc7..8136e66b8 100644
--- a/frontend/applets/gnome-shell/src/extension.js
+++ b/frontend/applets/gnome-shell/src/extension.js
@@ -1,13 +1,14 @@
const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Mainloop = imports.mainloop;
-const Main = imports.ui.main;
-const Lang = imports.lang;
-const PopupMenu = imports.ui.popupMenu;
-const PanelMenu = imports.ui.panelMenu;
-const Gettext = imports.gettext;
const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gettext = imports.gettext;
const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Main = imports.ui.main;
+const Mainloop = imports.mainloop;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const St = imports.gi.St;
const Workrave = imports.gi.Workrave;
const _ = Gettext.gettext;
@@ -155,13 +156,11 @@ const CoreIface = '<node>\
let CoreProxy = Gio.DBusProxy.makeProxyWrapper(CoreIface);
+const WorkraveButton = GObject.registerClass(
+ class WorkraveButton extends PanelMenu.Button {
-const WorkraveButton = new Lang.Class({
- Name: 'WorkraveButton',
- Extends: PanelMenu.Button,
-
- _init: function() {
- PanelMenu.Button.prototype._init.call(this, 0.0);
+ _init() {
+ super._init(0.0);
this._timerbox = new Workrave.Timerbox();
@@ -178,11 +177,11 @@ const WorkraveButton = new Lang.Class({
this._area.connect('repaint', Lang.bind(this, this._draw));
this._box = new St.Bin();
- this._box.add_actor(this._area, { y_expand: true });
+ this._box.add_actor(this._area);
if (typeof this.add_actor === "function")
{
- this.add_actor(this._box, { y_expand: true });
+ this.add_actor(this._box);
this.show();
}
else
@@ -202,9 +201,9 @@ const WorkraveButton = new Lang.Class({
this._operation_mode_changed_id = this._core_proxy.connectSignal("OperationModeChanged", Lang.bind(this, this._onOperationModeChanged));
this._updateMenu(null);
- },
+ }
- _connectUI: function() {
+ _connectUI() {
try
{
this._watchid = Gio.DBus.session.watch_name('org.workrave.Workrave',
@@ -217,21 +216,21 @@ const WorkraveButton = new Lang.Class({
{
return true;
}
- },
+ }
- _connectCore: function() {
- },
+ _connectCore() {
+ }
- _onDestroy: function() {
+ _onDestroy() {
if (this._ui_proxy != null)
{
this._ui_proxy.EmbedRemote(false, this._bus_name);
}
this._stop();
this._destroy();
- },
+ }
- _destroy: function() {
+ _destroy() {
if (this._watchid > 0)
{
Gio.DBus.session.unwatch_name(this._watchid);
@@ -249,9 +248,9 @@ const WorkraveButton = new Lang.Class({
this._core_proxy.disconnectSignal(this._operation_mode_changed_id);
this._core_proxy = null;
}
- },
+ }
- _start: function() {
+ _start() {
if (! this._alive)
{
this._bus_id = Gio.DBus.session.own_name(this._bus_name, Gio.BusNameOwnerFlags.NONE, null, null);
@@ -263,9 +262,9 @@ const WorkraveButton = new Lang.Class({
this._alive = true;
this._update_count = 0;
}
- },
+ }
- _stop_dbus: function() {
+ _stop_dbus() {
if (this._alive)
{
Mainloop.source_remove(this._timeoutId);
@@ -273,9 +272,9 @@ const WorkraveButton = new Lang.Class({
this._timeoutId = 0;
this._bus_id = 0;
}
- },
+ }
- _stop: function() {
+ _stop() {
if (this._alive)
{
this._stop_dbus();
@@ -286,14 +285,14 @@ const WorkraveButton = new Lang.Class({
this._area.queue_repaint();
this._area.set_width(this._width=24);
}
- },
+ }
- _draw: function(area) {
+ _draw(area) {
let cr = area.get_context();
this._timerbox.draw(cr);
- },
+ }
- _onTimer: function() {
+ _onTimer() {
if (! this._alive)
{
return false;
@@ -307,17 +306,17 @@ const WorkraveButton = new Lang.Class({
this._update_count = 0;
return this._alive;
- },
+ }
- _onWorkraveAppeared: function(owner) {
+ _onWorkraveAppeared(owner) {
this._start();
- },
+ }
- _onWorkraveVanished: function(oldOwner) {
+ _onWorkraveVanished(oldOwner) {
this._stop();
- },
+ }
- _onTimersUpdated : function(emitter, senderName, [microbreak, restbreak, daily]) {
+ _onTimersUpdated (emitter, senderName, [microbreak, restbreak, daily]) {
if (! this._alive)
{
@@ -362,49 +361,49 @@ const WorkraveButton = new Lang.Class({
this._area.set_width(this._width=timerbox_width);
this._area.queue_repaint();
- },
+ }
- _onGetMenuReply : function([menuitems], excp) {
+ _onGetMenuReply ([menuitems], excp) {
this._updateMenu(menuitems);
- },
+ }
- _onGetTrayIconEnabledReply : function([enabled], excp) {
+ _onGetTrayIconEnabledReply ([enabled], excp) {
this._updateTrayIcon(enabled);
- },
+ }
- _onGetOperationModeReply : function([mode], excp) {
+ _onGetOperationModeReply ([mode], excp) {
this._timerbox.set_operation_mode(mode);
- },
+ }
- _onMenuUpdated : function(emitter, senderName, [menuitems]) {
+ _onMenuUpdated (emitter, senderName, [menuitems]) {
this._updateMenu(menuitems);
- },
+ }
- _onTrayIconUpdated : function(emitter, senderName, [enabled]) {
+ _onTrayIconUpdated (emitter, senderName, [enabled]) {
this._updateTrayIcon(enabled);
- },
+ }
- _onOperationModeChanged : function(emitter, senderName, [mode]) {
+ _onOperationModeChanged (emitter, senderName, [mode]) {
this._timerbox.set_operation_mode(mode);
- },
+ }
- _onCommandReply : function(menuitems) {
- },
+ _onCommandReply (menuitems) {
+ }
- _onMenuCommand : function(item, event, command) {
+ _onMenuCommand (item, event, command) {
this._ui_proxy.CommandRemote(command, Lang.bind(this, this._onCommandReply));
- },
+ }
- _onMenuOpenCommand: function(item, event) {
+ _onMenuOpenCommand(item, event) {
this._ui_proxy.GetMenuRemote(); // A dummy method call to re-activate the service
- },
+ }
- _updateTrayIcon : function(enabled) {
+ _updateTrayIcon (enabled) {
this._force_icon = enabled;
this._timerbox.set_force_icon(this._force_icon);
- },
+ }
- _updateMenu : function(menuitems) {
+ _updateMenu (menuitems) {
this.menu.removeAll();
let current_menu = this.menu;
++++++ gnome42-vertical-alignment.patch ++++++
From 5c9361424bda7129d74bddea5fb39fbbe76a597d Mon Sep 17 00:00:00 2001
From: Rob Caelers
Date: Sun, 23 Jan 2022 20:43:19 +0100
Subject: [PATCH] Fix vertical alignment of GNOME shell applet (#356)
---
frontend/applets/gnome-shell/src/extension.js | 25 ++++---------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/frontend/applets/gnome-shell/src/extension.js b/frontend/applets/gnome-shell/src/extension.js
index 66d581b52..8a6388cc7 100644
--- a/frontend/applets/gnome-shell/src/extension.js
+++ b/frontend/applets/gnome-shell/src/extension.js
@@ -1,3 +1,4 @@
+const Clutter = imports.gi.Clutter;
const St = imports.gi.St;
const Mainloop = imports.mainloop;
const Main = imports.ui.main;
@@ -171,22 +172,22 @@ const WorkraveButton = new Lang.Class({
this._bus_id = 0;
this._watchid = 0;
- this._area = new St.DrawingArea({ style_class: 'workrave-area', reactive: true } );
+ this._area = new St.DrawingArea({ style_class: 'workrave-area', reactive: true, y_align: Clutter.ActorAlign.CENTER } );
this._area.set_width(this._width=24);
this._area.set_height(this._height=24);
this._area.connect('repaint', Lang.bind(this, this._draw));
this._box = new St.Bin();
- this._box.add_actor(this._area);
+ this._box.add_actor(this._area, { y_expand: true });
if (typeof this.add_actor === "function")
{
- this.add_actor(this._box);
+ this.add_actor(this._box, { y_expand: true });
this.show();
}
else
{
- this.actor.add_actor(this._box);
+ this.actor.add_actor(this._box, { y_expand: true });
this.actor.show();
}
@@ -359,22 +360,6 @@ const WorkraveButton = new Lang.Class({
let timerbox_width = this._timerbox.get_width();
let timerbox_height = this._timerbox.get_height();
- let height = 24;
- if (typeof this.get_height === "function")
- {
- height = this.get_height();
- }
- else
- {
- // Fallback for older Gnome Shell versions
- height = this.actor.height;
- }
-
- let padding = Math.floor((height - timerbox_height) / 2);
-
- this._box.style = "padding-top: " + padding + "px;";
- this._padding = padding;
-
this._area.set_width(this._width=timerbox_width);
this._area.queue_repaint();
},
++++++ gnome42.patch ++++++
From 64dc9c66aac24e7a4d14e31c290169b92f7031f3 Mon Sep 17 00:00:00 2001
From: Rob Caelers
Date: Sun, 23 Jan 2022 20:44:42 +0100
Subject: [PATCH] Support GNOME Shell 42
# Conflicts:
# frontend/applets/gnome-shell/src/metadata.json.in
---
frontend/applets/gnome-shell/src/metadata.json.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/frontend/applets/gnome-shell/src/metadata.json.in b/frontend/applets/gnome-shell/src/metadata.json.in
index 7c8c8241e..7070a1987 100644
--- a/frontend/applets/gnome-shell/src/metadata.json.in
+++ b/frontend/applets/gnome-shell/src/metadata.json.in
@@ -25,6 +25,7 @@
"3.32",
"40",
"41",
+ "42",
"@shell_current@" ],
"localedir": "@LOCALEDIR@",
"url": "@url@"