diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:25:08 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:25:08 +0000 |
| commit | 58b2df33dcc6651e9bffbce3bd2511e55ff651ec (patch) | |
| tree | 1b6eb9baff70cb6f5d17e6e57a531a4ac052cb4b /debian/patches | |
| parent | Releasing progress-linux version 4:24.2.0-1~progress7.99u1. (diff) | |
| download | libreoffice-58b2df33dcc6651e9bffbce3bd2511e55ff651ec.tar.xz libreoffice-58b2df33dcc6651e9bffbce3bd2511e55ff651ec.zip | |
Merging debian version 4:24.2.0-2.
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, 29 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index b25a3b7f78..4eba62e51f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -48,3 +48,4 @@ 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 new file mode 100644 index 0000000000..449d6f4817 --- /dev/null +++ b/debian/patches/sw-do-not-require-cui.diff @@ -0,0 +1,28 @@ +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 + |