gentoo resync : 25.01.2019

4 files changed, 0 insertions, 380 deletions

diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch
deleted file mode 100644
index 9899f5864ca6..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 5e8bdd9203dd642111c62a6668ee665a20d4ba19 Mon Sep 17 00:00:00 2001
-From: Mike Kaganski <mike.kaganski@collabora.com>
-Date: Tue, 20 Nov 2018 08:45:38 +0100
-Subject: poppler dropped GBool since 0.71
-
-See https://lists.freedesktop.org/archives/libreoffice/2018-November/081410.html
-
-Change-Id: I258e08894486a925bed50a3a4232b6e805af6784
-Reviewed-on: https://gerrit.libreoffice.org/63625
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
----
- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx       | 21 +++++++------
- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx       | 35 +++++++++++++---------
- 2 files changed, 31 insertions(+), 25 deletions(-)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 575a90a..ab74b36 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPath )
- PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
-     m_pDoc( pDoc ),
-     m_aFontMap(),
--    m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
-+    m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
-     m_bSkipImages(false)
- {
- }
-@@ -939,9 +939,9 @@ void PDFOutDev::endTextObject(GfxState*)
- }
- 
- void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
--                              int width, int height, GBool invert,
--                              GBool /*interpolate*/,
--                              GBool /*inlineImg*/ )
-+                              int width, int height, poppler_bool invert,
-+                              poppler_bool /*interpolate*/,
-+                              poppler_bool /*inlineImg*/ )
- {
-     if (m_bSkipImages)
-         return;
-@@ -969,8 +969,8 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
- 
- void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
-                           int width, int height, GfxImageColorMap* colorMap,
--                          GBool /*interpolate*/,
--                          int* maskColors, GBool /*inlineImg*/ )
-+                          poppler_bool /*interpolate*/,
-+                          int* maskColors, poppler_bool /*inlineImg*/ )
- {
-     if (m_bSkipImages)
-         return;
-@@ -1018,11 +1018,10 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
- void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
-                                 int width, int height,
-                                 GfxImageColorMap* colorMap,
--                                GBool /*interpolate*/,
-+                                poppler_bool /*interpolate*/,
-                                 Stream* maskStr,
-                                 int maskWidth, int maskHeight,
--                                GBool maskInvert
--                                , GBool /*maskInterpolate*/
-+                                poppler_bool maskInvert, poppler_bool /*maskInterpolate*/
-                                )
- {
-     if (m_bSkipImages)
-@@ -1036,11 +1035,11 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
- void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
-                                     int width, int height,
-                                     GfxImageColorMap* colorMap,
--                                    GBool /*interpolate*/,
-+                                    poppler_bool /*interpolate*/,
-                                     Stream* maskStr,
-                                     int maskWidth, int maskHeight,
-                                     GfxImageColorMap* maskColorMap
--                                    , GBool /*maskInterpolate*/
-+                                    , poppler_bool /*maskInterpolate*/
-                                    )
- {
-     if (m_bSkipImages)
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index da021a2a..a6135fa 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -130,6 +130,13 @@ namespace pdfi
-         { return const_cast<GooString &>(familyName); }
-     };
- 
-+    // Versions before 0.15 defined GBool as int; 0.15 redefined it as bool; 0.71 dropped GBool
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 71
-+    typedef GBool poppler_bool;
-+#else
-+    typedef bool poppler_bool;
-+#endif
-+
-     class PDFOutDev : public OutputDev
-     {
-         // not owned by this class
-@@ -151,17 +158,17 @@ namespace pdfi
- 
-         // Does this device use upside-down coordinates?
-         // (Upside-down means (0,0) is the top left corner of the page.)
--        virtual GBool upsideDown() override { return gTrue; }
-+        virtual poppler_bool upsideDown() override { return true; }
- 
-         // Does this device use drawChar() or drawString()?
--        virtual GBool useDrawChar() override { return gTrue; }
-+        virtual poppler_bool useDrawChar() override { return true; }
- 
-         // Does this device use beginType3Char/endType3Char?  Otherwise,
-         // text in Type 3 fonts will be drawn with drawChar/drawString.
--        virtual GBool interpretType3Chars() override { return gFalse; }
-+        virtual poppler_bool interpretType3Chars() override { return false; }
- 
-         // Does this device need non-text content?
--        virtual GBool needNonText() override { return gTrue; }
-+        virtual poppler_bool needNonText() override { return true; }
- 
-         //----- initialization and control
- 
-@@ -233,29 +240,29 @@ namespace pdfi
- 
-         //----- image drawing
-         virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
--                                   int width, int height, GBool invert,
--                                   GBool interpolate,
--                                   GBool inlineImg) override;
-+                                   int width, int height, poppler_bool invert,
-+                                   poppler_bool interpolate,
-+                                   poppler_bool inlineImg) override;
-         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-                                int width, int height, GfxImageColorMap *colorMap,
--                               GBool interpolate,
--                               int *maskColors, GBool inlineImg) override;
-+                               poppler_bool interpolate,
-+                               int* maskColors, poppler_bool inlineImg) override;
-         virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
-                                      int width, int height,
-                                      GfxImageColorMap *colorMap,
--                                     GBool interpolate,
-+                                     poppler_bool interpolate,
-                                      Stream *maskStr, int maskWidth, int maskHeight,
--                                     GBool maskInvert
--                                     , GBool maskInterpolate
-+                                     poppler_bool maskInvert,
-+                                     poppler_bool maskInterpolate
-                                     ) override;
-         virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
-                                          int width, int height,
-                                          GfxImageColorMap *colorMap,
--                                         GBool interpolate,
-+                                         poppler_bool interpolate,
-                                          Stream *maskStr,
-                                          int maskWidth, int maskHeight,
-                                          GfxImageColorMap *maskColorMap
--                                         , GBool maskInterpolate
-+                                         , poppler_bool maskInterpolate
-                                         ) override;
- 
-         static void setPageNum( int nNumPages );
--- 
-cgit v1.1
-
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch
deleted file mode 100644
index 37b44556219f..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 8ff41a26caf51544699863c89598d37d93dc1b21 Mon Sep 17 00:00:00 2001
-From: Aleksei Nikiforov <darktemplar@basealt.ru>
-Date: Thu, 22 Nov 2018 17:54:00 +0300
-Subject: Fix build with poppler 0.71
-
-Change-Id: I470ece9dc4766e10e1ccb5e99b25a8d8cc4cbf38
-Reviewed-on: https://gerrit.libreoffice.org/63860
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx    | 4 ++--
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index ab74b36..101e3be 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
-     printf( "restoreState\n" );
- }
- 
-+#if POPPLER_CHECK_VERSION(0, 71, 0)
-+void PDFOutDev::setDefaultCTM(const double *pMat)
-+#else
- void PDFOutDev::setDefaultCTM(double *pMat)
-+#endif
- {
-     assert(pMat);
- 
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index a6135fa..98d8ede 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -173,7 +173,11 @@ namespace pdfi
-         //----- initialization and control
- 
-         // Set default transform matrix.
-+#if POPPLER_CHECK_VERSION(0, 71, 0)
-+        virtual void setDefaultCTM(const double *ctm) override;
-+#else
-         virtual void setDefaultCTM(double *ctm) override;
-+#endif
- 
-         // Start a page.
-         virtual void startPage(int pageNum, GfxState *state
-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-index 0f4a35b..b0a6ac4 100644
---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-@@ -69,7 +69,7 @@ int main(int argc, char **argv)
- 
-     // read config file
-     globalParams = new GlobalParams();
--    globalParams->setErrQuiet(gTrue);
-+    globalParams->setErrQuiet(true);
- #if defined(_MSC_VER)
-     globalParams->setupBaseFonts(nullptr);
- #endif
-@@ -145,7 +145,7 @@ int main(int argc, char **argv)
-                 i,
-                 PDFI_OUTDEV_RESOLUTION,
-                 PDFI_OUTDEV_RESOLUTION,
--                0, gTrue, gTrue, gTrue);
-+                0, true, true, true);
-         rDoc.processLinks(&aOutDev, i);
-     }
- 
--- 
-cgit v1.1
-
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch
deleted file mode 100644
index 7f0b1f71a1ee..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 65a6c9ae4791188ffcecf489073cf38873ce5e17 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 8 Jan 2019 11:24:40 +0100
-Subject: Fix build with poppler-0.72
-
-Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134
-Reviewed-on: https://gerrit.libreoffice.org/65960
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 101e3be..dab405b 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*)
-     LinkAction* pAction = link->getAction();
-     if (pAction && pAction->getKind() == actionURI)
-     {
-+#if POPPLER_CHECK_VERSION(0, 72, 0)
-+        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
-+#else
-         const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
-+#endif
- 
-         std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
- 
-@@ -757,7 +761,11 @@ void PDFOutDev::updateFont(GfxState *state)
- 
-             aFont = it->second;
- 
-+#if POPPLER_CHECK_VERSION(0, 72, 0)
-+            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
-+#else
-             std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
-+#endif
-             printf( " %d %d %d %d %f %d %s",
-                     aFont.isEmbedded,
-                     aFont.isBold,
--- 
-cgit v1.1
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
deleted file mode 100644
index fb9112bc3981..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 9e1522ad1d2c2bd775fa50c2b142eb110a56af72 Mon Sep 17 00:00:00 2001
-From: Michael Stahl <Michael.Stahl@cib.de>
-Date: Mon, 14 Jan 2019 15:08:42 +0100
-Subject: sdext: fix build with poppler 0.73
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-... which has removed Guchar, Gushort, Guint, Gulong...
-
-Change-Id: Ia54ad378031f167f6779f6ffe574b85c1e72f26d
-Reviewed-on: https://gerrit.libreoffice.org/66305
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
-(cherry picked from commit 50d371ae08c66648d9f32f633b2245e1746e2bb6)
-Reviewed-on: https://gerrit.libreoffice.org/66356
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++--
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6 +++++-
- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx      | 6 +++---
- 3 files changed, 10 insertions(+), 6 deletions(-)
-
-(limited to 'sdext/source/pdfimport/xpdfwrapper')
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 575a90a..35490a0 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -298,7 +298,7 @@ static void writePpm_( OutputBuffer&     o_rOutputBuf,
-     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 @@ static void writeImage_( OutputBuffer&     o_rOutputBuf,
-                 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 );
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index da021a2a..443e757 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -267,9 +267,13 @@ 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;
- 
-+#if !POPPLER_CHECK_VERSION(0, 73, 0)
-+static_assert(std::is_same<Guchar, unsigned char>::value, "unexpected typedef");
-+#endif
-+
- #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
- 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
-index 4d9e3bb..b582856 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
-@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
-     appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
- 
-     // initialize stream
--    Guchar *p, *pm;
-+    unsigned char *p, *pm;
-     GfxRGB rgb;
-     GfxGray alpha;
-     std::unique_ptr<ImageStream> imgStr(
-@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
-     appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
- 
-     // initialize stream
--    Guchar *p;
-+    unsigned char *p;
-     GfxRGB rgb;
-     std::unique_ptr<ImageStream> imgStr(
-         new ImageStream(str,
-@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
-     {
-         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
--- 
-cgit v1.1
-