Tue Dec 31 05:17:04 UTC 201920191231051704

a/kmod-26-x86_64-3.txz:  Rebuilt.
  This doesn't build with --enable-python and python3-3.8.1, so we'll
  disable it for now. The python additions don't appear to be widely
  packaged anyway.
a/util-linux-2.34-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
ap/hplip-3.19.12-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
ap/ksh93-20191228_5abcbd06-x86_64-1.txz:  Upgraded.
ap/linuxdoc-tools-0.9.73-x86_64-3.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
ap/lxc-2.0.11_fad08f383-x86_64-3.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
ap/rpm-4.15.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/Cython-0.29.14-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/clisp-2.50_20191103_c26de7873-x86_64-1.txz:  Upgraded.
d/distcc-3.3.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/gdb-8.3.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/llvm-9.0.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/meson-0.52.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/python-pip-19.3.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/python-setuptools-42.0.2-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/python3-3.8.1-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
kde/pykde4-4.14.3-x86_64-10.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/Mako-1.1.0-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/PyQt-4.12.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/QScintilla-2.11.4-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/alsa-lib-1.2.1.2-x86_64-2.txz:  Rebuilt.
  Recompiled without --enable-mixer-pymods.
l/dbus-python-1.2.14-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/gexiv2-0.12.0-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/gobject-introspection-1.62.0-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/libcaca-0.99.beta19-x86_64-5.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/libcap-ng-0.7.10-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/libproxy-0.4.15-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/libwebp-1.0.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/libwmf-0.2.8.4-x86_64-9.txz:  Rebuilt.
  Correct the path for the GDK_PIXBUF_DIR.
  Thanks to B. Watson and Robby Workman.
l/libxml2-2.9.10-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/newt-0.52.21-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pycairo-1.18.2-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pycups-1.9.74-x86_64-3.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pycurl-7.43.0.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pygobject-2.28.7-x86_64-5.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pygobject3-3.34.0-x86_64-3.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pyparsing-2.4.5-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-appdirs-1.4.3-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-certifi-2019.11.28-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-chardet-3.0.4-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-docutils-0.15.2-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-idna-2.8-x86_64-3.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-notify2-0.3.1-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-packaging-19.2-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-pillow-6.2.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-ply-3.11-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-requests-2.22.0-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-sane-2.8.3-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-six-1.13.0-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-urllib3-1.25.7-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/sip-4.19.20-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/system-config-printer-1.5.12-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/talloc-2.3.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/tdb-1.4.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/tevent-0.10.2-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/urwid-1.0.3-x86_64-5.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/zstd-1.4.4-x86_64-2.txz:  Rebuilt.
  Fix libdir in libzstd.pc. Thanks to orbea.
n/gpgme-1.13.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
n/obexftp-0.24.2-x86_64-5.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
n/pssh-2.3.1-x86_64-5.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
n/s-nail-14.9.16-x86_64-1.txz:  Upgraded.
n/samba-4.11.4-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
x/pyxdg-0.26-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
x/xcb-proto-1.13-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
xap/blueman-2.1.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
xap/hexchat-2.14.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
extra/pure-alsa-system/alsa-lib-1.2.1.2-x86_64-2_alsa.txz:  Rebuilt.
  Recompiled without --enable-mixer-pymods.
isolinux/initrd.img:  Rebuilt.
  SeTEFI: Patched to remove extra whitespace from lsblk output.
  Thanks to Didier Spaier.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
  SeTEFI: Patched to remove extra whitespace from lsblk output.
  Thanks to Didier Spaier.

3 files changed, 103 insertions, 54 deletions

diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild
index 9a16b8609..6841bf1d2 100755
--- a/source/d/python3/python3.SlackBuild
+++ b/source/d/python3/python3.SlackBuild
@@ -122,6 +122,13 @@ make install DESTDIR=$PKG || exit 1
 # Remove to avoid overwriting a copy from Python2.
 rm -f $PKG/usr/bin/2to3
 
+## NOPE, let's try using -I instead.
+## Add a symlink to cpython include directory to fix various builds that
+## do not expect the new location:
+#( cd $PKG/usr/include
+#  ln -sf python?.?/cpython .
+#)
+
 # We'll install the python-tools under site-packages.
 mkdir -p $SITEPK
 cp -a Tools/* $SITEPK
diff --git a/source/d/python3/python3.no-static-library.diff b/source/d/python3/python3.no-static-library.diff
index 2e03ab8ad..76a75402c 100644
--- a/source/d/python3/python3.no-static-library.diff
+++ b/source/d/python3/python3.no-static-library.diff
@@ -1,36 +1,61 @@
---- ./Makefile.pre.in.orig	2019-01-13 13:06:37.518767495 -0600
-+++ ./Makefile.pre.in	2019-01-13 13:28:41.778781670 -0600
-@@ -549,7 +549,7 @@
- 	$(PYTHON_FOR_REGEN) ./Tools/clinic/clinic.py --make
+From 2559cbe8f0431ba20de8a1c9921013e5e3820967 Mon Sep 17 00:00:00 2001
+From: David Malcolm <dmalcolm@redhat.com>
+Date: Mon, 18 Jan 2010 17:59:07 +0000
+Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Downstream only: not appropriate for upstream.
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=556092
+
+Co-authored-by: David Malcolm <dmalcolm@redhat.com>
+Co-authored-by: Bohuslav Kabrda <bkabrda@redhat.com>
+Co-authored-by: Matej Stuchlik <mstuchli@redhat.com>
+Co-authored-by: Robert Kuska <rkuska@redhat.com>
+Co-authored-by: Charalampos Stratakis <cstratak@redhat.com>
+Co-authored-by: Miro Hrončok <miro@hroncok.cz>
+---
+ Makefile.pre.in | 21 ++-------------------
+ 1 file changed, 2 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 4ad3df1122..72d202d71b 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -562,7 +562,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
+ 	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
  
  # Build the interpreter
 -$(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
 +$(BUILDPYTHON):	Programs/python.o $(LDLIBRARY) $(PY3LIBRARY)
- 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
  
  platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -598,11 +598,6 @@
+@@ -610,12 +610,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+ 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
  		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
  
- 
+-
 -# Build static library
 -$(LIBRARY): $(LIBRARY_OBJS)
 -	-rm -f $@
 -	$(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
 -
- libpython$(LDVERSION).so: $(LIBRARY_OBJS)
+ libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
  	if test $(INSTSONAME) != $(LDLIBRARY); then \
- 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -692,7 +687,7 @@
- 		echo "-----------------------------------------------"; \
- 	fi
+ 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
+@@ -693,7 +687,7 @@ Makefile Modules/config.c: Makefile.pre \
+ 	@echo "The Makefile was updated, you may need to re-run make."
+ 
  
 -Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
 +Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
- 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
  
  ############################################################################
-@@ -1428,17 +1423,6 @@
+@@ -1557,17 +1551,6 @@ libainstall:	@DEF_MAKE_RULE@ python-config
  		else	true; \
  		fi; \
  	done
@@ -48,3 +73,6 @@
  	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
  	$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
  	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
+-- 
+2.24.1
+
diff --git a/source/d/python3/python3.x86_64.diff b/source/d/python3/python3.x86_64.diff
index 1649c2344..85f62b1ef 100644
--- a/source/d/python3/python3.x86_64.diff
+++ b/source/d/python3/python3.x86_64.diff
@@ -1,6 +1,20 @@
---- ./configure.orig	2018-12-23 15:37:36.000000000 -0600
-+++ ./configure	2019-02-19 16:02:14.585002930 -0600
-@@ -15149,9 +15149,9 @@
+--- ./configure.ac.orig	2019-12-18 11:21:23.000000000 -0600
++++ ./configure.ac	2019-12-29 18:07:37.316132144 -0600
+@@ -4668,9 +4668,9 @@
+ dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
+ AC_SUBST(PY_ENABLE_SHARED)
+ if test x$PLATFORM_TRIPLET = x; then
+-  LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
++  LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
+ else
+-  LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
++  LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
+ fi
+ AC_SUBST(LIBPL)
+ 
+--- ./configure.orig	2019-12-18 11:21:23.000000000 -0600
++++ ./configure	2019-12-29 18:07:37.320132144 -0600
+@@ -15170,9 +15170,9 @@
  
  
  if test x$PLATFORM_TRIPLET = x; then
@@ -12,9 +26,9 @@
  fi
  
  
---- ./Makefile.pre.in.orig	2018-12-23 15:37:36.000000000 -0600
-+++ ./Makefile.pre.in	2019-02-19 16:02:14.576002930 -0600
-@@ -142,7 +142,7 @@
+--- ./Makefile.pre.in.orig	2019-12-18 11:21:23.000000000 -0600
++++ ./Makefile.pre.in	2019-12-29 18:07:37.321132144 -0600
+@@ -143,7 +143,7 @@
  MANDIR=		@mandir@
  INCLUDEDIR=	@includedir@
  CONFINCLUDEDIR=	$(exec_prefix)/include
@@ -23,8 +37,8 @@
  ABIFLAGS=	@ABIFLAGS@
  
  # Detailed destination directories
---- ./Lib/sysconfig.py.orig	2018-12-23 15:37:36.000000000 -0600
-+++ ./Lib/sysconfig.py	2019-02-19 16:02:14.574002930 -0600
+--- ./Lib/sysconfig.py.orig	2019-12-18 11:21:23.000000000 -0600
++++ ./Lib/sysconfig.py	2019-12-29 18:07:37.322132144 -0600
 @@ -20,10 +20,10 @@
  
  _INSTALL_SCHEMES = {
@@ -70,9 +84,9 @@
          'include': '{userbase}/include/python{py_version_short}',
          'scripts': '{userbase}/bin',
          'data': '{userbase}',
---- ./Lib/site.py.orig	2018-12-23 15:37:36.000000000 -0600
-+++ ./Lib/site.py	2019-02-19 16:02:14.572002930 -0600
-@@ -334,7 +334,7 @@
+--- ./Lib/site.py.orig	2019-12-18 11:21:23.000000000 -0600
++++ ./Lib/site.py	2019-12-29 18:07:37.324132144 -0600
+@@ -335,7 +335,7 @@
          seen.add(prefix)
  
          if os.sep == '/':
@@ -81,8 +95,8 @@
                                          "python%d.%d" % sys.version_info[:2],
                                          "site-packages"))
          else:
---- ./Lib/distutils/command/install.py.orig	2018-12-23 15:37:36.000000000 -0600
-+++ ./Lib/distutils/command/install.py	2019-02-19 16:02:14.567002930 -0600
+--- ./Lib/distutils/command/install.py.orig	2019-12-18 11:21:23.000000000 -0600
++++ ./Lib/distutils/command/install.py	2019-12-29 18:10:30.181135838 -0600
 @@ -29,15 +29,15 @@
  
  INSTALL_SCHEMES = {
@@ -103,9 +117,9 @@
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
          'data'   : '$base',
---- ./Lib/distutils/sysconfig.py.orig	2018-12-23 15:37:36.000000000 -0600
-+++ ./Lib/distutils/sysconfig.py	2019-02-19 16:02:14.570002930 -0600
-@@ -130,7 +130,7 @@
+--- ./Lib/distutils/sysconfig.py.orig	2019-12-18 11:21:23.000000000 -0600
++++ ./Lib/distutils/sysconfig.py	2019-12-29 18:07:37.325132144 -0600
+@@ -147,7 +147,7 @@
  
      if os.name == "posix":
          libpython = os.path.join(prefix,
@@ -114,28 +128,28 @@
          if standard_lib:
              return libpython
          else:
---- ./Modules/getpath.c.orig	2019-02-19 16:02:14.580002930 -0600
-+++ ./Modules/getpath.c	2019-02-19 16:06:51.535002940 -0600
-@@ -500,7 +500,7 @@
-                 "Could not find platform dependent libraries <exec_prefix>\n");
+--- ./Modules/getpath.c.orig	2019-12-18 11:21:23.000000000 -0600
++++ ./Modules/getpath.c	2019-12-29 18:07:37.326132144 -0600
+@@ -730,7 +730,7 @@
+         if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) {
+             return PATHLEN_ERR();
+         }
+-        status = joinpath(exec_prefix, L"lib/lib-dynload", exec_prefix_len);
++        status = joinpath(exec_prefix, L"lib64/lib-dynload", exec_prefix_len);
+         if (_PyStatus_EXCEPTION(status)) {
+             return status;
+         }
+@@ -1067,7 +1067,7 @@
+             return PATHLEN_ERR();
          }
-         wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN);
--        joinpath(exec_prefix, L"lib/lib-dynload");
-+        joinpath(exec_prefix, L"lib64/lib-dynload");
      }
-     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
- }
-@@ -742,7 +742,7 @@
-     else {
-         wcsncpy(calculate->zip_path, calculate->prefix, MAXPATHLEN);
+-    status = joinpath(zip_path, L"lib/python00.zip", zip_path_len);
++    status = joinpath(zip_path, L"lib64/python00.zip", zip_path_len);
+     if (_PyStatus_EXCEPTION(status)) {
+         return status;
      }
--    joinpath(calculate->zip_path, L"lib/python00.zip");
-+    joinpath(calculate->zip_path, L"lib64/python00.zip");
- 
-     /* Replace "00" with version */
-     size_t bufsz = wcslen(calculate->zip_path);
-@@ -867,7 +867,7 @@
-     if (!calculate->prefix) {
+@@ -1197,7 +1197,7 @@
+     if (!calculate->exec_prefix) {
          return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
      }
 -    calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);
@@ -143,14 +157,14 @@
      if (!calculate->lib_python) {
          return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
      }
---- ./setup.py.orig	2018-12-23 15:37:36.000000000 -0600
-+++ ./setup.py	2019-02-19 16:02:14.587002930 -0600
-@@ -546,7 +546,7 @@
+--- ./setup.py.orig	2019-12-18 11:21:23.000000000 -0600
++++ ./setup.py	2019-12-29 18:07:37.327132144 -0600
+@@ -649,7 +649,7 @@
          # directories (i.e. '.' and 'Include') must be first.  See issue
          # 10520.
-         if not cross_compiling:
+         if not CROSS_COMPILING:
 -            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 +            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
              add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
          # only change this for cross builds for 3.3, issues on Mageia
-         if cross_compiling:
+         if CROSS_COMPILING: