aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/libreoffice/files')
-rw-r--r--app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch11
-rw-r--r--app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch29
-rw-r--r--app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch13
-rw-r--r--app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch48
-rw-r--r--app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch46
-rw-r--r--app-office/libreoffice/files/libreoffice.confd5
-rw-r--r--app-office/libreoffice/files/libreoffice.initd14
7 files changed, 0 insertions, 166 deletions
diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
deleted file mode 100644
index a6e732f..0000000
--- a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/shell/source/unix/misc/senddoc.sh 2017-06-15 15:44:22.000000000 +0200
-+++ b/shell/source/unix/misc/senddoc.sh 2017-06-25 01:00:08.525435930 +0200
-@@ -389,6 +389,8 @@
- elif [ -n "$DESKTOP_LAUNCH" ]; then
- # http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html
- MAILER=${DESKTOP_LAUNCH}
-+ elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then
-+ MAILER=/usr/bin/kde-open5
- elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
- MAILER=/usr/bin/kde-open
- elif [ -x /usr/bin/xdg-open ] ; then
diff --git a/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
deleted file mode 100644
index ea6eb8b..0000000
--- a/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/bin/distro-install-desktop-integration 2018-10-29 20:55:29.000000000 +0100
-+++ b/bin/distro-install-desktop-integration 2018-11-22 02:03:36.464866894 +0100
-@@ -39,22 +39,20 @@
-
- create_man_link()
- {
-- echo "Install $MANDIR/man1/$1.1.gz"
-+ echo "Install $MANDIR/man1/$1.1"
-
- mkdir -p $DESTDIR$MANDIR/man1
- echo ".so man1/$2.1" >| $DESTDIR$MANDIR/man1/$1.1
-- gzip -f $DESTDIR$MANDIR/man1/$1.1
-- test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$3"
-+ test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$3"
- }
-
- install_man()
- {
-- echo "Install $MANDIR/man1/$1.1.gz"
-+ echo "Install $MANDIR/man1/$1.1"
-
- mkdir -p $DESTDIR$MANDIR/man1
- cp "${SRCDIR?}"/sysui/desktop/man/$1.1 $DESTDIR$MANDIR/man1 || exit 1;
-- gzip -f $DESTDIR$MANDIR/man1/$1.1
-- test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$2"
-+ test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$2"
- }
-
-
diff --git a/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch
deleted file mode 100644
index c905fab..0000000
--- a/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 971d7ad440c5..adb01509ab29 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -12683,7 +12683,7 @@ then
-
- dnl Check for Meta Object Compiler
-
-- AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH])
-+ AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin])
- if test "$MOC5" = "no"; then
- AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
- the root of your Qt installation by exporting QT5DIR before running "configure".])
diff --git a/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch b/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch
deleted file mode 100644
index d8dae52..0000000
--- a/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/865321
-https://lists.freedesktop.org/archives/libreoffice/2022-August/089261.html
-https://github.com/LibreOffice/core/commit/aa0b2b756c17d43d2e8c828a909ee2815e332377
-
-From: Rene Engelhard <rene@debian.org>
-Date: Wed, 24 Aug 2022 09:55:33 +0200
-Subject: [PATCH] Make configure work with gpgme >= 1.18
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Sam James wrote:
-> gpgme-1.18.0 dropped a bunch of internal symbols,
-> including progress_callback (see e.g. callbacks.h
-> which has a comment at the top saying it's internal).
-
-Plausibly the workaround to not link against older KDE-specific distro
-packages is not needed anymore.
-
-Check for main as a workaround as we do for other C++ libraries, too.
-
-Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667
-Tested-by: Jenkins
-Reviewed-by: Sam James <sam@gentoo.org>
-Reviewed-by: René Engelhard <rene@debian.org>
-(cherry picked from commit b4a94d681a99a6a3eeb6aaa4d2f4dfab8f7c000b)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138553
-Tested-by: René Engelhard <rene@debian.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -12537,12 +12537,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE
- # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
- AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
- [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], [])
-- # progress_callback is the only func with plain C linkage
-- # checking for it also filters out older, KDE-dependent libgpgmepp versions
-- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ],
-- [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
- AC_CHECK_HEADER(gpgme.h, [],
- [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
-+ AC_CHECK_LIB(gpgmepp, main, [],
-+ [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
-+ GPGMEPP_LIBS=-lgpgmepp
- else
- AC_MSG_RESULT([internal])
- BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
-
diff --git a/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch b/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch
deleted file mode 100644
index f269d53..0000000
--- a/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://gerrit.libreoffice.org/c/core/+/139249
-
-From 8bad83bf044661357b02b695e6f53e2e19dea396 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Sep 2022 04:31:18 +0100
-Subject: [PATCH] Fix build with Poppler 22.09.0
-
-With Poppler 22.09.0, LO fails to build with:
-```
-/var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments
- state->getLineDash(&dashArray, &arrayLen, &startOffset);
- ~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~
-/usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here
- const std::vector<double> &getLineDash(double *start)
- ^
-1 error generated.
-```
-
-Poppler changed the getLineDash interface:
-```
-- void getLineDash(double **dash, int *length, double *start)
-+ const std::vector<double> &getLineDash(double *start)
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
-Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -678,8 +678,16 @@ void PDFOutDev::updateLineDash(GfxState *state)
- return;
- assert(state);
-
-- double* dashArray; int arrayLen; double startOffset;
-+ int arrayLen; double startOffset;
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+ const double* dashArray;
-+ const std::vector<double> &dash = state->getLineDash(&startOffset);
-+ dashArray = dash.data();
-+ arrayLen = dash.size();
-+#else
-+ double* dashArray;
- state->getLineDash(&dashArray, &arrayLen, &startOffset);
-+#endif
-
- printf( "updateLineDash" );
- if( arrayLen && dashArray )
diff --git a/app-office/libreoffice/files/libreoffice.confd b/app-office/libreoffice/files/libreoffice.confd
deleted file mode 100644
index df1a269..0000000
--- a/app-office/libreoffice/files/libreoffice.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Default options for the soffice daemon
-libreoffice_opts="--accept=\"socket,host=localhost,port=8100,tcpNoDelay=1;urp;\""
diff --git a/app-office/libreoffice/files/libreoffice.initd b/app-office/libreoffice/files/libreoffice.initd
deleted file mode 100644
index ecd6501..0000000
--- a/app-office/libreoffice/files/libreoffice.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="LibreOffice headless daemon for generating documents"
-name="LibreOffice headless daemon"
-pidfile="/run/soffice.pid"
-soffice_args="${libreoffice_opts}"
-
-command="/usr/bin/soffice"
-command_args="--nodefault --nofirststartwizard --nolockcheck --nologo --norestore --headless ${soffice_args}"
-command_background="true"
-command_group="libreoffice"
-command_user="libreoffice"