CVS commit: pkgsrc/print

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Jan 13 00:57:18 UTC 2020

Modified Files:
        pkgsrc/print/poppler: distinfo
        pkgsrc/print/poppler-includes: Makefile
Added Files:
        pkgsrc/print/poppler/patches: patch-poppler_poppler-config.h.cmake

Log Message:
Fix poppler for C consumers.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/print/poppler/distinfo
cvs rdiff -u -r1.26 -r1.27 pkgsrc/print/poppler-includes/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/poppler/patches/patch-poppler_poppler-config.h.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/poppler/distinfo
diff -u pkgsrc/print/poppler/distinfo:1.143 pkgsrc/print/poppler/distinfo:1.144
--- pkgsrc/print/poppler/distinfo:1.143 Fri Jan 10 13:24:18 2020
+++ pkgsrc/print/poppler/distinfo       Mon Jan 13 00:57:17 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.143 2020/01/10 13:24:18 wiz Exp $
+$NetBSD: distinfo,v 1.144 2020/01/13 00:57:17 joerg Exp $
 
 SHA1 (poppler-0.84.0.tar.xz) = f362f27b95c12e7fdab983650685dae1052aacf2
 RMD160 (poppler-0.84.0.tar.xz) = cb87b2e56d0db84679dc693b5938f1d0de069b5f
 SHA512 (poppler-0.84.0.tar.xz) = e00aca76b4909621b79ec68374529396ddba756af5d60d86750095dfebbabe5b576aa7c873c3fcfabaff28c89e3e37e826d4a0fac356d76ef966500514a772e7
 Size (poppler-0.84.0.tar.xz) = 1561236 bytes
+SHA1 (patch-poppler_poppler-config.h.cmake) = d2a67beb1275f10f19468421f203806ead6fa8ff
 SHA1 (patch-qt5_src_poppler-page.cc) = b4f076c0417d8fbd342a1d9918a52369b2ddc952

Index: pkgsrc/print/poppler-includes/Makefile
diff -u pkgsrc/print/poppler-includes/Makefile:1.26 pkgsrc/print/poppler-includes/Makefile:1.27
--- pkgsrc/print/poppler-includes/Makefile:1.26 Mon Nov  4 19:58:01 2019
+++ pkgsrc/print/poppler-includes/Makefile      Mon Jan 13 00:57:18 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2019/11/04 19:58:01 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2020/01/13 00:57:18 joerg Exp $
 
 .include "../../print/poppler/Makefile.common"
 
+PKGREVISION=   1
 PKGNAME=       poppler-includes-${POPPLER_VERS}
 
 COMMENT=       Poppler Xpdf includes (unsupported)

Added files:

Index: pkgsrc/print/poppler/patches/patch-poppler_poppler-config.h.cmake
diff -u /dev/null pkgsrc/print/poppler/patches/patch-poppler_poppler-config.h.cmake:1.1
--- /dev/null   Mon Jan 13 00:57:18 2020
+++ pkgsrc/print/poppler/patches/patch-poppler_poppler-config.h.cmake   Mon Jan 13 00:57:17 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-poppler_poppler-config.h.cmake,v 1.1 2020/01/13 00:57:17 joerg Exp $
+
+--- poppler/poppler-config.h.cmake.orig        2020-01-13 00:10:29.414712344 +0000
++++ poppler/poppler-config.h.cmake
+@@ -139,7 +139,11 @@
+ //------------------------------------------------------------------------
+ 
+ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+-#include <cstdio> // __MINGW_PRINTF_FORMAT is defined in the mingw stdio.h
++#  if __cplusplus
++#  include <cstdio> // __MINGW_PRINTF_FORMAT is defined in the mingw stdio.h
++#  else
++#  include <stdio.h>
++#  endif
+ #ifdef __MINGW_PRINTF_FORMAT
+ #define GCC_PRINTF_FORMAT(fmt_index, va_index) \
+       __attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))