CVS commit: pkgsrc/misc/libreoffice

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Feb 17 15:27:41 UTC 2019

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
        pkgsrc/misc/libreoffice/patches:
            patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
            patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx
Added Files:
        pkgsrc/misc/libreoffice/patches:
            patch-sdext_source_pdfimport_xpdfwrapper_pnghelper.cxx

Log Message:
libreoffice: fix poppler-0.74.0 "Guchar" type removal fallout


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pnghelper.cxx

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

Modified files:

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.70 pkgsrc/misc/libreoffice/distinfo:1.71
--- pkgsrc/misc/libreoffice/distinfo:1.70       Wed Dec 19 12:09:55 2018
+++ pkgsrc/misc/libreoffice/distinfo    Sun Feb 17 15:27:41 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2018/12/19 12:09:55 ryoon Exp $
+$NetBSD: distinfo,v 1.71 2019/02/17 15:27:41 tnn Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -237,8 +237,9 @@ SHA1 (patch-i18nutil_source_utility_unic
 SHA1 (patch-lotuswordpro_source_filter_localtime.cxx) = 8db23e81f54b5a71e331dfccb57cceb8aab92d2a
 SHA1 (patch-mysqlc_Library__mysqlc.mk) = c5560b4739cf54b8207c7d9dfa2a22ffeeee8cfd
 SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b
-SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = 1910ebf571181b2f6a973e2f6537baf67edbcb4a
-SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx) = 15a5d9708a5349f6584231dcf787537618371cb0
+SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = 9fd6c51371a70373a0375a23851339af2cb8b639
+SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx) = b0df1d01d1aa69943681c020e4964fb5ea654699
+SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pnghelper.cxx) = 31733d663e2255b3d9a082d3897a1c7aa663d1ea
 SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_wrapper__gpl.cxx) = f2ecf16e731bebc88639598c5e63b05998317f8a
 SHA1 (patch-sfx2_source_appl_shutdownicon.cxx) = 111d4ca26c55cf2ab192c1fcec40e9e3f3017e57
 SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d

Index: pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
diff -u pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx:1.7 
pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx:1.8
--- pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx:1.7    Tue Dec 11 12:59:49 2018
+++ pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx        Sun Feb 17 15:27:41 2019
@@ -1,7 +1,27 @@
-$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.7 2018/12/11 12:59:49 ryoon Exp $
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.8 2019/02/17 15:27:41 tnn Exp $
 
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-10-29 19:55:29.000000000 +0000
+poppler compatibility
+
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-12-12 21:59:14.000000000 +0000
 +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -298,7 +298,7 @@ void writePpm_( OutputBuffer&     o_rOut
+     o_rOutputBuf.resize(header_size);
+ 
+     // initialize stream
+-    Guchar *p;
++    unsigned char *p;
+     GfxRGB rgb;
+     std::unique_ptr<ImageStream> imgStr(
+         new ImageStream(str,
+@@ -401,7 +401,7 @@ void writeImage_( OutputBuffer&     o_rO
+                 oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) };
+         if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray )
+         {
+-            Guchar nIndex = 0;
++            unsigned char nIndex = 0;
+             colorMap->getRGB( &nIndex, &zeroColor );
+             nIndex = 1;
+             colorMap->getRGB( &nIndex, &oneColor );
 @@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPat
  PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
      m_pDoc( pDoc ),

Index: pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx
diff -u pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx:1.3 
pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx:1.4
--- pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx:1.3    Tue Dec  4 12:56:49 2018
+++ pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx        Sun Feb 17 15:27:41 2019
@@ -1,6 +1,8 @@
-$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx,v 1.3 2018/12/04 12:56:49 ryoon Exp $
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx,v 1.4 2019/02/17 15:27:41 tnn Exp $
 
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2018-10-29 19:55:29.000000000 +0000
+poppler compatibility
+
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2018-12-12 21:59:14.000000000 +0000
 +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
 @@ -151,22 +151,22 @@ namespace pdfi
  
@@ -81,3 +83,12 @@ $NetBSD: patch-sdext_source_pdfimport_xp
  #endif
                                          ) override;
  
+@@ -279,7 +279,7 @@ extern FILE* g_binary_out;
+ 
+ // note: if you ever change Output_t, please keep in mind that the current code
+ // relies on it being of 8 bit size
+-typedef Guchar Output_t;
++typedef unsigned char Output_t;
+ typedef std::vector< Output_t > OutputBuffer;
+ 
+ #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pnghelper.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pnghelper.cxx:1.1
--- /dev/null   Sun Feb 17 15:27:41 2019
+++ pkgsrc/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pnghelper.cxx      Sun Feb 17 15:27:41 2019
@@ -0,0 +1,33 @@
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pnghelper.cxx,v 1.1 2019/02/17 15:27:41 tnn Exp $
+
+poppler compatibility
+
+--- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx.orig      2018-12-12 21:59:14.000000000 +0000
++++ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer&
+     appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
+ 
+     // initialize stream
+-    Guchar *p, *pm;
++    unsigned char *p, *pm;
+     GfxRGB rgb;
+     GfxGray alpha;
+     ImageStream* imgStr =
+@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer&
+     appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
+ 
+     // initialize stream
+-    Guchar *p;
++    unsigned char *p;
+     GfxRGB rgb;
+     ImageStream* imgStr =
+         new ImageStream(str,
+@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer&
+     {
+         for( int x = 0; x < maskWidth; ++x )
+         {
+-            Guchar aPixel = 0;
++            unsigned char aPixel = 0;
+             imgStrMask->getPixel( &aPixel );
+             int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line
+                          (x*width/maskWidth)*4 + 1  + 3        // mapped column