From caa1d82025c7bd1126fa5b5a49f0ae83cbce3dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Sat, 4 Apr 2026 17:26:05 -0600 Subject: [PATCH] libreoffice: add nopython patch for ecne --- .../000-debian-rules_7.3.patch} | 0 .../patch_changes/001-fix_nopython_profile.patch | 14 ++++++++++++++ helpers/make-libreoffice | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-) rename helpers/DATA/libreoffice/{debian-rules_7.3.patch => patch_changes/000-debian-rules_7.3.patch} (100%) create mode 100644 helpers/DATA/libreoffice/patch_changes/001-fix_nopython_profile.patch diff --git a/helpers/DATA/libreoffice/debian-rules_7.3.patch b/helpers/DATA/libreoffice/patch_changes/000-debian-rules_7.3.patch similarity index 100% rename from helpers/DATA/libreoffice/debian-rules_7.3.patch rename to helpers/DATA/libreoffice/patch_changes/000-debian-rules_7.3.patch diff --git a/helpers/DATA/libreoffice/patch_changes/001-fix_nopython_profile.patch b/helpers/DATA/libreoffice/patch_changes/001-fix_nopython_profile.patch new file mode 100644 index 00000000..9cf39886 --- /dev/null +++ b/helpers/DATA/libreoffice/patch_changes/001-fix_nopython_profile.patch @@ -0,0 +1,14 @@ +diff --git a/debian/rules b/debian/rules +index abb880f..90b89d5 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -2340,7 +2340,9 @@ ifeq "$(ENABLE_RUST)" "y" + endif + + ifneq "$(PYTHON_VERSION)" "default" ++ifneq "$(PYTHON)" "" + rm -f bin/$(PYTHON) ++endif + endif + + dh_clean diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice index 2a738859..be5a883e 100644 --- a/helpers/make-libreoffice +++ b/helpers/make-libreoffice @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2025 Luis Guzmán +# Copyright (C) 2026 Luis Guzmán # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,14 +17,14 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=5 +VERSION=6 EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu $UPSTREAM main' REPOKEY="73AEE920AD55F5A0" BACKPORT=true . ./config -patch_p1 $DATA/debian-rules_7.3.patch +apply_patch_changes # Increase CPU usage for amd64 build. sed -i "/NUM_CPUS=/s|3|7|" debian/rules