Hi,
Am 10.03.24 um 19:44 schrieb Rene Engelhard:
and similar stuff in upstreams configure.
python_include=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
python_version=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('VERSION'));"`
python_libs=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('LIBS'));"`
python_libdir=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('LIBDIR'));"`
to be precise.
BTW, What is the replacement for it? setuptools._distutils? As in the
following patch?
diff --git a/changelog b/changelog
index 968af9a3b..9d16707d6 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (4:24.2.2~rc1-3) UNRELEASED; urgency=medium
+
+ * debian/patches/distutils-is-obsolete.diff, debian/rules: use
+ setuptools._distutils instead of distutils (closes: #1065893)
+
+ -- Rene Engelhard <r...@debian.org> Sun, 10 Mar 2024 19:57:14 +0100
+
libreoffice (4:24.2.2~rc1-2) experimental; urgency=medium
* debian/patches/fix-32bit-build.diff: as name says; from upstream
diff --git a/patches/series b/patches/series
index 75a4f68d2..47b80676f 100644
--- a/patches/series
+++ b/patches/series
@@ -50,3 +50,4 @@ fix-system-abseil-build.diff
fix-riscv64-bridge.diff
pdfium-ports.diff
fix-32bit-build.diff
+distutils-is-obsolete.diff
diff --git a/rules b/rules
index aa981c5b1..a47940395 100755
--- a/rules
+++ b/rules
@@ -1086,7 +1086,7 @@ ifeq "$(ENABLE_PYTHON)" "y"
PYMAJOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[0])")
PYMINOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1])")
PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print
(sys.version_info[1]+1)")
-PYTHON_SITE:=debian/python3-uno/$(shell $(PYTHON) -c 'from distutils
import sysconfig; print(sysconfig.get_python_lib())')
+PYTHON_SITE:=$(shell $(PYTHON) -c 'from setuptools._distutils import
sysconfig; print(sysconfig.get_python_lib())')
endif
BUILD_DEPS += , $(PYTHON)
@@ -2953,9 +2953,9 @@ else
endif
ifeq "$(PACKAGE_BASE)" "y"
- mkdir -p debian/python3-access2base/$(shell $(PYTHON) -c 'from
distutils import sysconfig; print(sysconfig.get_python_lib())')
+ mkdir -p debian/python3-access2base/$(PYTHON_SITE) }
mv $(PKGDIR)-common/$(OODIR)/program/access2base.py \
- debian/python3-access2base/$(shell $(PYTHON) -c 'from distutils
import sysconfig; print(sysconfig.get_python_lib())')
+ debian/python3-access2base/$(PYTHON_SITE)
else
rm -rf $(PKGDIR)-common/$(OODIR)/share/basic/Access2Base
t=`mktemp -q`; grep -v Access2Base
$(PKGDIR)-common/$(OODIR)/share/basic/dialog.xlc > \
@@ -2966,9 +2966,9 @@ else
endif
# ScriptForge
- mkdir -p debian/python3-scriptforge/$(shell $(PYTHON) -c 'from
distutils import sysconfig; print(sysconfig.get_python_lib())')
+ mkdir -p debian/python3-scriptforge/$(PYTHON_SITE) \
mv $(PKGDIR)-common/$(OODIR)/program/scriptforge.py \
- debian/python3-scriptforge/$(shell $(PYTHON) -c 'from distutils
import sysconfig; print(sysconfig.get_python_lib())')
+ debian/python3-scriptforge/$(PYTHON_SITE)
ifeq "$(PACKAGE_SDK)" "y"
# move gengal stuff into -dev-gui
@@ -3354,16 +3354,16 @@ endif
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
- install -d $(PYTHON_SITE)
+ install -d debian/python3-uno/$(PYTHON_SITE)
# prepend stuff so that it works when the module is not in LOs
# directories but in $(PYTHON_SITE). Can't be a patch (anymore)
# as otherwise the python-based unittests fail miserably.
- echo "import sys, os" > $(PYTHON_SITE)/uno.py
- echo "sys.path.append('/$(OODIR)/program')" >> $(PYTHON_SITE)/uno.py
- echo "os.putenv('URE_BOOTSTRAP',
'vnd.sun.star.pathname:/$(OODIR)/program/fundamentalrc')" >>
$(PYTHON_SITE)/uno.py
- cat debian/python3-uno/$(OODIR)/program/uno.py >> $(PYTHON_SITE)/uno.py
+ echo "import sys, os" > debian/python3-uno/$(PYTHON_SITE)/uno.py
+ echo "sys.path.append('/$(OODIR)/program')" >>
debian/python3-uno/$(PYTHON_SITE)/uno.py
+ echo "os.putenv('URE_BOOTSTRAP',
'vnd.sun.star.pathname:/$(OODIR)/program/fundamentalrc')" >>
debian/python3-uno/$(PYTHON_SITE)/uno.py
+ cat debian/python3-uno/$(OODIR)/program/uno.py >>
debian/python3-uno/$(PYTHON_SITE)/uno.py
rm -f debian/python3-uno/$(OODIR)/program/uno.py
- mv debian/python3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
+ mv debian/python3-uno/$(OODIR)/program/unohelper.py
debian/python3-uno/$(PYTHON_SITE)
touch debian/python3-uno/$(OODIR)/program/pythonloader.unorc
chmod u+w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
( echo 'PYTHONHOME=file:///usr/lib/python$(PYMAJOR).$(PYMINOR)' ;\
--- /dev/null 2024-03-09 21:11:03.946057442 +0100
+++ patches/distutils-is-obsolete.diff 2024-03-10 19:55:13.982399830
+0100
@@ -0,0 +1,19 @@
+diff --git a/configure.ac b/configure.ac
+index 8101a2b2e1dd..d0823453ee8e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9959,10 +10003,10 @@ if test $enable_python = system; then
+ unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
am_cv_python_version am_cv_python_platform am_cv_python_pythondir
am_cv_python_pyexecdir
+ # This causes an error if no python command is found
+ AM_PATH_PYTHON([3.3])
+- python_include=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
+- python_version=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('VERSION'));"`
+- python_libs=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('LIBS'));"`
+- python_libdir=`$PYTHON -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('LIBDIR'));"`
++ python_include=`$PYTHON -c "import
setuptools._distutils.sysconfig;
print(setuptools._distutils.sysconfig.get_config_var('INCLUDEPY'));"`
++ python_version=`$PYTHON -c "import
setuptools._distutils.sysconfig;
print(setuptools._distutils.sysconfig.get_config_var('VERSION'));"`
++ python_libs=`$PYTHON -c "import
setuptools._distutils.sysconfig;
print(setuptools._distutils.sysconfig.get_config_var('LIBS'));"`
++ python_libdir=`$PYTHON -c "import
setuptools._distutils.sysconfig;
print(setuptools._distutils.sysconfig.get_config_var('LIBDIR'));"`
+ if test -z "$PKG_CONFIG"; then
+ PYTHON_CFLAGS="-I$python_include"
+ PYTHON_LIBS="-L$python_libdir -lpython$python_version
$python_libs"
Regards,
Rene
