[neon/forks/pyqt5/Neon/release] debian: Revert "Disable generation of .pyi files on mipsel to reduce memory consumption."

Dmitry Shachnev null at kde.org
Sat Feb 4 00:27:06 GMT 2023


Git commit 4f9324da8ab9f0eb691c17e8f314cec4ea35314c by Dmitry Shachnev.
Committed on 29/01/2023 at 15:09.
Pushed by carlosdem into branch 'Neon/release'.

Revert "Disable generation of .pyi files on mipsel to reduce memory consumption."

The latest sip should use less memory.

This reverts commit d20365bb3aefff2b00f5aaf5f928f45a3cb42974.

M  +1    -0    debian/changelog
M  +1    -7    debian/rules

https://invent.kde.org/neon/forks/pyqt5/commit/4f9324da8ab9f0eb691c17e8f314cec4ea35314c

diff --git a/debian/changelog b/debian/changelog
index 06dcebd4..d31ba7ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pyqt5 (5.15.8+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump sip build-dependencies to 6.6.2, pyqt-builder to 1.14.1.
   * Update years in debian/copyright.
+  * Generate .pyi on mipsel again. The latest sip should use less memory.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 29 Jan 2023 00:28:15 +0400
 
diff --git a/debian/rules b/debian/rules
index 2a7fd1df..fc15bfba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ build-%/configure-stamp:
 	dh_testdir
 	python$* /usr/bin/sip-build $(SHARED_CONFIGURE_OPTIONS) \
 			--build-dir build-$* \
-			$(if $(filter $(DEFAULT_PYTHON),$*),$(if $(filter $(DEB_BUILD_ARCH),mipsel),,--pep484-pyi),--no-designer-plugin --no-qml-plugin)
+			$(if $(filter $(DEFAULT_PYTHON),$*),--pep484-pyi,--no-designer-plugin --no-qml-plugin)
 	sed -i '/strip/d' build-$*/*/Makefile
 	touch $@
 
@@ -94,12 +94,6 @@ override_dh_auto_install-arch:
 		$(MAKE) -C build-$$p install INSTALL_ROOT=$(CURDIR)/debian/tmp; \
 	done
 
-ifneq (,$(filter $(DEB_BUILD_ARCH),mipsel))
-execute_before_dh_install-arch:
-	sed -i '/\.pyi$$/d' debian/*.install
-	sed -i '/py.typed/d' debian/python3-pyqt5.install
-endif
-
 execute_after_dh_install-arch:
 	sed -i 's,/usr/bin/python3[.0-9]*,/usr/bin/python3,' debian/pyqt5-dev-tools/usr/bin/*
 	rm -rfv debian/python3-pyqt5/usr/lib/python3/dist-packages/PyQt5/uic/port_v2



More information about the Neon-commits mailing list