ppisar pushed to perl-Prima (master). "1.44 bump"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Aug 5 14:11:50 UTC 2015
From 0f9c6c87d76ac4aec6a85e3d20b59e6241d1f282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Wed, 5 Aug 2015 15:47:09 +0200
Subject: 1.44 bump
diff --git a/.gitignore b/.gitignore
index 4339be4..74fa322 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/Prima-1.41.tar.gz
/Prima-1.42.tar.gz
/Prima-1.43.tar.gz
+/Prima-1.44.tar.gz
diff --git a/Prima-1.43-FcPatternAddDouble.patch b/Prima-1.43-FcPatternAddDouble.patch
deleted file mode 100644
index db42ef5..0000000
--- a/Prima-1.43-FcPatternAddDouble.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a06569708a2edc124c0290c68af5c17d57b22e51 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
-Date: Thu, 23 Apr 2015 09:10:21 +0200
-Subject: [PATCH] FcPatternAddDouble
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-<URL: https://rt.cpan.org/Ticket/Display.html?id=103484 >
-
-Hi Petr,
-
-May I ask to test with another patch? This time I cannot give the
-proper one because it's too far off with all debug stuff I've added,
-but can you try something like this fix below?
-
-Signed-off-by: Petr Písař <ppisar at redhat.com>
-
-diff --git a/unix/xft.c b/unix/xft.c
-index 442c702..a530d37 100644
---- a/unix/xft.c
-+++ b/unix/xft.c
-@@ -690,7 +690,7 @@ prima_xft_font_pick( Handle self, Font * source, Font * dest, double * size, Xft
- FcPatternAddDouble( request, FC_SIZE, *size);
- XFTdebug("FC_SIZE = %.1f", *size);
- } else {
-- FcPatternAddInteger( request, FC_SIZE, requested_font. size);
-+ FcPatternAddDouble( request, FC_SIZE, requested_font. size);
- XFTdebug("FC_SIZE = %d", requested_font. size);
- }
- } else {
---
-2.1.0
-
diff --git a/Prima-1.43-fxa_average_width_inconsistent_with_xlfd_width.patch b/Prima-1.43-fxa_average_width_inconsistent_with_xlfd_width.patch
deleted file mode 100644
index eb3d8fb..0000000
--- a/Prima-1.43-fxa_average_width_inconsistent_with_xlfd_width.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From rt-cpan-org-return at perl.org Thu Apr 16 19:00:18 2015
-Return-Path: rt-cpan-org-return at perl.org
-Received: from zmta05.collab.prod.int.phx2.redhat.com (LHLO
- zmta05.collab.prod.int.phx2.redhat.com) (10.5.81.12) by
- zmail14.collab.prod.int.phx2.redhat.com with LMTP; Thu, 16 Apr 2015
- 13:00:18 -0400 (EDT)
-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
- by zmta05.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A372F17C123
- for <ppisar at mail.corp.redhat.com>; Thu, 16 Apr 2015 13:00:18 -0400 (EDT)
-Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.21])
- by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3GH0IDE022350
- for <ppisar at redhat.com>; Thu, 16 Apr 2015 13:00:18 -0400
-Received: from rtcpan.develooper.com (rtcpan.develooper.com [207.171.7.181])
- by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3GH0Hlj004418
- for <ppisar at redhat.com>; Thu, 16 Apr 2015 13:00:17 -0400
-Received: by rtcpan.develooper.com (Postfix, from userid 536)
- id 91CAE5D7; Thu, 16 Apr 2015 10:00:16 -0700 (PDT)
-Precedence: normal
-Subject: [rt.cpan.org #103484] Font tests fail with hlv fonts
-From: "KARASIK via RT" <bug-Prima at rt.cpan.org>
-Reply-To: bug-Prima at rt.cpan.org
-In-Reply-To: <rt-4.0.18-23549-1428916055-238.103484-6-0 at rt.cpan.org>
-References: <RT-Ticket-103484 at rt.cpan.org>
- <rt-4.0.18-23549-1428916055-238.103484-6-0 at rt.cpan.org>
-Message-ID: <rt-4.0.18-29430-1429203616-1071.103484-6-0 at rt.cpan.org>
-X-RT-Loop-Prevention: rt.cpan.org
-RT-Ticket: rt.cpan.org #103484
-Managed-BY: RT 4.0.18 (http://www.bestpractical.com/rt/)
-RT-Originator: KARASIK at cpan.org
-To: ppisar at redhat.com
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Content-Type: text/plain; charset="utf-8"
-X-RT-Original-Encoding: utf-8
-Date: Thu, 16 Apr 2015 13:00:16 -0400
-X-RedHat-Spam-Score: -1.9 (BAYES_00,SPF_PASS,URIBL_BLOCKED) 207.171.7.181 rtcpan.develooper.com 207.171.7.181 rtcpan.develooper.com <rt-cpan-org-return at perl.org>
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
-X-Scanned-By: MIMEDefang 2.68 on 10.5.110.21
-Status: RO
-Content-Length: 960
-Lines: 22
-
-<URL: https://rt.cpan.org/Ticket/Display.html?id=103484 >
-
-Hi, thanks for the report! These fonts indeed are corner cases, reporting FXA_AVERAGE_WIDTHs inconsistent with the requested XLFD widths; I think I adapted for this now. May I ask you
-to run the test again with the following patch and see if that works for you?
-
-Sincerely, Dmitry
-
---- a/unix/apc_font.c
-+++ b/unix/apc_font.c
-@@ -1291,7 +1291,10 @@ AGAIN:
-
- /* detailing width */
- if ( f-> font. width == 0 || !f-> flags. width) {
-- if ( XGetFontProperty( s, FXA_AVERAGE_WIDTH, &v) && v) {
-+ if ( f-> vecname && font-> width > 0) {
-+ f-> font. width = font-> width;
-+ Fdebug("font: width = copy as is %d\n", f->font.width);
-+ } else if ( XGetFontProperty( s, FXA_AVERAGE_WIDTH, &v) && v) {
- XCHECKPOINT;
- f-> font. width = (v + 5) / 10;
- Fdebug("font: width = FXA_AVERAGE_WIDTH %d(%d)\n", f->font.width, v);
-
-
diff --git a/Prima-1.44-warn-s-first-argument-is-a-formating-string.patch b/Prima-1.44-warn-s-first-argument-is-a-formating-string.patch
new file mode 100644
index 0000000..ab0e998
--- /dev/null
+++ b/Prima-1.44-warn-s-first-argument-is-a-formating-string.patch
@@ -0,0 +1,30 @@
+From cee9d72d34b97c029082538c2e02b493f2a0b04a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 5 Aug 2015 15:37:28 +0200
+Subject: [PATCH] warn()'s first argument is a formating string
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC -Werror=format-security complains that calling warn( msg); is not
+safe because the msg argument is interpreted as a formating string,
+not a string literal.
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+
+diff --git a/img/codec_png.c b/img/codec_png.c
+index d8f4f39..7b7c307 100644
+--- a/img/codec_png.c
++++ b/img/codec_png.c
+@@ -267,7 +267,7 @@ PNGAPI
+ #endif
+ warning_fn( png_structp png_ptr, png_const_charp msg)
+ {
+- warn( msg);
++ warn( "%s", msg);
+ }
+
+ static void
+--
+2.4.3
+
diff --git a/perl-Prima.spec b/perl-Prima.spec
index 9e7c745..0b36dde 100644
--- a/perl-Prima.spec
+++ b/perl-Prima.spec
@@ -1,17 +1,15 @@
%global use_x11_tests 1
Name: perl-Prima
-Version: 1.43
-Release: 4%{?dist}
+Version: 1.44
+Release: 1%{?dist}
Summary: Perl graphic toolkit
License: BSD
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 font width check, bug #1210922, CPAN RT#103484
-Patch0: Prima-1.43-fxa_average_width_inconsistent_with_xlfd_width.patch
-# Fix font width check, bug #1210922, CPAN RT#103484
-Patch1: Prima-1.43-FcPatternAddDouble.patch
+# Fix a warn() miscall, bug #1250528, CPAN RT#106257
+Patch0: Prima-1.44-warn-s-first-argument-is-a-formating-string.patch
BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: fontconfig-devel
@@ -40,6 +38,7 @@ BuildRequires: perl(File::Basename)
BuildRequires: perl(File::Copy)
BuildRequires: perl(File::Find)
BuildRequires: perl(File::Path)
+BuildRequires: perl(File::Spec)
BuildRequires: perl(lib)
BuildRequires: perl(strict)
BuildRequires: perl(Tie::Hash)
@@ -57,7 +56,6 @@ BuildRequires: perl(Test::More)
%if %{use_x11_tests}
# X11 tests:
BuildRequires: xorg-x11-server-Xvfb
-BuildRequires: xorg-x11-xinit
BuildRequires: font(:lang=en)
# Tests exhibit a proportinal font
BuildRequires: liberation-sans-fonts
@@ -77,6 +75,9 @@ Provides: perl(Prima::StdDlg) = %{version}
# Do not export private modules (not starting with "Prima")
%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\((am|apc|bi|bs|bt|ci|cl|cm|CodeEditor|cr|cs|CustomPodView|Divider|dmfp|dt|Editor|fdo|fds|fe|fp|fr|fra|frr|fs|fw|gm|gr|grow|gsci|gt|gui|ict|im|is|ItemsOutline|kb|km|le|lj|lp|mb|mbi|MenuOutline|MPropListViewer|mt|MyOutline|nt|PackPropListViewer|PropListViewer|rop|Round3D|sbmp|ss|sv|ta|tb|tka|tm|tno|tns|tw|wc|ws)\\)
+# Filter under-specified provides
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\((Prima|Prima::Buttons)\\)$
+
%description
Prima is a general purpose extensible graphical user interface toolkit with
a rich set of standard widgets and an emphasis on 2D image processing tasks.
@@ -94,7 +95,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" WITH_GTK2=1
@@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
%{_mandir}/man3/Prima::Test.*
%changelog
+* Wed Aug 05 2015 Petr Pisar <ppisar at redhat.com> - 1.44-1
+- 1.44 bump
+
* Tue Jun 23 2015 Petr Pisar <ppisar at redhat.com> - 1.43-4
- Build-require open Perl module (bug #1234731)
- Replace dependency on glibc-headers with gcc (bug #1230488)
diff --git a/sources b/sources
index fbddcd3..dc7c428 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b001ff37915a4584f592207653545bb4 Prima-1.43.tar.gz
+efc577c1e60dc378f58b24a2e90d8aa6 Prima-1.44.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/perl-Prima.git/commit/?h=master&id=0f9c6c87d76ac4aec6a85e3d20b59e6241d1f282
More information about the perl-devel
mailing list