From 3927e50aa720c0b6076253aed29976d5a9fae553 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Tue, 7 Apr 2026 10:43:11 -0600
Subject: [PATCH] libreoffice: disable pip and venv tests

---
 .../001-disable_tests_pyuno_trisquel.patch    | 34 +++++++++++++++++++
 .../001-fix_nopython_profile.patch            | 14 --------
 helpers/make-libreoffice                      |  5 ++-
 3 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 helpers/DATA/libreoffice/patch_changes/001-disable_tests_pyuno_trisquel.patch
 delete mode 100644 helpers/DATA/libreoffice/patch_changes/001-fix_nopython_profile.patch

diff --git a/helpers/DATA/libreoffice/patch_changes/001-disable_tests_pyuno_trisquel.patch b/helpers/DATA/libreoffice/patch_changes/001-disable_tests_pyuno_trisquel.patch
new file mode 100644
index 00000000..4dbd438c
--- /dev/null
+++ b/helpers/DATA/libreoffice/patch_changes/001-disable_tests_pyuno_trisquel.patch
@@ -0,0 +1,34 @@
+diff --git a/debian/control b/debian/control
+index b0f95119..073ece8e 100644
+--- a/debian/control
++++ b/debian/control
+@@ -196,9 +196,7 @@ Build-Depends-Arch: at-spi2-core [amd64 arm64 armhf] <!nocheck>,
+                     poppler-data [amd64 arm64 armhf] <!nocheck>,
+                     pstoedit [amd64 arm64 armhf] <!nocheck>,
+                     python3-lxml [!ppc64el !riscv64 !s390x] <!nocheck !nopython>,
+-                    python3-pip [!ppc64el !riscv64 !s390x] <!nocheck !nopython>,
+                     python3-setuptools [!ppc64el !riscv64 !s390x] <!nocheck !nopython>,
+-                    python3-venv [!ppc64el !riscv64 !s390x] <!nocheck !nopython>,
+                     qt5-qmake,
+                     qtbase5-dev,
+                     qtbase5-dev-tools,
+diff --git a/pyuno/qa/pytests/testimports.py b/pyuno/qa/pytests/testimports.py
+index 29b14736..85ed1a53 100644
+--- a/pyuno/qa/pytests/testimports.py
++++ b/pyuno/qa/pytests/testimports.py
+@@ -33,6 +33,7 @@ class ImportsTest(unittest.TestCase):
+             print(str(ssl), file=devnull)
+ 
+     # tdf#162786: make sure importing pip works on all platforms
++    @unittest.skip("Test disabled on Trisquel")
+     def test_pip_import(self):
+         import pip
+ 
+@@ -40,6 +41,7 @@ class ImportsTest(unittest.TestCase):
+         with open(os.devnull, "w") as devnull:
+             print(str(pip), file=devnull)
+ 
++    @unittest.skip("Test disabled on Trisquel")
+     def test_venv_import(self):
+         import venv
+ 
diff --git a/helpers/DATA/libreoffice/patch_changes/001-fix_nopython_profile.patch b/helpers/DATA/libreoffice/patch_changes/001-fix_nopython_profile.patch
deleted file mode 100644
index 9cf39886..00000000
--- a/helpers/DATA/libreoffice/patch_changes/001-fix_nopython_profile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 be5a883e..2c83a5f5 100644
--- a/helpers/make-libreoffice
+++ b/helpers/make-libreoffice
@@ -29,8 +29,7 @@ apply_patch_changes
 # Increase CPU usage for amd64 build.
 sed -i "/NUM_CPUS=/s|3|7|" debian/rules
 
-# Profile 'nopython'
-
-changelog "Backport libreoffice fresh into Trisquel"
+changelog "Disabled python-pip/venv tests for Trisquel
+Backport libreoffice fresh into Trisquel"
 
 package