diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:09 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:09 +0000 |
| commit | b6d11bc9cde5639b019a6468a57eec0b47dd9c0a (patch) | |
| tree | 96e8337e3f4bb8674517deca4bb80b9ad11fb98c /debian/patches | |
| parent | Merging upstream version 4:24.2.1. (diff) | |
| download | libreoffice-b6d11bc9cde5639b019a6468a57eec0b47dd9c0a.tar.xz libreoffice-b6d11bc9cde5639b019a6468a57eec0b47dd9c0a.zip | |
Merging debian version 4:24.2.1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/sw-do-not-require-cui.diff | 28 |
2 files changed, 0 insertions, 29 deletions
diff --git a/debian/patches/series b/debian/patches/series index 4eba62e51f..b25a3b7f78 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -48,4 +48,3 @@ we-dont-have-the-needed-fonts.diff adapt-for-new-carlito.diff fix-system-abseil-build.diff fix-riscv64-bridge.diff -sw-do-not-require-cui.diff diff --git a/debian/patches/sw-do-not-require-cui.diff b/debian/patches/sw-do-not-require-cui.diff deleted file mode 100644 index 449d6f4817..0000000000 --- a/debian/patches/sw-do-not-require-cui.diff +++ /dev/null @@ -1,28 +0,0 @@ -From 8d26ca7f9ac37b5ada0a2c463b37181bcc8301a8 Mon Sep 17 00:00:00 2001 -From: Noel Grandin <noel.grandin@collabora.co.uk> -Date: Tue, 30 Jan 2024 14:13:41 +0200 -Subject: tdf#158695 convert-to bogusly needs libcui (--disable-gui build) - -Change-Id: I8e13902c4ee9b4b17e921b68b0626f7728cb0c18 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162749 -Tested-by: Jenkins -Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> ---- - sw/Library_sw.mk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk -index bd5d831f7f2f..707f5506d6a6 100644 ---- a/sw/Library_sw.mk -+++ b/sw/Library_sw.mk -@@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,sw,\ - comphelper \ - cppu \ - cppuhelper \ -- cui \ - $(call gb_Helper_optional,DBCONNECTIVITY, \ - dbtools) \ - docmodel \ --- -cgit v1.2.3 - |