Attachment #188766 for bug #224288





CONFLICTS_BUILD=	mdds0

BUILD_DEPENDS=	${LOCALBASE}/lib/libcppunit.so:devel/cppunit \
		p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
		zip:archivers/zip \
		${LOCALBASE}/include/sqlext.h:databases/unixODBC \
		dmake:devel/dmake \

		libexttextcat-2.0.so:textproc/libexttextcat \
		libmwaw-0.3.so:textproc/libmwaw03 \
		libodfgen-0.1.so:textproc/libodfgen01 \
		libepubgen-0.0.so:textproc/libepubgen00 \
		librevenge-0.0.so:textproc/librevenge \
		libstaroffice-0.0.so:textproc/libstaroffice \
		libvisio-0.1.so:textproc/libvisio01 \
		libwpd-0.10.so:textproc/libwpd010 \
		libwps-0.4.so:textproc/libwps \
		libxml2.so:textproc/libxml2 \
		libxmlsec1-nss.so:security/xmlsec1 \
		libxslt.so:textproc/libxslt \
		libmythes-1.2.so:textproc/mythes \
		librdf.so:textproc/redland \

		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g

DISTFILES+=	4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \
#		pdfium-3235.tar.bz2:src
		cppunit-1.13.2.tar.gz:src

.if defined(PRERELEASE)
MASTER_SITES+=	http://dev-builds.libreoffice.org/pre-releases/src/


OPTIONS_DEFINE=	CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \
		TEST WEBDAV
OPTIONS_DEFAULT=	CUPS GTK3 MMEDIA

GTK3_DESC=	GTK+ 3 GUI toolkit support
JAVA_DESC=	Add Java support (XML filters, macros)
MMEDIA_DESC=	Enable multimedia backend for impress
PGSQL_DESC=	Build with PostgreSQL-SDBC driver

		--disable-mergelibs \
		--disable-online-update \
		--enable-cairo-canvas \
		--enable-graphite \
		--enable-python=system \
		--enable-release-build \
		--disable-pdfium \
		--exec-prefix=${PREFIX} \
		--with-alloc=system \
		--with-boost=${LOCALBASE} \

		--with-system-zlib \
		--with-vendor="FreeBSD ports" \
		--without-fonts \
		--without-myspell-dicts
		--without-system-cppunit

CONFIGURE_ENV=	DMAKE=${LOCALBASE}/bin/dmake \
		GNUTAR="${TAR}" \

Lines 1-7 Link Here

(-)i/editors/libreoffice/Makefile.common (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libreoffice	3	PORTNAME= libreoffice
4	PORTVERSION= 5.3.7	4	PORTVERSION= 6.0.0
5	CATEGORIES+= editors	5	CATEGORIES+= editors
6		6
7	MAINTAINER= office@FreeBSD.org	7	MAINTAINER= office@FreeBSD.org
Lines 10-13 LICENSE= LGPL3+ MPL20 Link Here
10	LICENSE_COMB= dual	10	LICENSE_COMB= dual
11		11
12	LOVERSION= ${PORTVERSION}.${RCVER}	12	LOVERSION= ${PORTVERSION}.${RCVER}
13	RCVER= 2	13	RCVER= 0.beta2




TIMESTAMP = 1513088793
SHA256 (libreoffice/libreoffice-6.0.0.0.beta2.tar.xz) = 9488fb08f211dcf7e2fe2ec46139e3ffe6d372d8dcacdf7cf976c5cb3fbb182a
SIZE (libreoffice/libreoffice-6.0.0.0.beta2.tar.xz) = 203422696
SHA256 (libreoffice/libreoffice-help-6.0.0.0.beta2.tar.xz) = 02ad6505fffbaa8a4065a10424cd8dcfc1bec1f2ae12f22b918a7076fb0cd46e
SIZE (libreoffice/libreoffice-help-6.0.0.0.beta2.tar.xz) = 2640096
SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
SHA256 (libreoffice/pdfium-3235.tar.bz2) = 7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f
SIZE (libreoffice/pdfium-3235.tar.bz2) = 5836207
SHA256 (libreoffice/cppunit-1.13.2.tar.gz) = 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f
SIZE (libreoffice/cppunit-1.13.2.tar.gz) = 953596
SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470
SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
SIZE (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582
SHA256 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
SIZE (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 9796
SHA256 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
SIZE (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 153157
SHA256 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
SIZE (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610
SHA256 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
SIZE (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926
SHA256 (libreoffice/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar) = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
SIZE (libreoffice/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar) = 2448421
SHA256 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
SIZE (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 762419
SHA256 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
SIZE (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721
SHA256 (libreoffice/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar) = a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34
SIZE (libreoffice/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar) = 18033694
SHA256 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
SIZE (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 2929311
SHA256 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
SIZE (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 743031
SHA256 (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
SIZE (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 207563
SHA256 (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772
SIZE (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = 1396007
SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800
SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919
SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288




 
 # create bash completion
-mkdir -p $DESTDIR/usr/share/bash-completion/completions
-"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
-test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
+mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions
+"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh
+test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
 if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
-    "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
-    test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
+    "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh
+    test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
 fi
 




--- sal/osl/unx/system.cxx.orig	2016-10-28 14:50:26 UTC
+++ sal/osl/unx/system.cxx
@@ -247,6 +247,9 @@ int macxp_resolveAlias(char *path, int b
 #endif /* NO_PTHREAD_RTL */
 
 #if defined(FREEBSD)
+
+#include <cmath>
+
 char *fcvt(double value, int ndigit, int *decpt, int *sign)
 {
   static char ret[256];




--- sal/osl/unx/thread.cxx.orig	2017-12-12 17:31:34.756103000 +0300
+++ sal/osl/unx/thread.cxx	2017-12-12 17:33:13.924729000 +0300
@@ -45,6 +45,10 @@
 #include <sys/syscall.h>
 #endif
 
+#ifdef __FreeBSD_kernel__
+#include <pthread_np.h>
+#endif
+
 /****************************************************************************
  * @@@ TODO @@@
  *
@@ -545,7 +549,7 @@
     if ( 0 != err )
         SAL_WARN("sal.osl", "pthread_setname_np failed with errno " << err);
 #elif defined __FreeBSD_kernel__
-    pthread_setname_np( pthread_self(), name );
+    pthread_set_name_np( pthread_self(), name );
 #elif defined MACOSX || defined IOS
     pthread_setname_np( name );
 #else




--- shell/source/unix/exec/shellexec.cxx.orig	2017-12-08 02:26:19.000000000 +0300
+++ shell/source/unix/exec/shellexec.cxx	2017-12-12 15:51:21.551684000 +0300
@@ -145,7 +145,7 @@
         aBuffer.append("open --");
 #else
         // Just use xdg-open on non-Mac
-        aBuffer.append("/usr/bin/xdg-open");
+        aBuffer.append("%%LOCALBASE%%/bin/xdg-open");
         }
 #endif
         aBuffer.append(" ");
         escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding()));




--- vcl/CppunitTest_vcl_wmf_test.mk.orig	2017-05-03 16:46:29 UTC
+++ vcl/CppunitTest_vcl_wmf_test.mk
@@ -131,10 +131,9 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_wmf_tes
 ))
 endif
 else
-ifeq ($(OS),LINUX)
+ifeq ($(OS), $(filter LINUX %BSD, $(OS)))
 $(eval $(call gb_CppunitTest_add_libs,vcl_wmf_test,\
-    -lm \
-    -ldl \
+    -lm $(DLOPEN_LIBS) \
     -lpthread \
     -lGL \
     -lX11 \

Lines 11-19 Link Here

(-)i/editors/libreoffice/files/patch-vcl_Executable__visualbackendtest.mk (-2 lines)
11	- -ldl \	11	- -ldl \
12	+ -lm $(DLOPEN_LIBS) \	12	+ -lm $(DLOPEN_LIBS) \
13	-lpthread \	13	-lpthread \
14	- -lGL \
15	- -lX11 \	14	- -lX11 \
16	+ -lGL \
17	+ -lX11 \	15	+ -lX11 \
18	))	16	))
19		17




--- vcl/Library_vcl.mk.orig	2017-05-03 16:46:29 UTC
+++ vcl/Library_vcl.mk
@@ -643,13 +643,12 @@ else
     vcl/source/opengl/OpenGLHelper \
     vcl/source/window/openglwin \
  ))
-ifeq ($(OS),LINUX)
+ifeq ($(OS), $(filter LINUX %BSD, $(OS)))
 $(eval $(call gb_Library_add_libs,vcl,\
-	-lm \
-	-ldl \
+	-lm $(DLOPEN_LIBS) \
 	-lpthread \
-    -lGL \
-    -lX11 \
+	-lGL \
+	-lX11 \
 ))
 endif
 endif




--- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx.orig	2017-01-12 00:54:33 UTC
+++ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -436,10 +436,13 @@ dialog_remove_buttons( GtkDialog *pDialo
 {
     g_return_if_fail( GTK_IS_DIALOG( pDialog ) );
 
-#if GTK_CHECK_VERSION(3,0,0)
 #if GTK_CHECK_VERSION(3,12,0)
-    dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog));
+    GtkWidget *pHeaderBar = gtk_dialog_get_header_bar( pDialog );
+    if( pHeaderBar != nullptr )
+        dialog_remove_buttons( pHeaderBar );
+    else
 #endif
+#if GTK_CHECK_VERSION(2,14,0)
     dialog_remove_buttons(gtk_dialog_get_action_area(pDialog));
 #else
     dialog_remove_buttons(pDialog->action_area);

Return to bug 224288

Lines 15-21 COMMENT= Full integrated office productivity suite Link Here

(-)i/editors/libreoffice/Makefile (-8 / +9 lines)
15		15
16	CONFLICTS_BUILD= mdds0	16	CONFLICTS_BUILD= mdds0
17		17
18	BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \	18	BUILD_DEPENDS= ${LOCALBASE}/lib/libcppunit.so:devel/cppunit \
		19	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
19	zip:archivers/zip \	20	zip:archivers/zip \
20	${LOCALBASE}/include/sqlext.h:databases/unixODBC \	21	${LOCALBASE}/include/sqlext.h:databases/unixODBC \
21	dmake:devel/dmake \	22	dmake:devel/dmake \
Lines 63-74 LIB_DEPENDS= libapr-1.so:devel/apr1 \ Link Here
63	libexttextcat-2.0.so:textproc/libexttextcat \	64	libexttextcat-2.0.so:textproc/libexttextcat \
64	libmwaw-0.3.so:textproc/libmwaw03 \	65	libmwaw-0.3.so:textproc/libmwaw03 \
65	libodfgen-0.1.so:textproc/libodfgen01 \	66	libodfgen-0.1.so:textproc/libodfgen01 \
		67	libepubgen-0.0.so:textproc/libepubgen00 \
66	librevenge-0.0.so:textproc/librevenge \	68	librevenge-0.0.so:textproc/librevenge \
67	libstaroffice-0.0.so:textproc/libstaroffice \	69	libstaroffice-0.0.so:textproc/libstaroffice \
68	libvisio-0.1.so:textproc/libvisio01 \	70	libvisio-0.1.so:textproc/libvisio01 \
69	libwpd-0.10.so:textproc/libwpd010 \	71	libwpd-0.10.so:textproc/libwpd010 \
70	libwps-0.4.so:textproc/libwps \	72	libwps-0.4.so:textproc/libwps \
71	libxml2.so:textproc/libxml2 \	73	libxml2.so:textproc/libxml2 \
		74	libxmlsec1-nss.so:security/xmlsec1 \
72	libxslt.so:textproc/libxslt \	75	libxslt.so:textproc/libxslt \
73	libmythes-1.2.so:textproc/mythes \	76	libmythes-1.2.so:textproc/mythes \
74	librdf.so:textproc/redland \	77	librdf.so:textproc/redland \
Lines 83-90 RUN_DEPENDS= xdg-open:devel/xdg-utils \ Link Here
83	${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g	86	${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g
84		87
85	DISTFILES+= 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \	88	DISTFILES+= 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \
86	86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz:src \	89	# pdfium-3235.tar.bz2:src
87	cppunit-1.13.2.tar.gz:src
88		90
89	.if defined(PRERELEASE)	91	.if defined(PRERELEASE)
90	MASTER_SITES+= http://dev-builds.libreoffice.org/pre-releases/src/	92	MASTER_SITES+= http://dev-builds.libreoffice.org/pre-releases/src/
Lines 106-114 USES= autoreconf:build bison compiler:c++11-lib cpe gmake jpeg \ Link Here
106		108
107	OPTIONS_DEFINE= CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \	109	OPTIONS_DEFINE= CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \
108	TEST WEBDAV	110	TEST WEBDAV
109	OPTIONS_DEFAULT= CUPS GTK2 MMEDIA	111	OPTIONS_DEFAULT= CUPS GTK3 MMEDIA
110		112
111	GTK3_DESC= GTK+ 3 GUI toolkit support (experimental)	113	GTK3_DESC= GTK+ 3 GUI toolkit support
112	JAVA_DESC= Add Java support (XML filters, macros)	114	JAVA_DESC= Add Java support (XML filters, macros)
113	MMEDIA_DESC= Enable multimedia backend for impress	115	MMEDIA_DESC= Enable multimedia backend for impress
114	PGSQL_DESC= Build with PostgreSQL-SDBC driver	116	PGSQL_DESC= Build with PostgreSQL-SDBC driver
Lines 225-233 CONFIGURE_ARGS= --disable-dependency-tracking \ Link Here
225	--disable-mergelibs \	227	--disable-mergelibs \
226	--disable-online-update \	228	--disable-online-update \
227	--enable-cairo-canvas \	229	--enable-cairo-canvas \
228	--enable-graphite \
229	--enable-python=system \	230	--enable-python=system \
230	--enable-release-build \	231	--enable-release-build \
		232	--disable-pdfium \
231	--exec-prefix=${PREFIX} \	233	--exec-prefix=${PREFIX} \
232	--with-alloc=system \	234	--with-alloc=system \
233	--with-boost=${LOCALBASE} \	235	--with-boost=${LOCALBASE} \
Lines 248-255 CONFIGURE_ARGS= --disable-dependency-tracking \ Link Here
248	--with-system-zlib \	250	--with-system-zlib \
249	--with-vendor="FreeBSD ports" \	251	--with-vendor="FreeBSD ports" \
250	--without-fonts \	252	--without-fonts \
251	--without-myspell-dicts \	253	--without-myspell-dicts
252	--without-system-cppunit
253		254
254	CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \	255	CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \
255	GNUTAR="${TAR}" \	256	GNUTAR="${TAR}" \

Lines 1-45 Link Here

(-)i/editors/libreoffice/distinfo (-43 / +7 lines)
1	TIMESTAMP = 1508961364	1	TIMESTAMP = 1513088793
2	SHA256 (libreoffice/libreoffice-5.3.7.2.tar.xz) = c3d7ceecdf4d97dfd2ed748c4479152a1c9b8c879587a63a4f403209aed6ee7c	2	SHA256 (libreoffice/libreoffice-6.0.0.0.beta2.tar.xz) = 9488fb08f211dcf7e2fe2ec46139e3ffe6d372d8dcacdf7cf976c5cb3fbb182a
3	SIZE (libreoffice/libreoffice-5.3.7.2.tar.xz) = 189508568	3	SIZE (libreoffice/libreoffice-6.0.0.0.beta2.tar.xz) = 203422696
4	SHA256 (libreoffice/libreoffice-help-5.3.7.2.tar.xz) = f65e68322c50c52382093153ef0753852dde97962e63c1426256a05ce007ae2c	4	SHA256 (libreoffice/libreoffice-help-6.0.0.0.beta2.tar.xz) = 02ad6505fffbaa8a4065a10424cd8dcfc1bec1f2ae12f22b918a7076fb0cd46e
5	SIZE (libreoffice/libreoffice-help-5.3.7.2.tar.xz) = 2124656	5	SIZE (libreoffice/libreoffice-help-6.0.0.0.beta2.tar.xz) = 2640096
6	SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb	6	SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
7	SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291	7	SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
8	SHA256 (libreoffice/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f	8	SHA256 (libreoffice/pdfium-3235.tar.bz2) = 7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f
9	SIZE (libreoffice/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 1794694	9	SIZE (libreoffice/pdfium-3235.tar.bz2) = 5836207
10	SHA256 (libreoffice/cppunit-1.13.2.tar.gz) = 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f
11	SIZE (libreoffice/cppunit-1.13.2.tar.gz) = 953596
12	SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
13	SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470
14	SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
15	SIZE (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582
16	SHA256 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
17	SIZE (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 9796
18	SHA256 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
19	SIZE (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 153157
20	SHA256 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
21	SIZE (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610
22	SHA256 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
23	SIZE (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926
24	SHA256 (libreoffice/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar) = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
25	SIZE (libreoffice/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar) = 2448421
26	SHA256 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
27	SIZE (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 762419
28	SHA256 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
29	SIZE (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721
30	SHA256 (libreoffice/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar) = a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34
31	SIZE (libreoffice/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar) = 18033694
32	SHA256 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
33	SIZE (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 2929311
34	SHA256 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
35	SIZE (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 743031
36	SHA256 (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
37	SIZE (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 207563
38	SHA256 (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772
39	SIZE (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = 1396007
40	SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
41	SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800
42	SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
43	SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919
44	SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
45	SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288

Lines 48-62 Link Here

(-)i/editors/libreoffice/files/patch-bin_distro-install-desktop-integration (-4 / +4 lines)
48		48
49	# create bash completion	49	# create bash completion
50	-mkdir -p $DESTDIR/usr/share/bash-completion/completions	50	-mkdir -p $DESTDIR/usr/share/bash-completion/completions
51	-"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh	51	-"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
52	-test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand	52	-test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
53	+mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions	53	+mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions
54	+"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh	54	+"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh
55	+test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand	55	+test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
56	if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then	56	if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
57	- "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh	57	- "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
58	- test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand	58	- test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
59	+ "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh	59	+ "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh
60	+ test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand	60	+ test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
61	fi	61	fi
62		62

Removed Link Here

(-)c/editors/libreoffice/files/patch-sal_osl_unx_system.cxx (-12 lines)
1	--- sal/osl/unx/system.cxx.orig 2016-10-28 14:50:26 UTC
2	+++ sal/osl/unx/system.cxx
3	@@ -247,6 +247,9 @@ int macxp_resolveAlias(char *path, int b
4	#endif /* NO_PTHREAD_RTL */
5
6	#if defined(FREEBSD)
7	+
8	+#include <cmath>
9	+
10	char fcvt(double value, int ndigit, int decpt, int *sign)
11	{
12	static char ret[256];

Added Link Here

(-)i/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx (+22 lines)
1	--- sal/osl/unx/thread.cxx.orig 2017-12-12 17:31:34.756103000 +0300
2	+++ sal/osl/unx/thread.cxx 2017-12-12 17:33:13.924729000 +0300
3	@@ -45,6 +45,10 @@
4	#include <sys/syscall.h>
5	#endif
6
7	+#ifdef __FreeBSD_kernel__
8	+#include <pthread_np.h>
9	+#endif
10	+
11	/****************************************************************************
12	* @@@ TODO @@@
13	*
14	@@ -545,7 +549,7 @@
15	if ( 0 != err )
16	SAL_WARN("sal.osl", "pthread_setname_np failed with errno " << err);
17	#elif defined __FreeBSD_kernel__
18	- pthread_setname_np( pthread_self(), name );
19	+ pthread_set_name_np( pthread_self(), name );
20	#elif defined MACOSX \|\| defined IOS
21	pthread_setname_np( name );
22	#else

Lines 1-11 Link Here

(-)i/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx (-9 / +9 lines)
1	--- shell/source/unix/exec/shellexec.cxx.orig 2017-01-12 00:54:33 UTC	1	--- shell/source/unix/exec/shellexec.cxx.orig 2017-12-08 02:26:19.000000000 +0300
2	+++ shell/source/unix/exec/shellexec.cxx	2	+++ shell/source/unix/exec/shellexec.cxx 2017-12-12 15:51:21.551684000 +0300
3	@@ -157,7 +157,7 @@ void SAL_CALL ShellExec::execute( const	3	@@ -145,7 +145,7 @@
4	if (std::getenv("LIBO_FLATPAK") != nullptr) {	4	aBuffer.append("open --");
5	aBuffer.append("/app/bin/xdg-open");	5	#else
6	} else {	6	// Just use xdg-open on non-Mac
7	- aBuffer.append("/usr/bin/xdg-open");	7	- aBuffer.append("/usr/bin/xdg-open");
8	+ aBuffer.append("%%LOCALBASE%%/bin/xdg-open");	8	+ aBuffer.append("%%LOCALBASE%%/bin/xdg-open");
9	}
10	#endif	9	#endif
11	aBuffer.append(" ");	10	aBuffer.append(" ");
		11	escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding()));

Removed Link Here

(-)c/editors/libreoffice/files/patch-vcl_CppunitTest__vcl__wmf__test.mk (-15 lines)
1	--- vcl/CppunitTest_vcl_wmf_test.mk.orig 2017-05-03 16:46:29 UTC
2	+++ vcl/CppunitTest_vcl_wmf_test.mk
3	@@ -131,10 +131,9 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_wmf_tes
4	))
5	endif
6	else
7	-ifeq ($(OS),LINUX)
8	+ifeq ($(OS), $(filter LINUX %BSD, $(OS)))
9	$(eval $(call gb_CppunitTest_add_libs,vcl_wmf_test,\
10	- -lm \
11	- -ldl \
12	+ -lm $(DLOPEN_LIBS) \
13	-lpthread \
14	-lGL \
15	-lX11 \

Removed Link Here

(-)c/editors/libreoffice/files/patch-vcl_Library__vcl.mk (-20 lines)
1	--- vcl/Library_vcl.mk.orig 2017-05-03 16:46:29 UTC
2	+++ vcl/Library_vcl.mk
3	@@ -643,13 +643,12 @@ else
4	vcl/source/opengl/OpenGLHelper \
5	vcl/source/window/openglwin \
6	))
7	-ifeq ($(OS),LINUX)
8	+ifeq ($(OS), $(filter LINUX %BSD, $(OS)))
9	$(eval $(call gb_Library_add_libs,vcl,\
10	- -lm \
11	- -ldl \
12	+ -lm $(DLOPEN_LIBS) \
13	-lpthread \
14	- -lGL \
15	- -lX11 \
16	+ -lGL \
17	+ -lX11 \
18	))
19	endif
20	endif

Removed Link Here

(-)c/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx (-18 lines)
1	--- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx.orig 2017-01-12 00:54:33 UTC
2	+++ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
3	@@ -436,10 +436,13 @@ dialog_remove_buttons( GtkDialog *pDialo
4	{
5	g_return_if_fail( GTK_IS_DIALOG( pDialog ) );
6
7	-#if GTK_CHECK_VERSION(3,0,0)
8	#if GTK_CHECK_VERSION(3,12,0)
9	- dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog));
10	+ GtkWidget *pHeaderBar = gtk_dialog_get_header_bar( pDialog );
11	+ if( pHeaderBar != nullptr )
12	+ dialog_remove_buttons( pHeaderBar );
13	+ else
14	#endif
15	+#if GTK_CHECK_VERSION(2,14,0)
16	dialog_remove_buttons(gtk_dialog_get_action_area(pDialog));
17	#else
18	dialog_remove_buttons(pDialog->action_area);