diff options
| author | richard <richard@pkgsrc.org> | 2016-06-02 05:14:21 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2016-06-02 05:14:21 +0000 |
| commit | 2d3b5cc5cd195823805f8838c1e107e707ed374f (patch) | |
| tree | 175261c2186deb361b331bbdbf6666376d3b7e8c | |
| parent | f505992115730d2166b90d2b3bd0ef722650ce11 (diff) | |
| download | pkgsrc-2d3b5cc5cd195823805f8838c1e107e707ed374f.tar.gz | |
avoid gnu-grep presumptions in favour of portable usage for detecting qt5
reported upstream: https://bugs.freedesktop.org/show_bug.cgi?id=72744
fixes poppler-qt5 build on SunOS
| -rw-r--r-- | print/poppler/distinfo | 3 | ||||
| -rw-r--r-- | print/poppler/patches/patch-configure | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/print/poppler/distinfo b/print/poppler/distinfo index c8d0c3305bd..9c3561ea69a 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.108 2016/05/22 18:17:17 wiz Exp $ +$NetBSD: distinfo,v 1.109 2016/06/02 05:14:21 richard Exp $ SHA1 (poppler-0.44.0.tar.xz) = e299affb9180e920c977fd60a217a6c21bde23c2 RMD160 (poppler-0.44.0.tar.xz) = 9037dd395f7e789bae96dfb3b1a5acf8cb9c0814 @@ -10,4 +10,5 @@ SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3 SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739 +SHA1 (patch-configure) = 07eea448deca5a1c586376ba38070a3efe943415 SHA1 (patch-qt5_src_Makefile.in) = c3a47fde201d61a7b7674020f5c998173a61b216 diff --git a/print/poppler/patches/patch-configure b/print/poppler/patches/patch-configure new file mode 100644 index 00000000000..a56c0b2f356 --- /dev/null +++ b/print/poppler/patches/patch-configure @@ -0,0 +1,16 @@ +$NetBSD: patch-configure,v 1.3 2016/06/02 05:14:21 richard Exp $ + +avoid gnu-grep presumptions in favour of portable usage +reported upstream: https://bugs.freedesktop.org/show_bug.cgi?id=72744 + +--- configure.orig 2016-05-21 16:59:37.000000000 +0000 ++++ configure +@@ -24084,7 +24084,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 moc" >&5 + $as_echo_n "checking for Qt5 moc... " >&6; } + mocversion=`$MOCQT5 -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` ++ mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` + if test x"$mocversiongrep" != x"$mocversion"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } |