Merge branch 'master' into staging.

With "conflicts" solved (all in favor of master except git) in:
	gnu/local.mk
	gnu/packages/databases.scm
	gnu/packages/glib.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/graphics.scm
	gnu/packages/gstreamer.scm
	gnu/packages/gtk.scm
	gnu/packages/linux.scm
	gnu/packages/machine-learning.scm
	gnu/packages/networking.scm
	gnu/packages/polkit.scm
	gnu/packages/pulseaudio.scm
	gnu/packages/rpc.scm
	gnu/packages/rust.scm
	gnu/packages/version-control.scm
	gnu/packages/w3m.scm

1 files changed, 0 insertions, 204 deletions

diff --git a/gnu/packages/patches/blender-2.79-python-3.8-fix.patch b/gnu/packages/patches/blender-2.79-python-3.8-fix.patch
deleted file mode 100644
index 18d25449ee..0000000000
--- a/gnu/packages/patches/blender-2.79-python-3.8-fix.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From 4b663ecf264020b1d7003a137ce84b06d7ec4ce6 Mon Sep 17 00:00:00 2001
-From: bartus <szczepaniak.bartek+github@gmail.com>
-Date: Sat, 16 Nov 2019 20:29:30 +0100
-Subject: [PATCH] Add python 3.8 support.
-
----
- source/blender/python/generic/py_capi_utils.c | 27 +++++++++++++++----
- 1 file changed, 22 insertions(+), 5 deletions(-)
-
-diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
-index 545e0506f84..a7eab70600b 100644
---- a/source/blender/python/generic/py_capi_utils.c
-+++ b/source/blender/python/generic/py_capi_utils.c
-@@ -696,9 +696,16 @@ PyObject *PyC_UnicodeFromByte(const char *str)
-  ****************************************************************************/
- PyObject *PyC_DefaultNameSpace(const char *filename)
- {
-+	#if PY_VERSION_HEX >= 0x03080000
-+	PyObject *modules = PyImport_GetModuleDict();
-+	PyObject *builtins = PyEval_GetBuiltins();
-+	#else
- 	PyInterpreterState *interp = PyThreadState_GET()->interp;
-+	PyObject *modules = interp->modules;
-+	PyObject *builtins = interp->builtins;
-+	#endif
- 	PyObject *mod_main = PyModule_New("__main__");
--	PyDict_SetItemString(interp->modules, "__main__", mod_main);
-+	PyDict_SetItemString(modules, "__main__", mod_main);
- 	Py_DECREF(mod_main); /* sys.modules owns now */
- 	PyModule_AddStringConstant(mod_main, "__name__", "__main__");
- 	if (filename) {
-@@ -706,8 +713,8 @@ PyObject *PyC_DefaultNameSpace(const char *filename)
- 		 * note: this wont map to a real file when executing text-blocks and buttons. */
- 		PyModule_AddObject(mod_main, "__file__", PyC_UnicodeFromByte(filename));
- 	}
--	PyModule_AddObject(mod_main, "__builtins__", interp->builtins);
--	Py_INCREF(interp->builtins); /* AddObject steals a reference */
-+	PyModule_AddObject(mod_main, "__builtins__", builtins);
-+	Py_INCREF(builtins); /* AddObject steals a reference */
- 	return PyModule_GetDict(mod_main);
- }
- 
-@@ -734,15 +741,25 @@ bool PyC_NameSpace_ImportArray(PyObject *py_dict, const char *imports[])
- /* restore MUST be called after this */
- void PyC_MainModule_Backup(PyObject **main_mod)
- {
-+	#if PY_VERSION_HEX >= 0x03080000
-+	PyObject *modules = PyImport_GetModuleDict();
-+	#else
- 	PyInterpreterState *interp = PyThreadState_GET()->interp;
--	*main_mod = PyDict_GetItemString(interp->modules, "__main__");
-+	PyObject *modules = interp->modules;
-+	#endif
-+	*main_mod = PyDict_GetItemString(modules, "__main__");
- 	Py_XINCREF(*main_mod); /* don't free */
- }
- 
- void PyC_MainModule_Restore(PyObject *main_mod)
- {
-+	#if PY_VERSION_HEX >= 0x03080000
-+	PyObject *modules = PyImport_GetModuleDict();
-+	#else
- 	PyInterpreterState *interp = PyThreadState_GET()->interp;
--	PyDict_SetItemString(interp->modules, "__main__", main_mod);
-+	PyObject *modules = interp->modules;
-+	#endif
-+	PyDict_SetItemString(modules, "__main__", main_mod);
- 	Py_XDECREF(main_mod);
- }
- 
--- 
-2.24.0
-
-From 44f719b63238503ef8f933f55383c6d4798995cc Mon Sep 17 00:00:00 2001
-From: Campbell Barton <ideasman42@gmail.com>
-Date: Thu, 13 Sep 2018 17:06:07 +1000
-Subject: [PATCH] Cleanup: use PyImport_GetModuleDict
-
-Replace direct access using PyThreadState_GET
----
- source/blender/python/bmesh/bmesh_py_api.c        | 2 +-
- source/blender/python/generic/idprop_py_api.c     | 2 +-
- source/blender/python/intern/bpy_interface.c      | 2 +-
- source/blender/python/intern/gpu.c                | 4 ++--
- source/blender/python/mathutils/mathutils.c       | 2 +-
- source/blender/python/mathutils/mathutils_noise.c | 5 +++--
- source/gameengine/Ketsji/KX_PythonInit.cpp        | 2 +-
- 7 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/source/blender/python/bmesh/bmesh_py_api.c b/source/blender/python/bmesh/bmesh_py_api.c
-index d5973baeadb..d7324eabb6c 100644
---- a/source/blender/python/bmesh/bmesh_py_api.c
-+++ b/source/blender/python/bmesh/bmesh_py_api.c
-@@ -196,7 +196,7 @@ PyObject *BPyInit_bmesh(void)
- {
- 	PyObject *mod;
- 	PyObject *submodule;
--	PyObject *sys_modules = PyThreadState_GET()->interp->modules;
-+	PyObject *sys_modules = PyImport_GetModuleDict();
- 
- 	BPy_BM_init_types();
- 	BPy_BM_init_types_select();
-diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c
-index 4d4d5232800..8bed0f28cba 100644
---- a/source/blender/python/generic/idprop_py_api.c
-+++ b/source/blender/python/generic/idprop_py_api.c
-@@ -1795,7 +1795,7 @@ PyObject *BPyInit_idprop(void)
- {
- 	PyObject *mod;
- 	PyObject *submodule;
--	PyObject *sys_modules = PyThreadState_GET()->interp->modules;
-+	PyObject *sys_modules = PyImport_GetModuleDict();
- 
- 	mod = PyModule_Create(&IDProp_module_def);
- 
-diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
-index 7ca087e4993..123c938b921 100644
---- a/source/blender/python/intern/bpy_interface.c
-+++ b/source/blender/python/intern/bpy_interface.c
-@@ -537,7 +537,7 @@ static bool python_script_exec(
- 
- 	if (py_dict) {
- #ifdef PYMODULE_CLEAR_WORKAROUND
--		PyModuleObject *mmod = (PyModuleObject *)PyDict_GetItemString(PyThreadState_GET()->interp->modules, "__main__");
-+		PyModuleObject *mmod = (PyModuleObject *)PyDict_GetItemString(PyImport_GetModuleDict(), "__main__");
- 		PyObject *dict_back = mmod->md_dict;
- 		/* freeing the module will clear the namespace,
- 		 * gives problems running classes defined in this namespace being used later. */
-diff --git a/source/blender/python/intern/gpu.c b/source/blender/python/intern/gpu.c
-index 43796dc9474..d902b6838f4 100644
---- a/source/blender/python/intern/gpu.c
-+++ b/source/blender/python/intern/gpu.c
-@@ -326,7 +326,7 @@ PyObject *GPU_initPython(void)
- {
- 	PyObject *module;
- 	PyObject *submodule;
--	PyObject *sys_modules = PyThreadState_GET()->interp->modules;
-+	PyObject *sys_modules = PyImport_GetModuleDict();
- 
- 	module = PyInit_gpu();
- 
-@@ -337,6 +337,6 @@ PyObject *GPU_initPython(void)
- 	PyDict_SetItem(sys_modules, PyModule_GetNameObject(submodule), submodule);
- 	Py_INCREF(submodule);
- 
--	PyDict_SetItem(PyImport_GetModuleDict(), PyModule_GetNameObject(module), module);
-+	PyDict_SetItem(sys_modules, PyModule_GetNameObject(module), module);
- 	return module;
- }
-diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c
-index a3a4e7f313b..f021d456b3a 100644
---- a/source/blender/python/mathutils/mathutils.c
-+++ b/source/blender/python/mathutils/mathutils.c
-@@ -615,7 +615,7 @@ PyMODINIT_FUNC PyInit_mathutils(void)
- {
- 	PyObject *mod;
- 	PyObject *submodule;
--	PyObject *sys_modules = PyThreadState_GET()->interp->modules;
-+	PyObject *sys_modules = PyImport_GetModuleDict();
- 
- 	if (PyType_Ready(&vector_Type) < 0)
- 		return NULL;
-diff --git a/source/blender/python/mathutils/mathutils_noise.c b/source/blender/python/mathutils/mathutils_noise.c
-index 839d1ffc588..834322c0aed 100644
---- a/source/blender/python/mathutils/mathutils_noise.c
-+++ b/source/blender/python/mathutils/mathutils_noise.c
-@@ -845,6 +845,7 @@ static struct PyModuleDef M_Noise_module_def = {
- /*----------------------------MODULE INIT-------------------------*/
- PyMODINIT_FUNC PyInit_mathutils_noise(void)
- {
-+	PyObject *sys_modules = PyImport_GetModuleDict();
- 	PyObject *submodule = PyModule_Create(&M_Noise_module_def);
- 	PyObject *item_types, *item_metrics;
- 
-@@ -852,11 +853,11 @@ PyMODINIT_FUNC PyInit_mathutils_noise(void)
- 	setRndSeed(0);
- 
- 	PyModule_AddObject(submodule, "types", (item_types = PyInit_mathutils_noise_types()));
--	PyDict_SetItemString(PyThreadState_GET()->interp->modules, "noise.types", item_types);
-+	PyDict_SetItemString(sys_modules, "noise.types", item_types);
- 	Py_INCREF(item_types);
- 
- 	PyModule_AddObject(submodule, "distance_metrics", (item_metrics = PyInit_mathutils_noise_metrics()));
--	PyDict_SetItemString(PyThreadState_GET()->interp->modules, "noise.distance_metrics", item_metrics);
-+	PyDict_SetItemString(sys_modules, "noise.distance_metrics", item_metrics);
- 	Py_INCREF(item_metrics);
- 
- 	return submodule;
-diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
-index 251273cf7a8..9611a4ea49b 100644
---- a/source/gameengine/Ketsji/KX_PythonInit.cpp
-+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
-@@ -2234,7 +2234,7 @@ PyMODINIT_FUNC initBGE(void)
- {
- 	PyObject *mod;
- 	PyObject *submodule;
--	PyObject *sys_modules = PyThreadState_GET()->interp->modules;
-+	PyObject *sys_modules = PyImport_GetModuleDict();
- 	const char *mod_full;
- 
- 	mod = PyModule_Create(&BGE_module_def);
--- 
-2.25.0
-