Re: libreoffice on -current

["David H. Gutteridge" <david%gutteridge.ca@localhost>]

On Sat, 23 Nov 2019, at 14:57:27 +0100, Martin Husemann wrote:
> Hey folks,
> 
> I am trying to build libreoffice from pkgsrc -current on NetBSD -current.
> 
> Looks like it confuses freetype headers between the system version and
> its own freetype copy or something...

Hi Martin,

There are two issues (as of the present state of pkgsrc I've tested
with) building LibreOffice on -current. The first is what you've hit
there. I'd worked around that by simply reverting back to to use
poppler instead of pdfium.

There's a separate C++ issue that then arises with poppler 0.82, which
involves the PDF import functionality. Since I don't import PDFs (and
haven't had any time to look into this), I simply disabled that option,
at which point I had LibreOffice building and working.

If you (or anyone else) may find these (presumably temporary) workarounds
helpful, the patches follow.

Regards,

Dave

--- Makefile.orig
+++ Makefile
@@ -23,22 +23,22 @@
 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
+#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
 
 GCC_REQD+=     7
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(USE_BUILTIN.freetype2:M[Yy][Ee][Ss]) && \
-       !empty(BUILTIN_VERSION.freetype2:M2.10.0)
-CFLAGS+=                       -D_FT_CONST=
-.else
-CFLAGS+=                       -D_FT_CONST=const
-.endif
+#.if !empty(USE_BUILTIN.freetype2:M[Yy][Ee][Ss]) && \
+#      !empty(BUILTIN_VERSION.freetype2:M2.10.0)
+#CFLAGS+=                      -D_FT_CONST=
+#.else
+#CFLAGS+=                      -D_FT_CONST=const
+#.endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD*)
 pre-build:
@@ -187,8 +187,8 @@
 CONFIGURE_ARGS+=       --disable-sdremote-bluetooth
 # Enabling GIO causes error. losessioninstall.component not found.
 CONFIGURE_ARGS+=       --disable-gio
-# Use PDFium instead of poppler for PDF import since 6.3.2.2nb1
-CONFIGURE_ARGS+=       --enable-pdfium --disable-poppler
+CONFIGURE_ARGS+=       --disable-pdfimport
+CONFIGURE_ARGS+=       --disable-pdfium
 CONFIGURE_ARGS+=       --enable-gstreamer-1-0
 CONFIGURE_ARGS+=       --enable-python=system
 #CONFIGURE_ARGS+=      --enable-release-build
@@ -372,9 +372,8 @@
 .if !empty(PKG_OPTIONS:Mcups)
 .include "../../print/cups-base/buildlink3.mk"
 .endif
-# 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 "../../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"
 
--- PLIST.orig
+++ PLIST
@@ -181,8 +181,6 @@
 ${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
@@ -8545,7 +8543,6 @@
 ${PKGNAME}/lib/libreoffice/share/registry/ogltrans.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/oo-ad-ldap.xcd.sample
 ${PKGNAME}/lib/libreoffice/share/registry/oo-ldap.xcd.sample
-${PKGNAME}/lib/libreoffice/share/registry/pdfimport.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/postgresql.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/pyuno.xcd
 ${PKGNAME}/lib/libreoffice/share/registry/res/fcfg_langpack_af.xcd