From 7039d942a1fa1901482d2ea79dfc8d7004200646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Thu, 29 Sep 2016 11:59:47 +0200
Subject: 1.49 bump

---
 .gitignore                                         |  1 +
 ...-test-alpha-paint-under-non-rgba-displays.patch | 38 ----------------------
 Prima-1.48-fix-package-name.patch                  | 35 --------------------
 perl-Prima.spec                                    | 11 +++----
 sources                                            |  2 +-
 5 files changed, 6 insertions(+), 81 deletions(-)
 delete mode 100644 
Prima-1.48-don-t-test-alpha-paint-under-non-rgba-displays.patch
 delete mode 100644 Prima-1.48-fix-package-name.patch

diff --git a/.gitignore b/.gitignore
index e18a386..265c2ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /Prima-1.46.tar.gz
 /Prima-1.47.tar.gz
 /Prima-1.48.tar.gz
+/Prima-1.49.tar.gz
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
deleted file mode 100644
index 73a1ec5..0000000
--- a/Prima-1.48-don-t-test-alpha-paint-under-non-rgba-displays.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a1f2c88460b3f68cc95c76272e8c813e8a43274c Mon Sep 17 00:00:00 2001
-From: Dmitry Karasik <d...@novozymes.com>
-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ř <ppi...@redhat.com>
----
- 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
deleted file mode 100644
index 9b24cfa..0000000
--- a/Prima-1.48-fix-package-name.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 124ce27091af4dbdef550d17afc26e56f2665580 Mon Sep 17 00:00:00 2001
-From: Dmitry Karasik <d...@novozymes.com>
-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ř <ppi...@redhat.com>
-
-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 5adf94d..8927af4 100644
--- a/perl-Prima.spec
+++ b/perl-Prima.spec
@@ -1,7 +1,7 @@
 %global use_x11_tests 1
 
 Name:           perl-Prima
-Version:        1.48
+Version:        1.49
 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,6 @@ 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 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
@@ -117,8 +113,6 @@ Prima-related code together with standard Perl Test:: suite.
 
 %prep
 %setup -q -n Prima-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \
@@ -160,6 +154,9 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete
 %{_mandir}/man3/Prima::Test.*
 
 %changelog
+* Thu Sep 29 2016 Petr Pisar <ppi...@redhat.com> - 1.49-1
+- 1.49 bump
+
 * Fri Sep 02 2016 Petr Pisar <ppi...@redhat.com> - 1.48-1
 - 1.48 bump
 
diff --git a/sources b/sources
index 26d1936..8424319 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e4357bd4a64d8a8b401d2adf9424c3d  Prima-1.48.tar.gz
+164716f7265c987b472b58e8ff37cf75  Prima-1.49.tar.gz
-- 
cgit v0.12


        
http://pkgs.fedoraproject.org/cgit/perl-Prima.git/commit/?h=master&id=7039d942a1fa1901482d2ea79dfc8d7004200646
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org

Reply via email to