diff options
author | ryoon <ryoon@pkgsrc.org> | 2019-10-18 10:13:40 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2019-10-18 10:13:40 +0000 |
commit | 7f826879b09598c43c2505921a4503636336f5c4 (patch) | |
tree | 4918b51becf90cc5cfabb5bad6eabf62e91c9357 /misc | |
parent | c3eb91dbdfee3e4e47f35ccbcf52fe5ea6c9d378 (diff) | |
download | pkgsrc-7f826879b09598c43c2505921a4503636336f5c4.tar.gz |
Exclude Python 3.8 and use internal PDFium instead of external poppler
* Python 3.8 is not supported.
* Use PDFium instead of poppler for PDF import
* Bump PKGREVISION for poppler dependency removal.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/libreoffice/Makefile | 22 | ||||
-rw-r--r-- | misc/libreoffice/PLIST | 5 | ||||
-rw-r--r-- | misc/libreoffice/distinfo | 8 | ||||
-rw-r--r-- | misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk | 14 | ||||
-rw-r--r-- | misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1 | 63 |
5 files changed, 102 insertions, 10 deletions
diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile index 6ad76afd6bb..94cf14d521c 100644 --- a/misc/libreoffice/Makefile +++ b/misc/libreoffice/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.208 2019/10/07 18:41:01 rhialto Exp $ +# $NetBSD: Makefile,v 1.209 2019/10/18 10:13:40 ryoon Exp $ VERREL= 6.3.2 VERRC= 2 VER= ${VERREL}.${VERRC} DISTNAME= libreoffice-${VER} +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ EXTRACT_SUFX= .tar.xz @@ -23,6 +24,12 @@ SUBST_FILES.use-bash+= configure.ac SUBST_VARS.use-bash+= BASH SUBST_VARS.use-bash+= PREFIX +SUBST_CLASSES+= font-path +SUBST_STAGE.font-path= pre-configure +SUBST_MESSAGE.font-path= Use pkgsrc fonts for PDF import +SUBST_FILES.font-path+= external/pdfium/pkgsrc.patch.1 +SUBST_VARS.font-path+= X11BASE + .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD*) @@ -31,7 +38,7 @@ pre-build: .endif GCC_REQD+= 7 -PYTHON_VERSIONS_INCOMPATIBLE= 27 37 +PYTHON_VERSIONS_INCOMPATIBLE= 27 37 38 CHECK_SHLIBS_SUPPORTED= no # configure will be regenerated. @@ -99,7 +106,8 @@ MORE_DISTFILES= \ Scheherazade-2.100.zip \ lxml-4.1.1.tgz \ Amiri-0.111.zip \ - ReemKufi-0.7.zip + ReemKufi-0.7.zip \ + pdfium-3794.tar.bz2 .for md in ${MORE_DISTFILES} DISTFILES+= ${md} @@ -174,7 +182,8 @@ CONFIGURE_ARGS+= --disable-odk CONFIGURE_ARGS+= --disable-sdremote-bluetooth # Enabling GIO causes error. losessioninstall.component not found. CONFIGURE_ARGS+= --disable-gio -CONFIGURE_ARGS+= --disable-pdfium +# Use PDFium instead of poppler for PDF import since 6.3.2.2nb1 +CONFIGURE_ARGS+= --enable-pdfium --disable-poppler CONFIGURE_ARGS+= --enable-gstreamer-1-0 CONFIGURE_ARGS+= --enable-python=system #CONFIGURE_ARGS+= --enable-release-build @@ -358,8 +367,9 @@ BUILDLINK_API_DEPENDS.libetonyek+= libetonyek>=0.1.2 .if !empty(PKG_OPTIONS:Mcups) .include "../../print/cups-base/buildlink3.mk" .endif -.include "../../print/poppler-cpp/buildlink3.mk" -.include "../../print/poppler-includes/buildlink3.mk" +# Use PDFium instead of poppler for PDF import since 6.3.2.2nb1 +#.include "../../print/poppler-cpp/buildlink3.mk" +#.include "../../print/poppler-includes/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" diff --git a/misc/libreoffice/PLIST b/misc/libreoffice/PLIST index 4fdade90644..495f3300e36 100644 --- a/misc/libreoffice/PLIST +++ b/misc/libreoffice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.34 2019/09/13 08:59:47 prlw1 Exp $ +@comment $NetBSD: PLIST,v 1.35 2019/10/18 10:13:40 ryoon Exp $ bin/libreoffice bin/lobase bin/localc @@ -182,6 +182,7 @@ ${PKGNAME}/lib/libreoffice/program/libpasswordcontainerlo.so ${PKGNAME}/lib/libreoffice/program/libpcrlo.so ${PKGNAME}/lib/libreoffice/program/libpdffilterlo.so ${PKGNAME}/lib/libreoffice/program/libpdfimportlo.so +${PKGNAME}/lib/libreoffice/program/libpdfiumlo.so ${PKGNAME}/lib/libreoffice/program/libpostgresql-sdbc-impllo.so ${PKGNAME}/lib/libreoffice/program/libpostgresql-sdbclo.so ${PKGNAME}/lib/libreoffice/program/libpricinglo.so @@ -4178,7 +4179,6 @@ ${PKGNAME}/lib/libreoffice/program/wizards/ui/event/TaskListener.py ${PKGNAME}/lib/libreoffice/program/wizards/ui/event/UnoDataAware.py ${PKGNAME}/lib/libreoffice/program/wizards/ui/event/__init__.py ${PKGNAME}/lib/libreoffice/program/xid-fullscreen-on-all-monitors -${PKGNAME}/lib/libreoffice/program/xpdfimport ${PKGNAME}/lib/libreoffice/readmes/README_af ${PKGNAME}/lib/libreoffice/readmes/README_am ${PKGNAME}/lib/libreoffice/readmes/README_ar @@ -9096,7 +9096,6 @@ ${PKGNAME}/lib/libreoffice/share/xdg/math.desktop ${PKGNAME}/lib/libreoffice/share/xdg/startcenter.desktop ${PKGNAME}/lib/libreoffice/share/xdg/writer.desktop ${PKGNAME}/lib/libreoffice/share/xdg/xsltfilter.desktop -${PKGNAME}/lib/libreoffice/share/xpdfimport/xpdfimport_err.pdf ${PKGNAME}/lib/libreoffice/share/xslt/common/copy.xsl ${PKGNAME}/lib/libreoffice/share/xslt/common/math.xsl ${PKGNAME}/lib/libreoffice/share/xslt/common/measure_conversion.xsl diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo index de1da968aed..bf86ec60354 100644 --- a/misc/libreoffice/distinfo +++ b/misc/libreoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.86 2019/10/04 12:59:05 ryoon Exp $ +$NetBSD: distinfo,v 1.87 2019/10/18 10:13:40 ryoon Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -196,6 +196,10 @@ SHA1 (libreoffice/noto-fonts-20171024.tar.gz) = e775f61b4ed544198e9497b27b346062 RMD160 (libreoffice/noto-fonts-20171024.tar.gz) = 02f8d0e2615032daf36dc375d00a2b4575d858a3 SHA512 (libreoffice/noto-fonts-20171024.tar.gz) = 3888c5f19d85f9ae25413a064a27f01b87e09ba07b40f721b20e563bad3289a5c435686744dc3b52980625a24f82fa0b4b38046b4db971afc50a0cb3a757c179 Size (libreoffice/noto-fonts-20171024.tar.gz) = 6646182 bytes +SHA1 (libreoffice/pdfium-3794.tar.bz2) = 41ff3c2291c99db71ddca1873115b7fc0bfb5065 +RMD160 (libreoffice/pdfium-3794.tar.bz2) = f05b6814ed17f4a7cbce1f66a47c7689645dd3df +SHA512 (libreoffice/pdfium-3794.tar.bz2) = 56cf1bc0afab277aa00f9ac779a95919405566a40a4f914e379983907ee3bffaf8f500a64e8c5559daf5c4f831d1daab80f39ed4e492c2e010f09a2af0d00221 +Size (libreoffice/pdfium-3794.tar.bz2) = 7123074 bytes SHA1 (libreoffice/postgresql-9.2.24.tar.bz2) = 63d6966ccdbab6aae1f9754fdb8e341ada1ef653 RMD160 (libreoffice/postgresql-9.2.24.tar.bz2) = 2fc1b9c37cfefd5fae5bd02f974484c5fc680c08 SHA512 (libreoffice/postgresql-9.2.24.tar.bz2) = a6f043e5ef5e12e23c1c43b26a5ecafce62f3a86f38b5b85e7cb0cb7aa376d40e460a526baf67ae40de40525e4744fb5e48650ee5e007db4ce9742fcf548bd56 @@ -223,6 +227,8 @@ SHA1 (patch-download.lst) = a2daa977fee0024176ebe7e180e92931a15fe8c6 SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 90e46a519fe587c5ac0022f84e5d94cf9e15c232 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 01798842e3f573f627be31660195edbac802df89 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d +SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = e82cdef5c7636ca3340589cf1e258cc4555c8346 +SHA1 (patch-external_pdfium_pkgsrc.patch.1) = e40ad0abec8095a1598982e6ddf7752c9aa8d60f SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 48e68ff43b971996f81985ee79d71f7b83cce428 SHA1 (patch-i18npool_source_breakiterator_breakiterator_unicode.cxx) = 0a784bced0874b3ef7cc3b6ff19a865e0d64ce49 SHA1 (patch-i18npool_source_collator_collator_unicode.cxx) = 853367cf9a4be70c5d0de44a82e6fadc70e40ea6 diff --git a/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk b/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk new file mode 100644 index 00000000000..573567dded7 --- /dev/null +++ b/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk @@ -0,0 +1,14 @@ +$NetBSD: patch-external_pdfium_UnpackedTarball__pdfium.mk,v 1.1 2019/10/18 10:13:40 ryoon Exp $ + +* Support pkgsrc and NetBSD + +--- external/pdfium/UnpackedTarball_pdfium.mk.orig 2019-09-18 14:12:06.000000000 +0000 ++++ external/pdfium/UnpackedTarball_pdfium.mk +@@ -14,6 +14,7 @@ pdfium_patches += ubsan.patch + pdfium_patches += build.patch.1 + # Avoids Windows 8 build dependency. + pdfium_patches += windows7.patch.1 ++pdfium_patches += pkgsrc.patch.1 + + $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium)) + diff --git a/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1 b/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1 new file mode 100644 index 00000000000..4c8db8a3e11 --- /dev/null +++ b/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1 @@ -0,0 +1,63 @@ +$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.1 2019/10/18 10:13:40 ryoon Exp $ + +* Support NetBSD +* Do no conflict with FreeType 2.10 from pkgsrc +* Add pkgsrc font path + +--- external/pdfium/pkgsrc.patch.1.orig 2019-10-18 00:59:38.822575812 +0000 ++++ external/pdfium/pkgsrc.patch.1 +@@ -0,0 +1,54 @@ ++--- pdfium/core/fxcrt/cfx_fileaccess_posix.h.orig 2019-05-10 17:07:53.000000000 +0000 +++++ pdfium/core/fxcrt/cfx_fileaccess_posix.h ++@@ -12,7 +12,7 @@ ++ #include "core/fxcrt/fx_system.h" ++ ++ #if _FX_PLATFORM_ != _FX_PLATFORM_LINUX_ && !defined(OS_MACOSX) && \ ++- !defined(OS_ANDROID) +++ !defined(OS_ANDROID) && !defined(OS_NETBSD) ++ #error "Included on the wrong platform" ++ #endif ++ ++--- pdfium/third_party/freetype/src/src/base/ftobjs.c.orig 2019-03-11 15:49:39.000000000 +0000 +++++ pdfium/third_party/freetype/src/src/base/ftobjs.c ++@@ -4060,7 +4060,7 @@ ++ ++ FT_EXPORT_DEF( FT_UInt ) ++ FT_Get_Name_Index( FT_Face face, ++- FT_String* glyph_name ) +++ const FT_String* glyph_name ) ++ { ++ FT_UInt result = 0; ++ ++--- pdfium/third_party/freetype/src/include/freetype/freetype.h.orig 2019-03-11 15:49:39.000000000 +0000 +++++ pdfium/third_party/freetype/src/include/freetype/freetype.h ++@@ -3933,7 +3933,7 @@ FT_BEGIN_HEADER ++ */ ++ FT_EXPORT( FT_UInt ) ++ FT_Get_Name_Index( FT_Face face, ++- FT_String* glyph_name ); +++ const FT_String* glyph_name ); ++ ++ ++ /************************************************************************** ++--- pdfium/core/fxcrt/fx_system.h.orig 2019-05-10 17:07:53.000000000 +0000 +++++ pdfium/core/fxcrt/fx_system.h ++@@ -26,7 +26,7 @@ ++ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ ++ #elif defined(_WIN64) ++ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ ++-#elif defined(__linux__) +++#elif defined(__linux__) || defined(__NetBSD__) ++ #define _FX_PLATFORM_ _FX_PLATFORM_LINUX_ ++ #elif defined(__APPLE__) ++ #define _FX_PLATFORM_ _FX_PLATFORM_APPLE_ ++--- pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-10-17 12:10:31.399095490 +0000 +++++ pdfium/core/fxge/fx_ge_linux.cpp ++@@ -155,6 +155,7 @@ std::unique_ptr<SystemFontInfoIface> Sys ++ pInfo->AddPath("/usr/share/X11/fonts/Type1"); ++ pInfo->AddPath("/usr/share/X11/fonts/TTF"); ++ pInfo->AddPath("/usr/local/share/fonts"); +++ pInfo->AddPath("@X11BASE@/share/fonts"); ++ } ++ return std::move(pInfo); ++ } |