ppisar pushed to perl-Prima (master). "1.43 bump"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 23 07:38:49 UTC 2015


>From 3dac0da303be32d0ac3a7db97e6058bdb6c39c2a 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:24:12 +0200
Subject: 1.43 bump


diff --git a/.gitignore b/.gitignore
index a23cbd5..4339be4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Prima-1.40.tar.gz
 /Prima-1.41.tar.gz
 /Prima-1.42.tar.gz
+/Prima-1.43.tar.gz
diff --git a/Prima-1.43-FcPatternAddDouble.patch b/Prima-1.43-FcPatternAddDouble.patch
new file mode 100644
index 0000000..db42ef5
--- /dev/null
+++ b/Prima-1.43-FcPatternAddDouble.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 0000000..eb3d8fb
--- /dev/null
+++ b/Prima-1.43-fxa_average_width_inconsistent_with_xlfd_width.patch
@@ -0,0 +1,65 @@
+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/perl-Prima.spec b/perl-Prima.spec
index deb50dd..cb3fab7 100644
--- a/perl-Prima.spec
+++ b/perl-Prima.spec
@@ -1,13 +1,17 @@
 %global use_x11_tests 1
 
 Name:           perl-Prima
-Version:        1.42
-Release:        2%{?dist}
+Version:        1.43
+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
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  giflib-devel
@@ -84,6 +88,8 @@ 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
@@ -119,6 +125,9 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
 %{_mandir}/man3/Prima::Test.*
 
 %changelog
+* Mon Apr 13 2015 Petr Pisar <ppisar at redhat.com> - 1.43-1
+- 1.43 bump
+
 * Mon Mar 16 2015 Petr Pisar <ppisar at redhat.com> - 1.42-2
 - Provide perl(Prima::noX11)
 
diff --git a/sources b/sources
index 416e075..fbddcd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44017a874ab7fd4e352d43acbcd277a6  Prima-1.42.tar.gz
+b001ff37915a4584f592207653545bb4  Prima-1.43.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-Prima.git/commit/?h=master&id=3dac0da303be32d0ac3a7db97e6058bdb6c39c2a


More information about the perl-devel mailing list