commit workrave for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package workrave for openSUSE:Factory checked in at 2024-02-04 19:07:31 Comparing /work/SRC/openSUSE:Factory/workrave (Old) and /work/SRC/openSUSE:Factory/.workrave.new.1815 (New) Package is "workrave" Sun Feb 4 19:07:31 2024 rev:15 rq:1143668 version:1.10.50 Changes: --- /work/SRC/openSUSE:Factory/workrave/workrave.changes2023-04-26 17:27:01.366204792 +0200 +++ /work/SRC/openSUSE:Factory/.workrave.new.1815/workrave.changes 2024-02-04 19:07:42.725388164 +0100 @@ -1,0 +2,8 @@ +Fri Feb 2 15:20:00 UTC 2024 - Dominique Leuenberger + +- Drop obsolete python-xml BuildRequires: python-xml is a python2 + package, but there seems to be no trace of python2 being used in + any way. Changelog mentioned in 2019 that python2 would not + longer be required to build. (boo#1219306). + +--- Other differences: -- ++ workrave.spec ++ --- /var/tmp/diff_new_pack.qBeArI/_old 2024-02-04 19:07:43.393412237 +0100 +++ /var/tmp/diff_new_pack.qBeArI/_new 2024-02-04 19:07:43.393412237 +0100 @@ -1,7 +1,7 @@ # # spec file for package workrave # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,7 +36,6 @@ BuildRequires: intltool BuildRequires: libpulse-devel BuildRequires: libtool -BuildRequires: python-xml BuildRequires: python3-Jinja2 BuildRequires: update-desktop-files BuildRequires: pkgconfig(gdk-3.0)
commit workrave for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package workrave for openSUSE:Factory checked in at 2023-04-26 17:26:56 Comparing /work/SRC/openSUSE:Factory/workrave (Old) and /work/SRC/openSUSE:Factory/.workrave.new.1533 (New) Package is "workrave" Wed Apr 26 17:26:56 2023 rev:14 rq:1083000 version:1.10.50 Changes: --- /work/SRC/openSUSE:Factory/workrave/workrave.changes2022-04-10 00:41:59.701053302 +0200 +++ /work/SRC/openSUSE:Factory/.workrave.new.1533/workrave.changes 2023-04-26 17:27:01.366204792 +0200 @@ -1,0 +2,5 @@ +Wed Apr 26 11:50:18 UTC 2023 - Jan Engelhardt + +- Resolve xorg-x11-devel BuildRequire to pkgconfig(...) + +--- Other differences: -- ++ workrave.spec ++ --- /var/tmp/diff_new_pack.sb4Dsk/_old 2023-04-26 17:27:01.918208012 +0200 +++ /var/tmp/diff_new_pack.sb4Dsk/_new 2023-04-26 17:27:01.926208058 +0200 @@ -1,7 +1,7 @@ # # spec file for package workrave # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,12 +39,15 @@ BuildRequires: python-xml BuildRequires: python3-Jinja2 BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(gdk-3.0) BuildRequires: pkgconfig(glibmm-2.4) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtkmm-3.0) +BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sigc++-2.0) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(xtst) %description Workrave is a program that assists in the recovery and prevention of Repetitive Strain Injury (RSI). The program frequently alerts you to take micro-pauses, rest breaks and restricts you to your daily limit.
commit workrave for openSUSE:Factory
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-04-10 00:41:57
Comparing /work/SRC/openSUSE:Factory/workrave (Old)
and /work/SRC/openSUSE:Factory/.workrave.new.1900 (New)
Package is "workrave"
Sun Apr 10 00:41:57 2022 rev:13 rq:967922 version:1.10.50
Changes:
--- /work/SRC/openSUSE:Factory/workrave/workrave.changes2022-03-31
17:19:16.776872153 +0200
+++ /work/SRC/openSUSE:Factory/.workrave.new.1900/workrave.changes
2022-04-10 00:41:59.701053302 +0200
@@ -1,0 +2,14 @@
+Fri Apr 1 20:28:58 UTC 2022 - Sebastian Wagner
+
+- Update to version 1.10.50:
+ - The "Restbreak now" button in the main window no longer responds to
keyboard (#368)
+ - Allow installation on Windows without administrator rights.
+ - Fix vertical alignment of GNOME shell applet (#356)
+ - Support GNOME Shell 42 (#396)
+ - Restore support for Windows Vista and up (#367)
+ - The 'Backward shoulder stretch' exercises now plays a sound twice matching
the description (#354)
+- remove obsolete gnome42.patch
+- remove obsolete gnome42-vertical-alignment.patch
+- remove obsolete gnome42-fixapplet.patch
+
+---
Old:
gnome42-fixapplet.patch
gnome42-vertical-alignment.patch
gnome42.patch
v1_10_49.tar.gz
New:
v1_10_50.tar.gz
Other differences:
--
++ workrave.spec ++
--- /var/tmp/diff_new_pack.B5S1RS/_old 2022-04-10 00:42:00.721041958 +0200
+++ /var/tmp/diff_new_pack.B5S1RS/_new 2022-04-10 00:42:00.725041913 +0200
@@ -16,9 +16,9 @@
#
-%define upstream_version1_10_49
+%define upstream_version1_10_50
Name: workrave
-Version:1.10.49
+Version:1.10.50
Release:0
Summary:Recovery and prevention of Repetitive Strain Injury program
License:GPL-3.0-only
@@ -26,12 +26,6 @@
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
@@ -74,9 +68,6 @@
%prep
%setup -q -n %{name}-%{upstream_version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
./autogen.sh
++ v1_10_49.tar.gz -> v1_10_50.tar.gz ++
/work/SRC/openSUSE:Factory/workrave/v1_10_49.tar.gz
/work/SRC/openSUSE:Factory/.workrave.new.1900/v1_10_50.tar.gz differ: char 13,
line 1
commit workrave for openSUSE:Factory
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.changes2022-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 = '\
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;
commit workrave for openSUSE:Factory
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-01-08 23:23:24 Comparing /work/SRC/openSUSE:Factory/workrave (Old) and /work/SRC/openSUSE:Factory/.workrave.new.1892 (New) Package is "workrave" Sat Jan 8 23:23:24 2022 rev:11 rq:944725 version:1.10.49 Changes: --- /work/SRC/openSUSE:Factory/workrave/workrave.changes2021-08-18 08:56:19.662945571 +0200 +++ /work/SRC/openSUSE:Factory/.workrave.new.1892/workrave.changes 2022-01-08 23:23:57.538248283 +0100 @@ -1,0 +2,7 @@ +Wed Jan 5 20:34:12 UTC 2022 - Sebastian Wagner + +- Update to version 1.10.49 + - Adds support for GNOME Shell 41 (#342, Timo Jyrinki) + - Inno Setup improvement (#353, Kaleb Luedtke) + +--- Old: v1_10_48.tar.gz New: v1_10_49.tar.gz Other differences: -- ++ workrave.spec ++ --- /var/tmp/diff_new_pack.vhGITr/_old 2022-01-08 23:23:58.186248812 +0100 +++ /var/tmp/diff_new_pack.vhGITr/_new 2022-01-08 23:23:58.190248815 +0100 @@ -1,7 +1,7 @@ # # spec file for package workrave # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define upstream_version1_10_48 +%define upstream_version1_10_49 Name: workrave -Version:1.10.48 +Version:1.10.49 Release:0 Summary:Recovery and prevention of Repetitive Strain Injury program License:GPL-3.0-only ++ v1_10_48.tar.gz -> v1_10_49.tar.gz ++ /work/SRC/openSUSE:Factory/workrave/v1_10_48.tar.gz /work/SRC/openSUSE:Factory/.workrave.new.1892/v1_10_49.tar.gz differ: char 23, line 1
commit workrave for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package workrave for openSUSE:Factory
checked in at 2021-08-18 08:55:39
Comparing /work/SRC/openSUSE:Factory/workrave (Old)
and /work/SRC/openSUSE:Factory/.workrave.new.1899 (New)
Package is "workrave"
Wed Aug 18 08:55:39 2021 rev:10 rq:912304 version:1.10.48
Changes:
--- /work/SRC/openSUSE:Factory/workrave/workrave.changes2021-06-04
00:33:55.360933366 +0200
+++ /work/SRC/openSUSE:Factory/.workrave.new.1899/workrave.changes
2021-08-18 08:56:19.662945571 +0200
@@ -1,0 +2,20 @@
+Sun Aug 15 19:36:52 UTC 2021 - Sebastian Wagner
+
+- remove obsolete fix-wayland-gnome-crash.patch
+- remove obsolete support-gnome-40.patch
+
+---
+Sun Aug 8 13:08:45 UTC 2021 - Sebastian Wagner
+
+- update to version 1.10.48:
+ - Fixed GNOME Shell applet on Ubuntu 18.04 (#281)
+- update to version 1.10.47:
+ - Fixed a crash of the GNOME Shell applet (#281)
+ - Adds support for GNOME Shell 40 (#288)
+ - Fixed issue where the installer would fail when installing as system user
+ (#291)
+ - Fixed incorrect disabling of postpone/skip button (#301)
+ - Warn if operation mode is not 'normal' after unlocking the screen (Windows
+ only for now)
+
+---
Old:
fix-wayland-gnome-crash.patch
support-gnome-40.patch
v1_10_45.tar.gz
New:
v1_10_48.tar.gz
Other differences:
--
++ workrave.spec ++
--- /var/tmp/diff_new_pack.wxUD2H/_old 2021-08-18 08:56:20.350944762 +0200
+++ /var/tmp/diff_new_pack.wxUD2H/_new 2021-08-18 08:56:20.354944757 +0200
@@ -16,9 +16,9 @@
#
-%define upstream_version1_10_45
+%define upstream_version1_10_48
Name: workrave
-Version:1.10.45
+Version:1.10.48
Release:0
Summary:Recovery and prevention of Repetitive Strain Injury program
License:GPL-3.0-only
@@ -26,10 +26,6 @@
URL:http://www.workrave.org
Source:
https://github.com/rcaelers/workrave/archive/v%{upstream_version}.tar.gz
Source2:%{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM fix-wayland-gnome-crash.patch boo#1184773
-Patch0: fix-wayland-gnome-crash.patch
-# PATCH-FIX-UPSTREAM support-gnome-40.patch boo#1184863
-Patch1: support-gnome-40.patch
BuildRequires: autoconf
BuildRequires: autoconf-archive
BuildRequires: automake
@@ -72,8 +68,6 @@
%prep
%setup -q -n %{name}-%{upstream_version}
-%patch0 -p1
-%patch1 -p1
%build
./autogen.sh
++ v1_10_45.tar.gz -> v1_10_48.tar.gz ++
/work/SRC/openSUSE:Factory/workrave/v1_10_45.tar.gz
/work/SRC/openSUSE:Factory/.workrave.new.1899/v1_10_48.tar.gz differ: char 31,
line 1
commit workrave for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package workrave for openSUSE:Factory
checked in at 2021-06-04 00:33:39
Comparing /work/SRC/openSUSE:Factory/workrave (Old)
and /work/SRC/openSUSE:Factory/.workrave.new.1898 (New)
Package is "workrave"
Fri Jun 4 00:33:39 2021 rev:9 rq:897101 version:1.10.45
Changes:
--- /work/SRC/openSUSE:Factory/workrave/workrave.changes2021-06-01
10:41:19.409207528 +0200
+++ /work/SRC/openSUSE:Factory/.workrave.new.1898/workrave.changes
2021-06-04 00:33:55.360933366 +0200
@@ -1,0 +2,8 @@
+Thu Jun 3 08:25:16 UTC 2021 - Timo Jyrinki
+
+- Add back the removed patches that were not included yet in the latest
+ upstream release that was done already in March.
+ - Add fix-wayland-gnome-crash.patch, now not needing rebasing
+ - Add support-gnome-40.patch
+
+---
New:
fix-wayland-gnome-crash.patch
support-gnome-40.patch
Other differences:
--
++ workrave.spec ++
--- /var/tmp/diff_new_pack.ZNYA4F/_old 2021-06-04 00:33:55.896934909 +0200
+++ /var/tmp/diff_new_pack.ZNYA4F/_new 2021-06-04 00:33:55.896934909 +0200
@@ -26,6 +26,10 @@
URL:http://www.workrave.org
Source:
https://github.com/rcaelers/workrave/archive/v%{upstream_version}.tar.gz
Source2:%{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM fix-wayland-gnome-crash.patch boo#1184773
+Patch0: fix-wayland-gnome-crash.patch
+# PATCH-FIX-UPSTREAM support-gnome-40.patch boo#1184863
+Patch1: support-gnome-40.patch
BuildRequires: autoconf
BuildRequires: autoconf-archive
BuildRequires: automake
@@ -68,6 +72,8 @@
%prep
%setup -q -n %{name}-%{upstream_version}
+%patch0 -p1
+%patch1 -p1
%build
./autogen.sh
++ fix-wayland-gnome-crash.patch ++
>From 56af818cd3e148069134551aacc7b06043d8541a Mon Sep 17 00:00:00 2001
From: Rob Caelers
Date: Sun, 4 Apr 2021 20:11:24 +0200
Subject: [PATCH] Fix crash in Gnome Shell applet (#281)
---
frontend/applets/common/src/timebar.c | 107 ++
1 file changed, 40 insertions(+), 67 deletions(-)
diff --git a/frontend/applets/common/src/timebar.c
b/frontend/applets/common/src/timebar.c
index b35004f51..62bcf3282 100644
--- a/frontend/applets/common/src/timebar.c
+++ b/frontend/applets/common/src/timebar.c
@@ -25,7 +25,7 @@
static void workrave_timebar_class_init(WorkraveTimebarClass *klass);
static void workrave_timebar_init(WorkraveTimebar *self);
-static void workrave_timebar_init_ui(WorkraveTimebar *self);
+static void workrave_timebar_init_ui(WorkraveTimebar *self, cairo_t *c);
static void workrave_timebar_draw_filled_box(WorkraveTimebar *self, cairo_t
*cr, int x, int y, int width, int height);
static void workrave_timebar_draw_frame(WorkraveTimebar *self, cairo_t *cr,
int width, int height);
static void workrave_timebar_compute_bar_dimensions(WorkraveTimebar *self, int
*bar_width, int *sbar_width, int *bar_height);
@@ -48,8 +48,6 @@ enum
struct _WorkraveTimebarPrivate
{
- gchar *name;
-
//! Color of the time-bar.
WorkraveColorId bar_color;
@@ -77,9 +75,6 @@ struct _WorkraveTimebarPrivate
int width;
int height;
-#ifndef USE_GTK2
- GtkStyleContext *style_context;
-#endif
PangoContext *pango_context;
PangoLayout *pango_layout;
};
@@ -129,8 +124,10 @@ workrave_timebar_init(WorkraveTimebar *self)
priv->secondary_bar_value = 100;
priv->secondary_bar_max_value = 600;
priv->bar_text = g_strdup("");
-
- workrave_timebar_init_ui(self);
+ priv->width = 0;
+ priv->height = 0;
+ priv->pango_context = NULL;
+ priv->pango_layout = NULL;
}
void
@@ -239,79 +236,54 @@ workrave_timebar_draw_text(WorkraveTimebar *self, cairo_t
*cr)
pango_cairo_show_layout(cr, priv->pango_layout);
}
-#ifndef USE_GTK2
-static void
-workrave_timebar_init_ui(WorkraveTimebar *self)
+static PangoFontDescription *
+workrave_timebar_get_font(void)
{
- WorkraveTimebarPrivate *priv = workrave_timebar_get_instance_private(self);
-
- priv->style_context = gtk_style_context_new();
-
- GtkWidgetPath *path = gtk_widget_path_new();
- gtk_widget_path_append_type(path, GTK_TYPE_BUTTON);
- gtk_style_context_set_path(priv->style_context, path);
- gtk_style_context_add_class(priv->style_context, GTK_STYLE_CLASS_TROUGH);
-
- GdkScreen *screen = gdk_screen_get_default();
- priv->pango_context = gdk_pango_context_get_for_screen(screen);
+ PangoFontDescription *font_desc;
- PangoFontDescription *font_desc = NULL;
- gtk_style_context_get(priv->style_context, GTK_STATE_FLAG_ACTIVE, "font",
_desc, NULL);
-
- pango_context_set_language(priv->pango_context, gtk_get_default_language());
-
commit workrave for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package workrave for openSUSE:Factory
checked in at 2021-06-01 10:39:44
Comparing /work/SRC/openSUSE:Factory/workrave (Old)
and /work/SRC/openSUSE:Factory/.workrave.new.1898 (New)
Package is "workrave"
Tue Jun 1 10:39:44 2021 rev:8 rq:896432 version:1.10.45
Changes:
--- /work/SRC/openSUSE:Factory/workrave/workrave.changes2021-04-17
00:02:29.661663073 +0200
+++ /work/SRC/openSUSE:Factory/.workrave.new.1898/workrave.changes
2021-06-01 10:41:19.409207528 +0200
@@ -1,0 +2,29 @@
+Mon May 31 18:43:24 UTC 2021 - Sebastian Wagner
+
+- remove obsolete fix-wayland-gnome-crash.patch
+- remove obsolete support-gnome-40.patch
+- Update to version 1.10.45:
+ - Micro breaks without a postpone button could be postponed by starting a
+ - rest break while the break prompt window was visible and then clicking
+ - postpone in the rest break window. The postpone button is now disabled
+ - when the micro break is overdue, and the maximum number of break prompts
+ - was reached.
+ - A new sound theme calls 'Bells' has been added (#225, Pieter De Decker)
+ - Added support for High-DPI displays in the Windows Applet.
+ - The Windows applet now correctly enforces a minimum size (#252)
+ - Initial support for icon themes.
+ - Fixes:
+ - Fixed build issue with libayatana-indicator3
+ - Fixed issue where Workrave would show 2 status icons on Linux (#258)
+ - Fixed a deprecation warning in the Gnome Shell applet (#251)
+ - The cinnamon applet is no longer bouncing up and down (#253)
+ - Fixed issue where the current language was always "Unrecognized language"
+ - Fixed issue where activity monitoring would stop after restarting Gnome
Shell
+ - Fixed issue that caused the main window to disappear (#244, 259)
+ - Translation updates:
+ - Updated Chinese translation (#232, wintertee)
+ - Updated French translation (Darialalala)
+ - Updated Dutch translation (Matthias Huijgen)
+ - Fixed typo in the Italian translation (#234, albanobattistella)
+
+---
Old:
fix-wayland-gnome-crash.patch
support-gnome-40.patch
v1_10_44.tar.gz
New:
v1_10_45.tar.gz
Other differences:
--
++ workrave.spec ++
--- /var/tmp/diff_new_pack.YBfZ4p/_old 2021-06-01 10:41:19.985208508 +0200
+++ /var/tmp/diff_new_pack.YBfZ4p/_new 2021-06-01 10:41:19.989208516 +0200
@@ -16,9 +16,9 @@
#
-%define upstream_version1_10_44
+%define upstream_version1_10_45
Name: workrave
-Version:1.10.44
+Version:1.10.45
Release:0
Summary:Recovery and prevention of Repetitive Strain Injury program
License:GPL-3.0-only
@@ -26,10 +26,6 @@
URL:http://www.workrave.org
Source:
https://github.com/rcaelers/workrave/archive/v%{upstream_version}.tar.gz
Source2:%{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM fix-wayland-gnome-crash.patch boo#1184773 -- based on
https://github.com/rcaelers/workrave/commit/56af818cd3e148069134551aacc7b06043d8541a
-Patch0: fix-wayland-gnome-crash.patch
-# PATCH-FIX-UPSTREAM support-gnome-40.patch boo#1184863
-Patch1:
https://github.com/rcaelers/workrave/commit/f199d4c5df43612b7d513168a00f8094fe08218a.patch#/support-gnome-40.patch
BuildRequires: autoconf
BuildRequires: autoconf-archive
BuildRequires: automake
@@ -49,17 +45,6 @@
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gtkmm-3.0)
BuildRequires: pkgconfig(sigc++-2.0)
-# other requirements that are documented or previously used but (currently?)
not needed. let's see if there are problems without them
-#BuildRequires: gdome2-devel
-#BuildRequires: gnome-panel-devel
-#BuildRequires: libbonobo-devel
-#BuildRequires: libgmodule-2_0-0
-#BuildRequires: libgthread-2_0-0
-#BuildRequires: pkg-config
-#BuildRequires: pkgconfig(glib-2.0)
-#BuildRequires: pkgconfig(gstreamer-0.10)
-#BuildRequires: gconfmm-devel
-#BuildRequires: xorg-x11-Xvfb
%description
Workrave is a program that assists in the recovery and prevention of
Repetitive Strain Injury (RSI). The program frequently alerts you to take
micro-pauses, rest breaks and restricts you to your daily limit.
@@ -83,8 +68,6 @@
%prep
%setup -q -n %{name}-%{upstream_version}
-%patch0 -p1
-%patch1 -p1
%build
./autogen.sh
++ v1_10_44.tar.gz -> v1_10_45.tar.gz ++
/work/SRC/openSUSE:Factory/workrave/v1_10_44.tar.gz
/work/SRC/openSUSE:Factory/.workrave.new.1898/v1_10_45.tar.gz differ: char 16,
line 1
commit workrave for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package workrave for openSUSE:Factory
checked in at 2021-04-17 00:02:10
Comparing /work/SRC/openSUSE:Factory/workrave (Old)
and /work/SRC/openSUSE:Factory/.workrave.new.12324 (New)
Package is "workrave"
Sat Apr 17 00:02:10 2021 rev:7 rq:886007 version:1.10.44
Changes:
--- /work/SRC/openSUSE:Factory/workrave/workrave.changes2021-04-15
16:58:41.914795940 +0200
+++ /work/SRC/openSUSE:Factory/.workrave.new.12324/workrave.changes
2021-04-17 00:02:29.661663073 +0200
@@ -1,0 +2,5 @@
+Fri Apr 16 09:35:12 UTC 2021 - Timo Jyrinki
+
+- Add support-gnome-40.patch to fix working with GNOME 40
+
+---
New:
support-gnome-40.patch
Other differences:
--
++ workrave.spec ++
--- /var/tmp/diff_new_pack.341WCG/_old 2021-04-17 00:02:30.189663908 +0200
+++ /var/tmp/diff_new_pack.341WCG/_new 2021-04-17 00:02:30.201663927 +0200
@@ -26,8 +26,10 @@
URL:http://www.workrave.org
Source:
https://github.com/rcaelers/workrave/archive/v%{upstream_version}.tar.gz
Source2:%{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM fix-wayland-gnome-crash.patch boo#1184773
+# PATCH-FIX-UPSTREAM fix-wayland-gnome-crash.patch boo#1184773 -- based on
https://github.com/rcaelers/workrave/commit/56af818cd3e148069134551aacc7b06043d8541a
Patch0: fix-wayland-gnome-crash.patch
+# PATCH-FIX-UPSTREAM support-gnome-40.patch boo#1184863
+Patch1:
https://github.com/rcaelers/workrave/commit/f199d4c5df43612b7d513168a00f8094fe08218a.patch#/support-gnome-40.patch
BuildRequires: autoconf
BuildRequires: autoconf-archive
BuildRequires: automake
@@ -82,6 +84,7 @@
%prep
%setup -q -n %{name}-%{upstream_version}
%patch0 -p1
+%patch1 -p1
%build
./autogen.sh
++ support-gnome-40.patch ++
>From f199d4c5df43612b7d513168a00f8094fe08218a Mon Sep 17 00:00:00 2001
From: Rob Caelers
Date: Tue, 6 Apr 2021 21:30:09 +0200
Subject: [PATCH] Support Gnome Shell 40 (#288)
---
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 c10ca8212..1662021e2 100644
--- a/frontend/applets/gnome-shell/src/metadata.json.in
+++ b/frontend/applets/gnome-shell/src/metadata.json.in
@@ -23,6 +23,7 @@
"3.28",
"3.30",
"3.32",
+ "40",
"@shell_current@" ],
"localedir": "@LOCALEDIR@",
"url": "@url@"
commit workrave for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package workrave for openSUSE:Factory
checked in at 2021-04-15 16:58:00
Comparing /work/SRC/openSUSE:Factory/workrave (Old)
and /work/SRC/openSUSE:Factory/.workrave.new.12324 (New)
Package is "workrave"
Thu Apr 15 16:58:00 2021 rev:6 rq:885586 version:1.10.44
Changes:
--- /work/SRC/openSUSE:Factory/workrave/workrave.changes2020-09-16
19:39:12.694790577 +0200
+++ /work/SRC/openSUSE:Factory/.workrave.new.12324/workrave.changes
2021-04-15 16:58:41.914795940 +0200
@@ -1,0 +2,6 @@
+Thu Apr 15 06:38:32 UTC 2021 - Timo Jyrinki
+
+- Add fix-wayland-gnome-crash.patch (boo#1184773).
+ * Cherry-pick and rebase a fix from upstream git to fix a GNOME crash.
+
+---
New:
fix-wayland-gnome-crash.patch
Other differences:
--
++ workrave.spec ++
--- /var/tmp/diff_new_pack.lnWXkX/_old 2021-04-15 16:58:42.362796649 +0200
+++ /var/tmp/diff_new_pack.lnWXkX/_new 2021-04-15 16:58:42.366796655 +0200
@@ -1,7 +1,7 @@
#
# spec file for package workrave
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,8 @@
URL:http://www.workrave.org
Source:
https://github.com/rcaelers/workrave/archive/v%{upstream_version}.tar.gz
Source2:%{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM fix-wayland-gnome-crash.patch boo#1184773
+Patch0: fix-wayland-gnome-crash.patch
BuildRequires: autoconf
BuildRequires: autoconf-archive
BuildRequires: automake
@@ -79,6 +81,7 @@
%prep
%setup -q -n %{name}-%{upstream_version}
+%patch0 -p1
%build
./autogen.sh
++ fix-wayland-gnome-crash.patch ++
>From 56af818cd3e148069134551aacc7b06043d8541a Mon Sep 17 00:00:00 2001
From: Rob Caelers
Date: Sun, 4 Apr 2021 20:11:24 +0200
Subject: [PATCH] Fix crash in Gnome Shell applet (#281)
---
frontend/applets/common/src/timebar.c | 107 ++
1 file changed, 40 insertions(+), 67 deletions(-)
diff --git a/frontend/applets/common/src/timebar.c
b/frontend/applets/common/src/timebar.c
index b35004f51..62bcf3282 100644
--- a/frontend/applets/common/src/timebar.c
+++ b/frontend/applets/common/src/timebar.c
@@ -25,7 +25,7 @@
static void workrave_timebar_class_init(WorkraveTimebarClass *klass);
static void workrave_timebar_init(WorkraveTimebar *self);
-static void workrave_timebar_init_ui(WorkraveTimebar *self);
+static void workrave_timebar_init_ui(WorkraveTimebar *self, cairo_t *c);
static void workrave_timebar_draw_filled_box(WorkraveTimebar *self, cairo_t
*cr, int x, int y, int width, int height);
static void workrave_timebar_draw_frame(WorkraveTimebar *self, cairo_t *cr,
int width, int height);
static void workrave_timebar_compute_bar_dimensions(WorkraveTimebar *self, int
*bar_width, int *sbar_width, int *bar_height);
@@ -48,8 +48,6 @@ enum
struct _WorkraveTimebarPrivate
{
- gchar *name;
-
//! Color of the time-bar.
WorkraveColorId bar_color;
@@ -77,9 +75,6 @@ struct _WorkraveTimebarPrivate
int width;
int height;
-#ifndef USE_GTK2
- GtkStyleContext *style_context;
-#endif
PangoContext *pango_context;
PangoLayout *pango_layout;
};
@@ -129,8 +124,10 @@ workrave_timebar_init(WorkraveTimebar *self)
priv->secondary_bar_value = 100;
priv->secondary_bar_max_value = 600;
priv->bar_text = g_strdup("");
-
- workrave_timebar_init_ui(self);
+ priv->width = 0;
+ priv->height = 0;
+ priv->pango_context = NULL;
+ priv->pango_layout = NULL;
}
@@ -239,80 +236,54 @@ workrave_timebar_draw_text(WorkraveTimebar *self, cairo_t
*cr)
}
-#ifndef USE_GTK2
-static void
-workrave_timebar_init_ui(WorkraveTimebar *self)
+static PangoFontDescription *
+workrave_timebar_get_font(void)
{
- WorkraveTimebarPrivate *priv = workrave_timebar_get_instance_private(self);
-
- priv->style_context = gtk_style_context_new();
-
- GtkWidgetPath *path = gtk_widget_path_new();
- gtk_widget_path_append_type(path, GTK_TYPE_BUTTON);
- gtk_style_context_set_path(priv->style_context, path);
- gtk_style_context_add_class(priv->style_context, GTK_STYLE_CLASS_TROUGH);
-
- GdkScreen *screen = gdk_screen_get_default();
- priv->pango_context = gdk_pango_context_get_for_screen(screen);
+ PangoFontDescription *font_desc;
- PangoFontDescription *font_desc = NULL;
- gtk_style_context_get (priv->style_context, GTK_STATE_FLAG_ACTIVE, "font",
_desc, NULL);
-
- pango_context_set_language(priv->pango_context, gtk_get_default_language());
-
