Merge pull request #9968 from 4fury-c3440d8/b1

rebuilds.
This commit is contained in:
Kamil ATLI
2021-12-30 19:32:49 +03:00
committed by GitHub
5 changed files with 66 additions and 35 deletions
@@ -0,0 +1,26 @@
From 020a2c8267f88568dcba4848ed826c4d9c34f063 Mon Sep 17 00:00:00 2001
From: Sergios - Anestis Kefalidis <sergioskefalidis@gmail.com>
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
@@ -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);
+2 -2
View File
@@ -26,7 +26,7 @@
<Dependency versionFrom="4.16.0">libxfce4ui-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">xfce-terminal.patch</Patch> -->
<Patch level="1">Menubar_changes_size_when_the_window_is_maximized.patch</Patch>
</Patches>
</Source>
@@ -55,7 +55,7 @@
<History>
<Update release="4">
<Date>2021-12-11</Date>
<Date>2021-12-29</Date>
<Version>0.9.1</Version>
<Comment>Version bump.</Comment>
<Email>uglyside@yandex.ru</Email>
@@ -0,0 +1,22 @@
From c47d47ab7f66a1973b1314ef531de2fb444c2fe6 Mon Sep 17 00:00:00 2001
From: Ilias Stamatis <ilstam@mailbox.org>
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)
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>ffmulticonverter</Name>
@@ -11,15 +11,18 @@
<License>GPLv3</License>
<Icon>ffmulticonverter</Icon>
<IsA>app:gui</IsA>
<Summary>A multi converter</Summary>
<Summary>A multi converter.</Summary>
<Description>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.</Description>
<Archive sha1sum="bae21490cc0cb7c38fccc8b1a4e77dc0c1f31a32" type="targz">mirrors://sourceforge/ffmulticonv/ffmulticonverter-1.8.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-qt5-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency>
<Dependency>gettext-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>python3-qt5-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">QProgressBar_value_replaced_to_int.patch</Patch>
</Patches>
</Source>
<Package>
@@ -29,21 +32,26 @@
<Dependency>unoconv</Dependency>
<Dependency>python3-qt5</Dependency>
<Dependency>imagemagick</Dependency>
<!-- <Dependency>pythonmagick</Dependency> -->
<!-- <Dependency>python-imaging</Dependency> -->
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share/pixmaps</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/ffmulticonverter</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2021-12-28</Date>
<Version>1.8.0</Version>
<Comment>Rebuild python.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2020-03-08</Date>
<Version>1.8.0</Version>