diff --git a/0001-Do-not-inject-no-separator-into-window-decoration.patch b/0001-Do-not-inject-no-separator-into-window-decoration.patch new file mode 100644 index 0000000..a42fb62 --- /dev/null +++ b/0001-Do-not-inject-no-separator-into-window-decoration.patch @@ -0,0 +1,59 @@ +From e4ea51b9afb120b0d80db9ad82020a3246675a4e Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Fri, 12 Feb 2021 10:47:22 +0100 +Subject: [PATCH] Do not inject 'no-separator' into window decoration + +Gtk3::Dialog->new was called with the parameter "no-separator" +which is invalid for Gtk3 as the error message states (it was valid in +Gtk2) + +This is exposed by perl-Gtk3 0.038, which handled these flags in a buggy +way. The fix in perl-Gtk3 exposed the issue in clamtk. +--- + lib/Analysis.pm | 2 +- + lib/History.pm | 2 +- + lib/Scan.pm | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/Analysis.pm b/lib/Analysis.pm +index 06a1bf7..6a82933 100644 +--- a/lib/Analysis.pm ++++ b/lib/Analysis.pm +@@ -48,7 +48,7 @@ sub show_window { + ( undef, $from_scan, $parent ) = @_; + $window = Gtk3::Dialog->new( + undef, $parent, +- [ qw| modal destroy-with-parent no-separator ++ [ qw| modal destroy-with-parent + use-header-bar | + ], + ); +diff --git a/lib/History.pm b/lib/History.pm +index f84aa97..b5906be 100644 +--- a/lib/History.pm ++++ b/lib/History.pm +@@ -148,7 +148,7 @@ sub view_history { + + my $win = Gtk3::Dialog->new( + sprintf( _( 'Viewing %s' ), $basename ), +- undef, [ qw| modal destroy-with-parent no-separator | ], ++ undef, [ qw| modal destroy-with-parent | ], + ); + $win->signal_connect( destroy => sub { $win->destroy; 1 } ); + $win->set_default_size( 800, 350 ); +diff --git a/lib/Scan.pm b/lib/Scan.pm +index 0de14df..b1a32fc 100644 +--- a/lib/Scan.pm ++++ b/lib/Scan.pm +@@ -90,7 +90,7 @@ sub filter { + # Begin popup scanning + $window = Gtk3::Dialog->new( + undef, undef, +- [ qw| modal destroy-with-parent no-separator ++ [ qw| modal destroy-with-parent + use-header-bar | + ], + ); +-- +2.30.0 + diff --git a/clamtk-6.06.tar.xz b/clamtk-6.06.tar.xz deleted file mode 100644 index bc06151..0000000 --- a/clamtk-6.06.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69c399b296e7897ea2ade5239f0acba9e2538d1096b710b09f9552f215c637ab -size 232024 diff --git a/clamtk-6.06.tar.xz.asc b/clamtk-6.06.tar.xz.asc deleted file mode 100644 index 4b1830c..0000000 --- a/clamtk-6.06.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJIBAABCgAyFiEEXdR7OxIe5cNUogMF9R0ZVGraWd4FAl9h4hsUHGRhdmUubmVy -ZEBnbWFpbC5jb20ACgkQ9R0ZVGraWd5dQg//YoePyvln+hUCUmuqafNz4gIHqkQN -5EYkX0FC5lD0exxDb4/PCRNwsNU4Xd7XDLBzNA0vv4jAlOfrkzeNuqIg/cvS1N7O -u9+1C4JhtrCVBfP77EibkBE4YIkEqw4lYmQQUfhmBcdnuOoJbnGHhZw6wHmbYJy2 -F9U8TPIk7miTtUDfEBZKrVB+m6jKVwDhrX1xEVXkEffr1LrZtxTvWaN5a4ynusES -1onV/yCBoRSMPVvLzWCzf/jJuLYDnwrL+3lshadWpEmdoxTt+tWsuVRxs2Hjk9pn -g+xNxf2Uy2nO/WbLdIqBFHtMrf2mimEjK1MDDwa5yaK3L7Nuc27HBMwN3OXVtXlz -VaSpFdyfWXfXyeu9wT0v8E4eFm9TjYfzOFGdWKTgTUStUZzAEYEkxKLiVHi9jjd7 -vdqeaXgqXpb6nUKxF4MT97/33Rzum67cJkwVMT92llk54aKbH34uhwDZoGlDNVKa -ElVo3kxr1FqPZRxRhejCVMPTenyymMIPVjvQBQJw2i6F4v6FngL5Np0Fo4XHIU3R -Cb4WgM1d4HY5Caj7GhlB9C21UsNtfa1GwSEuLeqt1YkVkcFhtWa5M6jQ+5f7vrE4 -vzssp4zsDebVNVsrecHuj8JCzSHW56j44P4RVPTktlb9l6W9/aUo7s+9RSjxmfrN -ZuprOpDu8x7II3I= -=OAE+ ------END PGP SIGNATURE----- diff --git a/clamtk-6.07.tar.xz b/clamtk-6.07.tar.xz new file mode 100644 index 0000000..f29ca8d --- /dev/null +++ b/clamtk-6.07.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec79b5eb3e6d9c6045a74725ec3a772c0b462347614f4055e97321845a754f8e +size 234112 diff --git a/clamtk-6.07.tar.xz.asc b/clamtk-6.07.tar.xz.asc new file mode 100644 index 0000000..7f62623 --- /dev/null +++ b/clamtk-6.07.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJIBAABCgAyFiEEXdR7OxIe5cNUogMF9R0ZVGraWd4FAmAWhIYUHGRhdmUubmVy +ZEBnbWFpbC5jb20ACgkQ9R0ZVGraWd4tNQ//R5Hbi7IIhkrTiDd1ti2OToH91dCe +i2mBtt/2NxEIwgIeptd/eDyCc8R59bbdItm48ClYuUWdnzwpNPKXODNTQQNDrllB +GirstBpnjH3XBrymNem3MIXEczNVVZOtFxmmqolWWwQoJ0w4xyvolo0Z7CccIJXs +2qvSBBV2oIq400ClIOIkgP3/yQuwnm4XWk7u+MauwAQRVEgEAhthtY+zf/UBxhjp +G7jgdl5+TZQl9jcJsKL7UgEi5m4MBM5x6VLP82cGwrxP2RYddbqGEun66d1EDkMK +tb5kY6qunr+dTYo5dwSiNBJ7yfDLS1GtaW5BtuhwyyJ77/GK5uVz8P1WJkFP39lE +Ye//UCfuTKm0nkvGddqOX2WbKQJh/5B8iebx1HlknP8cg9kd1zf7lB4CnnueJX4/ +8xhr1Ny2cwZzweWbGtsPoOxCQzOovrRh4PmLJ1qPvgUpmI2V2Co7h3o4jyPy4euL +5qaVjRzQ281oNSpmnqAZ4wdBxz6A0GNabwJM/i9Dr6n6sX1BOH87DujBdeZaet1y +ekDsWXgcqxFmkAwUWyrCd4a2NEsQF5ifzfCCw4IyDV8gN0hg0SeA6a05wIUTHYO/ +WtCGsHKcUrg8i2AmC6VutIyH+xsbV3oC8amufLfhND4XHjpFNGctq+ywXixL+nPL +dcHYutzUqR2usxc= +=ZoQh +-----END PGP SIGNATURE----- diff --git a/clamtk.changes b/clamtk.changes index 9816e61..a05a60d 100644 --- a/clamtk.changes +++ b/clamtk.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Feb 12 09:45:59 UTC 2021 - Dominique Leuenberger + +- Update to version 6.07: + + Update to look for additional information during update to know + when finished. + + Update dates to 2021. +- Add 0001-Do-not-inject-no-separator-into-window-decoration.patch: + Do not add no-separator to window decoration (boo#1182151). + ------------------------------------------------------------------- Fri Sep 25 09:56:42 UTC 2020 - Paolo Stivanin diff --git a/clamtk.spec b/clamtk.spec index fd05fca..ece2bd5 100644 --- a/clamtk.spec +++ b/clamtk.spec @@ -1,7 +1,7 @@ # # spec file for package clamtk # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2012 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: clamtk -Version: 6.06 +Version: 6.07 Release: 0 Summary: GUI for the ClamAV Antivirus License: GPL-1.0-or-later OR Artistic-1.0 @@ -28,6 +28,7 @@ Source: https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-%{vers Source1: https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-%{version}.tar.xz.asc Source2: %{name}.keyring Patch0: clamtk-add_searchpath.patch +Patch1: 0001-Do-not-inject-no-separator-into-window-decoration.patch BuildRequires: update-desktop-files Requires: clamav >= 0.88 Requires: gnome-icon-theme @@ -65,6 +66,7 @@ It is designed to be an easy-to-use, point and click virus scanner. %prep %setup -q %patch0 +%patch1 -p1 %build gzip -dc clamtk.1.gz > clamtk.1