From b66e959d6679d73b013c4eaa11b00de57fa0f62f Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Tue, 28 Dec 2021 18:29:01 +0300 Subject: [PATCH 1/2] ffmulticonverter rebuild python. --- .../QProgressBar_value_replaced_to_int.patch | 22 +++++++++++++++++ .../converter/ffmulticonverter/pspec.xml | 24 ++++++++++++------- 2 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 multimedia/converter/ffmulticonverter/files/QProgressBar_value_replaced_to_int.patch diff --git a/multimedia/converter/ffmulticonverter/files/QProgressBar_value_replaced_to_int.patch b/multimedia/converter/ffmulticonverter/files/QProgressBar_value_replaced_to_int.patch new file mode 100644 index 0000000000..f6c2032f28 --- /dev/null +++ b/multimedia/converter/ffmulticonverter/files/QProgressBar_value_replaced_to_int.patch @@ -0,0 +1,22 @@ +From c47d47ab7f66a1973b1314ef531de2fb444c2fe6 Mon Sep 17 00:00:00 2001 +From: Ilias Stamatis +Date: Wed, 22 Dec 2021 14:43:22 +0000 +Subject: [PATCH] QProgressBar.setValue() expects an int, not a float + +--- + ffmulticonverter/progress.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ffmulticonverter/progress.py b/ffmulticonverter/progress.py +index 5d14efc..e196ef4 100755 +--- a/ffmulticonverter/progress.py ++++ b/ffmulticonverter/progress.py +@@ -304,7 +304,7 @@ def convert_video(self, from_file, to_file, command): + time = utils.duration_in_seconds(time) + now_sec = int(float(time)) + try: +- self.nowQPBar.setValue(100 * now_sec / total) ++ self.nowQPBar.setValue(int(100 * now_sec / total)) + except (UnboundLocalError, ZeroDivisionError): + pass + self.update_text_edit_signal.emit(myline) diff --git a/multimedia/converter/ffmulticonverter/pspec.xml b/multimedia/converter/ffmulticonverter/pspec.xml index e5ea200fe6..52485a806e 100644 --- a/multimedia/converter/ffmulticonverter/pspec.xml +++ b/multimedia/converter/ffmulticonverter/pspec.xml @@ -1,5 +1,5 @@ - + ffmulticonverter @@ -11,15 +11,18 @@ GPLv3 ffmulticonverter app:gui - A multi converter + A multi converter. FF Multi Converter is a simple graphical application that enables you to convert audio, video, image and document files between all popular formats, using and combining other programs. It uses ffmpeg for audio/video files, unoconv for document files (which uses the OpenOffice's UNO bindings) and PIL library for image file conversions. mirrors://sourceforge/ffmulticonv/ffmulticonverter-1.8.0.tar.gz - python3-qt5-devel ffmpeg-devel gettext-devel python3-devel + python3-qt5-devel + + QProgressBar_value_replaced_to_int.patch + @@ -29,21 +32,26 @@ unoconv python3-qt5 imagemagick - - - /usr/lib - /usr/share/doc - /usr/share/man /usr/bin + /usr/lib /usr/share/pixmaps /usr/share/applications /usr/share/ffmulticonverter + /usr/share/man + /usr/share/doc + + 2021-12-28 + 1.8.0 + Rebuild python. + Kamil Atlı + suvari@pisilinux.org + 2020-03-08 1.8.0 From 48be4dd4cfb68d5cb71a2fe7c766fa0119e534a9 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Thu, 30 Dec 2021 07:01:04 +0300 Subject: [PATCH 2/2] xfce4-terminal rebuild. --- ...es_size_when_the_window_is_maximized.patch | 26 +++++++++++++++++++ .../xfce4-terminal/files/xfce-terminal.patch | 25 ------------------ desktop/xfce/base/xfce4-terminal/pspec.xml | 4 +-- 3 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 desktop/xfce/base/xfce4-terminal/files/Menubar_changes_size_when_the_window_is_maximized.patch delete mode 100644 desktop/xfce/base/xfce4-terminal/files/xfce-terminal.patch diff --git a/desktop/xfce/base/xfce4-terminal/files/Menubar_changes_size_when_the_window_is_maximized.patch b/desktop/xfce/base/xfce4-terminal/files/Menubar_changes_size_when_the_window_is_maximized.patch new file mode 100644 index 0000000000..661866d68b --- /dev/null +++ b/desktop/xfce/base/xfce4-terminal/files/Menubar_changes_size_when_the_window_is_maximized.patch @@ -0,0 +1,26 @@ +From 020a2c8267f88568dcba4848ed826c4d9c34f063 Mon Sep 17 00:00:00 2001 +From: Sergios - Anestis Kefalidis +Date: Mon, 27 Dec 2021 20:08:18 +0200 +Subject: Fix regression: Menubar changes size when the window is maximized + (Issue #156) + +--- + terminal/terminal-window.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c +index b4532a92..45951ee0 100644 +--- a/terminal/terminal-window.c ++++ b/terminal/terminal-window.c +@@ -535,7 +535,7 @@ terminal_window_init (TerminalWindow *window) + g_signal_connect (G_OBJECT (window->priv->notebook), "scroll-event", + G_CALLBACK (terminal_window_notebook_scroll_event), window); + +- gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->menubar, TRUE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->menubar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->toolbar, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->priv->notebook, TRUE, TRUE, 0); + gtk_widget_show_all (window->priv->vbox); +-- +cgit v1.2.3 + diff --git a/desktop/xfce/base/xfce4-terminal/files/xfce-terminal.patch b/desktop/xfce/base/xfce4-terminal/files/xfce-terminal.patch deleted file mode 100644 index b3b34f3b62..0000000000 --- a/desktop/xfce/base/xfce4-terminal/files/xfce-terminal.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nuar a/terminal/terminal-window.c b/terminal/terminal-window.c ---- a/terminal/terminal-window.c 2020-12-23 00:50:31.000000000 +0300 -+++ b/terminal/terminal-window.c 2021-10-01 21:49:37.528945853 +0300 -@@ -390,7 +390,7 @@ - { "show-borders", NULL, N_ ("Show Window _Borders"), NULL, N_ ("Show/hide the window decorations"), G_CALLBACK (terminal_window_action_show_borders), TRUE, }, - { "fullscreen", "view-fullscreen", N_ ("_Fullscreen"), "F11", N_ ("Toggle fullscreen mode"), G_CALLBACK (terminal_window_action_fullscreen), FALSE, }, - { "read-only", NULL, N_ ("_Read-Only"), NULL, N_ ("Toggle read-only mode"), G_CALLBACK (terminal_window_action_readonly), FALSE, }, -- { "scroll-on-output", NULL, N_ ("Scroll on _Output"), NULL, N_ ("Toggle scroll on output"), G_CALLBACK (terminal_window_action_scroll_on_output), FALSE, }, -+ { "scroll-on-output", NULL, N_ ("Scroll on _Output"), NULL, N_ ("Toggle scroll on output"), G_CALLBACK (terminal_window_action_scroll_on_output), TRUE, }, - }; - - -@@ -1118,9 +1118,10 @@ - gtk_action_set_sensitive (action, input_enabled); - - /* update scroll on output mode */ -+ input_enabled = terminal_screen_get_input_enabled (window->priv->active); - action = terminal_window_get_action (window, "scroll-on-output"); -- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), -- terminal_screen_get_scroll_on_output (window->priv->active)); -+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !input_enabled); -+ //terminal_screen_get_scroll_on_output (window->priv->active)); - - /* update the "Go" menu */ - action = g_object_get_qdata (G_OBJECT (window->priv->active), tabs_menu_action_quark); diff --git a/desktop/xfce/base/xfce4-terminal/pspec.xml b/desktop/xfce/base/xfce4-terminal/pspec.xml index 73eb264828..553d9f26c6 100644 --- a/desktop/xfce/base/xfce4-terminal/pspec.xml +++ b/desktop/xfce/base/xfce4-terminal/pspec.xml @@ -26,7 +26,7 @@ libxfce4ui-devel - + Menubar_changes_size_when_the_window_is_maximized.patch @@ -55,7 +55,7 @@ - 2021-12-11 + 2021-12-29 0.9.1 Version bump. uglyside@yandex.ru