[packages/perl-Pango] - fix linking - rel 5
baggins
baggins at pld-linux.org
Tue Dec 29 01:11:52 CET 2015
commit e030e3f0c6432c0ea6ae816729e6c886a55bad6d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Dec 29 01:11:39 2015 +0100
- fix linking
- rel 5
link.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
perl-Pango.spec | 4 +++-
2 files changed, 53 insertions(+), 1 deletion(-)
---
diff --git a/perl-Pango.spec b/perl-Pango.spec
index 28fcb9c..3d4fb8d 100644
--- a/perl-Pango.spec
+++ b/perl-Pango.spec
@@ -8,11 +8,12 @@ Summary: Pango - Layout and render international text
Summary(pl.UTF-8): Pango - rozmieszczanie i renderowanie wielojęzycznego tekstu
Name: perl-Pango
Version: 1.226
-Release: 4
+Release: 5
License: LGPL v2.1+
Group: Development/Languages/Perl
Source0: http://downloads.sourceforge.net/gtk2-perl/Pango-%{version}.tar.gz
# Source0-md5: 9ff2dee3cc1d37563ea98b91a45e6ba1
+Patch0: link.patch
URL: http://search.cpan.org/dist/Pango/
BuildRequires: pango-devel >= 1:1.16
BuildRequires: perl-ExtUtils-Depends >= 0.300
@@ -54,6 +55,7 @@ Pliki programistyczne wiązań Pango dla Perla.
%prep
%setup -q -n %{pdir}-%{version}
+%patch0 -p1
%build
%{__perl} Makefile.PL \
diff --git a/link.patch b/link.patch
new file mode 100644
index 0000000..43addc8
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,50 @@
+From 7184bdd9074361e206760ae4ee6a9a2c42bbd338 Mon Sep 17 00:00:00 2001
+From: Thierry Vignaud <thierry.vignaud at gmail.com>
+Date: Thu, 15 Oct 2015 19:30:48 +0200
+Subject: [PATCH] fix linking with pangocairo
+
+thus fixing this:
+
+http://pkgsubmit.mageia.org/autobuild/cauldron/x86_64/core/2015-10-13/perl-Pango-1.226.0-1.mga6.src.rpm/build.0.20151013150513.log
+
+(...)
+xs/PangoCairo.xs: In function 'XS_Pango__Cairo__FontMap_create_context':
+xs/PangoCairo.xs:85:2: warning: 'pango_cairo_font_map_create_context' is deprecated: Use 'pango_font_map_create_context' instead [-Wdeprecated-declarations]
+ context = pango_cairo_font_map_create_context (fontmap);
+ ^
+In file included from ./pango-perl.h:28:0,
+ from xs/PangoCairo.xs:19:
+/usr/include/pango-1.0/pango/pangocairo.h:93:15: note: declared here
+ PangoContext *pango_cairo_font_map_create_context (PangoCairoFontMap *fontmap);
+ ^
+[ CC xs/PangoLayout.c ]
+[ CC xs/PangoAttributes.c ]
+rm -f blib/arch/auto/Pango/Pango.so
+[ LD blib/arch/auto/Pango/Pango.so ]
+chmod 755 blib/arch/auto/Pango/Pango.so
+"/usr/bin/perl5.22.0" -MExtUtils::Command::MM -e 'cp_nonempty' -- Pango.bs blib/arch/auto/Pango/Pango.bs 644
+Generating POD...
+/usr/bin/perl5.22.0: symbol lookup error: blib/arch/auto/Pango/Pango.so: undefined symbol: pango_cairo_font_map_get_type
+Makefile:1408: recipe for target 'build/podindex' failed
+make: *** [build/podindex] Error 127
+error: Bad exit status from /home/pterjan/rpmbuild/tmp/rpm-tmp.MZ04QX (%build)
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index e644209..0b3b910 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -161,7 +161,7 @@ my $libs = $pango_pkgcfg{libs};
+ if ($have_cairo) {
+ push @deps, qw/Cairo/;
+ $inc .= $pangocairo_pkgcfg{cflags};
+- $libs .= $pangocairo_pkgcfg{libs};
++ $libs .= " " . $pangocairo_pkgcfg{libs};
+ }
+
+ my @typemaps = map { File::Spec->catfile(cwd(), $_) }
+--
+2.6.1
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/perl-Pango.git/commitdiff/e030e3f0c6432c0ea6ae816729e6c886a55bad6d
More information about the pld-cvs-commit
mailing list