[libpango-perl] 02/06: Add patch to work with pkg-config >= 0.29.
gregor herrmann
gregoa at debian.org
Sat Nov 21 18:01:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libpango-perl.
commit e60e96545a0db19ece013fb43089964577c3eaa3
Author: gregor herrmann <gregoa at debian.org>
Date: Sat Nov 21 18:51:41 2015 +0100
Add patch to work with pkg-config >= 0.29.
Thanks: Niko Tyni for the patch.
Closes: #805403
---
...-separation-in-linker-arguments-with-pkg-.patch | 38 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 39 insertions(+)
diff --git a/debian/patches/0001-Ensure-word-separation-in-linker-arguments-with-pkg-.patch b/debian/patches/0001-Ensure-word-separation-in-linker-arguments-with-pkg-.patch
new file mode 100644
index 0000000..4630bc8
--- /dev/null
+++ b/debian/patches/0001-Ensure-word-separation-in-linker-arguments-with-pkg-.patch
@@ -0,0 +1,38 @@
+From 6bdc1e830eb1bb48209a22510425f9b0d88592ae Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Sat, 21 Nov 2015 10:38:52 +0200
+Subject: [PATCH] Ensure word separation in linker arguments with pkg-config >=
+ 0.29
+
+Since pkg-config 0.29,
+ http://cgit.freedesktop.org/pkg-config/commit/?id=f26a505826acec6b1e1af8d1efdf959913421c3a
+the cflags and libs no longer have a trailing space, resulting
+in bogus linker arguments like -lglib-2.0-lpangocairo-1.0.
+
+The 'cflags' strings are already joined with whitespace earlier
+so only the 'libs' need fixing.
+
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=109330
+Bug: https://rt.cpan.org/Ticket/Display.html?id=109330
+Bug-Debian: https://bugs.debian.org/805403
+
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index e644209..1d3349d 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.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 454a140..d3ae7b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix-manpages
+0001-Ensure-word-separation-in-linker-arguments-with-pkg-.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libpango-perl.git
More information about the Pkg-perl-cvs-commits
mailing list