summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-03-20 21:10:30 +0000
committer Eric Hameleers <alien@slackware.com>2024-03-20 23:08:57 +0100
commit0cbf4c3859f23aa741e63823bc1e46377a9e4a9f (patch)
tree1562260d1ee0cbaec3950cfd8124efa9ff2b8510 /source/kde/kde/patch
parent5a8e431607833376ae16794d1134d03dccc3da08 (diff)
downloadcurrent-0cbf4c3859f23aa741e63823bc1e46377a9e4a9f.tar.gz
current-0cbf4c3859f23aa741e63823bc1e46377a9e4a9f.tar.xz
Wed Mar 20 21:10:30 UTC 202420240320211030
a/libblockdev-2.28-x86_64-2.txz: Rebuilt. Drop python2 support. a/sysvinit-scripts-15.1-noarch-15.txz: Rebuilt. rc.M: start rc.iceccd and rc.icecc-scheduler earlier. a/util-linux-2.39.3-x86_64-2.txz: Rebuilt. Drop python2 support. a/volume_key-0.3.12-x86_64-6.txz: Rebuilt. Drop python2 support. ap/man-pages-6.7-noarch-1.txz: Upgraded. d/cmake-3.28.4-x86_64-1.txz: Upgraded. d/llvm-18.1.2-x86_64-1.txz: Upgraded. d/python2-2.7.18-x86_64-7.txz: Rebuilt. Bundle the final python2 versions of pip and setuptools. Drop the /usr/bin/python symlink. d/python3-3.9.19-x86_64-1.txz: Upgraded. Point the /usr/bin/python symlink at python3.9. PEP 394 says we can do this, and in a world of ambigious shebangs, this is probably the best of the available options. This update also fixes security issues: bundled libexpat was updated to 2.6.0. zipfile is now protected from the "quoted-overlap" zipbomb. tempfile.TemporaryDirectory cleanup no longer dereferences symlinks when working around file system permission errors. For more information, see: https://pythoninsider.blogspot.com/2024/03/python-31014-3919-and-3819-is-now.html https://www.cve.org/CVERecord?id=CVE-2023-52425 https://www.cve.org/CVERecord?id=CVE-2024-0450 https://www.cve.org/CVERecord?id=CVE-2023-6597 (* Security fix *) d/strace-6.8-x86_64-1.txz: Upgraded. kde/kross-interpreters-23.08.5-x86_64-2.txz: Rebuilt. Drop python2 support. l/libxml2-2.12.6-x86_64-2.txz: Rebuilt. Drop python2 support. l/mozjs115-115.9.0esr-x86_64-2.txz: Rebuilt. Fixed installed library name. Thanks to reddog83. Fixed slack-desc. Thanks to r1w1s1. l/phonon-4.12.0-x86_64-1.txz: Upgraded. l/pilot-link-0.12.5-x86_64-17.txz: Rebuilt. Drop python2 support. l/python2-module-collection-2.7.18-x86_64-6.txz: Removed. Good bye! l/python2-pycairo-1.18.2-x86_64-1.txz: Added. We'll need this (along with pygtk and pygobject) until we get gimp3. Well, we could build gimp without python support, but I really don't think that's the route we want to take. n/bind-9.18.25-x86_64-1.txz: Upgraded. n/crda-4.15-x86_64-1.txz: Removed. The kernel is able to load from wireless-regdb directly. Obsolete. n/getmail-6.18.14-x86_64-1.txz: Upgraded. n/gpgme-1.23.2-x86_64-2.txz: Rebuilt. Drop python2 support. n/obexftp-0.24.2-x86_64-11.txz: Rebuilt. Drop python2 support. n/wireless-regdb-2024.01.23-x86_64-1.txz: Added. Wireless regulatory database, previously bundled with crda. x/ibus-1.5.29-x86_64-2.txz: Rebuilt. Drop python2 support. x/libkkc-0.3.5-x86_64-4.txz: Rebuilt. Still forcing python2 with this one, but perhaps a python3 marisa module could work around this. x/libkkc-data-0.2.7-x86_64-4.txz: Rebuilt. Still forcing python2 with this one, but perhaps a python3 marisa module could work around this. x/xcb-proto-1.16.0-x86_64-2.txz: Rebuilt. Drop python2 support. x/xpyb-1.3.1-x86_64-7.txz: Removed. Nothing uses it, and it was never updated for python3. Removed as obsolete.
Diffstat (limited to 'source/kde/kde/patch')
-rw-r--r--source/kde/kde/patch/kross-interpreters.patch1
-rw-r--r--source/kde/kde/patch/kross-interpreters/dump-python2.patch42
2 files changed, 43 insertions, 0 deletions
diff --git a/source/kde/kde/patch/kross-interpreters.patch b/source/kde/kde/patch/kross-interpreters.patch
new file mode 100644
index 000000000..0c0038b19
--- /dev/null
+++ b/source/kde/kde/patch/kross-interpreters.patch
@@ -0,0 +1 @@
+cat $CWD/patch/kross-interpreters/dump-python2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kross-interpreters/dump-python2.patch b/source/kde/kde/patch/kross-interpreters/dump-python2.patch
new file mode 100644
index 000000000..c4fa64268
--- /dev/null
+++ b/source/kde/kde/patch/kross-interpreters/dump-python2.patch
@@ -0,0 +1,42 @@
+--- ./CMakeLists.txt.orig 2024-01-11 15:29:12.000000000 -0600
++++ ./CMakeLists.txt 2024-03-19 22:59:23.005420760 -0500
+@@ -16,28 +16,6 @@
+ find_package(Qt5 5.2.0 CONFIG REQUIRED Core Gui Widgets)
+ find_package(KF5 5.11.0 REQUIRED Kross)
+
+-# ========================= Find Python 2 =========================
+-
+-# TODO: CMake's FindPythonLibs.cmake needs fixing, because without the
+-# following hack find_package(PythonLibs 3) would find the previously found
+-# version 2.7. Due to this hack one cannot predefine PYTHON_LIBRARY and/or
+-# PYTHON_INCLUDE_DIR by editing CMakeCache.txt.
+-unset(PYTHON_INCLUDE_DIR CACHE)
+-unset(PYTHON_LIBRARY CACHE)
+-unset(PYTHON_LIBRARY_DEBUG CACHE)
+-# Unset variables set by find_package(PythonInterp) which is called by KI18n
+-unset(PYTHON_VERSION_MAJOR)
+-unset(PYTHON_VERSION_MINOR)
+-find_package(PythonLibs 2 EXACT)
+-
+-set(PYTHON2_LIBS_FOUND ${PYTHONLIBS_FOUND})
+-set(PYTHON2_LIBRARIES ${PYTHON_LIBRARIES})
+-set(PYTHON2_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
+-set(PYTHON2_LIBS_VERSION_STRING ${PYTHONLIBS_VERSION_STRING})
+-if(PYTHON2_LIBS_FOUND)
+- message(STATUS "Found Python 2: ${PYTHON2_LIBRARIES} (found version \"${PYTHON2_LIBS_VERSION_STRING}\")")
+-endif()
+-
+ # ========================= Find FALCON =========================
+
+ ### Falcon support disabled because it does not work with most modern falcon-0.9.x
+@@ -61,10 +39,6 @@
+
+ # ========================= Traverse subdirectories for actual targets =========================
+
+-if(PYTHON2_LIBS_FOUND)
+- ecm_optional_add_subdirectory(python)
+-endif(PYTHON2_LIBS_FOUND)
+-
+ ### Falcon support disabled because it does not work with most modern falcon-0.9.x
+ # if(FALCON_FOUND)
+ # ecm_optional_add_subdirectory(falcon)