From 6f00a726f73bd28e03a6dad90a92b97fc92859fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> Date: Fri, 2 Sep 2016 13:20:10 +0200 Subject: 1.48 bump
--- .gitignore | 1 + ...o-not-store-DESTDIR-into-Prima-Config-bin.patch | 31 ------------------ Prima-1.47-typo-fix.patch | 29 ----------------- ...-test-alpha-paint-under-non-rgba-displays.patch | 38 ++++++++++++++++++++++ Prima-1.48-fix-package-name.patch | 35 ++++++++++++++++++++ perl-Prima.spec | 14 +++++--- sources | 2 +- 7 files changed, 84 insertions(+), 66 deletions(-) delete mode 100644 Prima-1.47-Do-not-store-DESTDIR-into-Prima-Config-bin.patch delete mode 100644 Prima-1.47-typo-fix.patch create mode 100644 Prima-1.48-don-t-test-alpha-paint-under-non-rgba-displays.patch create mode 100644 Prima-1.48-fix-package-name.patch diff --git a/.gitignore b/.gitignore index 50cd681..e18a386 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /Prima-1.45.tar.gz /Prima-1.46.tar.gz /Prima-1.47.tar.gz +/Prima-1.48.tar.gz diff --git a/Prima-1.47-Do-not-store-DESTDIR-into-Prima-Config-bin.patch b/Prima-1.47-Do-not-store-DESTDIR-into-Prima-Config-bin.patch deleted file mode 100644 index ee54760..0000000 --- a/Prima-1.47-Do-not-store-DESTDIR-into-Prima-Config-bin.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bd6a7d42e198801e9d49c07ad7782fbbfdd14eec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> -Date: Mon, 6 Jun 2016 10:58:14 +0200 -Subject: [PATCH] Do not store DESTDIR into Prima::Config::bin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -CPAN RT#115118 - -Signed-off-by: Petr Písař <[email protected]> ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 7120d63..30efa6c 100755 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -2288,7 +2288,7 @@ sub install - "$2\$(DEST$3)$4". - "$5\$(DEST$6)$7$8". - "\n\t\$(NOECHO) \$(ABSPERL) $0 --postinstall ". -- "dest=\$(DEST$3) bin=\$(DEST$6) slib=$cygwin_fake_Slib\n\n" -+ "dest=\$(DEST$3) bin=\$($6) slib=$cygwin_fake_Slib\n\n" - ]xgse; - - $END .= <<BAD_MAKEFILE if $n != 3; --- -2.5.5 - diff --git a/Prima-1.47-typo-fix.patch b/Prima-1.47-typo-fix.patch deleted file mode 100644 index 0854af7..0000000 --- a/Prima-1.47-typo-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 65d9ccbf02df7193652d6e696de91af19c52543f Mon Sep 17 00:00:00 2001 -From: Dmitry Karasik <[email protected]> -Date: Sat, 4 Jun 2016 20:31:35 +0200 -Subject: [PATCH] typo fix -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař <[email protected]> ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 58b3f60..7120d63 100755 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -1932,7 +1932,7 @@ sub command_postinstall - package Prima::Config; - use vars qw(\%Config); - --my \$bin = qq($opt{bin}); -+my \$bin = q($opt{bin}); - - # Determine lib based on the location of this module - use File::Basename qw(dirname); --- -2.5.5 - diff --git a/Prima-1.48-don-t-test-alpha-paint-under-non-rgba-displays.patch b/Prima-1.48-don-t-test-alpha-paint-under-non-rgba-displays.patch new file mode 100644 index 0000000..73a1ec5 --- /dev/null +++ b/Prima-1.48-don-t-test-alpha-paint-under-non-rgba-displays.patch @@ -0,0 +1,38 @@ +From a1f2c88460b3f68cc95c76272e8c813e8a43274c Mon Sep 17 00:00:00 2001 +From: Dmitry Karasik <[email protected]> +Date: Mon, 29 Aug 2016 11:19:55 +0200 +Subject: [PATCH] don't test alpha paint under non-rgba displays +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař <[email protected]> +--- + t/Image/ROP.t | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/t/Image/ROP.t b/t/Image/ROP.t +index 5ac9f1d..bdee676 100644 +--- a/t/Image/ROP.t ++++ b/t/Image/ROP.t +@@ -214,10 +214,13 @@ is_bits( $dst->mask, "5678", "ropAlphaCopy"); + $dst->alpha(ord("9"), 1, 0, 2, 0); + is_bits( $dst->mask, "5998", "alpha(x)"); + +-$dst->begin_paint; +-$dst->alpha(ord("0"), 1, 0, 2, 0); +-$dst->end_paint; +-is_bits( $dst->mask, "5008", "alpha(x) in paint"); ++SKIP: { ++ skip "no argb support", 1 unless Prima::Application->get_system_value(sv::LayeredWidgets); ++ $dst->begin_paint; ++ $dst->alpha(ord("0"), 1, 0, 2, 0); ++ $dst->end_paint; ++ is_bits( $dst->mask, "5008", "alpha(x) in paint"); ++} + + # test porter-duff + sub pd_color +-- +2.5.5 + diff --git a/Prima-1.48-fix-package-name.patch b/Prima-1.48-fix-package-name.patch new file mode 100644 index 0000000..9b24cfa --- /dev/null +++ b/Prima-1.48-fix-package-name.patch @@ -0,0 +1,35 @@ +From 124ce27091af4dbdef550d17afc26e56f2665580 Mon Sep 17 00:00:00 2001 +From: Dmitry Karasik <[email protected]> +Date: Mon, 22 Aug 2016 14:22:16 +0200 +Subject: [PATCH] fix package name +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař <[email protected]> + +diff --git a/Prima/themes/round3d.pm b/Prima/themes/round3d.pm +index 6829a1c..e9e782d 100644 +--- a/Prima/themes/round3d.pm ++++ b/Prima/themes/round3d.pm +@@ -4,7 +4,7 @@ use strict; + use warnings; + use Prima qw(Themes); + +-package Round3D; ++package Prima::Themes::Round3D; + use vars qw(@ISA); + @ISA=qw(Prima::Themes::Proxy); + +@@ -81,7 +81,7 @@ sub oval3d + + my %wrap_paint = ( + onPaint => sub { +- $_[0]-> on_paint( Round3D-> new($_[1])); ++ $_[0]-> on_paint( Prima::Themes::Round3D-> new($_[1])); + } + ); + +-- +2.5.5 + diff --git a/perl-Prima.spec b/perl-Prima.spec index 408dee3..5adf94d 100644 --- a/perl-Prima.spec +++ b/perl-Prima.spec @@ -1,7 +1,7 @@ %global use_x11_tests 1 Name: perl-Prima -Version: 1.47 +Version: 1.48 Release: 1%{?dist} Summary: Perl graphic toolkit # img/codec_jpeg.c: EXIF parser is based on io-jpeg.c from gdk-pixbuf @@ -20,10 +20,10 @@ License: BSD and MIT and TCL and ImageMagick and LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Prima/ Source0: http://www.cpan.org/authors/id/K/KA/KARASIK/Prima-%{version}.tar.gz -# Fix $opt{bin} expansion in Prima::Config, in upstream after 1.47 -Patch0: Prima-1.47-typo-fix.patch -# Do not store DESTDIR into Prima::Config, CPAN RT#115118 -Patch1: Prima-1.47-Do-not-store-DESTDIR-into-Prima-Config-bin.patch +# Fix Prima::Themes::Round3D package definition, in upstream after 1.48 +Patch0: Prima-1.48-fix-package-name.patch +# Skip alpha rendering test on non-alpha displays, in upstream after 1.48 +Patch1: Prima-1.48-don-t-test-alpha-paint-under-non-rgba-displays.patch BuildRequires: findutils BuildRequires: giflib-devel BuildRequires: gcc @@ -56,6 +56,7 @@ BuildRequires: pkgconfig(gtk+-2.0) >= 2.7 BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xpm) @@ -159,6 +160,9 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete %{_mandir}/man3/Prima::Test.* %changelog +* Fri Sep 02 2016 Petr Pisar <[email protected]> - 1.48-1 +- 1.48 bump + * Mon Jun 06 2016 Petr Pisar <[email protected]> - 1.47-1 - 1.47 bump - License changed to "BSD and MIT and TCL and ImageMagick and LGPLv2+" diff --git a/sources b/sources index 54b0479..26d1936 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85a5cfee71811098a3c663d1911fb96c Prima-1.47.tar.gz +9e4357bd4a64d8a8b401d2adf9424c3d Prima-1.48.tar.gz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/perl-Prima.git/commit/?h=master&id=6f00a726f73bd28e03a6dad90a92b97fc92859fa -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list [email protected] https://lists.fedoraproject.org/admin/lists/[email protected]
