diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-01-23 23:03:52 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-01-23 23:03:52 +0000 |
commit | 217ae6ec4e2004f11230b9713045f5b4943eed9d (patch) | |
tree | 6262122a0d290fc0737ae204dd1913daaa91b31d | |
parent | 2019-01-23 22:44:05 UTC (diff) | |
parent | app-office/libreoffice: Drop 6.2.0.2 (diff) | |
download | gentoo-217ae6ec4e2004f11230b9713045f5b4943eed9d.tar.gz gentoo-217ae6ec4e2004f11230b9713045f5b4943eed9d.tar.bz2 gentoo-217ae6ec4e2004f11230b9713045f5b4943eed9d.zip |
Merge updates from master
-rw-r--r-- | app-office/libreoffice/Manifest | 4 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch | 164 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch | 72 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch | 43 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch | 101 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.2.0.3.ebuild (renamed from app-office/libreoffice/libreoffice-6.2.0.2.ebuild) | 16 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 6 |
8 files changed, 13 insertions, 399 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index b7c8d733d9fb..5effcd09b239 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -5,8 +5,8 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c DIST libreoffice-6.1.5.1.tar.xz 207920688 BLAKE2B 7e435a62b880839c752ba90693918242ec29807acb73a22d6101d74f8c8d712a5a26a85cea334a6e66811b7a4f8e016b87932390f2746da4effcb74a416ca973 SHA512 fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be3bbbb83bcebba4ceadae -DIST libreoffice-6.2.0.2.tar.xz 213471412 BLAKE2B 61c07f0b6e2c12d197d93346ae4b9f583189a093f9fe49156c5f6ccee4309a77b4a6f6a133a61764d11dd56e7e36734ed4ebf3abab035021c0692477d556acf7 SHA512 6c8e039548b50071e50eea6719a92c11c85da2c7ae73bc70bddc5eb32859823fc5f5ab5867ec0b76d8a094cd21a228d6b0d3a7fa834e8005a2d7a82c7ecdb278 +DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab DIST libreoffice-help-6.1.5.1.tar.xz 15756964 BLAKE2B 0d7b32488e2e0ccab0ff067ba19dbbcdcc57f80280c74c6aa0f2e0f6cd49f2eeb67adb1d8f0e88459636d6301329fed3c5837b246571cecfa27a1e334d9b8579 SHA512 f9ae9134eb322f7cfc1cb2a18d23edfaed880925c289d49136d9e7ce026bfa2fbbf148b14a88e8f68d6f5bd8a04a97265c5c15d1eb92ef6fef50a899388617a3 -DIST libreoffice-help-6.2.0.2.tar.xz 16186468 BLAKE2B 3846172642023633420ba83f3c65430dd7c1e5b4fc652e758081175d6b52c412822acd2af1dc31ebcc5344bd4f4b5ba6d49beb4f43f997fd99cbe1ecd69a9f96 SHA512 43c99f3db3d773d3f724600a875b964a65ae3dcab4ab7348289828cf860475a036cd6ba2d54d57cfec4ca259c085932fa479d465475591919e86108c56ed5feb +DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1 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 - diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild index e2865fbd55d9..1855739d749b 100644 --- a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild @@ -63,7 +63,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird -googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc +googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -103,6 +103,7 @@ COMMON_DEPEND="${PYTHON_DEPS} app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* + dev-db/mysql-connector-c dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] @@ -188,7 +189,6 @@ COMMON_DEPEND="${PYTHON_DEPS} ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - mysql? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) " @@ -252,11 +252,6 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" - - # 6.2 branch - "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch - "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch - "${FILESDIR}"/${P}-poppler-0.73.patch ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -446,7 +441,6 @@ src_configure() { $(use_enable gtk2 gtk) $(use_enable kde kde5) $(use_enable kde qt5) - $(use_enable mysql bundle-mariadb) $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) @@ -556,7 +550,7 @@ src_install() { insinto /usr/$(get_libdir)/${PN}/program newins "${WORKDIR}/branding-sofficerc" sofficerc dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die fi # Hack for offlinehelp, this needs fixing upstream at some point. @@ -565,8 +559,8 @@ src_install() { insinto /usr/$(get_libdir)/libreoffice/help doins xmlhelp/util/*.xsl - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_postinst() { diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild index 55ece7a7600d..6536b71f5351 100644 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild @@ -552,7 +552,7 @@ src_install() { insinto /usr/$(get_libdir)/${PN}/program newins "${WORKDIR}/branding-sofficerc" sofficerc dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die fi # Hack for offlinehelp, this needs fixing upstream at some point. @@ -561,8 +561,8 @@ src_install() { insinto /usr/$(get_libdir)/libreoffice/help doins xmlhelp/util/*.xsl - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_postinst() { diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 55ece7a7600d..6536b71f5351 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -552,7 +552,7 @@ src_install() { insinto /usr/$(get_libdir)/${PN}/program newins "${WORKDIR}/branding-sofficerc" sofficerc dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die fi # Hack for offlinehelp, this needs fixing upstream at some point. @@ -561,8 +561,8 @@ src_install() { insinto /usr/$(get_libdir)/libreoffice/help doins xmlhelp/util/*.xsl - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_postinst() { |