[arch-commits] Commit in xfmpc/trunk (3 files)
Date: Saturday, November 28, 2020 @ 20:26:27 Author: eworm Revision: 766091 upgpkg: xfmpc 0.3.0-4: use upstream commits Modified: xfmpc/trunk/PKGBUILD Deleted: xfmpc/trunk/0001-add-parenthesis-around-expression.patch xfmpc/trunk/0002-use-Gtk-MenuButton-for-context-button.patch --+ 0001-add-parenthesis-around-expression.patch | 35 - 0002-use-Gtk-MenuButton-for-context-button.patch | 699 - PKGBUILD | 25 3 files changed, 14 insertions(+), 745 deletions(-) Deleted: 0001-add-parenthesis-around-expression.patch === --- 0001-add-parenthesis-around-expression.patch2020-11-28 20:19:54 UTC (rev 766090) +++ 0001-add-parenthesis-around-expression.patch2020-11-28 20:26:27 UTC (rev 766091) @@ -1,35 +0,0 @@ -From 1efd29280029a997ff96631fdbafd75094557615 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Tue, 24 Nov 2020 16:40:06 +0100 -Subject: [PATCH 1/1] add parenthesis around expression - -Add parenthesis around expression before casting to boolean. This fixes: - -main-window.vala:202.8-202.57: error: Condition must be boolean - if ((bool) event.changed_mask & Gdk.WindowState.STICKY && this.visible) { - ^^ -main-window.vala:204.9-204.73: error: Equality operation: `bool' and `Gdk.WindowState' are incompatible - if (((bool) event.new_window_state & Gdk.WindowState.STICKY) == false) - ^ - -Signed-off-by: Christian Hesse - src/main-window.vala | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main-window.vala b/src/main-window.vala -index 8155ec1..a0755a9 100644 a/src/main-window.vala -+++ b/src/main-window.vala -@@ -199,9 +199,9 @@ namespace Xfmpc { -* window-state-event signal, so here we take the value only if -* the window is visible -**/ -- if ((bool) event.changed_mask & Gdk.WindowState.STICKY && this.visible) { -+ if ((bool) (event.changed_mask & Gdk.WindowState.STICKY) && this.visible) { - bool sticky; -- if (((bool) event.new_window_state & Gdk.WindowState.STICKY) == false) -+ if (((bool) (event.new_window_state & Gdk.WindowState.STICKY)) == false) - sticky = false; - else - sticky = true; Deleted: 0002-use-Gtk-MenuButton-for-context-button.patch === --- 0002-use-Gtk-MenuButton-for-context-button.patch2020-11-28 20:19:54 UTC (rev 766090) +++ 0002-use-Gtk-MenuButton-for-context-button.patch2020-11-28 20:26:27 UTC (rev 766091) @@ -1,699 +0,0 @@ -From d548f88376e0a174e68ede1926bafbbd88b5fbcf Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Wed, 25 Nov 2020 17:54:18 +0100 -Subject: [PATCH 1/1] use Gtk MenuButton for context button - -The old implementation had issues with constant re-drawing of the -button. Now that we use Gtk+ 3.x drop the old implementation and just -use upstream MenuButton. - -Fixes #7 - -Signed-off-by: Christian Hesse - src/Makefile.am | 8 +- - src/extended-interface.vala | 104 - - src/xfce-arrow-button.c | 406 - src/xfce-arrow-button.h | 64 -- - src/xfce-arrow-button.vapi | 15 -- - 5 files changed, 45 insertions(+), 552 deletions(-) - delete mode 100644 src/xfce-arrow-button.c - delete mode 100644 src/xfce-arrow-button.h - delete mode 100644 src/xfce-arrow-button.vapi - -diff --git a/src/Makefile.am b/src/Makefile.am -index dc0ac0a..1505c78 100644 a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,8 +21,7 @@ xfmpc_SOURCES = \ - preferences.vala\ - progress-bar.vala \ - main.vala \ -- mpdclient.c \ -- xfce-arrow-button.c -+ mpdclient.c - - xfmpc_VALAFLAGS = \ - --header=xfmpc.h\ -@@ -30,8 +29,7 @@ xfmpc_VALAFLAGS = \ - --vapidir=$(top_srcdir)/third-party \ - --pkg=libxfce4ui-2 \ - --pkg=config
[arch-commits] Commit in xfmpc/trunk (3 files)
Date: Wednesday, November 25, 2020 @ 22:41:02 Author: eworm Revision: 761315 upgpkg: xfmpc 0.3.0-3: build from git, fix cpu usage Added: xfmpc/trunk/0001-add-parenthesis-around-expression.patch xfmpc/trunk/0002-use-Gtk-MenuButton-for-context-button.patch Modified: xfmpc/trunk/PKGBUILD --+ 0001-add-parenthesis-around-expression.patch | 35 + 0002-use-Gtk-MenuButton-for-context-button.patch | 699 + PKGBUILD | 32 3 files changed, 759 insertions(+), 7 deletions(-) Added: 0001-add-parenthesis-around-expression.patch === --- 0001-add-parenthesis-around-expression.patch (rev 0) +++ 0001-add-parenthesis-around-expression.patch2020-11-25 22:41:02 UTC (rev 761315) @@ -0,0 +1,35 @@ +From 1efd29280029a997ff96631fdbafd75094557615 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Tue, 24 Nov 2020 16:40:06 +0100 +Subject: [PATCH 1/1] add parenthesis around expression + +Add parenthesis around expression before casting to boolean. This fixes: + +main-window.vala:202.8-202.57: error: Condition must be boolean + if ((bool) event.changed_mask & Gdk.WindowState.STICKY && this.visible) { + ^^ +main-window.vala:204.9-204.73: error: Equality operation: `bool' and `Gdk.WindowState' are incompatible + if (((bool) event.new_window_state & Gdk.WindowState.STICKY) == false) + ^ + +Signed-off-by: Christian Hesse +--- + src/main-window.vala | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/main-window.vala b/src/main-window.vala +index 8155ec1..a0755a9 100644 +--- a/src/main-window.vala b/src/main-window.vala +@@ -199,9 +199,9 @@ namespace Xfmpc { +* window-state-event signal, so here we take the value only if +* the window is visible +**/ +- if ((bool) event.changed_mask & Gdk.WindowState.STICKY && this.visible) { ++ if ((bool) (event.changed_mask & Gdk.WindowState.STICKY) && this.visible) { + bool sticky; +- if (((bool) event.new_window_state & Gdk.WindowState.STICKY) == false) ++ if (((bool) (event.new_window_state & Gdk.WindowState.STICKY)) == false) + sticky = false; + else + sticky = true; Added: 0002-use-Gtk-MenuButton-for-context-button.patch === --- 0002-use-Gtk-MenuButton-for-context-button.patch (rev 0) +++ 0002-use-Gtk-MenuButton-for-context-button.patch2020-11-25 22:41:02 UTC (rev 761315) @@ -0,0 +1,699 @@ +From d548f88376e0a174e68ede1926bafbbd88b5fbcf Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 25 Nov 2020 17:54:18 +0100 +Subject: [PATCH 1/1] use Gtk MenuButton for context button + +The old implementation had issues with constant re-drawing of the +button. Now that we use Gtk+ 3.x drop the old implementation and just +use upstream MenuButton. + +Fixes #7 + +Signed-off-by: Christian Hesse +--- + src/Makefile.am | 8 +- + src/extended-interface.vala | 104 - + src/xfce-arrow-button.c | 406 + src/xfce-arrow-button.h | 64 -- + src/xfce-arrow-button.vapi | 15 -- + 5 files changed, 45 insertions(+), 552 deletions(-) + delete mode 100644 src/xfce-arrow-button.c + delete mode 100644 src/xfce-arrow-button.h + delete mode 100644 src/xfce-arrow-button.vapi + +diff --git a/src/Makefile.am b/src/Makefile.am +index dc0ac0a..1505c78 100644 +--- a/src/Makefile.am b/src/Makefile.am +@@ -21,8 +21,7 @@ xfmpc_SOURCES = \ + preferences.vala\ + progress-bar.vala \ + main.vala \ +- mpdclient.c \ +- xfce-arrow-button.c ++ mpdclient.c + + xfmpc_VALAFLAGS = \ + --header=xfmpc.h\ +@@ -30,8 +29,7 @@ xfmpc_VALAFLAGS = \ + --vapidir=$(top_srcdir)/third-party \ + --pkg=libxfce4ui-2 \ + --pkg=config