pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/libreoffice Sync internal harfbuzz and fix the bu...
details: https://anonhg.NetBSD.org/pkgsrc/rev/81050e417296
branches: trunk
changeset: 316093:81050e417296
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Tue Dec 04 12:56:48 2018 +0000
description:
Sync internal harfbuzz and fix the build with poppler-0.71
Bump PKGREVISION
diffstat:
misc/libreoffice/Makefile | 8 +-
misc/libreoffice/distinfo | 15 +-
misc/libreoffice/patches/patch-download.lst | 6 +-
misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx | 82 +++++++++
misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx | 83 ++++++++++
misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_wrapper__gpl.cxx | 22 ++
6 files changed, 203 insertions(+), 13 deletions(-)
diffs (295 lines):
diff -r 483104f27c3a -r 81050e417296 misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Tue Dec 04 12:54:01 2018 +0000
+++ b/misc/libreoffice/Makefile Tue Dec 04 12:56:48 2018 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.175 2018/12/03 08:35:30 wiz Exp $
+# $NetBSD: Makefile,v 1.176 2018/12/04 12:56:48 ryoon Exp $
VERREL= 6.1.3
VERRC= 2
VER= ${VERREL}.${VERRC}
DISTNAME= libreoffice-${VER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
EXTRACT_SUFX= .tar.xz
@@ -103,14 +103,14 @@
Amiri-0.111.zip \
ReemKufi-0.7.zip
-MORE_DISTFILES+= harfbuzz-2.1.1.tar.bz2
+MORE_DISTFILES+= harfbuzz-2.2.0.tar.bz2
.for md in ${MORE_DISTFILES}
DISTFILES+= ${md}
SITES.${md}= https://dev-www.libreoffice.org/src/
.endfor
-SITES.harfbuzz-2.1.1.tar.bz2= https://www.freedesktop.org/software/harfbuzz/release/
+SITES.harfbuzz-2.2.0.tar.bz2= https://www.freedesktop.org/software/harfbuzz/release/
.include "options.mk"
diff -r 483104f27c3a -r 81050e417296 misc/libreoffice/distinfo
--- a/misc/libreoffice/distinfo Tue Dec 04 12:54:01 2018 +0000
+++ b/misc/libreoffice/distinfo Tue Dec 04 12:56:48 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2018/11/18 07:11:40 ryoon Exp $
+$NetBSD: distinfo,v 1.66 2018/12/04 12:56:48 ryoon Exp $
SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -160,10 +160,10 @@
RMD160 (libreoffice/graphite2-minimal-1.3.10.tgz) = 508f69ef2f6c4e8e3843d4a367aea8e1c00439e3
SHA512 (libreoffice/graphite2-minimal-1.3.10.tgz) = 0bbf2b586d3b9f09aa6f8e68575482d63ea4ebc712bd2103ba678074b581ac0e5593fdb6d26be60a74fea0261da2797d4c0db7d384d75837fbf93dd4ac3579a2
Size (libreoffice/graphite2-minimal-1.3.10.tgz) = 155690 bytes
-SHA1 (libreoffice/harfbuzz-2.1.1.tar.bz2) = 14178b5d53083ea38b420ab860d49189d438393f
-RMD160 (libreoffice/harfbuzz-2.1.1.tar.bz2) = 13937f4ff98d55169cb5a818cd045ed1b8b2789a
-SHA512 (libreoffice/harfbuzz-2.1.1.tar.bz2) = c3fc46eaeb8c02594e2430f853b6eebb762072638e3113e27ff9b5caefce2c06534e8056d57f35d87df6dbb1027cbc0c1a08f914dec7c6a715c3f0abc0a18933
-Size (libreoffice/harfbuzz-2.1.1.tar.bz2) = 4386396 bytes
+SHA1 (libreoffice/harfbuzz-2.2.0.tar.bz2) = 6cf14715b28e4bb0e39773d11c60db50b64db933
+RMD160 (libreoffice/harfbuzz-2.2.0.tar.bz2) = 63a65304913d8b551f60708600c708acc88bc982
+SHA512 (libreoffice/harfbuzz-2.2.0.tar.bz2) = 5e8f35c0d7634afc6f623a91d56bfde46b2a1030d439e5dec196001d49a58e409a1bf66c7f9c15a04e030dab4fe2fe2c928061839b1e985459d4f8379b8a0818
+Size (libreoffice/harfbuzz-2.2.0.tar.bz2) = 4506619 bytes
SHA1 (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = a6fe98f8966d2deb6cf30009d28e39ea56b304c6
RMD160 (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = 38956930e7664d8bf942897d954901b3f32dd144
SHA512 (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = b1963b6433f720cf41959ac78b10894a19761037781c172064737ef3c44e2a8532d03788999289a32cc598507079701dc56df20d812524ac3283ab2d7855cabd
@@ -219,7 +219,7 @@
SHA1 (patch-configure.ac) = 7e7d4b8bc3064aac7c1689026b7c210587f80bdd
SHA1 (patch-desktop_scripts_soffice.sh) = 8017e34da0da404d106397288da02fae4aef4bfc
SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5
-SHA1 (patch-download.lst) = e99da66b2f8f01ffb60710980c314d381fd8e69f
+SHA1 (patch-download.lst) = 7d41c8537549deb263ddbf05255eb6550d522e93
SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 29da683484946a7bd6e1cec2a48a020513dc42dc
SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = ed0c6861fd9a61eeac05e235dd505b6bed166a3a
SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
@@ -236,6 +236,9 @@
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) = 3797e214235ca1b196bf634e2200b2f9e67f5381
+SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx) = 15a5d9708a5349f6584231dcf787537618371cb0
+SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_wrapper__gpl.cxx) = f2ecf16e731bebc88639598c5e63b05998317f8a
SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
SHA1 (patch-svx_source_gengal_gengal.sh) = 3313785a2cf2d22634a28fd6cf7a0ff19afcea62
diff -r 483104f27c3a -r 81050e417296 misc/libreoffice/patches/patch-download.lst
--- a/misc/libreoffice/patches/patch-download.lst Tue Dec 04 12:54:01 2018 +0000
+++ b/misc/libreoffice/patches/patch-download.lst Tue Dec 04 12:56:48 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-download.lst,v 1.9 2018/11/18 07:11:40 ryoon Exp $
+$NetBSD: patch-download.lst,v 1.10 2018/12/04 12:56:49 ryoon Exp $
--- download.lst.orig 2018-09-10 20:08:33.000000000 +0000
+++ download.lst
@@ -8,8 +8,8 @@
export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
-export HARFBUZZ_SHA256SUM := 3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
-export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
-+export HARFBUZZ_SHA256SUM := 83bf5d552df72c52969332f294cd97d8f6b46b77b41b61346ca56ebb81884e14
-+export HARFBUZZ_TARBALL := harfbuzz-2.1.1.tar.bz2
++export HARFBUZZ_SHA256SUM := b7ccfcbd56b970a709e8b9ea9fb46c922c606c2feef8f086fb6a8492e530f810
++export HARFBUZZ_TARBALL := harfbuzz-2.2.0.tar.bz2
export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
export HUNSPELL_SHA256SUM := 3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
diff -r 483104f27c3a -r 81050e417296 misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx Tue Dec 04 12:56:48 2018 +0000
@@ -0,0 +1,82 @@
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.6 2018/12/04 12:56:49 ryoon Exp $
+
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-10-29 19:55:29.000000000 +0000
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPat
+ 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)
+ {
+ }
+@@ -578,7 +578,7 @@ void PDFOutDev::restoreState(GfxState*)
+ printf( "restoreState\n" );
+ }
+
+-void PDFOutDev::setDefaultCTM(double *pMat)
++void PDFOutDev::setDefaultCTM(const double *pMat)
+ {
+ assert(pMat);
+
+@@ -939,11 +939,11 @@ void PDFOutDev::endTextObject(GfxState*)
+ }
+
+ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
+- int width, int height, GBool invert,
++ int width, int height, bool invert,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- GBool /*interpolate*/,
++ bool /*interpolate*/,
+ #endif
+- GBool /*inlineImg*/ )
++ bool /*inlineImg*/ )
+ {
+ if (m_bSkipImages)
+ return;
+@@ -972,9 +972,9 @@ void PDFOutDev::drawImageMask(GfxState*
+ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
+ int width, int height, GfxImageColorMap* colorMap,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- GBool /*interpolate*/,
++ bool /*interpolate*/,
+ #endif
+- int* maskColors, GBool /*inlineImg*/ )
++ int* maskColors, bool /*inlineImg*/ )
+ {
+ if (m_bSkipImages)
+ return;
+@@ -1023,13 +1023,13 @@ void PDFOutDev::drawMaskedImage(GfxState
+ int width, int height,
+ GfxImageColorMap* colorMap,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- GBool /*interpolate*/,
++ bool /*interpolate*/,
+ #endif
+ Stream* maskStr,
+ int maskWidth, int maskHeight,
+- GBool maskInvert
++ bool maskInvert
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- , GBool /*maskInterpolate*/
++ , bool /*maskInterpolate*/
+ #endif
+ )
+ {
+@@ -1045,13 +1045,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxS
+ int width, int height,
+ GfxImageColorMap* colorMap,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- GBool /*interpolate*/,
++ bool /*interpolate*/,
+ #endif
+ Stream* maskStr,
+ int maskWidth, int maskHeight,
+ GfxImageColorMap* maskColorMap
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- , GBool /*maskInterpolate*/
++ , bool /*maskInterpolate*/
+ #endif
+ )
+ {
diff -r 483104f27c3a -r 81050e417296 misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx Tue Dec 04 12:56:48 2018 +0000
@@ -0,0 +1,83 @@
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx,v 1.3 2018/12/04 12:56:49 ryoon Exp $
+
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2018-10-29 19:55:29.000000000 +0000
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -151,22 +151,22 @@ 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 bool upsideDown() override { return true; }
+
+ // Does this device use drawChar() or drawString()?
+- virtual GBool useDrawChar() override { return gTrue; }
++ virtual 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 bool interpretType3Chars() override { return false; }
+
+ // Does this device need non-text content?
+- virtual GBool needNonText() override { return gTrue; }
++ virtual bool needNonText() override { return true; }
+
+ //----- initialization and control
+
+ // Set default transform matrix.
+- virtual void setDefaultCTM(double *ctm) override;
++ virtual void setDefaultCTM(const double *ctm) override;
+
+ // Start a page.
+ virtual void startPage(int pageNum, GfxState *state
+@@ -233,40 +233,40 @@ namespace pdfi
+
+ //----- image drawing
+ virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
+- int width, int height, GBool invert,
++ int width, int height, bool invert,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- GBool interpolate,
++ bool interpolate,
+ #endif
+- GBool inlineImg) override;
++ bool inlineImg) override;
+ virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- GBool interpolate,
++ bool interpolate,
+ #endif
+- int *maskColors, GBool inlineImg) override;
++ int *maskColors, bool inlineImg) override;
+ virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height,
+ GfxImageColorMap *colorMap,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- GBool interpolate,
++ bool interpolate,
+ #endif
+ Stream *maskStr, int maskWidth, int maskHeight,
+- GBool maskInvert
++ bool maskInvert
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- , GBool maskInterpolate
++ , bool maskInterpolate
+ #endif
+ ) override;
+ virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height,
+ GfxImageColorMap *colorMap,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- GBool interpolate,
++ bool interpolate,
+ #endif
+ Stream *maskStr,
+ int maskWidth, int maskHeight,
+ GfxImageColorMap *maskColorMap
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+- , GBool maskInterpolate
++ , bool maskInterpolate
+ #endif
+ ) override;
+
diff -r 483104f27c3a -r 81050e417296 misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_wrapper__gpl.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_wrapper__gpl.cxx Tue Dec 04 12:56:48 2018 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_wrapper__gpl.cxx,v 1.1 2018/12/04 12:56:49 ryoon Exp $
+
+--- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx.orig 2018-10-29 19:55:29.000000000 +0000
++++ 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
+@@ -143,7 +143,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);
+ }
+
Home |
Main Index |
Thread Index |
Old Index