[arch-commits] Commit in (15 files)

Evangelos Foutras foutrelis at gemini.archlinux.org
Mon Nov 29 20:18:42 UTC 2021


    Date: Monday, November 29, 2021 @ 20:18:41
  Author: foutrelis
Revision: 429493

Prepare for Python 3.10 rebuild

Modified:
  boost/trunk/PKGBUILD
  deluge/trunk/PKGBUILD
  git-review/trunk/PKGBUILD
  gpgme/trunk/PKGBUILD
  libreoffice-fresh/trunk/PKGBUILD
  libreoffice-still/trunk/PKGBUILD
  libvoikko/trunk/PKGBUILD
  libxml2/trunk/PKGBUILD
  pyalpm/trunk/PKGBUILD
  python-numpy/trunk/PKGBUILD
  python-pip/trunk/PKGBUILD
  python-pycurl/trunk/PKGBUILD
  python-wrapt/trunk/PKGBUILD
  python-zope-interface/trunk/PKGBUILD
  subversion/trunk/PKGBUILD

--------------------------------------+
 boost/trunk/PKGBUILD                 |   16 ++++++++--------
 deluge/trunk/PKGBUILD                |    2 +-
 git-review/trunk/PKGBUILD            |    2 +-
 gpgme/trunk/PKGBUILD                 |    2 +-
 libreoffice-fresh/trunk/PKGBUILD     |    6 +++---
 libreoffice-still/trunk/PKGBUILD     |    6 +++---
 libvoikko/trunk/PKGBUILD             |    4 ++--
 libxml2/trunk/PKGBUILD               |    4 ++--
 pyalpm/trunk/PKGBUILD                |    2 +-
 python-numpy/trunk/PKGBUILD          |    2 +-
 python-pip/trunk/PKGBUILD            |    6 +++---
 python-pycurl/trunk/PKGBUILD         |    2 +-
 python-wrapt/trunk/PKGBUILD          |    2 +-
 python-zope-interface/trunk/PKGBUILD |    2 +-
 subversion/trunk/PKGBUILD            |    8 ++++----
 15 files changed, 33 insertions(+), 33 deletions(-)

Modified: boost/trunk/PKGBUILD
===================================================================
--- boost/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ boost/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -57,7 +57,7 @@
     runtime-link=shared \
     link=shared,static \
     toolset=gcc \
-    python=3.9 \
+    python=3.10 \
     cflags="$CPPFLAGS $CFLAGS -fPIC -O3" \
     cxxflags="$CPPFLAGS $CXXFLAGS -fPIC -O3" \
     linkflags="$LDFLAGS" \
@@ -92,9 +92,9 @@
     libboost_json.so libboost_locale.so libboost_log.so libboost_log_setup.so
     libboost_math_c99.so libboost_math_c99f.so libboost_math_c99l.so
     libboost_math_tr1.so libboost_math_tr1f.so libboost_math_tr1l.so
-    libboost_mpi.so libboost_numpy39.so
+    libboost_mpi.so libboost_numpy310.so
     libboost_prg_exec_monitor.so libboost_program_options.so
-    libboost_python39.so libboost_random.so
+    libboost_python310.so libboost_random.so
     libboost_regex.so libboost_serialization.so
     libboost_stacktrace_addr2line.so libboost_stacktrace_basic.so
     libboost_stacktrace_noop.so libboost_system.so libboost_thread.so
@@ -105,11 +105,11 @@
   cp -a fakeinstall/lib/*.so* "$pkgdir"/usr/lib/
 
   # https://github.com/boostorg/mpi/issues/112
-  install -d "$pkgdir"/usr/lib/python3.9/site-packages/boost
-  touch "$pkgdir"/usr/lib/python3.9/site-packages/boost/__init__.py
-  python -m compileall -o 0 -o 1 -o 2 "$pkgdir"/usr/lib/python3.9/site-packages/boost
-  cp fakeinstall/lib/boost-python3.9/mpi.so \
-    "$pkgdir"/usr/lib/python3.9/site-packages/boost/mpi.so
+  install -d "$pkgdir"/usr/lib/python3.10/site-packages/boost
+  touch "$pkgdir"/usr/lib/python3.10/site-packages/boost/__init__.py
+  python -m compileall -o 0 -o 1 -o 2 "$pkgdir"/usr/lib/python3.10/site-packages/boost
+  cp fakeinstall/lib/boost-python3.10/mpi.so \
+    "$pkgdir"/usr/lib/python3.10/site-packages/boost/mpi.so
 
   # https://github.com/boostorg/python/issues/203#issuecomment-391477685
   for _lib in python numpy; do

Modified: deluge/trunk/PKGBUILD
===================================================================
--- deluge/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ deluge/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -95,7 +95,7 @@
 
   _pick gtk usr/bin/deluge-gtk usr/share/man/man1/deluge-gtk.1
   _pick gtk usr/share/{appdata,applications,icons,pixmaps}
-  _pick gtk usr/lib/python3.9/site-packages/deluge/ui/gtk3
+  _pick gtk usr/lib/python3.10/site-packages/deluge/ui/gtk3
 }
 
 package_deluge-gtk() {

Modified: git-review/trunk/PKGBUILD
===================================================================
--- git-review/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ git-review/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -46,7 +46,7 @@
   python setup.py install --root="$PWD/tmp_install" --optimize=1
 
   python -m git_review.tests.prepare
-  PYTHONPATH="$PWD/tmp_install/usr/lib/python3.9/site-packages:$PYTHONPATH" PATH="$PWD/tmp_install/usr/bin:$PATH" stestr run || warning "Tests failed"
+  PYTHONPATH="$PWD/tmp_install/usr/lib/python3.10/site-packages:$PYTHONPATH" PATH="$PWD/tmp_install/usr/bin:$PATH" stestr run || warning "Tests failed"
 }
 
 package() {

Modified: gpgme/trunk/PKGBUILD
===================================================================
--- gpgme/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ gpgme/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -6,7 +6,7 @@
 pkgname=(gpgme qgpgme python-gpgme)
 pkgver=1.16.0
 pkgrel=1
-_python_ver=3.9
+_python_ver=3.10
 pkgdesc="A C wrapper library for GnuPG"
 arch=('x86_64')
 url='https://www.gnupg.org/related_software/gpgme/'

Modified: libreoffice-fresh/trunk/PKGBUILD
===================================================================
--- libreoffice-fresh/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ libreoffice-fresh/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -328,11 +328,11 @@
 	install -m644 "${srcdir}"/libreoffice-fresh.{sh,csh} "${pkgdir}"/etc/profile.d/
 
 	# make pyuno find its modules
-	install -dm755 "${pkgdir}"/usr/lib/python3.9/site-packages
+	install -dm755 "${pkgdir}"/usr/lib/python3.10/site-packages
 	ln -svf /usr/lib/libreoffice/program/uno.py \
-		"${pkgdir}"/usr/lib/python3.9/site-packages/uno.py
+		"${pkgdir}"/usr/lib/python3.10/site-packages/uno.py
 	ln -svf /usr/lib/libreoffice/program/unohelper.py \
-		"${pkgdir}"/usr/lib/python3.9/site-packages/unohelper.py
+		"${pkgdir}"/usr/lib/python3.10/site-packages/unohelper.py
 		
 	# add a symlink required for gnome-documents; FS#51887
 	# https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html

Modified: libreoffice-still/trunk/PKGBUILD
===================================================================
--- libreoffice-still/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ libreoffice-still/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -338,11 +338,11 @@
 	install -m644 "${srcdir}"/libreoffice-still.{sh,csh} "${pkgdir}"/etc/profile.d/
 
 	# make pyuno find its modules
-	install -dm755 "${pkgdir}"/usr/lib/python3.9/site-packages
+	install -dm755 "${pkgdir}"/usr/lib/python3.10/site-packages
 	ln -svf /usr/lib/libreoffice/program/uno.py \
-		"${pkgdir}"/usr/lib/python3.9/site-packages/uno.py
+		"${pkgdir}"/usr/lib/python3.10/site-packages/uno.py
 	ln -svf /usr/lib/libreoffice/program/unohelper.py \
-		"${pkgdir}"/usr/lib/python3.9/site-packages/unohelper.py
+		"${pkgdir}"/usr/lib/python3.10/site-packages/unohelper.py
 		
 	# add a symlink required for gnome-documents; FS#51887
 	# https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html

Modified: libvoikko/trunk/PKGBUILD
===================================================================
--- libvoikko/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ libvoikko/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -29,6 +29,6 @@
   cd $pkgname-$pkgver
 
   make DESTDIR="$pkgdir" install
-  mkdir -p "$pkgdir"/usr/lib/python3.9/site-packages
-  cp python/libvoikko.py "$pkgdir"/usr/lib/python3.9/site-packages/libvoikko.py
+  mkdir -p "$pkgdir"/usr/lib/python3.10/site-packages
+  cp python/libvoikko.py "$pkgdir"/usr/lib/python3.10/site-packages/libvoikko.py
 }

Modified: libxml2/trunk/PKGBUILD
===================================================================
--- libxml2/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ libxml2/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -84,8 +84,8 @@
   #Disabled for now, as I don't want to introduce file conflicts during a security update 
   #python2 -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7"
   #python2 -O -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7"
-  #python -m compileall -d /usr/lib/python3.9 "$pkgdir/usr/lib/python3.9"
-  #python -O -m compileall -d /usr/lib/python3.9 "$pkgdir/usr/lib/python3.9" 
+  #python -m compileall -d /usr/lib/python3.10 "$pkgdir/usr/lib/python3.10"
+  #python -O -m compileall -d /usr/lib/python3.10 "$pkgdir/usr/lib/python3.10" 
 }
 
 # vim: ts=2 sw=2 et:

Modified: pyalpm/trunk/PKGBUILD
===================================================================
--- pyalpm/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ pyalpm/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -24,7 +24,7 @@
 
 check() {
   cd "${pkgname}"
-  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.9" pytest
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.10" pytest
 }
 
 package() {

Modified: python-numpy/trunk/PKGBUILD
===================================================================
--- python-numpy/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ python-numpy/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -33,7 +33,7 @@
   cd numpy-$pkgver
   python setup.py install --root="$PWD/tmp_install" --optimize=1
   cd "$PWD/tmp_install"
-  PATH="$PWD/usr/bin:$PATH" PYTHONPATH="$PWD/usr/lib/python3.9/site-packages:$PYTHONPATH" python -c 'import numpy; numpy.test()'
+  PATH="$PWD/usr/bin:$PATH" PYTHONPATH="$PWD/usr/lib/python3.10/site-packages:$PYTHONPATH" python -c 'import numpy; numpy.test()'
 }
 
 package() {

Modified: python-pip/trunk/PKGBUILD
===================================================================
--- python-pip/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ python-pip/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -62,7 +62,7 @@
   # appdirs: https://github.com/pypa/pip/issues/7784
   # build_env: TODO weird looking errors
   # virtualenv: https://github.com/pypa/pip/issues/8273
-  PYTHONPATH="$PWD/tmp_install/usr/lib/python3.9/site-packages" PATH="$PWD/tmp_install/usr/bin:$PATH" \
+  PYTHONPATH="$PWD/tmp_install/usr/lib/python3.10/site-packages" PATH="$PWD/tmp_install/usr/bin:$PATH" \
     python -m pytest -m unit --junit-xml=junit/unit-test.xml --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux \
                                                              --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux_override \
                                                              --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux_empty \
@@ -87,8 +87,8 @@
 
   install -Dm644 -t "$pkgdir"/usr/share/man/man1 docs/build/man/*
 
-  PYTHONPATH="$pkgdir"/usr/lib/python3.9/site-packages "$pkgdir"/usr/bin/pip completion --bash \
+  PYTHONPATH="$pkgdir"/usr/lib/python3.10/site-packages "$pkgdir"/usr/bin/pip completion --bash \
     | install -Dm644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip
-  PYTHONPATH="$pkgdir"/usr/lib/python3.9/site-packages "$pkgdir"/usr/bin/pip completion --fish \
+  PYTHONPATH="$pkgdir"/usr/lib/python3.10/site-packages "$pkgdir"/usr/bin/pip completion --fish \
     | install -Dm644 /dev/stdin "$pkgdir"/usr/share/fish/vendor_completions.d/pip.fish
 }

Modified: python-pycurl/trunk/PKGBUILD
===================================================================
--- python-pycurl/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ python-pycurl/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -30,7 +30,7 @@
   # We don't have HTTP2 enabled
 
   cd pycurl-$pkgver
-  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.9:$PYTHONPATH" make test || warning "Tests failed"
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.10:$PYTHONPATH" make test || warning "Tests failed"
 }
 
 package() {

Modified: python-wrapt/trunk/PKGBUILD
===================================================================
--- python-wrapt/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ python-wrapt/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -28,7 +28,7 @@
 
 check() {
   cd "$srcdir"/wrapt-$pkgver
-  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.9:$PYTHONPATH" py.test
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.10:$PYTHONPATH" py.test
 }
 
 package() {

Modified: python-zope-interface/trunk/PKGBUILD
===================================================================
--- python-zope-interface/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ python-zope-interface/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -23,7 +23,7 @@
 
 check() {
   cd "$srcdir"/zope.interface-$pkgver
-  PYTHONPATH="$PWD/build/lib.linux-x86_64-3.9" python setup.py test
+  PYTHONPATH="$PWD/build/lib.linux-x86_64-3.10" python setup.py test
 }
 
 package() {

Modified: subversion/trunk/PKGBUILD
===================================================================
--- subversion/trunk/PKGBUILD	2021-11-29 20:09:29 UTC (rev 429492)
+++ subversion/trunk/PKGBUILD	2021-11-29 20:18:41 UTC (rev 429493)
@@ -71,8 +71,8 @@
                --disable-static
 
    make LT_LDFLAGS="-L$Fdestdir/usr/lib"
-   make swig_pydir=/usr/lib/python3.9/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python3.9/site-packages/svn swig-py swig-pl javahl swig-rb
+   make swig_pydir=/usr/lib/python3.10/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python3.10/site-packages/svn swig-py swig-pl javahl swig-rb
 }
 
 check() {
@@ -86,8 +86,8 @@
 
    export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH}
    make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
-     swig_pydir=/usr/lib/python3.9/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python3.9/site-packages/svn \
+     swig_pydir=/usr/lib/python3.10/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python3.10/site-packages/svn \
      install install-swig-py install-swig-pl install-javahl install-swig-rb
 
    install -dm755 "${pkgdir}"/usr/share/subversion



More information about the arch-commits mailing list