From nobody Thu Mar 31 17:54:11 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 051C21A59AB6; Thu, 31 Mar 2022 17:54:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KTrXN2ZyYz3Bt1; Thu, 31 Mar 2022 17:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648749252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LKGGZu88d7czfe7xpgvJ56cWzwO+Q21LJpFT9n57TT4=; b=HW6UkZtxY8Vplm2tSkJWM5+uDoI730QN8fNRPXi4X+pAW34XiXjOaDSXrod354b6NfIgu2 kYKS1YcpMv4TlAC3WzYjvKT3XFGsCu+ceDXWvYzWluK+GQ9mT/Td13avZtu9peGSq5Rjfr YBs0SnLINuU+P0UNNs7uU2xZG+lRHHGSDB61iZZKrJTJsXuGx6VLX4jcM7aVdUBoWzAs4t x1Fg2C3qZZcNjITuwl6157TuUfXiv+UAF/up0WwQY1BebOVHR4ORoEk2dEx62jS+wLYIf3 74iCPiu11NM2givyNkFAu7YrJkt2tuxKC7bgiS8fp8GPjN5yJdazSR2PdHTcjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 162772C331; Thu, 31 Mar 2022 17:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22VHsCY3043404; Thu, 31 Mar 2022 17:54:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22VHsBsj043403; Thu, 31 Mar 2022 17:54:11 GMT (envelope-from git) Date: Thu, 31 Mar 2022 17:54:11 GMT Message-Id: <202203311754.22VHsBsj043403@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: d3d8f2d69280 - main - editors/libreoffice6: remove expired port (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3d8f2d6928084db7145d08be51eb9f482574ed7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648749252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LKGGZu88d7czfe7xpgvJ56cWzwO+Q21LJpFT9n57TT4=; b=hSkgldd33ZprMCi1vuQ+NopVYM7rcFIj/DYrfVO/VnmgMNoxXE7KKCe4RhpOEb17PE4fSE X3yaM6K2QwG6DGckJg34OQGGD/gRsNPGUmHPrfSexmfzxar9FJCV7UMRDMdWDgRPgH3jQU aoyl4d6u8p+T9Bq4Z8VDL8eIqz67n+Y6OuRF5QG/4HajGxu2VvUR+lnc20S88+fLPV38eW nZHpn4+pnvs+29VArtduU8AxMCt8DgewrWcPL+cFLrTE97G/uzL1P4d61yYefYYlTiDkhp lw4go/9qMIfd+ujnNejR6O+p6LRWlHt7oi3BJ+zCj4lAo84JhWwLVm/d5YV6mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648749252; a=rsa-sha256; cv=none; b=c1lJoT0ynHudLWM4iTS2FgLY27x9YrSiUExJQ1uhUiCLu7x55Evky/7daLGQco5GXTMMic 1qR1QFm8280BprNv65syq/tcGgr6sFraXFRVC650SO1dC8r/Y3NAexhjN4JX7kTFykNd/z eXUMJwHwkAcQATbfUCA6ag2FWhKrK256ZBoESQE2c1aR81srciv4wZhfwSoEtJv5EfBFIc mktMnskfe0Zoj85jJTp8LlFIZkCrjvlao62sfUjBAqw6wadJGZtD0VXSDz9V74+lZd+Ni6 dTiAPQvD2pTx6txIQNC6kSCD3XG0Maol7ExDTn4JrcolqIGcB8KMc9IqWb35DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3d8f2d6928084db7145d08be51eb9f482574ed7 commit d3d8f2d6928084db7145d08be51eb9f482574ed7 Author: Dima Panov AuthorDate: 2022-03-31 17:52:38 +0000 Commit: Dima Panov CommitDate: 2022-03-31 17:54:03 +0000 editors/libreoffice6: remove expired port (+) LibreOffice 6.x suite is not supported upstream anymore. Please consider using editors/libreoffice instead. --- MOVED | 1 + editors/Makefile | 1 - editors/libreoffice6/Makefile | 328 --------------------- editors/libreoffice6/Makefile.common | 11 - editors/libreoffice6/Makefile.i18n | 47 --- editors/libreoffice6/distinfo | 51 ---- editors/libreoffice6/files/patch-Makefile.in | 20 -- .../files/patch-aarch64-gcc3_linux_aarch64 | 274 ----------------- .../patch-bin_distro-install-desktop-integration | 68 ----- ...ource_cpp__uno_gcc3__linux__aarch64_cpp2uno.cxx | 22 -- ...s_source_cpp__uno_gcc3__linux__intel_except.cxx | 14 - editors/libreoffice6/files/patch-configure | 20 -- editors/libreoffice6/files/patch-configure.aarch64 | 14 - editors/libreoffice6/files/patch-cxa_exception | 98 ------ .../files/patch-desktop_unx_source_pagein.c | 12 - editors/libreoffice6/files/patch-icu68 | 31 -- ...tch-include_LibreOfficeKit_LibreOfficeKitInit.h | 11 - ...egistry_schema_org_openoffice_Office_Common.xcs | 11 - editors/libreoffice6/files/patch-powerpc | 226 -------------- .../files/patch-sal_osl_unx_system.hxx | 13 - .../files/patch-sal_osl_unx_thread.cxx | 28 -- .../files/patch-sal_osl_unx_uunxapi.cxx | 25 -- .../patch-shell_source_unix_exec_shellexec.cxx | 11 - .../files/patch-solenv_gbuild_UnpackedTarball.mk | 10 - ...solenv_gbuild_platform_FREEBSD__AARCH64__GCC.mk | 17 -- .../files/patch-solenv_gbuild_platform_unxgcc.mk | 12 - .../files/patch-svtools_source_svrtf_parrtf.cxx | 10 - .../files/patch-sysui_desktop_share_create_tree.sh | 20 -- .../patch-ucb_source_ucp_webdav_DateTimeHelper.cxx | 11 - .../patch-vcl_Executable__visualbackendtest.mk | 17 -- .../libreoffice6/files/patch-vcl_qt5_Qt5Frame.cxx | 11 - .../files/patch-vcl_qt5_Qt5Instance.cxx | 35 --- .../files/patch-vcl_source_app_salplug.cxx | 19 -- .../files/patch-vcl_source_app_svapp.cxx | 11 - .../files/patch-vcl_unx_generic_app_geninst.cxx | 54 ---- ...es-source-cpp_uno-gcc3_linux_powerpc-except.cxx | 112 ------- ...ges-source-cpp_uno-gcc3_linux_powerpc-share.hxx | 106 ------- ...source-cpp_uno-gcc3_linux_powerpc64-cpp2uno.cxx | 79 ----- ...-source-cpp_uno-gcc3_linux_powerpc64-except.cxx | 112 ------- ...s-source-cpp_uno-gcc3_linux_powerpc64-share.hxx | 106 ------- .../patch-cppuhelper_source_exc__thrower.cxx | 10 - ...atch-desktop_source_deployment_misc_dp__ucb.cxx | 20 -- .../patch-include_com_sun_star_uno_Reference.h | 11 - .../patch-include_com_sun_star_uno_Reference.hxx | 20 -- .../files/powerpc64/patch-include_uno_mapping.hxx | 10 - .../powerpc64/patch-ucb_source_ucp_file_bc.cxx | 10 - editors/libreoffice6/pkg-descr | 6 - editors/libreoffice6/pkg-descr.i18n | 3 - 48 files changed, 1 insertion(+), 2168 deletions(-) diff --git a/MOVED b/MOVED index 1a9381c35b4f..8e33c7871dbe 100644 --- a/MOVED +++ b/MOVED @@ -16973,3 +16973,4 @@ math/py-symcxx||2022-03-28|Deprecated because the upstream repository was experi net-p2p/bazarr-devel|net-p2p/bazarr|2022-03-29|Use net-p2p/bazarr instead dns/py-dnspython2|dns/py-dnspython|2022-03-30|Has expired: Use dns/py-dnspython net/inlets||2022-03-30|FOSS version removed, project went commercial +editors/libreoffice6|editors/libreoffice|2022-03-31|Unsupported upstream. Please use editors/libreoffice instead diff --git a/editors/Makefile b/editors/Makefile index 9809b87bf2b9..7d55ae920ab6 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -188,7 +188,6 @@ SUBDIR += libreoffice-vec SUBDIR += libreoffice-xh SUBDIR += libreoffice-zu - SUBDIR += libreoffice6 SUBDIR += linux-bcompare SUBDIR += linux-sublime SUBDIR += linux-sublime-text4 diff --git a/editors/libreoffice6/Makefile b/editors/libreoffice6/Makefile deleted file mode 100644 index d5af8454597e..000000000000 --- a/editors/libreoffice6/Makefile +++ /dev/null @@ -1,328 +0,0 @@ - -PORTREVISION= 22 - -.include "${.CURDIR}/Makefile.common" - -MASTER_SITES= https://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ - https://dev-www.libreoffice.org/src/:src \ - https://dev-www.libreoffice.org/extern/:ext -DISTFILES= ${PORTNAME}-${LOVERSION}${EXTRACT_SUFX} \ - ${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX} -DIST_SUBDIR= libreoffice -EXTRACT_ONLY:= ${DISTFILES} -PKGNAMESUFFIX= 6 - -COMMENT= Full integrated office productivity suite - -DEPRECATED= Unsupported upstream. Please consider using editors/libreoffice instead -EXPIRATION_DATE=2022-03-31 - -BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ - zip:archivers/zip \ - ${LOCALBASE}/include/sqlext.h:databases/unixODBC \ - cppunit-config:devel/cppunit \ - dmake:devel/dmake \ - gperf>=3.1:devel/gperf \ - ucpp:devel/ucpp \ - ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ - vigra-config:graphics/vigra \ - ${LOCALBASE}/include/glm/glm.hpp:math/glm \ - bash:shells/bash \ - gsed:textproc/gsed \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ - flex>=0.26:textproc/flex -LIB_DEPENDS= libapr-1.so:devel/apr1 \ - libboost_date_time.so:devel/boost-libs \ - libicutu.so:devel/icu \ - liblangtag.so:devel/liblangtag \ - libltdl.so:devel/libltdl \ - libplds4.so:devel/nspr \ - libcurl.so:ftp/curl \ - libgraphite2.so:graphics/graphite2 \ - liblcms2.so:graphics/lcms2 \ - libcdr-0.1.so:graphics/libcdr01 \ - libepoxy.so:graphics/libepoxy \ - libfreehand-0.1.so:graphics/libfreehand \ - libwpg-0.3.so:graphics/libwpg03 \ - libzmf-0.0.so:graphics/libzmf \ - libpng.so:graphics/png \ - libpoppler.so:graphics/poppler \ - libqrcodegencpp.so:graphics/qr-code-generator \ - liblpsolve55.so:math/lp_solve \ - libcmis-0.5.so:net/libcmis \ - libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz \ - libharfbuzz-icu.so:print/harfbuzz-icu \ - libmspub-0.1.so:print/libmspub01 \ - libpagemaker-0.0.so:print/libpagemaker \ - libnss3.so:security/nss \ - libxmlsec1-nss.so:security/xmlsec1 \ - libclucene-core.so:textproc/clucene \ - libexpat.so:textproc/expat2 \ - libhunspell-1.7.so:textproc/hunspell \ - libhyphen.so:textproc/hyphen \ - libabw-0.1.so:textproc/libabw \ - libe-book-0.1.so:textproc/libe-book \ - libepubgen-0.1.so:textproc/libepubgen \ - libexttextcat-2.0.so:textproc/libexttextcat \ - libmwaw-0.3.so:textproc/libmwaw03 \ - libnumbertext-1.0.so:textproc/libnumbertext \ - libodfgen-0.1.so:textproc/libodfgen01 \ - libqxp-0.0.so:textproc/libqxp \ - librevenge-0.0.so:textproc/librevenge \ - libstaroffice-0.0.so:textproc/libstaroffice \ - libvisio-0.1.so:textproc/libvisio01 \ - libwpd-0.10.so:textproc/libwpd010 \ - libwps-0.4.so:textproc/libwps \ - libmythes-1.2.so:textproc/mythes \ - libraptor2.so:textproc/raptor2 \ - librdf.so:textproc/redland \ - libfontconfig.so:x11-fonts/fontconfig \ - libxcb-icccm.so:x11/xcb-util-wm \ - libserf-1.so:www/serf -RUN_DEPENDS= xdg-open:devel/xdg-utils \ - ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ - ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ - ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \ - ${LOCALBASE}/share/fonts/twemoji-color-font-ttf/TwitterColorEmoji-SVGinOT.ttf:x11-fonts/twemoji-color-font-ttf \ - ${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \ - ${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \ - ${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g - -DISTFILES+= 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf:ext -DISTFILES+= mdds-1.5.0.tar.bz2:src -DISTFILES+= liborcus-0.15.3.tar.gz:src -DISTFILES+= libetonyek-0.1.9.tar.xz:src - -NOT_FOR_ARCHS= armv6 armv7 -NOT_FOR_ARCHS_REASON= Unsupported host_cpu - -.if defined(PRERELEASE) -MASTER_SITES+= https://dev-builds.libreoffice.org/pre-releases/src/ -.endif - -CONFLICTS_INSTALL= libreoffice - -INSTALL_TARGET= distro-pack-install -WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION} - -SHEBANG_GLOB= *.py - -GNU_CONFIGURE= yes -USE_GL= gl glew glu -USE_GNOME= cairo glib20 libxml2 libxslt -USE_OPENLDAP= yes -USE_PERL5= build -USE_XORG= ice sm x11 xaw xcb xext xinerama xrandr xrender -USES= autoreconf:build bison compiler:c++14-lang cpe desktop-file-utils \ - gettext-runtime gl gmake gnome jpeg mysql:client perl5 pkgconfig \ - pkgconfig python shebangfix shared-mime-info ssl tar:xz xorg - -OPTIONS_DEFINE= COINMP CUPS DOCS GNOME GTK3 I18N JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV -OPTIONS_DEFAULT= CUPS MMEDIA QT5 - -COINMP_DESC= Enable CoinMP (deprecated) math solver -GTK3_DESC= GTK+ 3 GUI toolkit support (incomplete visual style) -I18N_DESC= Build i18n resources -JAVA_DESC= Add Java support (XML filters, macros, DB connections) -KF5_DESC= KF5/Qt5 GUI toolkit support (implies QT5) -MMEDIA_DESC= Enable multimedia backend for Impress -PGSQL_DESC= Build with PostgreSQL-SDBC driver -QT5_DESC= Qt5 GUI toolkit support (default visual style) -SDK_DESC= Build with SDK -TEST_DESC= Run all regression tests -WEBDAV_DESC= Enable WebDAV protocol - -COINMP_CONFIGURE_ENABLE= coinmp -COINMP_CONFIGURE_ON= --with-system-coinmp -COINMP_LIB_DEPENDS= libCoinMP.so:math/coinmp - -CUPS_CONFIGURE_ENABLE= cups -CUPS_LIB_DEPENDS= libcups.so:print/cups - -DOCS_CONFIGURE_WITH= help - -GNOME_CONFIGURE_ENABLE= dbus dconf -GNOME_IMPLIES= GTK3 -GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ - libdbus-glib-1.so:devel/dbus-glib -GNOME_USE= GNOME=dconf - -GTK3_CONFIGURE_ENABLE= gtk3 -GTK3_USE= GNOME=gtk30 - -I18N_CONFIGURE_WITH= lang=ALL -I18N_DISTFILES= ${PORTNAME}-dictionaries-${LOVERSION}${EXTRACT_SUFX} \ - ${PORTNAME}-translations-${LOVERSION}${EXTRACT_SUFX} -I18N_EXTRACT_ONLY= ${I18N_DISTFILES} -I18N_USES= gettext-tools - -JAVA_BUILD_DEPENDS= ant:devel/apache-ant \ - ${JAVAJARDIR}/commons-codec.jar:java/apache-commons-codec \ - ${JAVAJARDIR}/commons-httpclient.jar:java/apache-commons-httpclient \ - ${JAVAJARDIR}/commons-lang3.jar:java/apache-commons-lang3 \ - ${JAVAJARDIR}/commons-logging.jar:java/apache-commons-logging \ - ${JAVAJARDIR}/junit.jar:java/junit \ - ${JAVAJARDIR}/bsh.jar:lang/bsh -JAVA_CATEGORIES= java -JAVA_CONFIGURE_ON= --with-ant-home=${LOCALBASE}/share/java/apache-ant \ - --with-beanshell-jar=${JAVAJARDIR}/bsh.jar \ - --with-commons-codec-jar=${JAVAJARDIR}/commons-codec.jar \ - --with-commons-httpclient-jar=${JAVAJARDIR}/commons-httpclient.jar \ - --with-commons-lang-jar=${JAVAJARDIR}/commons-lang3.jar \ - --with-commons-logging-jar=${JAVAJARDIR}/commons-logging.jar \ - --with-jdk-home="${JAVA_HOME}" \ - --with-junit=${JAVAJARDIR}/junit.jar \ - --with-hamcrest=${JAVAJARDIR}/hamcrest.jar \ - --without-system-jfreereport -JAVA_CONFIGURE_WITH= java -# XXX jni.h from GNU classpath causes ABI conflicts. -JAVA_CONFLICTS_BUILD= classpath-[0-9]* -JAVA_DISTFILES= 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \ - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \ - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \ - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \ - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \ - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:src \ - 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar:ext \ - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \ - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \ - a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar:ext \ - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \ - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \ - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \ - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \ - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \ - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src -JAVA_USE= JAVA=yes -JAVA_VARS= JAVA_BUILD=yes - -KF5_CONFIGURE_ENABLE= kf5 -KF5_USE= kde=config,coreaddons,i18n,kio,windowsystem -KF5_USES= kde:5 -KF5_IMPLIES= QT5 - -MMEDIA_CONFIGURE_ENABLE= gstreamer-1-0 -MMEDIA_USE= GSTREAMER1=yes - -PGSQL_CONFIGURE_ENABLE= postgresql-sdbc -PGSQL_CONFIGURE_WITH= gssapi krb5 -PGSQL_USES= pgsql - -QT5_CONFIGURE_ENABLE= qt5 -QT5_USE= qt=buildtools_build,core,gui,network,qmake_build,widgets,x11extras -QT5_USES= qt:5 - -SDK_BUILD_DEPENDS= doxygen:devel/doxygen -SDK_CONFIGURE_ENABLE= odk -SDK_CONFIGURE_OFF= --without-doxygen -SDK_CONFIGURE_ON= --with-doxygen=${LOCALBASE}/bin/doxygen -SDK_DISTFILES= 185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext - -TEST_ALL_TARGET_OFF= build-nocheck -TEST_CONFIGURE_ENABLE= cve-tests - -WEBDAV_CONFIGURE_ENABLE= neon -WEBDAV_LIB_DEPENDS= libneon.so:www/neon - -CPPFLAGS+= -isystem ${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -CONFIGURE_ARGS= --disable-dependency-tracking \ - --disable-epm \ - --disable-fetch-external \ - --disable-firebird-sdbc \ - --disable-mergelibs \ - --disable-online-update \ - --enable-cairo-canvas \ - --enable-python=system \ - --enable-release-build \ - --disable-pdfium \ - --exec-prefix=${PREFIX} \ - --with-boost=${LOCALBASE} \ - --with-build-version="FreeBSD ports ${PKGVERSION}" \ - --with-external-dict-dir=${LOCALBASE}/share/hunspell \ - --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ - --with-external-tar=${DISTDIR}/${DIST_SUBDIR} \ - --with-external-thes-dir=${LOCALBASE}/share/mythes \ - --with-os-version=${OSVERSION} \ - --with-parallelism=${MAKE_JOBS_NUMBER} \ - --with-system-cppunit \ - --with-system-curl \ - --with-system-dicts \ - --with-system-libs \ - --with-system-libxml \ - --with-system-ucpp \ - --with-system-zlib \ - --with-system-mdds=no \ - --with-system-orcus=no \ - --with-system-libetonyek=no \ - --with-vendor="FreeBSD ports" \ - --without-fonts \ - --without-myspell-dicts - -CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \ - FLEX=${LOCALBASE}/bin/flex \ - GNUTAR="${TAR}" \ - GPERF=${LOCALBASE}/bin/gperf \ - ICU_CFLAGS="`icu-config --cflags`" \ - ICU_LIBS="`icu-config --ldflags`" \ - PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \ - PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" \ - ac_cv_path_SED=${LOCALBASE}/bin/gsed - -MAKE_ARGS+= TMPDIR=${WRKDIR} -MAKE_ENV+= CXXFLAGS_WARN="${CXXFLAGS_WARN}" -MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed -MAKE_ENV+= DISPLAY= -MAKE_ENV+= verbose=1 - -.include - -.include - -.if ${PORT_OPTIONS:MGTK3} -WARNING= "GTK3 visual style is incomplete yet, build at your own risk" -.endif - -.if ${ARCH:Mpowerpc*} -EXTRA_PATCHES+= ${FILESDIR}/powerpc64 -.endif - -.if ${CHOSEN_COMPILER_TYPE} == clang -CXXFLAGS_WARN= -Woverloaded-virtual -Wno-unused-parameter -Wno-unused-local-typedefs -.else -CXXFLAGS_WARN= -Wshadow -Woverloaded-virtual -.endif - -post-patch: - ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/shell/source/unix/exec/shellexec.cxx -.if ${COMPILER_FEATURES:Mlibstdc++} - ${REINPLACE_CMD} -e 's/gb_CC/gb_CXX/' ${WRKSRC}/solenv/gbuild/platform/unxgcc.mk -.endif - -pre-configure: - @${TOUCH} ${WRKSRC}/autogen.lastrun - -post-configure: - @${TOUCH} ${WRKSRC}/src.downloaded - -post-install: - @cd ${STAGEDIR}${PREFIX} && \ - ${FIND} -s lib/libreoffice -type d -empty \ - -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST} - @cd ${STAGEDIR}${PREFIX} && \ - ${FIND} -s bin lib man -not -type d >> ${TMPPLIST} -.for subdir in appdata application-registry applications bash-completion icons mime mime-info - @cd ${STAGEDIR}${PREFIX} && \ - ${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST} -.endfor - -post-install-SDK-on: -.for subdir in include share share/doc share/idl - @cd ${STAGEDIR}${PREFIX} && \ - ${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST} -.endfor - -.include diff --git a/editors/libreoffice6/Makefile.common b/editors/libreoffice6/Makefile.common deleted file mode 100644 index 903a2281683c..000000000000 --- a/editors/libreoffice6/Makefile.common +++ /dev/null @@ -1,11 +0,0 @@ -PORTNAME= libreoffice -PORTVERSION= 6.4.7 -CATEGORIES+= editors - -MAINTAINER= office@FreeBSD.org - -LICENSE= LGPL3+ MPL20 -LICENSE_COMB= dual - -LOVERSION= ${PORTVERSION}.${RCVER} -RCVER= 2 diff --git a/editors/libreoffice6/Makefile.i18n b/editors/libreoffice6/Makefile.i18n deleted file mode 100644 index 8e3f9bee9960..000000000000 --- a/editors/libreoffice6/Makefile.i18n +++ /dev/null @@ -1,47 +0,0 @@ -.include "${.CURDIR}/../../editors/libreoffice/Makefile.common" - -MASTER_SITES= https://download.documentfoundation.org/libreoffice/${MASTER_SITE_SUBDIR}/ -.if defined(PRERELEASE) -MASTER_SITES+= https://dev-builds.libreoffice.org/pre-releases/deb/x86_64/ -MASTER_SITE_SUBDIR= testing/${PORTVERSION}/deb/x86_64 -LO_I18N_FILE= LibreOffice_${LOVERSION}_Linux_x86-64_deb -.else -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/deb/x86_64 -LO_I18N_FILE= LibreOffice_${PORTVERSION}_Linux_x86-64_deb -.endif -PKGNAMEPREFIX= ${LO_I18N}- -DISTFILES= ${LO_I18N_FILE}_langpack_${LO_I18N:S/_/-/}${EXTRACT_SUFX} -.if defined(LO_HAS_HELPPACK) -DISTFILES+= ${LO_I18N_FILE}_helppack_${LO_I18N:S/_/-/}${EXTRACT_SUFX} -.endif -DIST_SUBDIR= libreoffice/i18n - -COMMENT?= ${LO_I18N} language pack for ${PORTNAME} - -DESCR?= ${.CURDIR}/../../editors/libreoffice/pkg-descr.i18n - -RUN_DEPENDS?= libreoffice:editors/libreoffice - -NO_ARCH= yes -NO_BUILD= yes - -EXTRACT_AFTER_ARGS= --exclude '${PORTNAME}*-dict-*.deb' \ - --strip-components 1 - -post-extract: - @${MKDIR} ${WRKSRC} - for deb in ${WRKDIR}/DEBS/*.deb ; do \ - ${TAR} xfO $${deb} data.tar.xz | ${TAR} -C ${WRKSRC} -xf - ; \ - done - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - cd ${WRKSRC}/opt/${PORTNAME}${PORTVERSION:R} ; \ - ${PAX} -rw . ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - -post-install: - @cd ${WRKSRC}/opt/${PORTNAME}${PORTVERSION:R} && \ - ${FIND} -s * -not -type d \ - -exec ${ECHO_CMD} "lib/${PORTNAME}/{}" \; >> ${TMPPLIST} && \ - ${FIND} -d * -type d -empty \ - -exec ${ECHO_CMD} "@dir lib/${PORTNAME}/{}" \; >> ${TMPPLIST} diff --git a/editors/libreoffice6/distinfo b/editors/libreoffice6/distinfo deleted file mode 100644 index aac844063ffd..000000000000 --- a/editors/libreoffice6/distinfo +++ /dev/null @@ -1,51 +0,0 @@ -TIMESTAMP = 1612365374 -SHA256 (libreoffice/libreoffice-6.4.7.2.tar.xz) = 034dd79a60cfff60c7d353130fe2cc8e6a1aabeab50d89e4570ae95f33296644 -SIZE (libreoffice/libreoffice-6.4.7.2.tar.xz) = 232364676 -SHA256 (libreoffice/libreoffice-help-6.4.7.2.tar.xz) = a126803900bca3bfd4d3efe2d3204fad828d86b2a52b05fcf7cb618a6cbb10b6 -SIZE (libreoffice/libreoffice-help-6.4.7.2.tar.xz) = 88296892 -SHA256 (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc -SIZE (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 207544 -SHA256 (libreoffice/mdds-1.5.0.tar.bz2) = 144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d -SIZE (libreoffice/mdds-1.5.0.tar.bz2) = 346888 -SHA256 (libreoffice/liborcus-0.15.3.tar.gz) = 0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2 -SIZE (libreoffice/liborcus-0.15.3.tar.gz) = 2602283 -SHA256 (libreoffice/libetonyek-0.1.9.tar.xz) = e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a -SIZE (libreoffice/libetonyek-0.1.9.tar.xz) = 1477064 -SHA256 (libreoffice/libreoffice-dictionaries-6.4.7.2.tar.xz) = 3718c44d5ec5fc1d011ddf5b9bbbef384f1bdc695338e8459d6e403da2539bb7 -SIZE (libreoffice/libreoffice-dictionaries-6.4.7.2.tar.xz) = 45951948 -SHA256 (libreoffice/libreoffice-translations-6.4.7.2.tar.xz) = b13088a98be1f6e7e177331db3d723419bfeb11ae16516334f0fbb853ae40ab1 -SIZE (libreoffice/libreoffice-translations-6.4.7.2.tar.xz) = 173291968 -SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 -SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470 -SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b -SIZE (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582 -SHA256 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 -SIZE (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 9796 -SHA256 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 -SIZE (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 153157 -SHA256 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743 -SIZE (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610 -SHA256 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 -SIZE (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926 -SHA256 (libreoffice/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar) = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 -SIZE (libreoffice/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar) = 2448421 -SHA256 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 -SIZE (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 762419 -SHA256 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8 -SIZE (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721 -SHA256 (libreoffice/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar) = a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34 -SIZE (libreoffice/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar) = 18033694 -SHA256 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 -SIZE (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 2929311 -SHA256 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd -SIZE (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 743031 -SHA256 (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133 -SIZE (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 207563 -SHA256 (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772 -SIZE (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = 1396007 -SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba -SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800 -SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 -SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 -SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 -SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288 diff --git a/editors/libreoffice6/files/patch-Makefile.in b/editors/libreoffice6/files/patch-Makefile.in deleted file mode 100644 index 3b22303f9e03..000000000000 --- a/editors/libreoffice6/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig 2019-02-03 18:10:00.287665000 +0800 -+++ Makefile.in 2019-02-03 18:10:53.310313000 +0800 -@@ -272,7 +272,7 @@ - # - # Bootstrap - # --bootstrap: check-if-root compilerplugins -+bootstrap: compilerplugins - - # - # Build -@@ -400,7 +400,7 @@ - @exit 1 - endif - --distro-pack-install: install -+distro-pack-install: install-strip - $(SRCDIR)/bin/distro-install-clean-up - $(SRCDIR)/bin/distro-install-desktop-integration - $(SRCDIR)/bin/distro-install-sdk diff --git a/editors/libreoffice6/files/patch-aarch64-gcc3_linux_aarch64 b/editors/libreoffice6/files/patch-aarch64-gcc3_linux_aarch64 deleted file mode 100644 index 22c7d9bf4326..000000000000 --- a/editors/libreoffice6/files/patch-aarch64-gcc3_linux_aarch64 +++ /dev/null @@ -1,274 +0,0 @@ -From 189d498f5c0c633f8cd87b3f1b6d57020371a952 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Tue, 17 Dec 2019 23:33:28 +0100 -Subject: [PATCH] tdf#128671: Rely on unwind.h, declare what's missing from - cxxabi.h - -...for gcc3_linux_aarch64, similar to what -128deeae81a6f802bfb79b8f0fa8c4b10729f7db "cxxabi.h is not specific to GCC" et al -did for gcc3_linux_x86-64 - -Change-Id: Iee9980842c0e5f6f49642407339a67e865f8be9c -Reviewed-on: https://gerrit.libreoffice.org/85344 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- - .../source/cpp_uno/gcc3_linux_aarch64/abi.cxx | 7 +- - .../source/cpp_uno/gcc3_linux_aarch64/abi.hxx | 117 +++++++++++++----- - .../cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx | 4 +- - 3 files changed, 92 insertions(+), 36 deletions(-) - -diff --git bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx -index 938011a09a2e..892bf6e81963 100644 ---- bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx -+++ bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx -@@ -24,7 +24,6 @@ - #include - #include - --#include - #include - - #include -@@ -135,8 +134,8 @@ std::type_info * getRtti(typelib_TypeDescription const & type) { - } - - extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void * exception) { -- abi_aarch64::__cxa_exception * header = -- static_cast(exception) - 1; -+ __cxxabiv1::__cxa_exception * header = -+ static_cast<__cxxabiv1::__cxa_exception *>(exception) - 1; - OUString unoName(toUnoName(header->exceptionType->name())); - typelib_TypeDescription * td = 0; - typelib_typedescription_getByName(&td, unoName.pData); -@@ -224,7 +223,7 @@ StructKind getStructKind(typelib_CompoundTypeDescription const * type) { - namespace abi_aarch64 { - - void mapException( -- __cxa_exception * exception, std::type_info const * type, uno_Any * any, uno_Mapping * mapping) -+ __cxxabiv1::__cxa_exception * exception, std::type_info const * type, uno_Any * any, uno_Mapping * mapping) - { - assert(exception != 0); - assert(type != nullptr); -diff --git bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx -index 50c5f1f21a37..e3dc9b5872a7 100644 ---- bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx -+++ bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx -@@ -22,55 +22,114 @@ - - #include - -+#include - #include - #include - -+#include -+#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h -+#define _GLIBCXX_CDTOR_CALLABI -+#endif -+#include -+ -+#include - #include - #include - #include - --namespace abi_aarch64 { -- --// Following declarations from libstdc++-v3/libsupc++/unwind-cxx.h and --// lib/gcc/*-*-*/*/include/unwind.h: -- --struct _Unwind_Exception --{ -- unsigned exception_class __attribute__((__mode__(__DI__))); -- void * exception_cleanup; -- unsigned private_1 __attribute__((__mode__(__word__))); -- unsigned private_2 __attribute__((__mode__(__word__))); --} __attribute__((__aligned__)); -+#if !HAVE_CXXABI_H_CLASS_TYPE_INFO -+// , -+// libstdc++-v3/libsupc++/cxxabi.h: -+namespace __cxxabiv1 { -+class __class_type_info: public std::type_info { -+public: -+ explicit __class_type_info(char const * n): type_info(n) {} -+ ~__class_type_info() override; -+}; -+} -+#endif - --struct __cxa_exception --{ -- std::type_info *exceptionType; -- void (*exceptionDestructor)(void *); -+#if !HAVE_CXXABI_H_SI_CLASS_TYPE_INFO -+// , -+// libstdc++-v3/libsupc++/cxxabi.h: -+namespace __cxxabiv1 { -+class __si_class_type_info: public __class_type_info { -+public: -+ __class_type_info const * __base_type; -+ explicit __si_class_type_info( -+ char const * n, __class_type_info const *base): -+ __class_type_info(n), __base_type(base) {} -+ ~__si_class_type_info() override; -+}; -+} -+#endif - -+#if !HAVE_CXXABI_H_CXA_EXCEPTION -+// , -+// libcxxabi/src/cxa_exception.hpp: -+namespace __cxxabiv1 { -+struct __cxa_exception { -+#if defined _LIBCPPABI_VERSION // detect libc++abi -+#if defined __LP64__ || LIBCXXABI_ARM_EHABI -+ std::size_t referenceCount; -+#endif -+#endif -+ std::type_info * exceptionType; -+ void (* exceptionDestructor)(void *); - void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17 - std::terminate_handler terminateHandler; -- -- __cxa_exception *nextException; -- -+ __cxa_exception * nextException; - int handlerCount; -- - int handlerSwitchValue; -- const unsigned char *actionRecord; -- const unsigned char *languageSpecificData; -- void *catchTemp; -- void *adjustedPtr; -- -+ char const * actionRecord; -+ char const * languageSpecificData; -+ void * catchTemp; -+ void * adjustedPtr; - _Unwind_Exception unwindHeader; - }; -+} -+#endif - --struct __cxa_eh_globals --{ -- __cxa_exception *caughtExceptions; -+#if !HAVE_CXXABI_H_CXA_EH_GLOBALS -+// : -+namespace __cxxabiv1 { -+struct __cxa_eh_globals { -+ __cxa_exception * caughtExceptions; - unsigned int uncaughtExceptions; - }; -+} -+#endif -+ -+#if !HAVE_CXXABI_H_CXA_GET_GLOBALS -+namespace __cxxabiv1 { -+extern "C" __cxa_eh_globals * __cxa_get_globals() throw(); -+} -+#endif -+ -+#if !HAVE_CXXABI_H_CXA_CURRENT_EXCEPTION_TYPE -+namespace __cxxabiv1 { -+extern "C" std::type_info *__cxa_current_exception_type() throw(); -+} -+#endif -+ -+#if !HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION -+namespace __cxxabiv1 { -+extern "C" void * __cxa_allocate_exception(std::size_t thrown_size) throw(); -+} -+#endif -+ -+#if !HAVE_CXXABI_H_CXA_THROW -+namespace __cxxabiv1 { -+extern "C" void __cxa_throw( -+ void * thrown_exception, void * tinfo, void (* dest)(void *)) -+ __attribute__((noreturn)); -+} -+#endif -+ -+namespace abi_aarch64 { - - void mapException( -- __cxa_exception * exception, std::type_info const * type, uno_Any * any, uno_Mapping * mapping); -+ __cxxabiv1::__cxa_exception * exception, std::type_info const * type, uno_Any * any, uno_Mapping * mapping); - - void raiseException(uno_Any * any, uno_Mapping * mapping); - -diff --git bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx -index f03d848521cc..0847dfc76db5 100644 ---- bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx -+++ bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx -@@ -24,8 +24,6 @@ - #include - #include - --#include -- - #include - #include - #include -@@ -190,7 +188,7 @@ void call( - } - } catch (css::uno::Exception &) { - abi_aarch64::mapException( -- reinterpret_cast( -+ reinterpret_cast<__cxxabiv1::__cxa_eh_globals *>( - __cxxabiv1::__cxa_get_globals())->caughtExceptions, - __cxxabiv1::__cxa_current_exception_type(), *exception, - proxy->getBridge()->getCpp2Uno()); -From a7d1fed24557b203acb5016a98af26f4ef24d27a Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Tue, 11 Feb 2020 15:46:45 +0100 -Subject: [PATCH] Hack to dynamically adapt to __cxa_exceptiom in LLVM 5.0 - libcxxabi - -...for Linux aarch64, similar to 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 "Hack -to dynamically adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" for macOS x86-64. -But unlike on macOS (which is known to always use libcxxabi), be careful to only -execute the hack in builds targeting libcxxabi. - -Change-Id: I5417fde425d2d6bac9400592193a9fe5d2bfe175 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88458 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- - .../source/cpp_uno/gcc3_linux_aarch64/abi.cxx | 22 +++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx -index 892bf6e81963..611442a31e31 100644 ---- bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx -+++ bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx -@@ -136,6 +136,28 @@ std::type_info * getRtti(typelib_TypeDescription const & type) { - extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void * exception) { - __cxxabiv1::__cxa_exception * header = - static_cast<__cxxabiv1::__cxa_exception *>(exception) - 1; -+#if defined _LIBCPPABI_VERSION // detect libc++abi -+ // The libcxxabi commit -+ // -+ // "[libcxxabi] Align unwindHeader on a double-word boundary" towards -+ // LLVM 5.0 changed the size of __cxa_exception by adding -+ // -+ // __attribute__((aligned)) -+ // -+ // to the final member unwindHeader, on x86-64 effectively adding a hole of -+ // size 8 in front of that member (changing its offset from 88 to 96, -+ // sizeof(__cxa_exception) from 120 to 128, and alignof(__cxa_exception) -+ // from 8 to 16); a hack to dynamically determine whether we run against a -+ // new libcxxabi is to look at the exceptionDestructor member, which must -+ // point to this function (the use of __cxa_exception in fillUnoException is -+ // unaffected, as it only accesses members towards the start of the struct, -+ // through a pointer known to actually point at the start): -+ if (header->exceptionDestructor != &deleteException) { -+ header = reinterpret_cast<__cxa_exception const *>( -+ reinterpret_cast(header) - 8); -+ assert(header->exceptionDestructor == &deleteException); -+ } -+#endif - OUString unoName(toUnoName(header->exceptionType->name())); - typelib_TypeDescription * td = 0; - typelib_typedescription_getByName(&td, unoName.pData); diff --git a/editors/libreoffice6/files/patch-bin_distro-install-desktop-integration b/editors/libreoffice6/files/patch-bin_distro-install-desktop-integration deleted file mode 100644 index 85241e2dcbac..000000000000 --- a/editors/libreoffice6/files/patch-bin_distro-install-desktop-integration +++ /dev/null @@ -1,68 +0,0 @@ ---- bin/distro-install-desktop-integration.orig 2019-01-24 03:35:25.000000000 +0800 -+++ bin/distro-install-desktop-integration 2019-02-03 18:17:18.645630000 +0800 -@@ -98,7 +98,7 @@ - cp -a "${SRCDIR?}"/sysui/desktop/share/create_tree.sh "$sysui_temp" - cd $sysui_temp - # we want non-versioned stuff in the distro packages --sed -i \ -+sed -i "" \ - -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ - -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ - -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -108,13 +108,13 @@ - export OFFICE_PREFIX=$LIBDIR - export PREFIX=$INSTALLDIRNAME - export ICON_PREFIX=$INSTALLDIRNAME -- export ICON_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/icons -+ export ICON_SOURCE_DIR="${SRCDIR}"/sysui/desktop/icons - export PRODUCTVERSION= - export KDEMAINDIR=$PREFIXDIR - export PREFIXDIR=${PREFIXDIR} - export GNOMEDIR=$PREFIXDIR - export GNOME_MIME_THEME=hicolor -- export APPDATA_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/appstream-appdata -+ export APPDATA_SOURCE_DIR="${SRCDIR}"/sysui/desktop/appstream-appdata - bash ./create_tree.sh - ) - cd - -@@ -129,7 +129,7 @@ - # we want non-versioned desktop files - cd $DESTDIR/$INSTALLDIR/share/xdg - # we want non-versioned stuff in the distro packages --sed -i \ -+sed -i "" \ - -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ - -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ - -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -143,7 +143,7 @@ - $PREFIXDIR/share/mime/packages \ - $PREFIXDIR/share/mime-info \ - $PREFIXDIR/share/icons ; do -- find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand -+ find "$DESTDIR$dir" \( -type f -o -type l \) | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand - done - fi - -@@ -171,16 +171,16 @@ - # you cannot include this link directly into the package - # For example, the Novell package mark this symlink as %ghost - # and update it in %post and %postun --ln -sf "$INSTALLDIR/program/soffice" "$DESTDIR$BINDIR/soffice" -+ln -sf ../lib/libreoffice/program/soffice $DESTDIR$PREFIXDIR/bin/soffice - test -f $DESTDIR/gid_Module_Root_Brand && echo "$BINDIR/soffice" >>$DESTDIR/gid_Module_Root_Brand - - # create bash completion --mkdir -p $DESTDIR/usr/share/bash-completion/completions --"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh --test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand -+mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions -+"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh -+test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand - if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then -- "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh -- test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand -+ "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh -+ test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand - fi - - echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath"; diff --git a/editors/libreoffice6/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_cpp2uno.cxx b/editors/libreoffice6/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_cpp2uno.cxx deleted file mode 100644 index 1f841530d63f..000000000000 --- a/editors/libreoffice6/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_cpp2uno.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx.orig 2020-03-11 17:18:35 UTC -+++ bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx -@@ -321,9 +321,16 @@ extern "C" void vtableSlotCall( - double fpr2, double fpr3, double fpr4, double fpr5, double fpr6, - double fpr7, ...) - { -- register void * volatile indirectRet asm ("x8"); -- register sal_Int32 volatile functionIndex asm ("x9"); -- register sal_Int32 volatile vtableOffset asm ("x10"); -+ void * volatile indirectRet; -+ sal_Int32 volatile functionIndex, vtableOffset; -+ -+ asm volatile( -+ "mov %0, x8\n" -+ "mov %1, x9\n" -+ "mov %2, x10\n" -+ : "=r" (indirectRet), "=r" (functionIndex), "=r" (vtableOffset) -+ ::); -+ - va_list ap; - va_start(ap, fpr7); - assert(sizeof (va_list) == sizeof (aarch64_va_list)); diff --git a/editors/libreoffice6/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx b/editors/libreoffice6/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx deleted file mode 100644 index 88704a7b8a6e..000000000000 --- a/editors/libreoffice6/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx +++ /dev/null @@ -1,14 +0,0 @@ -Fix uno bridge exception handling on i386. This matches the amd64 -implementation and fixes a segfault in code that uses uno exceptions. - ---- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx.orig 2019-03-13 18:20:48.089705000 +0000 -+++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx 2019-03-13 18:21:05.979965000 +0000 -@@ -196,7 +196,7 @@ - extern "C" { - static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc ) - { -- __cxa_exception const * header = static_cast<__cxa_exception const *>(pExc) - 1; -+ __cxxabiv1::__cxa_exception const * header = (static_cast<__cxxabiv1::__cxa_exception const *>(pExc) - 1); - typelib_TypeDescription * pTD = nullptr; - OUString unoName( toUNOname( header->exceptionType->name() ) ); - ::typelib_typedescription_getByName( &pTD, unoName.pData ); diff --git a/editors/libreoffice6/files/patch-configure b/editors/libreoffice6/files/patch-configure deleted file mode 100644 index e5a407355744..000000000000 --- a/editors/libreoffice6/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig 2020-10-07 12:27:53 UTC -+++ configure -@@ -33015,7 +33015,7 @@ fi - - - *** 1542 LINES SKIPPED ***