Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perl-Gtk3-ImageView for
openSUSE:Factory checked in at 2021-05-10 15:38:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Gtk3-ImageView (Old)
and /work/SRC/openSUSE:Factory/.perl-Gtk3-ImageView.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Gtk3-ImageView"
Mon May 10 15:38:43 2021 rev:2 rq:891831 version:8
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Gtk3-ImageView/perl-Gtk3-ImageView.changes
2021-03-05 13:48:24.923793401 +0100
+++
/work/SRC/openSUSE:Factory/.perl-Gtk3-ImageView.new.2988/perl-Gtk3-ImageView.changes
2021-05-10 15:41:16.501110877 +0200
@@ -1,0 +2,6 @@
+Sun May 9 03:07:44 UTC 2021 - Tina M??ller <[email protected]>
+
+- updated to 8
+ see /usr/share/doc/packages/perl-Gtk3-ImageView/
+
+-------------------------------------------------------------------
Old:
----
Gtk3-ImageView-6.tar.gz
New:
----
Gtk3-ImageView-8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Gtk3-ImageView.spec ++++++
--- /var/tmp/diff_new_pack.sBlaMx/_old 2021-05-10 15:41:16.905109297 +0200
+++ /var/tmp/diff_new_pack.sBlaMx/_new 2021-05-10 15:41:16.905109297 +0200
@@ -16,18 +16,16 @@
#
+%define cpan_name Gtk3-ImageView
Name: perl-Gtk3-ImageView
-Version: 6
+Version: 8
Release: 0
-%define cpan_name Gtk3-ImageView
Summary: Image viewer widget for Gtk3
License: Artistic-1.0 OR GPL-1.0-or-later
-Group: Development/Libraries/Perl
URL: https://metacpan.org/release/%{cpan_name}
-Source0:
https://cpan.metacpan.org/authors/id/R/RA/RATCLIFFE/%{cpan_name}-%{version}.tar.gz
+Source0:
https://cpan.metacpan.org/authors/id/A/AS/ASOKOLOV/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
BuildRequires: perl(Carp::Always)
@@ -35,6 +33,7 @@
BuildRequires: perl(Gtk3)
BuildRequires: perl(Image::Magick)
BuildRequires: perl(Readonly)
+BuildRequires: perl(Test::Deep)
BuildRequires: perl(Test::Differences)
BuildRequires: perl(Test::MockObject)
BuildRequires: perl(Try::Tiny)
@@ -57,11 +56,11 @@
authors, join [email protected] at lists.gnome.org.
%prep
-%setup -q -n %{cpan_name}-%{version}
+%autosetup -n %{cpan_name}-%{version}
%build
perl Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+%make_build
%check
# MANUAL no testing (requires Display)
@@ -73,7 +72,6 @@
%perl_gen_filelist
%files -f %{name}.files
-%defattr(-,root,root,755)
%doc README.md
%changelog
++++++ Gtk3-ImageView-6.tar.gz -> Gtk3-ImageView-8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/META.json
new/Gtk3-ImageView-8/META.json
--- old/Gtk3-ImageView-6/META.json 2020-11-17 15:38:41.000000000 +0100
+++ new/Gtk3-ImageView-8/META.json 2021-05-07 11:06:27.000000000 +0200
@@ -5,7 +5,7 @@
"Alexey Sokolov <[email protected]>"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter
version 2.150010",
+ "generated_by" : "ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter
version 2.150010",
"license" : [
"unknown"
],
@@ -42,6 +42,7 @@
"requires" : {
"Carp::Always" : "0",
"Image::Magick" : "0",
+ "Test::Deep" : "0",
"Test::Differences" : "0",
"Test::MockObject" : "0",
"Test::More" : "0",
@@ -51,12 +52,15 @@
},
"release_status" : "stable",
"resources" : {
+ "bugtracker" : {
+ "web" : "https://github.com/carygravel/gtk3-imageview/issues";
+ },
"repository" : {
"type" : "git",
"url" : "https://github.com/carygravel/gtk3-imageview.git";,
"web" : "https://github.com/carygravel/gtk3-imageview";
}
},
- "version" : "6",
- "x_serialization_backend" : "JSON::PP version 4.02"
+ "version" : "8",
+ "x_serialization_backend" : "JSON::PP version 4.04"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/META.yml
new/Gtk3-ImageView-8/META.yml
--- old/Gtk3-ImageView-6/META.yml 2020-11-17 15:38:41.000000000 +0100
+++ new/Gtk3-ImageView-8/META.yml 2021-05-07 11:06:27.000000000 +0200
@@ -7,6 +7,7 @@
Carp::Always: '0'
ExtUtils::MakeMaker: '0'
Image::Magick: '0'
+ Test::Deep: '0'
Test::Differences: '0'
Test::MockObject: '0'
Test::More: '0'
@@ -14,7 +15,7 @@
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version
2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version
2.150010'
license: unknown
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -29,6 +30,7 @@
Gtk3: '0'
Readonly: '0'
resources:
+ bugtracker: https://github.com/carygravel/gtk3-imageview/issues
repository: https://github.com/carygravel/gtk3-imageview.git
-version: '6'
+version: '8'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/Makefile.PL
new/Gtk3-ImageView-8/Makefile.PL
--- old/Gtk3-ImageView-6/Makefile.PL 2020-11-17 15:37:42.000000000 +0100
+++ new/Gtk3-ImageView-8/Makefile.PL 2021-03-29 12:15:42.000000000 +0200
@@ -4,7 +4,7 @@
my $year = (localtime)[5] + 1900;
# Slurp the program source and dig out the version number.
-my $text = do { local ( @ARGV, $/ ) = $path; <> };
+my $text = do { local ( @ARGV, $/ ) = $path; <> };
my $version = $2 if ( $text =~ /^(my|our) \$VERSION\s*=\s*'?([^;]*)'?/m );
WriteMakefile(
@@ -17,6 +17,7 @@
},
TEST_REQUIRES => {
Test::More => 0,
+ Test::Deep => 0,
Test::Differences => 0,
Image::Magick => 0,
Try::Tiny => 0,
@@ -31,6 +32,9 @@
url => 'https://github.com/carygravel/gtk3-imageview.git',
web => 'https://github.com/carygravel/gtk3-imageview',
},
+ bugtracker => {
+ web => 'https://github.com/carygravel/gtk3-imageview/issues',
+ },
},
},
clean => { FILES => '$(SOURCE_TIDY)' },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/lib/Gtk3/ImageView/Tool/Dragger.pm
new/Gtk3-ImageView-8/lib/Gtk3/ImageView/Tool/Dragger.pm
--- old/Gtk3-ImageView-6/lib/Gtk3/ImageView/Tool/Dragger.pm 2020-11-17
15:37:42.000000000 +0100
+++ new/Gtk3-ImageView-8/lib/Gtk3/ImageView/Tool/Dragger.pm 2021-05-07
11:05:07.000000000 +0200
@@ -8,7 +8,7 @@
Readonly my $FLOAT_EPS => 0.01;
Readonly my $RIGHT_BUTTON => 3;
-our $VERSION = 6;
+our $VERSION = 8;
sub button_pressed {
my $self = shift;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/lib/Gtk3/ImageView/Tool/Selector.pm
new/Gtk3-ImageView-8/lib/Gtk3/ImageView/Tool/Selector.pm
--- old/Gtk3-ImageView-6/lib/Gtk3/ImageView/Tool/Selector.pm 2020-11-17
15:37:42.000000000 +0100
+++ new/Gtk3-ImageView-8/lib/Gtk3/ImageView/Tool/Selector.pm 2021-05-07
11:05:07.000000000 +0200
@@ -10,7 +10,7 @@
Readonly my $CURSOR_PIXELS => 5;
Readonly my $RIGHT_BUTTON => 3;
-our $VERSION = 6;
+our $VERSION = 8;
my %cursorhash = (
lower => {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Gtk3-ImageView-6/lib/Gtk3/ImageView/Tool/SelectorDragger.pm
new/Gtk3-ImageView-8/lib/Gtk3/ImageView/Tool/SelectorDragger.pm
--- old/Gtk3-ImageView-6/lib/Gtk3/ImageView/Tool/SelectorDragger.pm
2020-11-17 15:37:42.000000000 +0100
+++ new/Gtk3-ImageView-8/lib/Gtk3/ImageView/Tool/SelectorDragger.pm
2021-05-07 11:05:07.000000000 +0200
@@ -5,7 +5,7 @@
use base 'Gtk3::ImageView::Tool';
use Glib qw(TRUE FALSE); # To get TRUE and FALSE
-our $VERSION = 6;
+our $VERSION = 8;
sub new {
my $class = shift;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/lib/Gtk3/ImageView/Tool.pm
new/Gtk3-ImageView-8/lib/Gtk3/ImageView/Tool.pm
--- old/Gtk3-ImageView-6/lib/Gtk3/ImageView/Tool.pm 2020-11-17
15:37:42.000000000 +0100
+++ new/Gtk3-ImageView-8/lib/Gtk3/ImageView/Tool.pm 2021-05-07
11:05:39.000000000 +0200
@@ -4,7 +4,7 @@
use strict;
use Glib qw(TRUE FALSE); # To get TRUE and FALSE
-our $VERSION = 6;
+our $VERSION = 8;
sub new {
my $class = shift;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/lib/Gtk3/ImageView.pm
new/Gtk3-ImageView-8/lib/Gtk3/ImageView.pm
--- old/Gtk3-ImageView-6/lib/Gtk3/ImageView.pm 2020-11-17 15:37:42.000000000
+0100
+++ new/Gtk3-ImageView-8/lib/Gtk3/ImageView.pm 2021-05-07 11:05:43.000000000
+0200
@@ -17,7 +17,7 @@
Readonly my $HALF => 0.5;
Readonly my $MAX_ZOOM => 100;
-our $VERSION = 6;
+our $VERSION = 8;
use Glib::Object::Subclass Gtk3::DrawingArea::, signals => {
'zoom-changed' => {
@@ -315,7 +315,7 @@
$style->restore;
}
- my $zoom = $self->get_zoom;
+ my $zoom = $self->get_zoom / $self->get('scale-factor');
$context->scale( $zoom / $ratio, $zoom );
my $offset = $self->get_offset;
$context->translate( $offset->{x}, $offset->{y} );
@@ -380,8 +380,9 @@
my $zoom = $self->get_zoom;
my $ratio = $self->get_resolution_ratio;
my $offset = $self->get_offset;
- return ( $x + $offset->{x} ) * $zoom / $ratio,
- ( $y + $offset->{y} ) * $zoom;
+ my $factor = $self->get('scale-factor');
+ return ( $x + $offset->{x} ) * $zoom / $factor / $ratio,
+ ( $y + $offset->{y} ) * $zoom / $factor;
}
# convert x, y in widget coords to image coords
@@ -390,15 +391,18 @@
my $zoom = $self->get_zoom;
my $ratio = $self->get_resolution_ratio;
my $offset = $self->get_offset;
- return $x / $zoom * $ratio - $offset->{x}, $y / $zoom - $offset->{y};
+ my $factor = $self->get('scale-factor');
+ return $x * $factor / $zoom * $ratio - $offset->{x},
+ $y * $factor / $zoom - $offset->{y};
}
# convert x, y in widget distance to image distance
sub to_image_distance {
my ( $self, $x, $y ) = @_;
- my $zoom = $self->get_zoom;
- my $ratio = $self->get_resolution_ratio;
- return $x / $zoom * $ratio, $y / $zoom;
+ my $zoom = $self->get_zoom;
+ my $ratio = $self->get_resolution_ratio;
+ my $factor = $self->get('scale-factor');
+ return $x * $factor / $zoom * $ratio, $y * $factor / $zoom;
}
# set zoom with centre in image coordinates
@@ -406,8 +410,10 @@
my ( $self, $zoom, $center_x, $center_y ) = @_;
my $allocation = $self->get_allocation;
my $ratio = $self->get_resolution_ratio;
- my $offset_x = $allocation->{width} / 2 / $zoom * $ratio - $center_x;
- my $offset_y = $allocation->{height} / 2 / $zoom - $center_y;
+ my $factor = $self->get('scale-factor');
+ my $offset_x =
+ $allocation->{width} * $factor / 2 / $zoom * $ratio - $center_x;
+ my $offset_y = $allocation->{height} * $factor / 2 / $zoom - $center_y;
$self->_set_zoom($zoom);
$self->set_offset( $offset_x, $offset_y );
return;
@@ -449,7 +455,9 @@
my $sc_factor_h =
min( $limit, $allocation->{height} / $box->{height} );
$self->_set_zoom_with_center(
- min( $sc_factor_w, $sc_factor_h ) * $additional_factor,
+ min( $sc_factor_w, $sc_factor_h ) *
+ $additional_factor *
+ $self->get('scale-factor'),
( $box->{x} + $box->{width} / 2 ) / $ratio,
$box->{y} + $box->{height} / 2
);
@@ -660,7 +668,7 @@
=head1 VERSION
-6
+8
=head1 SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/t/1_basics.t
new/Gtk3-ImageView-8/t/1_basics.t
--- old/Gtk3-ImageView-6/t/1_basics.t 2020-11-17 15:37:42.000000000 +0100
+++ new/Gtk3-ImageView-8/t/1_basics.t 2021-03-29 12:40:17.000000000 +0200
@@ -3,6 +3,7 @@
use Try::Tiny;
use File::Temp;
use Image::Magick;
+use Test::Deep;
use Test::More tests => 38;
BEGIN {
@@ -21,7 +22,7 @@
'get_tool() defaults to dragger'
);
-my $tmp = File::Temp->new( SUFFIX => '.jpg' );
+my $tmp = File::Temp->new( SUFFIX => '.png' );
my $image = Image::Magick->new();
my $x = $image->Read('rose:');
$x = $image->Write( filename => $tmp );
@@ -31,21 +32,29 @@
'offset-changed' => sub {
my ( $widget, $x, $y ) = @_;
$view->signal_handler_disconnect($signal);
- is $x, 0, 'emitted offset-changed signal x';
- is $y, 11, 'emitted offset-changed signal y';
+ SKIP: {
+ skip "I don't know how offset is supposed to work with HiDPI", 2
+ if $view->get('scale-factor') > 1;
+ is $x, 0, 'emitted offset-changed signal x';
+ is $y, 11, 'emitted offset-changed signal y';
+ }
}
);
$view->set_pixbuf( Gtk3::Gdk::Pixbuf->new_from_file($tmp), TRUE );
-is_deeply(
- $view->get_viewport,
- {
- x => 0,
- y => -11.9999998044223,
- width => 69.9999996088445,
- height => 69.9999996088445
- },
- 'get_viewport'
-);
+SKIP: {
+ skip "I don't know how offset is supposed to work with HiDPI", 1
+ if $view->get('scale-factor') > 1;
+ cmp_deeply(
+ $view->get_viewport,
+ {
+ x => 0,
+ y => num( -12, 0.001 ),
+ width => num( 70, 0.001 ),
+ height => num( 70, 0.001 ),
+ },
+ 'get_viewport'
+ );
+}
SKIP: {
skip 'not yet', 2;
@@ -61,7 +70,8 @@
is_deeply( $view->get_allocation, { x => -1, y => -1, width => 1, height => 1
},
'get_allocation' );
-is( $view->get_zoom, 0.0142857143655419, 'get_zoom()' );
+cmp_deeply( $view->get_zoom,
+ num( 0.01428 * $view->get('scale-factor'), 0.001 ), 'get_zoom()' );
$signal = $view->signal_connect(
'zoom-changed' => sub {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/t/2_transparent.t
new/Gtk3-ImageView-8/t/2_transparent.t
--- old/Gtk3-ImageView-6/t/2_transparent.t 2020-11-17 15:37:42.000000000
+0100
+++ new/Gtk3-ImageView-8/t/2_transparent.t 2021-03-29 12:15:42.000000000
+0200
@@ -73,7 +73,13 @@
$found = 0;
while ( $x > 0 ) {
my @pixel = $image->GetPixel( x => $x, y => $y );
- if ( join( ',', @pixel ) eq '0,0,1' ) {
+
+ # the blue chessboard can become blurred with hidpi :(
+ my @pixel_below =
+ $image->GetPixel( x => $x, y => $y + $view->get('scale-factor') );
+ if ( join( ',', @pixel ) eq '0,0,1'
+ or join( ',', @pixel_below ) eq '0,0,1' )
+ {
$found = 1;
last;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/t/3_zoom.t
new/Gtk3-ImageView-8/t/3_zoom.t
--- old/Gtk3-ImageView-6/t/3_zoom.t 2020-11-17 15:37:42.000000000 +0100
+++ new/Gtk3-ImageView-8/t/3_zoom.t 2021-03-29 12:40:17.000000000 +0200
@@ -1,6 +1,7 @@
use warnings;
use strict;
use Test::More tests => 7;
+use Test::Deep;
BEGIN {
use Glib qw/TRUE FALSE/;
@@ -10,11 +11,12 @@
my $window = Gtk3::Window->new('toplevel');
$window->set_size_request( 300, 200 );
-my $view = Gtk3::ImageView->new;
+my $view = Gtk3::ImageView->new;
+my $scale = $view->get('scale-factor');
$window->add($view);
$window->show_all;
$view->set_pixbuf( Gtk3::Gdk::Pixbuf->new_from_file('t/bigpic.svg'), TRUE );
-ok( abs( $view->get_zoom - 0.2 ) < 0.001, 'shrinked' );
+cmp_deeply( $view->get_zoom, num( 0.2 * $scale, 0.0001 ), 'shrinked' );
$view->set_zoom(1);
# the transp-green picture is 100x100 which is less than 200.
@@ -23,11 +25,11 @@
is( $view->get_zoom, 1, 'picture fully visible' );
$view->set_pixbuf( Gtk3::Gdk::Pixbuf->new_from_file('t/transp-green.svg'),
TRUE );
-is( $view->get_zoom, 2, 'zoomed' );
+is( $view->get_zoom, 2 * $scale, 'zoomed' );
$view->set_fitting(TRUE);
-is( $view->get_zoom, 1, 'no need to zoom' );
+is( $view->get_zoom, $scale, 'no need to zoom' );
$view->set_pixbuf( Gtk3::Gdk::Pixbuf->new_from_file('t/transp-green.svg'),
TRUE );
-is( $view->get_zoom, 1, 'no need to zoom even when TRUE' );
+is( $view->get_zoom, $scale, 'no need to zoom even when TRUE' );
$view->set_pixbuf( Gtk3::Gdk::Pixbuf->new_from_file('t/bigpic.svg'), TRUE );
-ok( abs( $view->get_zoom - 0.2 ) < 0.001, 'still shrinked' );
+cmp_deeply( $view->get_zoom, num( 0.2 * $scale, 0.0001 ), 'still shrinked' );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gtk3-ImageView-6/t/4_select.t
new/Gtk3-ImageView-8/t/4_select.t
--- old/Gtk3-ImageView-6/t/4_select.t 2020-11-17 15:37:42.000000000 +0100
+++ new/Gtk3-ImageView-8/t/4_select.t 2021-03-29 12:15:42.000000000 +0200
@@ -4,6 +4,7 @@
use File::Temp;
use Test::More tests => 2;
use Test::MockObject;
+use Test::Deep;
use Carp::Always;
BEGIN {
@@ -33,6 +34,18 @@
$event->set_always( 'x', 93 );
$event->set_always( 'y', 67 );
$view->get_tool->button_released($event);
-is_deeply( $view->get_selection, { x => 32, y => 38, width => 11, height => 8
},
- 'get_selection' );
+SKIP: {
+ skip "I can't figure out the correct formula here which works with HiDPI",
1
+ if $view->get('scale-factor') > 1;
+ cmp_deeply(
+ $view->get_selection,
+ {
+ x => num(32),
+ y => num(38),
+ width => 11,
+ height => 8
+ },
+ 'get_selection'
+ );
+}
