From 9f707cc3b23afced8a0eda57eeba42bcc13ee774 Mon Sep 17 00:00:00 2001 From: robert Date: Tue, 29 Sep 2015 16:10:48 +0000 Subject: [PATCH] update to 5.0.2.2 --- editors/libreoffice/Makefile | 25 ++-- editors/libreoffice/distinfo | 44 +++---- .../libreoffice/patches/patch-Repository_mk | 11 +- editors/libreoffice/patches/patch-configure | 18 +-- .../patch-desktop_Library_sofficeapp_mk | 21 ++-- .../patches/patch-desktop_source_app_app_cxx | 10 +- ...-external_coinmp_ExternalPackage_coinmp_mk | 8 +- ...xternal_cppunit_UnpackedTarball_cppunit_mk | 8 +- ...l_libetonyek_ExternalPackage_libetonyek_mk | 12 ++ ...l_libetonyek_ExternalProject_libetonyek_mk | 12 +- ...libfreehand_ExternalProject_libfreehand_mk | 8 +- ...rnal_liblangtag_ExternalProject_langtag_mk | 12 +- ...xternal_libmwaw_ExternalPackage_libmwaw_mk | 10 +- ...nal_libodfgen_ExternalPackage_libodfgen_mk | 10 +- ...nal_libodfgen_ExternalProject_libodfgen_mk | 11 ++ ...ernal_liborcus_ExternalProject_liborcus_mk | 16 ++- ...bpagemaker_UnpackedTarball_libpagemaker_mk | 12 +- .../patch-external_libpagemaker_patch-ldflags | 10 +- ...l_librevenge_ExternalPackage_librevenge_mk | 10 +- ...l_librevenge_ExternalProject_librevenge_mk | 11 ++ ...-external_libwpd_ExternalPackage_libwpd_mk | 12 ++ ...-external_libwpd_ExternalProject_libwpd_mk | 21 ++-- ...-external_libwpg_ExternalPackage_libwpg_mk | 12 ++ ...-external_libwpg_ExternalProject_libwpg_mk | 10 +- ...-external_libwps_ExternalPackage_libwps_mk | 12 +- ...nclude_LibreOfficeKit_LibreOfficeKitInit_h | 10 +- .../patches/patch-liborcus_openbsd_patch | 6 +- ...ibreofficekit_Executable_gtktiledviewer_mk | 8 +- ...ch-libreofficekit_Module_libreofficekit_mk | 10 +- ...cekit_qa_gtktiledviewer_gtktiledviewer_cxx | 10 +- .../patch-sal_cppunittester_cppunittester_cxx | 18 +-- ...tch-sc_qa_unit_subsequent_filters-test_cxx | 8 +- ...patch-shell_source_unix_exec_shellexec_cxx | 8 +- ...tch-solenv_gbuild_platform_com_GCC_defs_mk | 8 +- .../patches/patch-svx_Executable_gengal_mk | 17 ++- .../patches/patch-svx_Library_svxcore_mk | 10 +- .../patch-sw_Executable_tiledrendering_mk | 17 --- .../patches/patch-vcl_Executable_icontest_mk | 14 +-- .../patches/patch-vcl_Executable_mtfdemo_mk | 15 +++ .../patch-vcl_Executable_tdefilepicker_mk | 8 +- .../patch-vcl_Executable_ui-previewer_mk | 8 +- .../patches/patch-vcl_Executable_vcldemo_mk | 10 +- .../patches/patch-vcl_Library_vcl_mk | 21 +++- .../patches/patch-vcl_Library_vclplug_gen_mk | 8 +- .../patches/patch-vcl_Library_vclplug_gtk3_mk | 10 +- .../patches/patch-vcl_Library_vclplug_svp_mk | 16 --- .../patches/patch-vcl_Library_vclplug_tde_mk | 8 +- .../patches/patch-vcl_Module_vcl_mk | 16 +-- ...h-vcl_unx_gtk_gdi_salnativewidgets-gtk_cxx | 12 -- editors/libreoffice/pkg/PLIST-java | 31 +++-- editors/libreoffice/pkg/PLIST-main | 117 ++++++++++-------- 51 files changed, 418 insertions(+), 352 deletions(-) create mode 100644 editors/libreoffice/patches/patch-external_libetonyek_ExternalPackage_libetonyek_mk create mode 100644 editors/libreoffice/patches/patch-external_libodfgen_ExternalProject_libodfgen_mk create mode 100644 editors/libreoffice/patches/patch-external_librevenge_ExternalProject_librevenge_mk create mode 100644 editors/libreoffice/patches/patch-external_libwpd_ExternalPackage_libwpd_mk create mode 100644 editors/libreoffice/patches/patch-external_libwpg_ExternalPackage_libwpg_mk delete mode 100644 editors/libreoffice/patches/patch-sw_Executable_tiledrendering_mk create mode 100644 editors/libreoffice/patches/patch-vcl_Executable_mtfdemo_mk delete mode 100644 editors/libreoffice/patches/patch-vcl_Library_vclplug_svp_mk delete mode 100644 editors/libreoffice/patches/patch-vcl_unx_gtk_gdi_salnativewidgets-gtk_cxx diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 9079e3eb34d..b1fbb647920 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.136 2015/08/18 08:15:40 kirby Exp $ +# $OpenBSD: Makefile,v 1.137 2015/09/29 16:10:48 robert Exp $ ONLY_FOR_ARCHS= amd64 i386 @@ -6,8 +6,8 @@ COMMENT-main= multi-platform productivity suite COMMENT-kde= optional integration of LibreOffice to the KDE environment COMMENT-java= optional integration of LibreOffice java features -BV= 4.4 -VERSION= ${BV}.5.2 +BV= 5.0 +VERSION= ${BV}.2.2 DISTNAME= libreoffice-${VERSION} DISTNAME= libreoffice-${VERSION} WRKDIST= ${WRKDIR}/libreoffice-${VERSION} @@ -15,7 +15,6 @@ PKGNAME= libreoffice-${VERSION} PKGNAME-main= libreoffice-${VERSION} PKGNAME-kde= libreoffice-kde-${VERSION} PKGNAME-java= libreoffice-java-${VERSION} -REVISION-java= 0 CATEGORIES= editors productivity DPB_PROPERTIES= parallel tag:kde3 @@ -74,7 +73,7 @@ DISTFILES+= ${EDISTFILES} \ 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz:0 \ a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip:0 \ a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip:0 \ - 896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2:0 \ + mdds_0.12.1.tar.bz2:0 \ cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2:0 \ ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:0 \ 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2:0 \ @@ -87,7 +86,7 @@ DISTFILES+= ${EDISTFILES} \ db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:0 \ e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip:0 \ commons-logging-1.2-src.tar.gz:0 \ - ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz:0 \ + ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip:0 \ edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz:0 \ eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:0 \ f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:0 \ @@ -95,18 +94,18 @@ DISTFILES+= ${EDISTFILES} \ libabw-0.1.1.tar.bz2:0 \ libcdr-0.1.1.tar.bz2:0 \ libe-book-0.1.2.tar.bz2:0 \ - libetonyek-0.1.1.tar.bz2:0 \ - libfreehand-0.1.0.tar.bz2:0 \ + libetonyek-0.1.3.tar.bz2:0 \ + libfreehand-0.1.1.tar.bz2:0 \ libgltf-0.0.2.tar.bz2:1 \ libmspub-0.1.2.tar.bz2:0 \ - libmwaw-0.3.4.tar.bz2:0 \ - libodfgen-0.1.3.tar.bz2:0 \ + libmwaw-0.3.5.tar.bz2:0 \ + libodfgen-0.1.4.tar.bz2:0 \ libpagemaker-0.0.2.tar.bz2:0 \ librevenge-0.0.2.tar.bz2:0 \ libvisio-0.1.1.tar.bz2:0 \ libwpd-0.10.0.tar.bz2:0 \ libwpg-0.3.0.tar.bz2:0 \ - libwps-0.3.1.tar.bz2:0 + libwps-0.4.0.tar.bz2:0 DIST_SUBDIR= libreoffice @@ -130,8 +129,6 @@ COMMENT-i18n-$l= $l language pack for LibreOffice RUN_DEPENDS-i18n-$l= editors/libreoffice WANTLIB-i18n-$l= LIB_DEPENDS-i18n-$l= -REVISION-i18n-hu= 0 -REVISION-i18n-ru= 0 .endfor .endif @@ -209,6 +206,7 @@ WANTLIB-main+= lber ldap WANTLIB-main+= poppler WANTLIB-main+= GLEW WANTLIB-main+= GL GLU harfbuzz harfbuzz-icu +WANTLIB-main+= lzma RUN_DEPENDS-main= devel/desktop-file-utils \ devel/libexecinfo \ @@ -280,6 +278,7 @@ CONFIGURE_ARGS+=\ --disable-packagekit \ --disable-dependency-tracking \ --disable-online-update \ + --disable-orcus \ --enable-gio \ --enable-kde \ --enable-systray \ diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index 130ba1dd198..9d529cdf282 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -19,7 +19,6 @@ SHA256 (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1 SHA256 (libreoffice/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2) = d3Oo9fC4EODxRtvPPbtC6J3YrwhoI14B2fDN795BqKk= SHA256 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = H7RY1qqwaTJpPMiptuTnCUTuH/BS+mNgbjEx3zTiF1M= SHA256 (libreoffice/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz) = zID9QV5X7OwGczm+rdDu+eqkXmXTxRqSK6X5Fyd5v7g= -SHA256 (libreoffice/896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2) = QYLsm3HT9wUgXaogoh1imUv6ICmKaNp5tcfkjbQmJ/c= SHA256 (libreoffice/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz) = l8okyA1Bb2UdzTUTYR1eqFW+IamU49SFY8g3pZlhiQg= SHA256 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = q+LFesErpF2DVjsC4kD6ldlzN23i9yCquP4R8uYhwJU= SHA256 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = PYU7GbHZSm76aeevkPfysJ7PMCkTvuPaeWwV7P68+sg= @@ -38,7 +37,7 @@ SHA256 (libreoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = //A SHA256 (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = G1sk97xUPANitmdpL3jbi6tO1tr8YXLxBNC9N1fYoTM= SHA256 (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = 4fuH8/e5gNM0FEcyeWFcRkQCfgEwEtFW76U4vCsDF3I= SHA256 (libreoffice/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip) = VK3LK8jKwJJ6ZH+9k2L0Xv9IEwzm4jedw4Z2QwGeCMU= -SHA256 (libreoffice/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz) = ZI8Q+3ZNAA1qaLLU4AgReQDoU8GXoCTR+R27qbkQEso= +SHA256 (libreoffice/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip) = kJk6oXp4aZZlP8X88Ujoefs2ibhnj5upmzdqWhPf9RM= SHA256 (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = 57yaH+x4elKeSfWia5Pc3PQVBkSd/HD5LN720X62+2E= SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = dcgDWcnONDwgqrijakXLO57nxhz5LBOuRTmdhUQjqbo= SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = BWQKH2gFsrLX4sucUNuaXLCE48Uqsacc4BUjm0odQ0M= @@ -46,22 +45,23 @@ SHA256 (libreoffice/graphite2-1.2.4.tgz) = S8PVFoApvMCqAOsslzJp0pQHvieW/1b5yA4Qc SHA256 (libreoffice/libabw-0.1.1.tar.bz2) = ej00Fc+Cq5iU9gHRswV8RhUGAwTVJ5797GJ14BuWoZk= SHA256 (libreoffice/libcdr-0.1.1.tar.bz2) = cv57u/InUkKs32etL5tscayRRqVsQJ3vNg2rysVpW0k= SHA256 (libreoffice/libe-book-0.1.2.tar.bz2) = txClfGMyBbkzAVR00KwIYiU9HFIRTVNd0Jsgk5oNGFA= -SHA256 (libreoffice/libetonyek-0.1.1.tar.bz2) = cW7fcmujiW/oXuqadXhpSNXd7aY6VMAPMwhljMO72eQ= -SHA256 (libreoffice/libfreehand-0.1.0.tar.bz2) = xpli1ZR1Ya/u/u5xvHi6dBnp2bD+qLzvL2Jb6Gev4wc= +SHA256 (libreoffice/libetonyek-0.1.3.tar.bz2) = mWPYorASU5D6JZ/ocqtwemZCgX0qoeZn6fl6G6NRDR8= +SHA256 (libreoffice/libfreehand-0.1.1.tar.bz2) = Rdqw5dYy61HusAhHlyygODXWeRFJ6ecU8JOp3ytEWHc= SHA256 (libreoffice/libgltf-0.0.2.tar.bz2) = 0cxyl+0ZIaqWniZBO0xOGK/Igs5NL1oqoqKQVwb3IGs= SHA256 (libreoffice/libmspub-0.1.2.tar.bz2) = JtSIUn/7sLQWhtS6t1bj5qrrmfiK3rFp0MFtLN6WhZo= -SHA256 (libreoffice/libmwaw-0.3.4.tar.bz2) = RE4V4+YOn8x9hZsgFXHZYSpTR879bnU85HEPY4UU2mc= -SHA256 (libreoffice/libodfgen-0.1.3.tar.bz2) = ZtHzUPucDoye7BuMZE2FMbjWd3rnuFB/irxHg7bSmBw= +SHA256 (libreoffice/libmwaw-0.3.5.tar.bz2) = /nG38SCsoxGpd1afUf+yWOgkYW22r7sp6gByOY/EybQ= +SHA256 (libreoffice/libodfgen-0.1.4.tar.bz2) = 90mZ0sk6wMwHegqcNjQNr/Kdx3KZIWCugd0BA0X3K4A= SHA256 (libreoffice/libpagemaker-0.0.2.tar.bz2) = Q75Gchr/y1qWdAbAms/DbHnS2WiRf+NqIcwAQjCgHg8= -SHA256 (libreoffice/libreoffice-4.4.5.2.tar.xz) = OutPCJGMbKbsEvxHwr5pDSGAwuQcwxNrbtNhhbic7A0= -SHA256 (libreoffice/libreoffice-dictionaries-4.4.5.2.tar.xz) = +37P915GaKlDX2ER5ljRpTFhVONKi5PNN7Kbkn+L/9w= -SHA256 (libreoffice/libreoffice-help-4.4.5.2.tar.xz) = ZgRKr/F8301SPO6gAZc4G7UNTLhjWb6DAWqDjCd2FoE= -SHA256 (libreoffice/libreoffice-translations-4.4.5.2.tar.xz) = f0UpkU5N+pYCQ62mQa2oCGGeGT4Rh/EPZ+N5BjI20qc= +SHA256 (libreoffice/libreoffice-5.0.2.2.tar.xz) = AfBoBwlDIDl2L6YIvLEkB4bStlSQmalglaq5Lc67wXY= +SHA256 (libreoffice/libreoffice-dictionaries-5.0.2.2.tar.xz) = NlXDvu2gjRQpNJCzZO1lyqKtD3Bqt+THPB0dM3QnPcQ= +SHA256 (libreoffice/libreoffice-help-5.0.2.2.tar.xz) = Q0KlWTuoozsdY1SfJWpBJ6C1HMGlP6/9wnCPBP718JQ= +SHA256 (libreoffice/libreoffice-translations-5.0.2.2.tar.xz) = kF4s/mc/I/tPVQHPrBz2aJSnf/mdar6c0cuMgM5/gRs= SHA256 (libreoffice/librevenge-0.0.2.tar.bz2) = 3t1v4fZD/C8lTyrTcZVHCEvYa8xIIQS5lcrzuCg2ixg= SHA256 (libreoffice/libvisio-0.1.1.tar.bz2) = vhZvVSCN4gNizMqxEd6zceKoGxf7CgqpNoLiSHWfyo0= SHA256 (libreoffice/libwpd-0.10.0.tar.bz2) = 8r9dZRVqNRzkBFUN2CLI24q4dAs5P2HbqCjRsssz/pE= SHA256 (libreoffice/libwpg-0.3.0.tar.bz2) = KPw1gCKKgpSN/AHQer1Qdsiw33amhwLBqB64j983c0g= -SHA256 (libreoffice/libwps-0.3.1.tar.bz2) = zraxqsRkbGQXCaAKG9zrKWsw/oteUkRvEEiS6cwzjU8= +SHA256 (libreoffice/libwps-0.4.0.tar.bz2) = tg1XSu/mouRGUA7biAL5vHiF+iYeLkfuMEJDKgK7LTU= +SHA256 (libreoffice/mdds_0.12.1.tar.bz2) = I1ZenXgQpqwwR4gzgT24R/gOkntBSnvge3zAPtOq6D0= SIZE (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 SIZE (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 102916 SIZE (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 525299 @@ -83,7 +83,6 @@ SIZE (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.t SIZE (libreoffice/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2) = 1665988 SIZE (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926 SIZE (libreoffice/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz) = 466545 -SIZE (libreoffice/896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2) = 153091 SIZE (libreoffice/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz) = 739050 SIZE (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 762419 SIZE (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721 @@ -102,7 +101,7 @@ SIZE (libreoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = 58146 SIZE (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 207563 SIZE (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = 1396007 SIZE (libreoffice/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip) = 6651982 -SIZE (libreoffice/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz) = 726942 +SIZE (libreoffice/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip) = 1982036 SIZE (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = 1098827 SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800 SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 @@ -110,19 +109,20 @@ SIZE (libreoffice/graphite2-1.2.4.tgz) = 6938866 SIZE (libreoffice/libabw-0.1.1.tar.bz2) = 369311 SIZE (libreoffice/libcdr-0.1.1.tar.bz2) = 664694 SIZE (libreoffice/libe-book-0.1.2.tar.bz2) = 465922 -SIZE (libreoffice/libetonyek-0.1.1.tar.bz2) = 423556 -SIZE (libreoffice/libfreehand-0.1.0.tar.bz2) = 340549 +SIZE (libreoffice/libetonyek-0.1.3.tar.bz2) = 460867 +SIZE (libreoffice/libfreehand-0.1.1.tar.bz2) = 597212 SIZE (libreoffice/libgltf-0.0.2.tar.bz2) = 538040 SIZE (libreoffice/libmspub-0.1.2.tar.bz2) = 429360 -SIZE (libreoffice/libmwaw-0.3.4.tar.bz2) = 1170238 -SIZE (libreoffice/libodfgen-0.1.3.tar.bz2) = 406636 +SIZE (libreoffice/libmwaw-0.3.5.tar.bz2) = 1304580 +SIZE (libreoffice/libodfgen-0.1.4.tar.bz2) = 435590 SIZE (libreoffice/libpagemaker-0.0.2.tar.bz2) = 358918 -SIZE (libreoffice/libreoffice-4.4.5.2.tar.xz) = 164472672 -SIZE (libreoffice/libreoffice-dictionaries-4.4.5.2.tar.xz) = 37163812 -SIZE (libreoffice/libreoffice-help-4.4.5.2.tar.xz) = 1876044 -SIZE (libreoffice/libreoffice-translations-4.4.5.2.tar.xz) = 127872924 +SIZE (libreoffice/libreoffice-5.0.2.2.tar.xz) = 166869100 +SIZE (libreoffice/libreoffice-dictionaries-5.0.2.2.tar.xz) = 36704156 +SIZE (libreoffice/libreoffice-help-5.0.2.2.tar.xz) = 1882964 +SIZE (libreoffice/libreoffice-translations-5.0.2.2.tar.xz) = 130062656 SIZE (libreoffice/librevenge-0.0.2.tar.bz2) = 486777 SIZE (libreoffice/libvisio-0.1.1.tar.bz2) = 515702 SIZE (libreoffice/libwpd-0.10.0.tar.bz2) = 632272 SIZE (libreoffice/libwpg-0.3.0.tar.bz2) = 381878 -SIZE (libreoffice/libwps-0.3.1.tar.bz2) = 496436 +SIZE (libreoffice/libwps-0.4.0.tar.bz2) = 564733 +SIZE (libreoffice/mdds_0.12.1.tar.bz2) = 153265 diff --git a/editors/libreoffice/patches/patch-Repository_mk b/editors/libreoffice/patches/patch-Repository_mk index 978b49d0c90..ec33d582381 100644 --- a/editors/libreoffice/patches/patch-Repository_mk +++ b/editors/libreoffice/patches/patch-Repository_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-Repository_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- Repository.mk.orig.port Wed Apr 8 08:50:01 2015 -+++ Repository.mk Wed Apr 8 08:50:31 2015 -@@ -67,12 +67,12 @@ $(eval $(call gb_Helper_register_executables,NONE, \ +$OpenBSD: patch-Repository_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- Repository.mk.orig.port Sun Sep 27 12:19:17 2015 ++++ Repository.mk Sun Sep 27 12:20:07 2015 +@@ -67,13 +67,13 @@ $(eval $(call gb_Helper_register_executables,NONE, \ svptest \ svpclient \ pixelctl ) \ @@ -12,12 +12,13 @@ $OpenBSD: patch-Repository_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ outdevgrind) \ vcldemo \ tiledrendering \ + mtfdemo \ - $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \ + $(if $(and $(ENABLE_GTK), $(filter OPENBSD LINUX,$(OS))), gtktiledviewer) \ )) $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ -@@ -610,7 +610,7 @@ $(eval $(call gb_Helper_register_libraries_for_install +@@ -581,7 +581,7 @@ $(eval $(call gb_Helper_register_libraries_for_install i18nlangtag \ i18nutil \ index_data \ diff --git a/editors/libreoffice/patches/patch-configure b/editors/libreoffice/patches/patch-configure index 739e34c141b..772897f7343 100644 --- a/editors/libreoffice/patches/patch-configure +++ b/editors/libreoffice/patches/patch-configure @@ -1,11 +1,11 @@ -$OpenBSD: patch-configure,v 1.8 2015/08/13 08:38:36 robert Exp $ ---- configure.orig.port Wed Jul 22 23:16:22 2015 -+++ configure Wed Aug 12 19:55:09 2015 +$OpenBSD: patch-configure,v 1.9 2015/09/29 16:10:48 robert Exp $ +--- configure.orig.port Thu Sep 17 15:43:48 2015 ++++ configure Sun Sep 27 12:18:17 2015 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.68 for LibreOffice 4.4.5.2. + # Generated by GNU Autoconf 2.68 for LibreOffice 5.0.2.2. # @@ -245,7 +245,7 @@ $0: the script under such a shell if you do have one." fi @@ -16,7 +16,7 @@ $OpenBSD: patch-configure,v 1.8 2015/08/13 08:38:36 robert Exp $ export SHELL # Unset more variables known to interfere with behavior of common tools. CLICOLOR_FORCE= GREP_OPTIONS= -@@ -9807,7 +9807,7 @@ fi +@@ -9951,7 +9951,7 @@ fi # Use -isystem (gcc) if possible, to avoid warnigs in 3rd party headers. # NOTE: must _not_ be used for bundled external libraries! ISYSTEM= @@ -25,7 +25,7 @@ $OpenBSD: patch-configure,v 1.8 2015/08/13 08:38:36 robert Exp $ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -isystem " >&5 $as_echo_n "checking for -isystem ... " >&6; } save_CFLAGS=$CFLAGS -@@ -21962,7 +21962,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : +@@ -22221,7 +22221,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else @@ -34,7 +34,7 @@ $OpenBSD: patch-configure,v 1.8 2015/08/13 08:38:36 robert Exp $ test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros -@@ -22228,7 +22228,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : +@@ -22487,7 +22487,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else @@ -43,7 +43,7 @@ $OpenBSD: patch-configure,v 1.8 2015/08/13 08:38:36 robert Exp $ test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros -@@ -22513,7 +22513,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : +@@ -22772,7 +22772,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else @@ -52,7 +52,7 @@ $OpenBSD: patch-configure,v 1.8 2015/08/13 08:38:36 robert Exp $ test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros -@@ -37057,11 +37057,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE"; +@@ -37264,11 +37264,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE"; kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries" fi if test -n "$KDEDIR"; then diff --git a/editors/libreoffice/patches/patch-desktop_Library_sofficeapp_mk b/editors/libreoffice/patches/patch-desktop_Library_sofficeapp_mk index 57b43605cb4..b1791f57f99 100644 --- a/editors/libreoffice/patches/patch-desktop_Library_sofficeapp_mk +++ b/editors/libreoffice/patches/patch-desktop_Library_sofficeapp_mk @@ -1,12 +1,16 @@ -$OpenBSD: patch-desktop_Library_sofficeapp_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- desktop/Library_sofficeapp.mk.orig.port Sat May 2 23:41:52 2015 -+++ desktop/Library_sofficeapp.mk Sat May 2 23:42:19 2015 -@@ -94,14 +94,14 @@ $(eval $(call gb_Library_add_exception_objects,soffice - desktop/source/migration/migration \ +$OpenBSD: patch-desktop_Library_sofficeapp_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- desktop/Library_sofficeapp.mk.orig.port Sun Sep 27 12:20:22 2015 ++++ desktop/Library_sofficeapp.mk Sun Sep 27 17:37:57 2015 +@@ -100,18 +100,16 @@ $(eval $(call gb_Library_add_exception_objects,soffice + ifeq ($(ENABLE_HEADLESS),TRUE) + $(eval $(call gb_Library_add_libs,sofficeapp,\ + -lm \ +- -ldl \ + -lpthread \ )) - + else -ifeq ($(OS),LINUX) -+ifneq (,$(filter LINUX OPENBSD,$(OS))) ++ifeq ($(OS),OPENBSD) $(eval $(call gb_Library_use_static_libraries,sofficeapp,\ glxtest \ )) @@ -14,7 +18,6 @@ $OpenBSD: patch-desktop_Library_sofficeapp_mk,v 1.1 2015/05/03 11:30:33 robert E $(eval $(call gb_Library_add_libs,sofficeapp,\ -lm \ - -ldl \ -+ $(if $(filter LINUX,$(OS)),-ldl) \ -lpthread \ -lGL \ - -lGLU \ + -lX11 \ diff --git a/editors/libreoffice/patches/patch-desktop_source_app_app_cxx b/editors/libreoffice/patches/patch-desktop_source_app_app_cxx index 66453070efb..0ad2093f5fc 100644 --- a/editors/libreoffice/patches/patch-desktop_source_app_app_cxx +++ b/editors/libreoffice/patches/patch-desktop_source_app_app_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-desktop_source_app_app_cxx,v 1.7 2015/05/03 11:30:33 robert Exp $ ---- desktop/source/app/app.cxx.orig.port Thu Jan 22 21:05:28 2015 -+++ desktop/source/app/app.cxx Sat Jan 31 16:03:15 2015 -@@ -119,6 +119,8 @@ +$OpenBSD: patch-desktop_source_app_app_cxx,v 1.8 2015/09/29 16:10:48 robert Exp $ +--- desktop/source/app/app.cxx.orig.port Thu Sep 17 15:33:12 2015 ++++ desktop/source/app/app.cxx Sun Sep 27 12:18:17 2015 +@@ -120,6 +120,8 @@ #include #endif @@ -10,7 +10,7 @@ $OpenBSD: patch-desktop_source_app_app_cxx,v 1.7 2015/05/03 11:30:33 robert Exp #ifdef WNT #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ -@@ -651,7 +653,7 @@ void Desktop::DeInit() +@@ -640,7 +642,7 @@ void Desktop::DeInit() // clear lockfile m_xLockfile.reset(); diff --git a/editors/libreoffice/patches/patch-external_coinmp_ExternalPackage_coinmp_mk b/editors/libreoffice/patches/patch-external_coinmp_ExternalPackage_coinmp_mk index 647ecd787b8..31246203304 100644 --- a/editors/libreoffice/patches/patch-external_coinmp_ExternalPackage_coinmp_mk +++ b/editors/libreoffice/patches/patch-external_coinmp_ExternalPackage_coinmp_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-external_coinmp_ExternalPackage_coinmp_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- external/coinmp/ExternalPackage_coinmp.mk.orig.port Thu Jan 22 21:05:28 2015 -+++ external/coinmp/ExternalPackage_coinmp.mk Sat Jan 31 16:03:15 2015 -@@ -25,14 +25,14 @@ $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIB +$OpenBSD: patch-external_coinmp_ExternalPackage_coinmp_mk,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- external/coinmp/ExternalPackage_coinmp.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ external/coinmp/ExternalPackage_coinmp.mk Sun Sep 27 12:18:17 2015 +@@ -28,14 +28,14 @@ $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIB $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinUtils.3.dylib,CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib)) $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsi.1.dylib,Osi/src/Osi/.libs/libOsi.1.11.5.dylib)) else diff --git a/editors/libreoffice/patches/patch-external_cppunit_UnpackedTarball_cppunit_mk b/editors/libreoffice/patches/patch-external_cppunit_UnpackedTarball_cppunit_mk index 454f6b7dc28..08aa21ea20f 100644 --- a/editors/libreoffice/patches/patch-external_cppunit_UnpackedTarball_cppunit_mk +++ b/editors/libreoffice/patches/patch-external_cppunit_UnpackedTarball_cppunit_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-external_cppunit_UnpackedTarball_cppunit_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- external/cppunit/UnpackedTarball_cppunit.mk.orig.port Thu Jan 22 21:05:28 2015 -+++ external/cppunit/UnpackedTarball_cppunit.mk Sat Jan 31 16:03:15 2015 -@@ -24,6 +24,10 @@ ifeq ($(DISABLE_DYNLOADING),TRUE) +$OpenBSD: patch-external_cppunit_UnpackedTarball_cppunit_mk,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- external/cppunit/UnpackedTarball_cppunit.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ external/cppunit/UnpackedTarball_cppunit.mk Sun Sep 27 12:18:17 2015 +@@ -25,6 +25,10 @@ ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ external/cppunit/disable-dynloading.patch \ )) diff --git a/editors/libreoffice/patches/patch-external_libetonyek_ExternalPackage_libetonyek_mk b/editors/libreoffice/patches/patch-external_libetonyek_ExternalPackage_libetonyek_mk new file mode 100644 index 00000000000..d50f5b8ac6f --- /dev/null +++ b/editors/libreoffice/patches/patch-external_libetonyek_ExternalPackage_libetonyek_mk @@ -0,0 +1,12 @@ +$OpenBSD: patch-external_libetonyek_ExternalPackage_libetonyek_mk,v 1.1 2015/09/29 16:10:48 robert Exp $ +--- external/libetonyek/ExternalPackage_libetonyek.mk.orig.port Tue Sep 29 08:01:07 2015 ++++ external/libetonyek/ExternalPackage_libetonyek.mk Tue Sep 29 08:01:11 2015 +@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libetonyek,$ + else ifeq ($(OS),WNT) + $(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.dll,src/lib/.libs/libetonyek-0.1.dll)) + else ifeq ($(filter IOS ANDROID,$(OS)),) +-$(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1-lo.so.1,src/lib/.libs/libetonyek-0.1-lo.so.1.0.$(ETONYEK_VERSION_MICRO))) ++$(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1-lo.so.1,src/lib/.libs/libetonyek-0.1-lo.so.1.$(ETONYEK_VERSION_MICRO))) + endif + + # vim: set noet sw=4 ts=4: diff --git a/editors/libreoffice/patches/patch-external_libetonyek_ExternalProject_libetonyek_mk b/editors/libreoffice/patches/patch-external_libetonyek_ExternalProject_libetonyek_mk index e2c5b7d0610..542011b2914 100644 --- a/editors/libreoffice/patches/patch-external_libetonyek_ExternalProject_libetonyek_mk +++ b/editors/libreoffice/patches/patch-external_libetonyek_ExternalProject_libetonyek_mk @@ -1,12 +1,12 @@ -$OpenBSD: patch-external_libetonyek_ExternalProject_libetonyek_mk,v 1.1 2015/05/26 08:44:58 robert Exp $ ---- external/libetonyek/ExternalProject_libetonyek.mk.orig.port Mon May 25 15:07:50 2015 -+++ external/libetonyek/ExternalProject_libetonyek.mk Mon May 25 15:08:05 2015 -@@ -25,7 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libeton +$OpenBSD: patch-external_libetonyek_ExternalProject_libetonyek_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- external/libetonyek/ExternalProject_libetonyek.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ external/libetonyek/ExternalProject_libetonyek.mk Sun Sep 27 12:18:17 2015 +@@ -27,7 +27,7 @@ $(eval $(call gb_ExternalProject_use_externals,libeton $(call gb_ExternalProject_get_state_target,libetonyek,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && MAKE=$(MAKE) ./configure \ + && MAKE=$(MAKE) CPPFLAGS="-fPIC -DPIC" ./configure \ --with-pic \ - --enable-static \ - --disable-shared \ + --enable-shared \ + --disable-static \ diff --git a/editors/libreoffice/patches/patch-external_libfreehand_ExternalProject_libfreehand_mk b/editors/libreoffice/patches/patch-external_libfreehand_ExternalProject_libfreehand_mk index 49d3331a3b7..ff430fc434a 100644 --- a/editors/libreoffice/patches/patch-external_libfreehand_ExternalProject_libfreehand_mk +++ b/editors/libreoffice/patches/patch-external_libfreehand_ExternalProject_libfreehand_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-external_libfreehand_ExternalProject_libfreehand_mk,v 1.1 2015/05/26 08:44:58 robert Exp $ ---- external/libfreehand/ExternalProject_libfreehand.mk.orig.port Mon May 25 15:08:39 2015 -+++ external/libfreehand/ExternalProject_libfreehand.mk Mon May 25 15:08:54 2015 -@@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libfree +$OpenBSD: patch-external_libfreehand_ExternalProject_libfreehand_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- external/libfreehand/ExternalProject_libfreehand.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ external/libfreehand/ExternalProject_libfreehand.mk Sun Sep 27 12:18:17 2015 +@@ -25,7 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libfree $(call gb_ExternalProject_get_state_target,libfreehand,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ diff --git a/editors/libreoffice/patches/patch-external_liblangtag_ExternalProject_langtag_mk b/editors/libreoffice/patches/patch-external_liblangtag_ExternalProject_langtag_mk index 3d0fed80f57..19dfce24495 100644 --- a/editors/libreoffice/patches/patch-external_liblangtag_ExternalProject_langtag_mk +++ b/editors/libreoffice/patches/patch-external_liblangtag_ExternalProject_langtag_mk @@ -1,12 +1,12 @@ -$OpenBSD: patch-external_liblangtag_ExternalProject_langtag_mk,v 1.1 2014/10/10 17:13:10 robert Exp $ ---- external/liblangtag/ExternalProject_langtag.mk.orig.port Tue Sep 16 22:10:41 2014 -+++ external/liblangtag/ExternalProject_langtag.mk Fri Oct 3 19:58:20 2014 +$OpenBSD: patch-external_liblangtag_ExternalProject_langtag_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- external/liblangtag/ExternalProject_langtag.mk.orig.port Sun Sep 27 12:20:51 2015 ++++ external/liblangtag/ExternalProject_langtag.mk Sun Sep 27 12:20:57 2015 @@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,langtag,bui LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ LIBXML2_LIBS="$(if $(filter WNTMSC,$(OS)$(COM)),-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ -- $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ -+ $(if $(filter-out LINUX OPENBSD FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ - $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ +- $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN) \ ++ $(if $(filter-out OPENBSD LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN) \ + $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN) \ $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ && $(if $(filter WNTMSC,$(OS)$(COM)),\ diff --git a/editors/libreoffice/patches/patch-external_libmwaw_ExternalPackage_libmwaw_mk b/editors/libreoffice/patches/patch-external_libmwaw_ExternalPackage_libmwaw_mk index 494246fab17..60aabf3b990 100644 --- a/editors/libreoffice/patches/patch-external_libmwaw_ExternalPackage_libmwaw_mk +++ b/editors/libreoffice/patches/patch-external_libmwaw_ExternalPackage_libmwaw_mk @@ -1,12 +1,12 @@ -$OpenBSD: patch-external_libmwaw_ExternalPackage_libmwaw_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- external/libmwaw/ExternalPackage_libmwaw.mk.orig.port Thu Mar 26 12:51:14 2015 -+++ external/libmwaw/ExternalPackage_libmwaw.mk Wed Apr 8 16:01:42 2015 +$OpenBSD: patch-external_libmwaw_ExternalPackage_libmwaw_mk,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- external/libmwaw/ExternalPackage_libmwaw.mk.orig.port Sun Sep 27 12:21:07 2015 ++++ external/libmwaw/ExternalPackage_libmwaw.mk Sun Sep 27 18:48:18 2015 @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LI else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll)) else ifeq ($(filter IOS ANDROID,$(OS)),) --$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.$(MWAW_VERSION_MICRO))) -+$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.4)) +-$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3-lo.so.3,src/lib/.libs/libmwaw-0.3-lo.so.3.0.$(MWAW_VERSION_MICRO))) ++$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3-lo.so.3,src/lib/.libs/libmwaw-0.3-lo.so.3.$(MWAW_VERSION_MICRO))) endif # vim: set noet sw=4 ts=4: diff --git a/editors/libreoffice/patches/patch-external_libodfgen_ExternalPackage_libodfgen_mk b/editors/libreoffice/patches/patch-external_libodfgen_ExternalPackage_libodfgen_mk index db9f19db089..fae1398d1bd 100644 --- a/editors/libreoffice/patches/patch-external_libodfgen_ExternalPackage_libodfgen_mk +++ b/editors/libreoffice/patches/patch-external_libodfgen_ExternalPackage_libodfgen_mk @@ -1,12 +1,12 @@ -$OpenBSD: patch-external_libodfgen_ExternalPackage_libodfgen_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- external/libodfgen/ExternalPackage_libodfgen.mk.orig.port Wed Apr 8 16:38:49 2015 -+++ external/libodfgen/ExternalPackage_libodfgen.mk Wed Apr 8 16:39:04 2015 +$OpenBSD: patch-external_libodfgen_ExternalPackage_libodfgen_mk,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- external/libodfgen/ExternalPackage_libodfgen.mk.orig.port Sun Sep 27 12:21:31 2015 ++++ external/libodfgen/ExternalPackage_libodfgen.mk Sun Sep 27 18:54:48 2015 @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libodfgen,$( else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.dll,src/.libs/libodfgen-0.1.dll)) else ifeq ($(filter IOS ANDROID,$(OS)),) --$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.3)) -+$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.3)) +-$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1-lo.so.1,src/.libs/libodfgen-0.1-lo.so.1.0.$(ODFGEN_VERSION_MICRO))) ++$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1-lo.so.1,src/.libs/libodfgen-0.1-lo.so.1.$(ODFGEN_VERSION_MICRO))) endif # vim: set noet sw=4 ts=4: diff --git a/editors/libreoffice/patches/patch-external_libodfgen_ExternalProject_libodfgen_mk b/editors/libreoffice/patches/patch-external_libodfgen_ExternalProject_libodfgen_mk new file mode 100644 index 00000000000..5a3f269529f --- /dev/null +++ b/editors/libreoffice/patches/patch-external_libodfgen_ExternalProject_libodfgen_mk @@ -0,0 +1,11 @@ +$OpenBSD: patch-external_libodfgen_ExternalProject_libodfgen_mk,v 1.1 2015/09/29 16:10:48 robert Exp $ +--- external/libodfgen/ExternalProject_libodfgen.mk.orig.port Mon Sep 28 16:56:06 2015 ++++ external/libodfgen/ExternalProject_libodfgen.mk Mon Sep 28 16:56:33 2015 +@@ -36,6 +36,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,b + --without-docs \ + $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \ ++ CPPFLAGS="-fPIC -DPIC" LDFLAGS="-fPIC -DPIC" \ + $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ diff --git a/editors/libreoffice/patches/patch-external_liborcus_ExternalProject_liborcus_mk b/editors/libreoffice/patches/patch-external_liborcus_ExternalProject_liborcus_mk index 890f8be8a27..330515a289d 100644 --- a/editors/libreoffice/patches/patch-external_liborcus_ExternalProject_liborcus_mk +++ b/editors/libreoffice/patches/patch-external_liborcus_ExternalProject_liborcus_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-external_liborcus_ExternalProject_liborcus_mk,v 1.1 2014/10/10 17:13:10 robert Exp $ ---- external/liborcus/ExternalProject_liborcus.mk.orig.port Mon Oct 6 08:28:52 2014 -+++ external/liborcus/ExternalProject_liborcus.mk Mon Oct 6 08:30:02 2014 +$OpenBSD: patch-external_liborcus_ExternalProject_liborcus_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- external/liborcus/ExternalProject_liborcus.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ external/liborcus/ExternalProject_liborcus.mk Sun Sep 27 18:59:01 2015 @@ -38,7 +38,8 @@ ifneq ($(SYSTEM_ZLIB),) liborcus_LIBS+=-lz endif @@ -11,3 +11,13 @@ $OpenBSD: patch-external_liborcus_ExternalProject_liborcus_mk,v 1.1 2014/10/10 1 else liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams endif +@@ -76,6 +77,9 @@ endif + ifneq (,$(PTHREAD_LIBS)) + liborcus_LDFLAGS+=$(PTHREAD_LIBS) + endif ++ ++liborcus_CPPFLAGS += -fPIC -DPIC ++liborcus_LDFLAGS += -fPIC -DPIC + + $(call gb_ExternalProject_get_state_target,liborcus,build) : + $(call gb_ExternalProject_run,build,\ diff --git a/editors/libreoffice/patches/patch-external_libpagemaker_UnpackedTarball_libpagemaker_mk b/editors/libreoffice/patches/patch-external_libpagemaker_UnpackedTarball_libpagemaker_mk index b03f68cdd95..ac9b1b2e52e 100644 --- a/editors/libreoffice/patches/patch-external_libpagemaker_UnpackedTarball_libpagemaker_mk +++ b/editors/libreoffice/patches/patch-external_libpagemaker_UnpackedTarball_libpagemaker_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-external_libpagemaker_UnpackedTarball_libpagemaker_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- external/libpagemaker/UnpackedTarball_libpagemaker.mk.orig.port Mon Apr 13 08:23:52 2015 -+++ external/libpagemaker/UnpackedTarball_libpagemaker.mk Mon Apr 13 08:24:06 2015 -@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libpa +$OpenBSD: patch-external_libpagemaker_UnpackedTarball_libpagemaker_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- external/libpagemaker/UnpackedTarball_libpagemaker.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ external/libpagemaker/UnpackedTarball_libpagemaker.mk Sun Sep 27 12:18:17 2015 +@@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libpa $(eval $(call gb_UnpackedTarball_set_tarball,libpagemaker,$(PAGEMAKER_TARBALL))) @@ -9,4 +9,6 @@ $OpenBSD: patch-external_libpagemaker_UnpackedTarball_libpagemaker_mk,v 1.1 2015 + external/libpagemaker/patch-ldflags \ +)) + - # vim: set noet sw=4 ts=4: + $(eval $(call gb_UnpackedTarball_set_patchlevel,libpagemaker,0)) + + ifeq ($(COM_GCC_IS_CLANG),TRUE) diff --git a/editors/libreoffice/patches/patch-external_libpagemaker_patch-ldflags b/editors/libreoffice/patches/patch-external_libpagemaker_patch-ldflags index 6d6d09f8206..21e9fa9c854 100644 --- a/editors/libreoffice/patches/patch-external_libpagemaker_patch-ldflags +++ b/editors/libreoffice/patches/patch-external_libpagemaker_patch-ldflags @@ -1,9 +1,9 @@ -$OpenBSD: patch-external_libpagemaker_patch-ldflags,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- external/libpagemaker/patch-ldflags.orig.port Mon Apr 13 08:20:15 2015 -+++ external/libpagemaker/patch-ldflags Mon Apr 13 08:27:19 2015 +$OpenBSD: patch-external_libpagemaker_patch-ldflags,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- external/libpagemaker/patch-ldflags.orig.port Sun Sep 27 12:18:17 2015 ++++ external/libpagemaker/patch-ldflags Sun Sep 27 19:06:23 2015 @@ -0,0 +1,11 @@ -+--- a/b/src/lib/Makefile.in.orig Mon Apr 13 08:19:08 2015 -++++ a/b/src/lib/Makefile.in Mon Apr 13 08:19:17 2015 ++--- src/lib/Makefile.in.orig Mon Apr 13 08:19:08 2015 +++++ src/lib/Makefile.in Mon Apr 13 08:19:17 2015 +@@ -354,7 +354,7 @@ + AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(REVENGE_STREAM_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBPAGEMAKER_BUILD + libpagemaker_@PMD_MAJOR_VERSION@_@PMD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBPMD_WIN32_RESOURCE@ diff --git a/editors/libreoffice/patches/patch-external_librevenge_ExternalPackage_librevenge_mk b/editors/libreoffice/patches/patch-external_librevenge_ExternalPackage_librevenge_mk index ac8a0259db9..6829d89886c 100644 --- a/editors/libreoffice/patches/patch-external_librevenge_ExternalPackage_librevenge_mk +++ b/editors/libreoffice/patches/patch-external_librevenge_ExternalPackage_librevenge_mk @@ -1,12 +1,12 @@ -$OpenBSD: patch-external_librevenge_ExternalPackage_librevenge_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- external/librevenge/ExternalPackage_librevenge.mk.orig.port Wed Apr 8 13:37:49 2015 -+++ external/librevenge/ExternalPackage_librevenge.mk Wed Apr 8 13:40:07 2015 +$OpenBSD: patch-external_librevenge_ExternalPackage_librevenge_mk,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- external/librevenge/ExternalPackage_librevenge.mk.orig.port Sun Sep 27 12:22:30 2015 ++++ external/librevenge/ExternalPackage_librevenge.mk Sun Sep 27 18:21:17 2015 @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,librevenge,$ else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.dll,src/lib/.libs/librevenge-0.0.dll)) else ifeq ($(filter IOS ANDROID,$(OS)),) --$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.so.0,src/lib/.libs/librevenge-0.0.so.0.0.2)) -+$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.so.0,src/lib/.libs/librevenge-0.0.so.0.2)) +-$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0-lo.so.0,src/lib/.libs/librevenge-0.0-lo.so.0.0.2)) ++$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0-lo.so.0,src/lib/.libs/librevenge-0.0-lo.so.0.2)) endif # vim: set noet sw=4 ts=4: diff --git a/editors/libreoffice/patches/patch-external_librevenge_ExternalProject_librevenge_mk b/editors/libreoffice/patches/patch-external_librevenge_ExternalProject_librevenge_mk new file mode 100644 index 00000000000..02775ea2263 --- /dev/null +++ b/editors/libreoffice/patches/patch-external_librevenge_ExternalProject_librevenge_mk @@ -0,0 +1,11 @@ +$OpenBSD: patch-external_librevenge_ExternalProject_librevenge_mk,v 1.1 2015/09/29 16:10:48 robert Exp $ +--- external/librevenge/ExternalProject_librevenge.mk.orig.port Mon Sep 28 08:11:35 2015 ++++ external/librevenge/ExternalProject_librevenge.mk Mon Sep 28 08:01:57 2015 +@@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,librevenge, + --disable-generators \ + --without-docs \ + $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ ++ CPPFLAGS="-fPIC -DPIC" LDFLAGS="-fPIC -DPIC" \ + CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ diff --git a/editors/libreoffice/patches/patch-external_libwpd_ExternalPackage_libwpd_mk b/editors/libreoffice/patches/patch-external_libwpd_ExternalPackage_libwpd_mk new file mode 100644 index 00000000000..f67dc4e6096 --- /dev/null +++ b/editors/libreoffice/patches/patch-external_libwpd_ExternalPackage_libwpd_mk @@ -0,0 +1,12 @@ +$OpenBSD: patch-external_libwpd_ExternalPackage_libwpd_mk,v 1.1 2015/09/29 16:10:48 robert Exp $ +--- external/libwpd/ExternalPackage_libwpd.mk.orig.port Sun Sep 27 19:11:39 2015 ++++ external/libwpd/ExternalPackage_libwpd.mk Sun Sep 27 19:11:44 2015 +@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIB + else ifeq ($(OS),WNT) + $(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.dll,src/lib/.libs/libwpd-0.10.dll)) + else ifeq ($(filter IOS ANDROID,$(OS)),) +-$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10-lo.so.10,src/lib/.libs/libwpd-0.10-lo.so.10.0.0)) ++$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10-lo.so.10,src/lib/.libs/libwpd-0.10-lo.so.10.0)) + endif + + # vim: set noet sw=4 ts=4: diff --git a/editors/libreoffice/patches/patch-external_libwpd_ExternalProject_libwpd_mk b/editors/libreoffice/patches/patch-external_libwpd_ExternalProject_libwpd_mk index c1ba8dd9161..143b9b98062 100644 --- a/editors/libreoffice/patches/patch-external_libwpd_ExternalProject_libwpd_mk +++ b/editors/libreoffice/patches/patch-external_libwpd_ExternalProject_libwpd_mk @@ -1,11 +1,16 @@ -$OpenBSD: patch-external_libwpd_ExternalProject_libwpd_mk,v 1.1 2015/05/26 08:44:58 robert Exp $ ---- external/libwpd/ExternalProject_libwpd.mk.orig.port Tue May 26 08:03:54 2015 -+++ external/libwpd/ExternalProject_libwpd.mk Tue May 26 10:23:52 2015 -@@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,buil - $(if $(filter MACOSX,$(OS)),--disable-werror) \ +$OpenBSD: patch-external_libwpd_ExternalProject_libwpd_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- external/libwpd/ExternalProject_libwpd.mk.orig.port Sun Sep 27 12:22:50 2015 ++++ external/libwpd/ExternalProject_libwpd.mk Mon Sep 28 17:02:04 2015 +@@ -35,10 +35,11 @@ $(call gb_ExternalProject_get_state_target,libwpd,buil + --prefix=/@.__________________________________________________OOO) \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \ -+ CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \ +- $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ ++ $(if $(filter OPENBSD LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ ++ CPPFLAGS="-fPIC -DPIC" LDFLAGS="-fPIC -DPIC" \ && $(MAKE) \ - ) + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ diff --git a/editors/libreoffice/patches/patch-external_libwpg_ExternalPackage_libwpg_mk b/editors/libreoffice/patches/patch-external_libwpg_ExternalPackage_libwpg_mk new file mode 100644 index 00000000000..144824f6a11 --- /dev/null +++ b/editors/libreoffice/patches/patch-external_libwpg_ExternalPackage_libwpg_mk @@ -0,0 +1,12 @@ +$OpenBSD: patch-external_libwpg_ExternalPackage_libwpg_mk,v 1.1 2015/09/29 16:10:48 robert Exp $ +--- external/libwpg/ExternalPackage_libwpg.mk.orig.port Sun Sep 27 19:12:28 2015 ++++ external/libwpg/ExternalPackage_libwpg.mk Sun Sep 27 19:12:31 2015 +@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIB + else ifeq ($(OS),WNT) + $(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.dll,src/lib/.libs/libwpg-0.3.dll)) + else ifeq ($(filter IOS ANDROID,$(OS)),) +-$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3-lo.so.3,src/lib/.libs/libwpg-0.3-lo.so.3.0.0)) ++$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3-lo.so.3,src/lib/.libs/libwpg-0.3-lo.so.3.0)) + endif + + # vim: set noet sw=4 ts=4: diff --git a/editors/libreoffice/patches/patch-external_libwpg_ExternalProject_libwpg_mk b/editors/libreoffice/patches/patch-external_libwpg_ExternalProject_libwpg_mk index 1da5c134ab4..41bb36d00cb 100644 --- a/editors/libreoffice/patches/patch-external_libwpg_ExternalProject_libwpg_mk +++ b/editors/libreoffice/patches/patch-external_libwpg_ExternalProject_libwpg_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-external_libwpg_ExternalProject_libwpg_mk,v 1.1 2015/05/26 08:44:58 robert Exp $ ---- external/libwpg/ExternalProject_libwpg.mk.orig.port Tue May 26 07:57:42 2015 -+++ external/libwpg/ExternalProject_libwpg.mk Tue May 26 10:31:37 2015 +$OpenBSD: patch-external_libwpg_ExternalProject_libwpg_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- external/libwpg/ExternalProject_libwpg.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ external/libwpg/ExternalProject_libwpg.mk Sun Sep 27 12:18:17 2015 @@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libwpg, $(call gb_ExternalProject_get_state_target,libwpg,build) : $(call gb_ExternalProject_run,build,\ @@ -8,5 +8,5 @@ $OpenBSD: patch-external_libwpg_ExternalProject_libwpg_mk,v 1.1 2015/05/26 08:44 - && MAKE=$(MAKE) ./configure \ + && MAKE=$(MAKE) CPPFLAGS="-fPIC" ./configure \ --with-pic \ - --enable-static \ - --disable-shared \ + $(if $(DISABLE_DYNLOADING), \ + --disable-shared --enable-static, \ diff --git a/editors/libreoffice/patches/patch-external_libwps_ExternalPackage_libwps_mk b/editors/libreoffice/patches/patch-external_libwps_ExternalPackage_libwps_mk index 1aafa1dc311..911d96059ba 100644 --- a/editors/libreoffice/patches/patch-external_libwps_ExternalPackage_libwps_mk +++ b/editors/libreoffice/patches/patch-external_libwps_ExternalPackage_libwps_mk @@ -1,12 +1,12 @@ -$OpenBSD: patch-external_libwps_ExternalPackage_libwps_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- external/libwps/ExternalPackage_libwps.mk.orig.port Mon Apr 13 11:13:34 2015 -+++ external/libwps/ExternalPackage_libwps.mk Mon Apr 13 11:13:58 2015 +$OpenBSD: patch-external_libwps_ExternalPackage_libwps_mk,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- external/libwps/ExternalPackage_libwps.mk.orig.port Sun Sep 27 12:23:21 2015 ++++ external/libwps/ExternalPackage_libwps.mk Sun Sep 27 19:16:52 2015 @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libwps,$(LIB else ifeq ($(OS),WNT) - $(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.dll,src/lib/.libs/libwps-0.3.dll)) + $(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.dll,src/lib/.libs/libwps-0.4.dll)) else ifeq ($(filter IOS ANDROID,$(OS)),) --$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.so.3,src/lib/.libs/libwps-0.3.so.3.0.1)) -+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.so.3,src/lib/.libs/libwps-0.3.so.3.1)) +-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4-lo.so.4,src/lib/.libs/libwps-0.4-lo.so.4.0.$(WPS_VERSION_MICRO))) ++$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4-lo.so.4,src/lib/.libs/libwps-0.4-lo.so.4.$(WPS_VERSION_MICRO))) endif # vim: set noet sw=4 ts=4: diff --git a/editors/libreoffice/patches/patch-include_LibreOfficeKit_LibreOfficeKitInit_h b/editors/libreoffice/patches/patch-include_LibreOfficeKit_LibreOfficeKitInit_h index 153a3947bb5..181cb318c2f 100644 --- a/editors/libreoffice/patches/patch-include_LibreOfficeKit_LibreOfficeKitInit_h +++ b/editors/libreoffice/patches/patch-include_LibreOfficeKit_LibreOfficeKitInit_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-include_LibreOfficeKit_LibreOfficeKitInit_h,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- include/LibreOfficeKit/LibreOfficeKitInit.h.orig.port Sun May 3 12:45:55 2015 -+++ include/LibreOfficeKit/LibreOfficeKitInit.h Sun May 3 12:46:05 2015 +$OpenBSD: patch-include_LibreOfficeKit_LibreOfficeKitInit_h,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- include/LibreOfficeKit/LibreOfficeKitInit.h.orig.port Sun Sep 27 12:24:37 2015 ++++ include/LibreOfficeKit/LibreOfficeKitInit.h Sun Sep 27 12:24:45 2015 @@ -17,7 +17,7 @@ extern "C" { #endif --#if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) || defined(_WIN32) -+#if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) || defined(_WIN32) || defined(__OpenBSD__) +-#if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) || defined(_WIN32) || defined(__APPLE__) ++#if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) || defined(_WIN32) || defined(__APPLE__) || defined(__OpenBSD__) #include #include diff --git a/editors/libreoffice/patches/patch-liborcus_openbsd_patch b/editors/libreoffice/patches/patch-liborcus_openbsd_patch index 04a09ef3aca..e0904880b18 100644 --- a/editors/libreoffice/patches/patch-liborcus_openbsd_patch +++ b/editors/libreoffice/patches/patch-liborcus_openbsd_patch @@ -1,6 +1,6 @@ -$OpenBSD: patch-liborcus_openbsd_patch,v 1.1 2013/11/12 07:57:23 robert Exp $ ---- liborcus/openbsd.patch.orig.port Sun Nov 3 19:11:09 2013 -+++ liborcus/openbsd.patch Sun Nov 3 19:11:12 2013 +$OpenBSD: patch-liborcus_openbsd_patch,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- liborcus/openbsd.patch.orig.port Sun Sep 27 12:18:17 2015 ++++ liborcus/openbsd.patch Sun Sep 27 12:18:17 2015 @@ -0,0 +1,19 @@ +--- ./src/Makefile.in.orig.port Sun Nov 3 19:10:23 2013 ++++ ./src/Makefile.in Sun Nov 3 19:10:46 2013 diff --git a/editors/libreoffice/patches/patch-libreofficekit_Executable_gtktiledviewer_mk b/editors/libreoffice/patches/patch-libreofficekit_Executable_gtktiledviewer_mk index 628324733c1..7bff5bf5cae 100644 --- a/editors/libreoffice/patches/patch-libreofficekit_Executable_gtktiledviewer_mk +++ b/editors/libreoffice/patches/patch-libreofficekit_Executable_gtktiledviewer_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-libreofficekit_Executable_gtktiledviewer_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- libreofficekit/Executable_gtktiledviewer.mk.orig.port Sun May 3 12:39:56 2015 -+++ libreofficekit/Executable_gtktiledviewer.mk Sun May 3 12:40:23 2015 -@@ -30,10 +30,10 @@ $(eval $(call gb_Executable_add_libs,gtktiledviewer,\ +$OpenBSD: patch-libreofficekit_Executable_gtktiledviewer_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- libreofficekit/Executable_gtktiledviewer.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ libreofficekit/Executable_gtktiledviewer.mk Sun Sep 27 12:18:17 2015 +@@ -31,10 +31,10 @@ $(eval $(call gb_Executable_add_libs,gtktiledviewer,\ -lICE \ )) diff --git a/editors/libreoffice/patches/patch-libreofficekit_Module_libreofficekit_mk b/editors/libreoffice/patches/patch-libreofficekit_Module_libreofficekit_mk index 2c7b97fff92..2978ff23087 100644 --- a/editors/libreoffice/patches/patch-libreofficekit_Module_libreofficekit_mk +++ b/editors/libreoffice/patches/patch-libreofficekit_Module_libreofficekit_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-libreofficekit_Module_libreofficekit_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- libreofficekit/Module_libreofficekit.mk.orig.port Sun May 3 12:38:20 2015 -+++ libreofficekit/Module_libreofficekit.mk Sun May 3 12:39:21 2015 +$OpenBSD: patch-libreofficekit_Module_libreofficekit_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- libreofficekit/Module_libreofficekit.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ libreofficekit/Module_libreofficekit.mk Sun Sep 27 12:18:17 2015 @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libreofficekit)) @@ -8,5 +8,5 @@ $OpenBSD: patch-libreofficekit_Module_libreofficekit_mk,v 1.1 2015/05/03 11:30:3 -ifeq ($(OS),LINUX) +ifneq (,$(filter LINUX OPENBSD,$(OS))) - # $(eval $(call gb_Module_add_check_targets,libreofficekit,\ - # CppunitTest_libreofficekit_tiledrendering \ + $(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\ + CppunitTest_libreofficekit_tiledrendering \ diff --git a/editors/libreoffice/patches/patch-libreofficekit_qa_gtktiledviewer_gtktiledviewer_cxx b/editors/libreoffice/patches/patch-libreofficekit_qa_gtktiledviewer_gtktiledviewer_cxx index 5393086a7d8..030e17a4281 100644 --- a/editors/libreoffice/patches/patch-libreofficekit_qa_gtktiledviewer_gtktiledviewer_cxx +++ b/editors/libreoffice/patches/patch-libreofficekit_qa_gtktiledviewer_gtktiledviewer_cxx @@ -1,11 +1,11 @@ -$OpenBSD: patch-libreofficekit_qa_gtktiledviewer_gtktiledviewer_cxx,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx.orig.port Sun May 3 12:44:34 2015 -+++ libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx Sun May 3 12:44:42 2015 +$OpenBSD: patch-libreofficekit_qa_gtktiledviewer_gtktiledviewer_cxx,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx.orig.port Thu Sep 17 15:33:12 2015 ++++ libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx Sun Sep 27 12:18:17 2015 @@ -9,6 +9,7 @@ #include #include +#include #include - - #include + #include + #include diff --git a/editors/libreoffice/patches/patch-sal_cppunittester_cppunittester_cxx b/editors/libreoffice/patches/patch-sal_cppunittester_cppunittester_cxx index c11768ad654..aef65bafa2a 100644 --- a/editors/libreoffice/patches/patch-sal_cppunittester_cppunittester_cxx +++ b/editors/libreoffice/patches/patch-sal_cppunittester_cppunittester_cxx @@ -1,11 +1,11 @@ -$OpenBSD: patch-sal_cppunittester_cppunittester_cxx,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- sal/cppunittester/cppunittester.cxx.orig.port Thu Jan 22 21:05:28 2015 -+++ sal/cppunittester/cppunittester.cxx Sat Jan 31 16:03:15 2015 -@@ -267,6 +267,7 @@ class CPPUNIT_API ProtectedFixtureFunctor (public) - } +$OpenBSD: patch-sal_cppunittester_cppunittester_cxx,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- sal/cppunittester/cppunittester.cxx.orig.port Sun Sep 27 12:24:51 2015 ++++ sal/cppunittester/cppunittester.cxx Sun Sep 27 12:25:05 2015 +@@ -296,6 +296,7 @@ class CPPUNIT_API ProtectedFixtureFunctor (public) - SAL_IMPLEMENT_MAIN() { + SAL_IMPLEMENT_MAIN() + { + return EXIT_SUCCESS; - #ifdef WNT - //Disable Dr-Watson in order to crash simply without popup dialogs under - //windows + bool ok = false; + try + { diff --git a/editors/libreoffice/patches/patch-sc_qa_unit_subsequent_filters-test_cxx b/editors/libreoffice/patches/patch-sc_qa_unit_subsequent_filters-test_cxx index e00a7ef5587..a31e4dc4878 100644 --- a/editors/libreoffice/patches/patch-sc_qa_unit_subsequent_filters-test_cxx +++ b/editors/libreoffice/patches/patch-sc_qa_unit_subsequent_filters-test_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-sc_qa_unit_subsequent_filters-test_cxx,v 1.5 2015/05/03 11:30:33 robert Exp $ ---- sc/qa/unit/subsequent_filters-test.cxx.orig.port Thu Jan 22 21:05:28 2015 -+++ sc/qa/unit/subsequent_filters-test.cxx Sat Jan 31 16:03:15 2015 -@@ -239,7 +239,7 @@ class ScFiltersTest (public) +$OpenBSD: patch-sc_qa_unit_subsequent_filters-test_cxx,v 1.6 2015/09/29 16:10:48 robert Exp $ +--- sc/qa/unit/subsequent_filters-test.cxx.orig.port Thu Sep 17 15:33:12 2015 ++++ sc/qa/unit/subsequent_filters-test.cxx Sun Sep 27 12:18:17 2015 +@@ -269,7 +269,7 @@ class ScFiltersTest (public) //disable testPassword on MacOSX due to problems with libsqlite3 //also crashes on DragonFly due to problems with nss/nspr headers diff --git a/editors/libreoffice/patches/patch-shell_source_unix_exec_shellexec_cxx b/editors/libreoffice/patches/patch-shell_source_unix_exec_shellexec_cxx index 3ff489802fa..69e83d45f4e 100644 --- a/editors/libreoffice/patches/patch-shell_source_unix_exec_shellexec_cxx +++ b/editors/libreoffice/patches/patch-shell_source_unix_exec_shellexec_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-shell_source_unix_exec_shellexec_cxx,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- shell/source/unix/exec/shellexec.cxx.orig.port Thu Jan 22 21:05:28 2015 -+++ shell/source/unix/exec/shellexec.cxx Sat Jan 31 16:03:15 2015 -@@ -251,7 +251,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom +$OpenBSD: patch-shell_source_unix_exec_shellexec_cxx,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- shell/source/unix/exec/shellexec.cxx.orig.port Thu Sep 17 15:33:12 2015 ++++ shell/source/unix/exec/shellexec.cxx Sun Sep 27 12:18:17 2015 +@@ -245,7 +245,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom } OString cmd = diff --git a/editors/libreoffice/patches/patch-solenv_gbuild_platform_com_GCC_defs_mk b/editors/libreoffice/patches/patch-solenv_gbuild_platform_com_GCC_defs_mk index db0ad07be26..609664eee5a 100644 --- a/editors/libreoffice/patches/patch-solenv_gbuild_platform_com_GCC_defs_mk +++ b/editors/libreoffice/patches/patch-solenv_gbuild_platform_com_GCC_defs_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-solenv_gbuild_platform_com_GCC_defs_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- solenv/gbuild/platform/com_GCC_defs.mk.orig.port Thu Jan 22 21:05:28 2015 -+++ solenv/gbuild/platform/com_GCC_defs.mk Sat Jan 31 16:03:15 2015 +$OpenBSD: patch-solenv_gbuild_platform_com_GCC_defs_mk,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- solenv/gbuild/platform/com_GCC_defs.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ solenv/gbuild/platform/com_GCC_defs.mk Sun Sep 27 12:18:17 2015 @@ -58,6 +58,7 @@ gb_CFLAGS_COMMON := \ -Wunused-macros \ -fmessage-length=0 \ @@ -9,7 +9,7 @@ $OpenBSD: patch-solenv_gbuild_platform_com_GCC_defs_mk,v 1.2 2015/05/03 11:30:33 -pipe \ gb_CXXFLAGS_COMMON := \ -@@ -69,6 +70,7 @@ gb_CXXFLAGS_COMMON := \ +@@ -70,6 +71,7 @@ gb_CXXFLAGS_COMMON := \ -Wunused-macros \ -fmessage-length=0 \ -fno-common \ diff --git a/editors/libreoffice/patches/patch-svx_Executable_gengal_mk b/editors/libreoffice/patches/patch-svx_Executable_gengal_mk index 3c5581f7fd4..4e47cae83d0 100644 --- a/editors/libreoffice/patches/patch-svx_Executable_gengal_mk +++ b/editors/libreoffice/patches/patch-svx_Executable_gengal_mk @@ -1,15 +1,14 @@ -$OpenBSD: patch-svx_Executable_gengal_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- svx/Executable_gengal.mk.orig.port Sun May 3 00:38:55 2015 -+++ svx/Executable_gengal.mk Sun May 3 00:39:21 2015 -@@ -61,9 +61,9 @@ $(eval $(call gb_Executable_use_system_win32_libs,geng +$OpenBSD: patch-svx_Executable_gengal_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- svx/Executable_gengal.mk.orig.port Sun Sep 27 12:25:12 2015 ++++ svx/Executable_gengal.mk Sun Sep 27 19:48:24 2015 +@@ -67,9 +67,8 @@ $(eval $(call gb_Executable_add_libs,gengal,\ + -lpthread \ )) - endif - + else -ifeq ($(OS),LINUX) -+ifneq (,$(filter LINUX OPENBSD,$(OS))) ++ifeq ($(OS),OPENBSD) $(eval $(call gb_Executable_add_libs,gengal,\ - -ldl \ -+ $(if $(filter LINUX,$(OS)),-ldl) \ -lpthread \ -lGL \ - -lGLU \ + -lX11 \ diff --git a/editors/libreoffice/patches/patch-svx_Library_svxcore_mk b/editors/libreoffice/patches/patch-svx_Library_svxcore_mk index 8f68c1c891e..ab3cbd4cfb5 100644 --- a/editors/libreoffice/patches/patch-svx_Library_svxcore_mk +++ b/editors/libreoffice/patches/patch-svx_Library_svxcore_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-svx_Library_svxcore_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- svx/Library_svxcore.mk.orig.port Thu Jan 22 21:05:28 2015 -+++ svx/Library_svxcore.mk Sat Jan 31 16:03:15 2015 +$OpenBSD: patch-svx_Library_svxcore_mk,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- svx/Library_svxcore.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ svx/Library_svxcore.mk Sun Sep 27 12:18:17 2015 @@ -101,7 +101,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks, endif @@ -10,7 +10,7 @@ $OpenBSD: patch-svx_Library_svxcore_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ svx/source/core/coreservices \ svx/source/core/extedit \ svx/source/core/graphichelper \ -@@ -407,9 +407,10 @@ $(eval $(call gb_Library_add_exception_objects,svxcore +@@ -410,9 +410,10 @@ $(eval $(call gb_Library_add_exception_objects,svxcore svx/source/xoutdev/xtable \ svx/source/xoutdev/XPropertyEntry \ svx/source/xoutdev/xtablend \ @@ -22,7 +22,7 @@ $OpenBSD: patch-svx_Library_svxcore_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ svx/source/fmcomp/dbaexchange \ svx/source/fmcomp/fmgridcl \ svx/source/fmcomp/fmgridif \ -@@ -460,6 +461,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore +@@ -462,6 +463,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore svx/source/form/stringlistresource \ svx/source/form/typemap \ svx/source/form/xfm_addcondition \ diff --git a/editors/libreoffice/patches/patch-sw_Executable_tiledrendering_mk b/editors/libreoffice/patches/patch-sw_Executable_tiledrendering_mk deleted file mode 100644 index c825a66e1d6..00000000000 --- a/editors/libreoffice/patches/patch-sw_Executable_tiledrendering_mk +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-sw_Executable_tiledrendering_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- sw/Executable_tiledrendering.mk.orig.port Thu Mar 26 12:51:14 2015 -+++ sw/Executable_tiledrendering.mk Sun May 3 11:52:29 2015 -@@ -42,11 +42,11 @@ $(eval $(call gb_Executable_add_exception_objects,tile - sw/qa/tiledrendering/tiledrendering \ - )) - --ifeq ($(OS),LINUX) -+ifneq (,$(filter LINUX OPENBSD,$(OS))) - - $(eval $(call gb_Executable_add_libs,tiledrendering,\ - -lm \ -- -ldl \ -+ $(if $(filter LINUX,$(OS)),-ldl) \ - -lpthread \ - -lGL \ - -lGLU \ diff --git a/editors/libreoffice/patches/patch-vcl_Executable_icontest_mk b/editors/libreoffice/patches/patch-vcl_Executable_icontest_mk index 5cd57002930..808c0f955d3 100644 --- a/editors/libreoffice/patches/patch-vcl_Executable_icontest_mk +++ b/editors/libreoffice/patches/patch-vcl_Executable_icontest_mk @@ -1,17 +1,15 @@ -$OpenBSD: patch-vcl_Executable_icontest_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- vcl/Executable_icontest.mk.orig.port Mon Apr 6 15:42:33 2015 -+++ vcl/Executable_icontest.mk Mon Apr 6 16:14:12 2015 -@@ -25,11 +25,11 @@ $(eval $(call gb_Executable_use_static_libraries,icont +$OpenBSD: patch-vcl_Executable_icontest_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- vcl/Executable_icontest.mk.orig.port Sun Sep 27 12:25:49 2015 ++++ vcl/Executable_icontest.mk Mon Sep 28 17:40:32 2015 +@@ -25,10 +25,9 @@ $(eval $(call gb_Executable_use_static_libraries,icont vclmain \ )) -ifeq ($(OS),LINUX) -+ifneq (,$(filter LINUX OPENBSD,$(OS))) - ++ifeq ($(OS),OPENBSD) $(eval $(call gb_Executable_add_libs,icontest,\ -lm \ - -ldl \ -+ $(if $(filter LINUX,$(OS)),-ldl) \ -lpthread \ -lGL \ - -lGLU \ + -lX11 \ diff --git a/editors/libreoffice/patches/patch-vcl_Executable_mtfdemo_mk b/editors/libreoffice/patches/patch-vcl_Executable_mtfdemo_mk new file mode 100644 index 00000000000..de99ac92f34 --- /dev/null +++ b/editors/libreoffice/patches/patch-vcl_Executable_mtfdemo_mk @@ -0,0 +1,15 @@ +$OpenBSD: patch-vcl_Executable_mtfdemo_mk,v 1.1 2015/09/29 16:10:48 robert Exp $ +--- vcl/Executable_mtfdemo.mk.orig.port Tue Sep 29 17:26:51 2015 ++++ vcl/Executable_mtfdemo.mk Tue Sep 29 17:26:56 2015 +@@ -40,10 +40,9 @@ $(eval $(call gb_Executable_use_static_libraries,mtfde + vclmain \ + )) + +-ifeq ($(OS),LINUX) ++ifeq ($(OS),OPENBSD) + $(eval $(call gb_Executable_add_libs,mtfdemo,\ + -lm \ +- -ldl \ + -lpthread \ + -lGL \ + -lX11 \ diff --git a/editors/libreoffice/patches/patch-vcl_Executable_tdefilepicker_mk b/editors/libreoffice/patches/patch-vcl_Executable_tdefilepicker_mk index c0a973bdd7f..062fbaf473f 100644 --- a/editors/libreoffice/patches/patch-vcl_Executable_tdefilepicker_mk +++ b/editors/libreoffice/patches/patch-vcl_Executable_tdefilepicker_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-vcl_Executable_tdefilepicker_mk,v 1.1 2013/11/12 07:57:23 robert Exp $ ---- vcl/Executable_tdefilepicker.mk.orig.port Mon Nov 11 08:35:35 2013 -+++ vcl/Executable_tdefilepicker.mk Mon Nov 11 08:35:50 2013 -@@ -31,6 +31,10 @@ $(eval $(call gb_Executable_add_libs,tdefilepicker,\ +$OpenBSD: patch-vcl_Executable_tdefilepicker_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- vcl/Executable_tdefilepicker.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ vcl/Executable_tdefilepicker.mk Sun Sep 27 12:18:17 2015 +@@ -30,6 +30,10 @@ $(eval $(call gb_Executable_add_libs,tdefilepicker,\ -ltdeio -lX11 \ )) diff --git a/editors/libreoffice/patches/patch-vcl_Executable_ui-previewer_mk b/editors/libreoffice/patches/patch-vcl_Executable_ui-previewer_mk index 2b192659a17..5a436a22c92 100644 --- a/editors/libreoffice/patches/patch-vcl_Executable_ui-previewer_mk +++ b/editors/libreoffice/patches/patch-vcl_Executable_ui-previewer_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-vcl_Executable_ui-previewer_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- vcl/Executable_ui-previewer.mk.orig.port Thu Mar 26 12:51:14 2015 -+++ vcl/Executable_ui-previewer.mk Mon Apr 6 15:44:15 2015 +$OpenBSD: patch-vcl_Executable_ui-previewer_mk,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- vcl/Executable_ui-previewer.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ vcl/Executable_ui-previewer.mk Sun Sep 27 12:18:17 2015 @@ -20,6 +20,11 @@ $(eval $(call gb_Executable_use_static_libraries,ui-pr vclmain \ )) @@ -25,4 +25,4 @@ $OpenBSD: patch-vcl_Executable_ui-previewer_mk,v 1.2 2015/05/03 11:30:33 robert + $(if $(filter LINUX,$(OS)),-ldl) \ -lpthread \ -lGL \ - -lGLU \ + -lX11 \ diff --git a/editors/libreoffice/patches/patch-vcl_Executable_vcldemo_mk b/editors/libreoffice/patches/patch-vcl_Executable_vcldemo_mk index 2c78ca9bf54..1ac66303fe4 100644 --- a/editors/libreoffice/patches/patch-vcl_Executable_vcldemo_mk +++ b/editors/libreoffice/patches/patch-vcl_Executable_vcldemo_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-vcl_Executable_vcldemo_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- vcl/Executable_vcldemo.mk.orig.port Mon Apr 6 15:44:30 2015 -+++ vcl/Executable_vcldemo.mk Mon Apr 6 15:44:47 2015 -@@ -42,10 +42,10 @@ $(eval $(call gb_Executable_use_static_libraries,vclde +$OpenBSD: patch-vcl_Executable_vcldemo_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- vcl/Executable_vcldemo.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ vcl/Executable_vcldemo.mk Sun Sep 27 12:18:17 2015 +@@ -46,10 +46,10 @@ $(eval $(call gb_Executable_use_static_libraries,vclde vclmain \ )) @@ -13,4 +13,4 @@ $OpenBSD: patch-vcl_Executable_vcldemo_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ + $(if $(filter LINUX,$(OS)),-ldl) \ -lpthread \ -lGL \ - -lGLU \ + -lX11 \ diff --git a/editors/libreoffice/patches/patch-vcl_Library_vcl_mk b/editors/libreoffice/patches/patch-vcl_Library_vcl_mk index e05a3514e18..05be615b196 100644 --- a/editors/libreoffice/patches/patch-vcl_Library_vcl_mk +++ b/editors/libreoffice/patches/patch-vcl_Library_vcl_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-vcl_Library_vcl_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ ---- vcl/Library_vcl.mk.orig.port Thu Mar 26 12:51:14 2015 -+++ vcl/Library_vcl.mk Mon Apr 6 15:44:07 2015 +$OpenBSD: patch-vcl_Library_vcl_mk,v 1.3 2015/09/29 16:10:48 robert Exp $ +--- vcl/Library_vcl.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ vcl/Library_vcl.mk Sun Sep 27 15:50:55 2015 @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_custom_headers,vcl,office $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ @@ -9,8 +9,17 @@ $OpenBSD: patch-vcl_Library_vcl_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ $(if $(filter WNTGCC,$(OS)$(COM)),-I$(MINGW_SYSROOT)/include/gdiplus) \ )) -@@ -703,10 +704,10 @@ endif - endif +@@ -58,7 +59,7 @@ $(eval $(call gb_Library_use_custom_headers,vcl,\ + )) + + $(eval $(call gb_Library_use_externals,vcl,\ +- $(if $(filter LINUX MACOSX,$(OS)), \ ++ $(if $(filter OPENBSD LINUX MACOSX,$(OS)), \ + curl) \ + jpeg \ + $(if $(filter-out WNT,$(OS)), \ +@@ -718,10 +719,10 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ + $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc)) endif -ifeq ($(OS),LINUX) @@ -21,4 +30,4 @@ $OpenBSD: patch-vcl_Library_vcl_mk,v 1.2 2015/05/03 11:30:33 robert Exp $ + $(if $(filter LINUX,$(OS)),-ldl) \ -lpthread \ -lGL \ - -lGLU \ + -lX11 \ diff --git a/editors/libreoffice/patches/patch-vcl_Library_vclplug_gen_mk b/editors/libreoffice/patches/patch-vcl_Library_vclplug_gen_mk index 47f478d8594..6b55868285a 100644 --- a/editors/libreoffice/patches/patch-vcl_Library_vclplug_gen_mk +++ b/editors/libreoffice/patches/patch-vcl_Library_vclplug_gen_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-vcl_Library_vclplug_gen_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- vcl/Library_vclplug_gen.mk.orig.port Sat May 2 17:04:07 2015 -+++ vcl/Library_vclplug_gen.mk Sat May 2 17:05:32 2015 -@@ -143,10 +143,10 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ +$OpenBSD: patch-vcl_Library_vclplug_gen_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- vcl/Library_vclplug_gen.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ vcl/Library_vclplug_gen.mk Sun Sep 27 12:18:17 2015 +@@ -142,10 +142,10 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ endif endif # USE_XINERAMA diff --git a/editors/libreoffice/patches/patch-vcl_Library_vclplug_gtk3_mk b/editors/libreoffice/patches/patch-vcl_Library_vclplug_gtk3_mk index 2f42b06bb6e..fddc08bc01c 100644 --- a/editors/libreoffice/patches/patch-vcl_Library_vclplug_gtk3_mk +++ b/editors/libreoffice/patches/patch-vcl_Library_vclplug_gtk3_mk @@ -1,8 +1,8 @@ -$OpenBSD: patch-vcl_Library_vclplug_gtk3_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- vcl/Library_vclplug_gtk3.mk.orig.port Sat May 2 17:04:07 2015 -+++ vcl/Library_vclplug_gtk3.mk Sat May 2 17:06:04 2015 -@@ -117,10 +117,10 @@ $(eval $(call gb_Library_use_static_libraries,vclplug_ - headless \ +$OpenBSD: patch-vcl_Library_vclplug_gtk3_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- vcl/Library_vclplug_gtk3.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ vcl/Library_vclplug_gtk3.mk Sun Sep 27 12:18:17 2015 +@@ -115,10 +115,10 @@ $(eval $(call gb_Library_add_exception_objects,vclplug + vcl/unx/gtk3/window/gtk3hudawareness \ )) -ifeq ($(OS),LINUX) diff --git a/editors/libreoffice/patches/patch-vcl_Library_vclplug_svp_mk b/editors/libreoffice/patches/patch-vcl_Library_vclplug_svp_mk deleted file mode 100644 index 5e249e34bf2..00000000000 --- a/editors/libreoffice/patches/patch-vcl_Library_vclplug_svp_mk +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-vcl_Library_vclplug_svp_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- vcl/Library_vclplug_svp.mk.orig.port Sat May 2 17:04:07 2015 -+++ vcl/Library_vclplug_svp.mk Sat May 2 17:06:48 2015 -@@ -64,10 +64,10 @@ $(eval $(call gb_Library_use_static_libraries,vclplug_ - headless \ - )) - --ifeq ($(OS),LINUX) -+ifneq (,$(filter LINUX OPENBSD,$(OS))) - $(eval $(call gb_Library_add_libs,vclplug_svp,\ - -lm \ -- -ldl \ -+ $(if $(filter LINUX,$(OS)),-ldl) \ - -lpthread \ - )) - endif diff --git a/editors/libreoffice/patches/patch-vcl_Library_vclplug_tde_mk b/editors/libreoffice/patches/patch-vcl_Library_vclplug_tde_mk index d547a8109d9..ce3d6ae2af5 100644 --- a/editors/libreoffice/patches/patch-vcl_Library_vclplug_tde_mk +++ b/editors/libreoffice/patches/patch-vcl_Library_vclplug_tde_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-vcl_Library_vclplug_tde_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- vcl/Library_vclplug_tde.mk.orig.port Sat May 2 17:04:07 2015 -+++ vcl/Library_vclplug_tde.mk Sat May 2 17:07:00 2015 -@@ -76,10 +76,10 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_tde,\ +$OpenBSD: patch-vcl_Library_vclplug_tde_mk,v 1.2 2015/09/29 16:10:48 robert Exp $ +--- vcl/Library_vclplug_tde.mk.orig.port Thu Sep 17 15:33:12 2015 ++++ vcl/Library_vclplug_tde.mk Sun Sep 27 12:18:17 2015 +@@ -74,10 +74,10 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_tde,\ $(eval $(call gb_Library_set_warnings_not_errors,vclplug_tde)) diff --git a/editors/libreoffice/patches/patch-vcl_Module_vcl_mk b/editors/libreoffice/patches/patch-vcl_Module_vcl_mk index c1cb1c8265b..da33bed6d1b 100644 --- a/editors/libreoffice/patches/patch-vcl_Module_vcl_mk +++ b/editors/libreoffice/patches/patch-vcl_Module_vcl_mk @@ -1,12 +1,12 @@ -$OpenBSD: patch-vcl_Module_vcl_mk,v 1.1 2015/05/03 11:30:33 robert Exp $ ---- vcl/Module_vcl.mk.orig.port Thu Mar 26 12:51:14 2015 -+++ vcl/Module_vcl.mk Sat May 2 17:07:19 2015 -@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ - $(if $(filter DESKTOP,$(BUILD_TYPE)), \ +$OpenBSD: patch-vcl_Module_vcl_mk,v 1.2 2015/09/29 16:10:49 robert Exp $ +--- vcl/Module_vcl.mk.orig.port Sun Sep 27 12:32:51 2015 ++++ vcl/Module_vcl.mk Sun Sep 27 12:32:56 2015 +@@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ StaticLibrary_vclmain \ - Executable_ui-previewer \ + $(if $(ENABLE_HEADLESS),, \ + Executable_ui-previewer) \ - $(if $(filter LINUX MACOSX WNT,$(OS)), \ + $(if $(filter OPENBSD LINUX MACOSX WNT,$(OS)), \ - Executable_icontest \ Executable_outdevgrind \ - Executable_vcldemo )) \ + $(if $(ENABLE_HEADLESS),, \ + Executable_vcldemo \ diff --git a/editors/libreoffice/patches/patch-vcl_unx_gtk_gdi_salnativewidgets-gtk_cxx b/editors/libreoffice/patches/patch-vcl_unx_gtk_gdi_salnativewidgets-gtk_cxx deleted file mode 100644 index 4757cd14d31..00000000000 --- a/editors/libreoffice/patches/patch-vcl_unx_gtk_gdi_salnativewidgets-gtk_cxx +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-vcl_unx_gtk_gdi_salnativewidgets-gtk_cxx,v 1.9 2015/07/09 17:05:14 robert Exp $ ---- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.orig.port Tue Jun 23 22:06:25 2015 -+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx Wed Jul 8 22:00:48 2015 -@@ -4209,7 +4209,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSet - aStyleSet.SetPreferredIconTheme( OUString::createFromAscii( pIconThemeName ) ); - g_free( pIconThemeName ); - -- aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); -+ aStyleSet.SetToolbarIconSize( nDispDPIY > 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL ); - - #if !GTK_CHECK_VERSION(2,9,0) - static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) = diff --git a/editors/libreoffice/pkg/PLIST-java b/editors/libreoffice/pkg/PLIST-java index efff4c0f743..0836cd8f69f 100644 --- a/editors/libreoffice/pkg/PLIST-java +++ b/editors/libreoffice/pkg/PLIST-java @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST-java,v 1.16 2015/08/18 08:15:40 kirby Exp $ +@comment $OpenBSD: PLIST-java,v 1.17 2015/09/29 16:10:49 robert Exp $ +lib/libreoffice/program/JREProperties.class lib/libreoffice/program/classes/ lib/libreoffice/program/classes/ScriptFramework.jar lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar @@ -12,7 +13,10 @@ lib/libreoffice/program/classes/flow-engine.jar lib/libreoffice/program/classes/flute-1.1.6.jar lib/libreoffice/program/classes/form.jar lib/libreoffice/program/classes/hsqldb.jar +lib/libreoffice/program/classes/java_uno.jar lib/libreoffice/program/classes/js.jar +lib/libreoffice/program/classes/juh.jar +lib/libreoffice/program/classes/jurt.jar lib/libreoffice/program/classes/libbase-1.1.6.jar lib/libreoffice/program/classes/libfonts-1.1.6.jar lib/libreoffice/program/classes/libformula-1.1.7.jar @@ -26,14 +30,24 @@ lib/libreoffice/program/classes/query.jar lib/libreoffice/program/classes/report.jar lib/libreoffice/program/classes/reportbuilder.jar lib/libreoffice/program/classes/reportbuilderwizard.jar +lib/libreoffice/program/classes/ridl.jar lib/libreoffice/program/classes/sac.jar lib/libreoffice/program/classes/sdbc_hsqldb.jar lib/libreoffice/program/classes/smoketest.jar lib/libreoffice/program/classes/table.jar lib/libreoffice/program/classes/unoil.jar +lib/libreoffice/program/classes/unoloader.jar lib/libreoffice/program/classes/xmerge.jar +@bin lib/libreoffice/program/javaldx +lib/libreoffice/program/javavendors.xml lib/libreoffice/program/libhsqldb.so +lib/libreoffice/program/libjava_uno.so +lib/libreoffice/program/libjavaloaderlo.so +lib/libreoffice/program/libjavavmlo.so lib/libreoffice/program/libjdbclo.so +lib/libreoffice/program/libjpipe.so +lib/libreoffice/program/libjuh.so +lib/libreoffice/program/libjuhx.so lib/libreoffice/program/libofficebean.so lib/libreoffice/program/services/scriptproviderforbeanshell.rdb lib/libreoffice/program/services/scriptproviderforjavascript.rdb @@ -175,18 +189,3 @@ lib/libreoffice/share/extensions/wiki-publisher/templates/MediaWiki/ lib/libreoffice/share/extensions/wiki-publisher/templates/MediaWiki/mediawiki.ott lib/libreoffice/share/registry/reportbuilder.xcd lib/libreoffice/share/template/common/wizard/report/default.otr -@bin lib/libreoffice/ure/bin/javaldx -lib/libreoffice/ure/lib/JREProperties.class -lib/libreoffice/ure/lib/libjava_uno.so -lib/libreoffice/ure/lib/libjavaloaderlo.so -lib/libreoffice/ure/lib/libjavavmlo.so -lib/libreoffice/ure/lib/libjpipe.so -lib/libreoffice/ure/lib/libjuh.so -lib/libreoffice/ure/lib/libjuhx.so -lib/libreoffice/ure/share/java/ -lib/libreoffice/ure/share/java/java_uno.jar -lib/libreoffice/ure/share/java/juh.jar -lib/libreoffice/ure/share/java/jurt.jar -lib/libreoffice/ure/share/java/ridl.jar -lib/libreoffice/ure/share/java/unoloader.jar -lib/libreoffice/ure/share/misc/javavendors.xml diff --git a/editors/libreoffice/pkg/PLIST-main b/editors/libreoffice/pkg/PLIST-main index ff608f5ea51..75364912f6e 100644 --- a/editors/libreoffice/pkg/PLIST-main +++ b/editors/libreoffice/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.37 2015/07/09 17:05:15 robert Exp $ +@comment $OpenBSD: PLIST-main,v 1.38 2015/09/29 16:10:49 robert Exp $ bin/libreoffice bin/libreoffice${BV} bin/lobase @@ -72,8 +72,6 @@ lib/libreoffice/presets/database/evolocal.odb lib/libreoffice/presets/gallery/ lib/libreoffice/presets/gallery/sg30.sdv lib/libreoffice/presets/gallery/sg30.thm -lib/libreoffice/presets/psprint/ -lib/libreoffice/presets/uno_packages/ lib/libreoffice/program/ lib/libreoffice/program/bootstraprc lib/libreoffice/program/flat_logo.svg @@ -83,11 +81,13 @@ lib/libreoffice/program/gengal @bin lib/libreoffice/program/gengal.bin lib/libreoffice/program/gnome-open-url lib/libreoffice/program/intro.png +lib/libreoffice/program/jvmfwk3rc lib/libreoffice/program/libOGLTranslo.so lib/libreoffice/program/libPresentationMinimizerlo.so lib/libreoffice/program/libPresenterScreenlo.so lib/libreoffice/program/libabplo.so lib/libreoffice/program/libacclo.so +lib/libreoffice/program/libaffine_uno_uno.so lib/libreoffice/program/libanalysislo.so lib/libreoffice/program/libanimcorelo.so lib/libreoffice/program/libavmedialo.so @@ -97,6 +97,8 @@ lib/libreoffice/program/libbasebmplo.so lib/libreoffice/program/libbasegfxlo.so lib/libreoffice/program/libbasprovlo.so lib/libreoffice/program/libbiblo.so +lib/libreoffice/program/libbinaryurplo.so +lib/libreoffice/program/libbootstraplo.so lib/libreoffice/program/libcached1.so lib/libreoffice/program/libcairocanvaslo.so lib/libreoffice/program/libcalclo.so @@ -143,6 +145,7 @@ lib/libreoffice/program/libepslo.so lib/libreoffice/program/libeptlo.so lib/libreoffice/program/liberalo.so lib/libreoffice/program/libetilo.so +@bin lib/libreoffice/program/libetonyek-0.1-lo.so.1 lib/libreoffice/program/libevtattlo.so lib/libreoffice/program/libexplo.so lib/libreoffice/program/libexpwraplo.so @@ -160,6 +163,7 @@ lib/libreoffice/program/libfwilo.so lib/libreoffice/program/libfwklo.so lib/libreoffice/program/libfwllo.so lib/libreoffice/program/libfwmlo.so +lib/libreoffice/program/libgcc3_uno.so lib/libreoffice/program/libgraphicfilterlo.so lib/libreoffice/program/libguesslanglo.so lib/libreoffice/program/libhelplinkerlo.so @@ -174,6 +178,10 @@ lib/libreoffice/program/libicglo.so lib/libreoffice/program/libidxlo.so lib/libreoffice/program/libimelo.so lib/libreoffice/program/libindex_data.so +lib/libreoffice/program/libintrospectionlo.so +lib/libreoffice/program/libinvocadaptlo.so +lib/libreoffice/program/libinvocationlo.so +lib/libreoffice/program/libiolo.so lib/libreoffice/program/libipblo.so lib/libreoffice/program/libipdlo.so lib/libreoffice/program/libipslo.so @@ -182,6 +190,8 @@ lib/libreoffice/program/libipxlo.so lib/libreoffice/program/libiralo.so lib/libreoffice/program/libitglo.so lib/libreoffice/program/libitilo.so +lib/libreoffice/program/libjvmaccesslo.so +lib/libreoffice/program/libjvmfwklo.so lib/libreoffice/program/libldapbe2lo.so lib/libreoffice/program/liblibreofficekitgtk.so lib/libreoffice/program/liblnglo.so @@ -191,6 +201,7 @@ lib/libreoffice/program/liblocaledata_en.so lib/libreoffice/program/liblocaledata_es.so lib/libreoffice/program/liblocaledata_euro.so lib/libreoffice/program/liblocaledata_others.so +lib/libreoffice/program/liblog_uno_uno.so lib/libreoffice/program/libloglo.so lib/libreoffice/program/liblosessioninstalllo.so lib/libreoffice/program/liblpsolve55.so @@ -204,11 +215,12 @@ lib/libreoffice/program/libmsfilterlo.so lib/libreoffice/program/libmsformslo.so lib/libreoffice/program/libmswordlo.so lib/libreoffice/program/libmtfrendererlo.so -@bin lib/libreoffice/program/libmwaw-0.3.so.3 +@bin lib/libreoffice/program/libmwaw-0.3-lo.so.3 lib/libreoffice/program/libmysqllo.so +lib/libreoffice/program/libnamingservicelo.so lib/libreoffice/program/libodbclo.so lib/libreoffice/program/libodfflatxmllo.so -@bin lib/libreoffice/program/libodfgen-0.1.so.1 +@bin lib/libreoffice/program/libodfgen-0.1-lo.so.1 lib/libreoffice/program/liboffacclo.so lib/libreoffice/program/liboglcanvaslo.so lib/libreoffice/program/libooxlo.so @@ -224,15 +236,19 @@ lib/libreoffice/program/libpostgresql-sdbc-impllo.so lib/libreoffice/program/libpostgresql-sdbclo.so lib/libreoffice/program/libpricinglo.so lib/libreoffice/program/libprotocolhandlerlo.so +lib/libreoffice/program/libproxyfaclo.so lib/libreoffice/program/libpythonloaderlo.so lib/libreoffice/program/libpyuno.so lib/libreoffice/program/libqstart_gtklo.so lib/libreoffice/program/librecentfile.so +lib/libreoffice/program/libreflectionlo.so +lib/libreoffice/program/libreglo.so lib/libreoffice/program/libreslo.so -@bin lib/libreoffice/program/librevenge-0.0.so.0 +@bin lib/libreoffice/program/librevenge-0.0-lo.so.0 lib/libreoffice/program/librptlo.so lib/libreoffice/program/librptuilo.so lib/libreoffice/program/librptxmllo.so +lib/libreoffice/program/libsal_textenclo.so lib/libreoffice/program/libsaxlo.so lib/libreoffice/program/libsblo.so lib/libreoffice/program/libscdlo.so @@ -258,7 +274,9 @@ lib/libreoffice/program/libsotlo.so lib/libreoffice/program/libspelllo.so lib/libreoffice/program/libspllo.so lib/libreoffice/program/libsrtrs1.so +lib/libreoffice/program/libstocserviceslo.so lib/libreoffice/program/libstoragefdlo.so +lib/libreoffice/program/libstorelo.so lib/libreoffice/program/libstringresourcelo.so lib/libreoffice/program/libsvgfilterlo.so lib/libreoffice/program/libsvgiolo.so @@ -289,12 +307,20 @@ lib/libreoffice/program/libucpgio1lo.so lib/libreoffice/program/libucphier1.so lib/libreoffice/program/libucppkg1.so lib/libreoffice/program/libucptdoc1lo.so +@bin lib/libreoffice/program/libuno_cppu.so.3 +@bin lib/libreoffice/program/libuno_cppuhelpergcc3.so.3 +@bin lib/libreoffice/program/libuno_purpenvhelpergcc3.so.3 +@bin lib/libreoffice/program/libuno_sal.so.3 +@bin lib/libreoffice/program/libuno_salhelpergcc3.so.3 +lib/libreoffice/program/libunoidllo.so lib/libreoffice/program/libunopkgapp.so lib/libreoffice/program/libunordflo.so lib/libreoffice/program/libunoxmllo.so +lib/libreoffice/program/libunsafe_uno_uno.so lib/libreoffice/program/libupdatefeedlo.so lib/libreoffice/program/libutllo.so lib/libreoffice/program/libuuilo.so +lib/libreoffice/program/libuuresolverlo.so lib/libreoffice/program/libvbaeventslo.so lib/libreoffice/program/libvbahelperlo.so lib/libreoffice/program/libvbaobjlo.so @@ -303,16 +329,18 @@ lib/libreoffice/program/libvclcanvaslo.so lib/libreoffice/program/libvcllo.so lib/libreoffice/program/libvclplug_genlo.so lib/libreoffice/program/libvclplug_gtklo.so -lib/libreoffice/program/libvclplug_svplo.so +@bin lib/libreoffice/program/libwpd-0.10-lo.so.10 lib/libreoffice/program/libwpftcalclo.so lib/libreoffice/program/libwpftdrawlo.so lib/libreoffice/program/libwpftimpresslo.so lib/libreoffice/program/libwpftwriterlo.so -@bin lib/libreoffice/program/libwps-0.3.so.3 +@bin lib/libreoffice/program/libwpg-0.3-lo.so.3 +@bin lib/libreoffice/program/libwps-0.4-lo.so.4 lib/libreoffice/program/libwriterfilterlo.so lib/libreoffice/program/libwriterperfectlo.so lib/libreoffice/program/libxmlfalo.so lib/libreoffice/program/libxmlfdlo.so +lib/libreoffice/program/libxmlreaderlo.so lib/libreoffice/program/libxmlscriptlo.so lib/libreoffice/program/libxmlsecurity.so lib/libreoffice/program/libxoflo.so @@ -329,6 +357,7 @@ lib/libreoffice/program/officehelper.py @bin lib/libreoffice/program/oosplash lib/libreoffice/program/open-url lib/libreoffice/program/opengl/ +lib/libreoffice/program/opengl/areaHashCRC64TFragmentShader.glsl lib/libreoffice/program/opengl/areaScaleFastFragmentShader.glsl lib/libreoffice/program/opengl/areaScaleFragmentShader.glsl lib/libreoffice/program/opengl/backgroundFragmentShader.glsl @@ -350,6 +379,7 @@ lib/libreoffice/program/opengl/linearMultiColorGradientFragmentShader.glsl lib/libreoffice/program/opengl/linearTwoColorGradientFragmentShader.glsl lib/libreoffice/program/opengl/maskFragmentShader.glsl lib/libreoffice/program/opengl/maskedTextureFragmentShader.glsl +lib/libreoffice/program/opengl/maskedTextureVertexShader.glsl lib/libreoffice/program/opengl/pickingFragmentShader.glsl lib/libreoffice/program/opengl/pickingVertexShader.glsl lib/libreoffice/program/opengl/radialGradientFragmentShader.glsl @@ -393,6 +423,8 @@ lib/libreoffice/program/pythonloader.unorc lib/libreoffice/program/pythonscript.py lib/libreoffice/program/pyuno.so lib/libreoffice/program/redirectrc +@bin lib/libreoffice/program/regmerge +@bin lib/libreoffice/program/regview lib/libreoffice/program/resource/ lib/libreoffice/program/resource/abpen-US.res lib/libreoffice/program/resource/accen-US.res @@ -455,6 +487,7 @@ lib/libreoffice/program/scalc lib/libreoffice/program/sdraw lib/libreoffice/program/senddoc lib/libreoffice/program/services/ +lib/libreoffice/program/services.rdb lib/libreoffice/program/services/postgresql-sdbc.rdb lib/libreoffice/program/services/pyuno.rdb lib/libreoffice/program/services/scriptproviderforpython.rdb @@ -469,14 +502,18 @@ lib/libreoffice/program/soffice lib/libreoffice/program/sofficerc lib/libreoffice/program/swriter lib/libreoffice/program/types/ +lib/libreoffice/program/types.rdb lib/libreoffice/program/types/offapi.rdb lib/libreoffice/program/types/oovbaapi.rdb @bin lib/libreoffice/program/ui-previewer +lib/libreoffice/program/uno +@bin lib/libreoffice/program/uno.bin lib/libreoffice/program/uno.py lib/libreoffice/program/unohelper.py lib/libreoffice/program/unoinfo lib/libreoffice/program/unopkg @bin lib/libreoffice/program/unopkg.bin +lib/libreoffice/program/unorc @bin lib/libreoffice/program/uri-encode lib/libreoffice/program/versionrc lib/libreoffice/program/wizards/ @@ -706,6 +743,8 @@ lib/libreoffice/share/basic/ lib/libreoffice/share/basic/Access2Base/ lib/libreoffice/share/basic/Access2Base/Application.xba lib/libreoffice/share/basic/Access2Base/Collect.xba +lib/libreoffice/share/basic/Access2Base/CommandBar.xba +lib/libreoffice/share/basic/Access2Base/CommandBarControl.xba lib/libreoffice/share/basic/Access2Base/Compatible.xba lib/libreoffice/share/basic/Access2Base/Control.xba lib/libreoffice/share/basic/Access2Base/DataDef.xba @@ -727,6 +766,7 @@ lib/libreoffice/share/basic/Access2Base/SubForm.xba lib/libreoffice/share/basic/Access2Base/TempVar.xba lib/libreoffice/share/basic/Access2Base/Test.xba lib/libreoffice/share/basic/Access2Base/Trace.xba +lib/libreoffice/share/basic/Access2Base/UtilProperty.xba lib/libreoffice/share/basic/Access2Base/Utils.xba lib/libreoffice/share/basic/Access2Base/_License.xba lib/libreoffice/share/basic/Access2Base/acConstants.xba @@ -835,7 +875,7 @@ lib/libreoffice/share/basic/Tutorials/script.xlb lib/libreoffice/share/basic/dialog.xlc lib/libreoffice/share/basic/script.xlc lib/libreoffice/share/config/ -lib/libreoffice/share/config/images_crystal.zip +lib/libreoffice/share/config/images_breeze.zip lib/libreoffice/share/config/images_galaxy.zip lib/libreoffice/share/config/images_hicontrast.zip lib/libreoffice/share/config/images_oxygen.zip @@ -1031,6 +1071,7 @@ lib/libreoffice/share/config/soffice.cfg/cui/ui/textdialog.ui lib/libreoffice/share/config/soffice.cfg/cui/ui/textflowpage.ui lib/libreoffice/share/config/soffice.cfg/cui/ui/thesaurus.ui lib/libreoffice/share/config/soffice.cfg/cui/ui/transparencytabpage.ui +lib/libreoffice/share/config/soffice.cfg/cui/ui/tsaurldialog.ui lib/libreoffice/share/config/soffice.cfg/cui/ui/twolinespage.ui lib/libreoffice/share/config/soffice.cfg/cui/ui/wordcompletionpage.ui lib/libreoffice/share/config/soffice.cfg/cui/ui/zoomdialog.ui @@ -1676,6 +1717,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/customanimationtimi lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/customslideshows.ui lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/definecustomslideshow.ui lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/dlgfield.ui +lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/dockinganimation.ui lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/headerfooterdialog.ui lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/headerfootertab.ui lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/insertslides.ui @@ -1707,7 +1749,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/smath/toolbar/toolbar.xml lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/ lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/alignmentdialog.ui lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/catalogdialog.ui -lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/floatingelements.ui +lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/dockingelements.ui lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/fontdialog.ui lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/fontsizedialog.ui lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/fonttypedialog.ui @@ -1985,6 +2027,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/linenumbering.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/mailconfigpage.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/mailmerge.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/mailmergedialog.ui +lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/managechangessidebar.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/mergeconnectdialog.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/mergetabledialog.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/mmaddressblockpage.ui @@ -2043,6 +2086,8 @@ lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/selectblockdialog.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/selectindexdialog.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/selecttabledialog.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/sidebarpage.ui +lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/sidebarstylepresets.ui +lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/sidebartheme.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/sidebarwrap.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/sortdialog.ui lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/splittable.ui @@ -2191,6 +2236,9 @@ lib/libreoffice/share/config/soffice.cfg/svx/ui/compressgraphicdialog.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/datanavigator.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/deletefooterdialog.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/deleteheaderdialog.ui +lib/libreoffice/share/config/soffice.cfg/svx/ui/docking3deffects.ui +lib/libreoffice/share/config/soffice.cfg/svx/ui/dockingcolorreplace.ui +lib/libreoffice/share/config/soffice.cfg/svx/ui/dockingfontwork.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/docrecoverybrokendialog.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/docrecoveryprogressdialog.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/docrecoveryrecoverdialog.ui @@ -2228,6 +2276,7 @@ lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebarinsert.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebarline.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebarparagraph.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebarpossize.ui +lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebarstylespanel.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebartextpanel.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/textcontrolchardialog.ui lib/libreoffice/share/config/soffice.cfg/svx/ui/textcontrolparadialog.ui @@ -2257,6 +2306,9 @@ lib/libreoffice/share/config/soffice.cfg/vcl/ui/printerpropertiesdialog.ui lib/libreoffice/share/config/soffice.cfg/vcl/ui/printprogressdialog.ui lib/libreoffice/share/config/soffice.cfg/vcl/ui/querydialog.ui lib/libreoffice/share/config/soffice.cfg/vcl/ui/res/ +lib/libreoffice/share/config/soffice.cfg/writerperfect/ +lib/libreoffice/share/config/soffice.cfg/writerperfect/ui/ +lib/libreoffice/share/config/soffice.cfg/writerperfect/ui/wpftencodingdialog.ui lib/libreoffice/share/config/soffice.cfg/xmlsec/ lib/libreoffice/share/config/soffice.cfg/xmlsec/ui/ lib/libreoffice/share/config/soffice.cfg/xmlsec/ui/certdetails.ui @@ -3693,6 +3745,9 @@ lib/libreoffice/share/template/common/presnt/Alizarin.otp lib/libreoffice/share/template/common/presnt/Focus.otp lib/libreoffice/share/template/common/presnt/Impress.otp lib/libreoffice/share/template/common/presnt/Midnightblue.otp +lib/libreoffice/share/template/common/styles/ +lib/libreoffice/share/template/common/styles/Default.ott +lib/libreoffice/share/template/common/styles/Modern.ott lib/libreoffice/share/template/common/wizard/ lib/libreoffice/share/template/common/wizard/agenda/ lib/libreoffice/share/template/common/wizard/agenda/10grey.ott @@ -3904,48 +3959,6 @@ lib/libreoffice/share/xslt/import/wordml/wordml2ooo_props.xsl lib/libreoffice/share/xslt/import/wordml/wordml2ooo_settings.xsl lib/libreoffice/share/xslt/import/wordml/wordml2ooo_table.xsl lib/libreoffice/share/xslt/import/wordml/wordml2ooo_text.xsl -lib/libreoffice/ure/ -lib/libreoffice/ure-link -lib/libreoffice/ure/bin/ -@bin lib/libreoffice/ure/bin/regmerge -@bin lib/libreoffice/ure/bin/regview -lib/libreoffice/ure/bin/startup.sh -lib/libreoffice/ure/bin/uno -@bin lib/libreoffice/ure/bin/uno.bin -lib/libreoffice/ure/lib/ -lib/libreoffice/ure/lib/jvmfwk3rc -lib/libreoffice/ure/lib/libaffine_uno_uno.so -lib/libreoffice/ure/lib/libbinaryurplo.so -lib/libreoffice/ure/lib/libbootstraplo.so -lib/libreoffice/ure/lib/libgcc3_uno.so -lib/libreoffice/ure/lib/libintrospectionlo.so -lib/libreoffice/ure/lib/libinvocadaptlo.so -lib/libreoffice/ure/lib/libinvocationlo.so -lib/libreoffice/ure/lib/libiolo.so -lib/libreoffice/ure/lib/libjvmaccesslo.so -lib/libreoffice/ure/lib/libjvmfwklo.so -lib/libreoffice/ure/lib/liblog_uno_uno.so -lib/libreoffice/ure/lib/libnamingservicelo.so -lib/libreoffice/ure/lib/libproxyfaclo.so -lib/libreoffice/ure/lib/libreflectionlo.so -lib/libreoffice/ure/lib/libreglo.so -lib/libreoffice/ure/lib/libsal_textenclo.so -lib/libreoffice/ure/lib/libstocserviceslo.so -lib/libreoffice/ure/lib/libstorelo.so -@bin lib/libreoffice/ure/lib/libuno_cppu.so.3 -@bin lib/libreoffice/ure/lib/libuno_cppuhelpergcc3.so.3 -@bin lib/libreoffice/ure/lib/libuno_purpenvhelpergcc3.so.3 -@bin lib/libreoffice/ure/lib/libuno_sal.so.3 -@bin lib/libreoffice/ure/lib/libuno_salhelpergcc3.so.3 -lib/libreoffice/ure/lib/libunoidllo.so -lib/libreoffice/ure/lib/libunsafe_uno_uno.so -lib/libreoffice/ure/lib/libuuresolverlo.so -lib/libreoffice/ure/lib/libxmlreaderlo.so -lib/libreoffice/ure/lib/unorc -lib/libreoffice/ure/share/ -lib/libreoffice/ure/share/misc/ -lib/libreoffice/ure/share/misc/services.rdb -lib/libreoffice/ure/share/misc/types.rdb share/applications/calc.desktop share/applications/draw.desktop share/applications/impress.desktop