From d21b0532eda8a95229e77c58d32944cf950f63f5 Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 2 Nov 2020 20:55:40 +0100 Subject: [PATCH] WIP Push for backup --- buildroot | 2 +- buildroot-external/Config.in | 4 +- .../configs/rpi4_64-gui_defconfig | 45 +++-- .../package/kf5-attica/kf5-attica.hash | 2 +- .../kf5-breeze-icons/kf5-breeze-icons.hash | 2 +- .../kf5-kactivities-stats.hash | 2 +- .../kf5-kactivities/kf5-kactivities.hash | 2 +- .../package/kf5-karchive/kf5-karchive.hash | 2 +- .../package/kf5-kauth/kf5-kauth.hash | 2 +- .../kf5-kbookmarks/kf5-kbookmarks.hash | 2 +- .../package/kf5-kcmutils/kf5-kcmutils.hash | 2 +- .../package/kf5-kcodecs/kf5-kcodecs.hash | 2 +- .../kf5-kcompletion/kf5-kcompletion.hash | 2 +- .../package/kf5-kconfig/kf5-kconfig.hash | 2 +- .../kf5-kconfigwidgets.hash | 2 +- .../package/kf5-kcrash/0001-No-X11.patch | 25 --- .../package/kf5-kcrash/kf5-kcrash.hash | 2 +- .../kf5-kdbusaddons/kf5-kdbusaddons.hash | 2 +- .../kf5-kdeclarative/kf5-kdeclarative.hash | 2 +- .../kf5-kdecoration/kf5-kdecoration.hash | 2 +- .../kf5-kdecoration/kf5-kdecoration.mk | 2 +- .../package/kf5-kded/kf5-kded.hash | 2 +- .../kf5-kdelibs4support/0001-No-X11.patch | 29 --- .../kf5-kdelibs4support.hash | 2 +- .../kf5-kdesignerplugin.hash | 2 +- .../package/kf5-kdesu/kf5-kdesu.hash | 2 +- .../package/kf5-kdoctools/kf5-kdoctools.hash | 2 +- .../kf5-kemoticons/kf5-kemoticons.hash | 2 +- .../kf5-kglobalaccel/0001-No-X11.patch | 41 ---- .../kf5-kglobalaccel/kf5-kglobalaccel.hash | 2 +- .../kf5-kguiaddons/kf5-kguiaddons.hash | 2 +- .../package/kf5-ki18n/kf5-ki18n.hash | 2 +- .../kf5-kiconthemes/kf5-kiconthemes.hash | 2 +- .../package/kf5-kidletime/0001-No-X11.patch | 31 --- .../package/kf5-kidletime/kf5-kidletime.hash | 2 +- .../package/kf5-kinit/0001-No-X11.patch | 33 ---- .../package/kf5-kinit/kf5-kinit.hash | 2 +- ...akeList-do-not-overwrite-module-path.patch | 25 --- .../package/kf5-kio/0001-No-X11.patch | 29 --- .../package/kf5-kio/kf5-kio.hash | 2 +- .../package/kf5-kirigami2/kf5-kirigami2.hash | 2 +- .../kf5-kitemmodels/kf5-kitemmodels.hash | 2 +- .../kf5-kitemviews/kf5-kitemviews.hash | 2 +- .../package/kf5-kjobwidgets/0001-No-X11.patch | 29 --- .../kf5-kjobwidgets/kf5-kjobwidgets.hash | 2 +- .../package/kf5-knewstuff/kf5-knewstuff.hash | 2 +- .../kf5-knotifications/0001-No-X11.patch | 29 --- .../kf5-knotifications.hash | 2 +- .../kf5-knotifyconfig/kf5-knotifyconfig.hash | 2 +- .../package/kf5-kpackage/kf5-kpackage.hash | 2 +- .../package/kf5-kparts/kf5-kparts.hash | 2 +- .../package/kf5-kpeople/kf5-kpeople.hash | 2 +- .../package/kf5-kpty/kf5-kpty.hash | 2 +- .../package/kf5-krunner/kf5-krunner.hash | 2 +- .../package/kf5-kscreen/kf5-kscreen.hash | 2 +- .../package/kf5-kscreen/kf5-kscreen.mk | 2 +- .../kf5-kscreenlocker/kf5-kscreenlocker.hash | 2 +- .../kf5-kscreenlocker/kf5-kscreenlocker.mk | 2 +- .../package/kf5-kservice/kf5-kservice.hash | 2 +- .../package/kf5-ksysguard/kf5-ksysguard.hash | 2 +- .../package/kf5-ksysguard/kf5-ksysguard.mk | 2 +- .../kf5-ktextwidgets/kf5-ktextwidgets.hash | 2 +- .../kf5-kunitconversion.hash | 2 +- .../package/kf5-kwallet/kf5-kwallet.hash | 2 +- .../package/kf5-kwayland/kf5-kwayland.hash | 2 +- .../kf5-kwidgetsaddons.hash | 2 +- .../package/kf5-kwin/kf5-kwin.hash | 2 +- .../package/kf5-kwin/kf5-kwin.mk | 2 +- .../kf5-kwindowsystem/0001-No-X11.patch | 25 --- .../kf5-kwindowsystem/kf5-kwindowsystem.hash | 2 +- .../package/kf5-kxmlgui/kf5-kxmlgui.hash | 2 +- .../kf5-libkscreen/kf5-libkscreen.hash | 2 +- .../package/kf5-libkscreen/kf5-libkscreen.mk | 2 +- .../kf5-libksysguard/kf5-libksysguard.hash | 2 +- .../kf5-plasma-framework/0001-No-X11.patch | 53 ----- .../kf5-plasma-framework.hash | 2 +- .../kf5-plasma-framework.mk | 6 +- .../kf5-plasma-nano/kf5-plasma-nano.hash | 2 +- .../kf5-plasma-nano/kf5-plasma-nano.mk | 2 +- .../0001-Remove-KDoctools-requirement.patch | 32 --- .../package/kf5-plasma-pa/kf5-plasma-pa.hash | 2 +- .../package/kf5-plasma-pa/kf5-plasma-pa.mk | 2 +- .../0001-Remove-DocTools-dependency.patch | 33 ---- .../kf5-plasma-workspace.hash | 2 +- .../kf5-plasma-workspace.mk | 2 +- .../package/kf5-solid/kf5-solid.hash | 2 +- .../package/kf5-sonnet/kf5-sonnet.hash | 2 +- .../kf5-threadweaver/kf5-threadweaver.hash | 2 +- .../package/python-colorzero/Config.in | 6 - .../python-colorzero/python-colorzero.hash | 5 - .../python-colorzero/python-colorzero.mk | 14 -- .../package/python-gpiozero/Config.in | 6 - .../python-gpiozero/python-gpiozero.hash | 3 - .../python-gpiozero/python-gpiozero.mk | 12 -- .../0001-Downgrade-python-idna-to-2.7.patch | 26 +-- .../0002-Upgrade-python-pillow-to-7.1.2.patch | 39 ---- ...003-Downgrade-python-psutil-to-5.6.6.patch | 43 +++-- .../0005-Downgrade-python-six-to-1.13.0.patch | 24 +-- ...-Downgrade-python-requests-to-2.20.0.patch | 51 +++-- ...009-Downgrade-python-pyyaml-to-5.1.2.patch | 33 +++- ...011-Downgrade-python-ifaddr-to-0.1.4.patch | 45 +++-- .../0015-Bump-python-pip-to-20.2.2.patch | 22 +-- ...d-rust-to-latest-versions-and-don-t-.patch | 182 ------------------ .../0106-Bump-RPI-Firmware-version.patch | 18 +- .../0108-Bump-RPI-Wifi-Firmware-version.patch | 18 +- .../0110-Bump-and-patch-KF5.patch | 8 +- ...4-Add-and-build-the-qtdesigner-tools.patch | 22 +-- 107 files changed, 278 insertions(+), 912 deletions(-) delete mode 100644 buildroot-external/package/kf5-kcrash/0001-No-X11.patch delete mode 100644 buildroot-external/package/kf5-kdelibs4support/0001-No-X11.patch delete mode 100644 buildroot-external/package/kf5-kglobalaccel/0001-No-X11.patch delete mode 100644 buildroot-external/package/kf5-kidletime/0001-No-X11.patch delete mode 100644 buildroot-external/package/kf5-kinit/0001-No-X11.patch delete mode 100644 buildroot-external/package/kf5-kio/0001-CMakeList-do-not-overwrite-module-path.patch delete mode 100644 buildroot-external/package/kf5-kio/0001-No-X11.patch delete mode 100644 buildroot-external/package/kf5-kjobwidgets/0001-No-X11.patch delete mode 100644 buildroot-external/package/kf5-knotifications/0001-No-X11.patch delete mode 100644 buildroot-external/package/kf5-kwindowsystem/0001-No-X11.patch delete mode 100644 buildroot-external/package/kf5-plasma-framework/0001-No-X11.patch delete mode 100644 buildroot-external/package/kf5-plasma-pa/0001-Remove-KDoctools-requirement.patch delete mode 100644 buildroot-external/package/kf5-plasma-workspace/0001-Remove-DocTools-dependency.patch delete mode 100644 buildroot-external/package/python-colorzero/Config.in delete mode 100644 buildroot-external/package/python-colorzero/python-colorzero.hash delete mode 100644 buildroot-external/package/python-colorzero/python-colorzero.mk delete mode 100644 buildroot-external/package/python-gpiozero/Config.in delete mode 100644 buildroot-external/package/python-gpiozero/python-gpiozero.hash delete mode 100644 buildroot-external/package/python-gpiozero/python-gpiozero.mk delete mode 100644 buildroot-patches/0002-Upgrade-python-pillow-to-7.1.2.patch delete mode 100644 buildroot-patches/0105-Upgrade-cargo-and-rust-to-latest-versions-and-don-t-.patch diff --git a/buildroot b/buildroot index af6c670a..5e44e80e 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit af6c670a78dc97eb3fcd091ea4a582a7284b4771 +Subproject commit 5e44e80e09bdbbb8861b770b09fe27d33a823086 diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 3fdae196..f373f55d 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -98,7 +98,7 @@ menu "Additional external python modules" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-bs4/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-cachetools/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-casttube/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-colorzero/Config.in" +# source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-colorzero/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-coverage/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-coveralls/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-deprecated/Config.in" @@ -110,7 +110,7 @@ menu "Additional external python modules" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-google-api-python-client/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-google-auth-httplib2/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-google-auth/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-gpiozero/Config.in" +# source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-gpiozero/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-gtts/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-gtts_token/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-humanhash3/Config.in" diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 1aff9dec..1b4061b5 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -4,13 +4,16 @@ BR2_ARM_FPU_VFPV4=y BR2_DL_DIR="../downloads" BR2_CCACHE=y BR2_CCACHE_DIR="../ccache" +BR2_OPTIMIZE_3=y BR2_GLOBAL_PATCH_DIR="../buildroot-patches" # BR2_COMPILER_PARANOID_UNSAFE_PATH is not set BR2_FORCE_HOST_BUILD=y +BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_GLIBC_UTILS=y -BR2_BINUTILS_VERSION_2_33_X=y -BR2_GCC_VERSION_9_X=y +BR2_BINUTILS_VERSION_2_34_X=y +BR2_GCC_VERSION_10_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y BR2_GCC_ENABLE_LTO=y @@ -20,7 +23,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to OpenVoiceOS" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_ROOT_PASSWD="mycroft" BR2_SYSTEM_BIN_SH_BASH=y -BR2_TARGET_GENERIC_GETTY_PORT="tty7" +BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_SYSTEM_DHCP="eth0" # BR2_ENABLE_LOCALE_PURGE is not set BR2_GENERATE_LOCALE="en_US.UTF-8" @@ -32,8 +35,9 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi4-64/post-image.s BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/e655052ab35ec3173845c627d0e8da91d88fbeac.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/b0ee9e22249a75c012d575de8254c68648984339.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" +BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -138,7 +142,6 @@ BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y -BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC=y @@ -151,7 +154,6 @@ BR2_PACKAGE_PULSEAUDIO_DAEMON=y BR2_PACKAGE_SQUEEZELITE=y BR2_PACKAGE_VLC=y BR2_PACKAGE_GZIP=y -BR2_PACKAGE_LZ4=y BR2_PACKAGE_LZIP=y BR2_PACKAGE_LZOP=y BR2_PACKAGE_P7ZIP=y @@ -184,25 +186,33 @@ BR2_PACKAGE_LIBERATION=y BR2_PACKAGE_FREERDP=y # BR2_PACKAGE_FREERDP_CLIENT_X11 is not set BR2_PACKAGE_MESA3D=y -BR2_PACKAGE_MESA3D_LLVM=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y +BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_SDL2_KMSDRM=y +BR2_PACKAGE_SDL2_OPENGLES=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT53D=y BR2_PACKAGE_QT5BASE_CONCURRENT=y BR2_PACKAGE_QT5BASE_SQLITE_QT=y +BR2_PACKAGE_QT5BASE_OPENGL_ES2=y BR2_PACKAGE_QT5BASE_LINUXFB=y +BR2_PACKAGE_QT5BASE_XCB=y +BR2_PACKAGE_QT5BASE_EGLFS=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs" +BR2_PACKAGE_QT5BASE_FONTCONFIG=y BR2_PACKAGE_QT5BASE_HARFBUZZ=y BR2_PACKAGE_QT5BASE_GIF=y BR2_PACKAGE_QT5BASE_JPEG=y +BR2_PACKAGE_QT5BASE_ICU=y BR2_PACKAGE_QT5BASE_TSLIB=y BR2_PACKAGE_QT5GRAPHICALEFFECTS=y BR2_PACKAGE_QT5IMAGEFORMATS=y BR2_PACKAGE_QT5MULTIMEDIA=y +BR2_PACKAGE_QT5QUICKCONTROLS=y +BR2_PACKAGE_QT5QUICKCONTROLS2=y BR2_PACKAGE_QT5SCRIPT=y BR2_PACKAGE_QT5SENSORS=y BR2_PACKAGE_QT5TOOLS_QDOC_TOOL=y @@ -215,28 +225,21 @@ BR2_PACKAGE_QT5VIRTUALKEYBOARD=y BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS="en_US" BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION=y BR2_PACKAGE_QT5WAYLAND=y -BR2_PACKAGE_QT5WEBENGINE=y -BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y -BR2_PACKAGE_QT5WEBVIEW=y +BR2_PACKAGE_QT5WEBCHANNEL=y BR2_PACKAGE_KF5=y BR2_PACKAGE_KF5_KCOREADDONS=y BR2_PACKAGE_KF5_NETWORKMANAGER_QT=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XCB_UTIL_CURSOR=y -BR2_PACKAGE_XCB_UTIL_KEYSYMS=y -BR2_PACKAGE_XCB_UTIL_WM=y BR2_PACKAGE_XLIB_LIBSM=y BR2_PACKAGE_XLIB_LIBXSCRNSAVER=y BR2_PACKAGE_XLIB_LIBXCOMPOSITE=y BR2_PACKAGE_XLIB_LIBXCURSOR=y -BR2_PACKAGE_XLIB_LIBXDAMAGE=y BR2_PACKAGE_XLIB_LIBXFONT2=y BR2_PACKAGE_XLIB_LIBXFT=y BR2_PACKAGE_XLIB_LIBXINERAMA=y -BR2_PACKAGE_XLIB_LIBXRANDR=y BR2_PACKAGE_XLIB_LIBXRES=y BR2_PACKAGE_XLIB_LIBXTST=y -BR2_PACKAGE_XLIB_LIBXXF86VM=y BR2_PACKAGE_XLIB_LIBXSHMFENCE=y BR2_PACKAGE_XFONT_FONT_ALIAS=y BR2_PACKAGE_XFONT_FONT_CURSOR_MISC=y @@ -258,7 +261,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X=y -BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y @@ -308,7 +310,6 @@ BR2_PACKAGE_WILC1000_FIRMWARE=y BR2_PACKAGE_WILINK_BT_FIRMWARE=y BR2_PACKAGE_ZD1211_FIRMWARE=y BR2_PACKAGE_DBUS_CPP=y -BR2_PACKAGE_KBD=y BR2_PACKAGE_PARTED=y BR2_PACKAGE_RASPI_GPIO=y BR2_PACKAGE_SPI_TOOLS=y @@ -331,6 +332,7 @@ BR2_PACKAGE_PYTHON_ARROW=y BR2_PACKAGE_PYTHON_AUTOBAHN=y BR2_PACKAGE_PYTHON_CHERRYPY=y BR2_PACKAGE_PYTHON_COLORAMA=y +BR2_PACKAGE_PYTHON_COLORZERO=y BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y BR2_PACKAGE_PYTHON_DAEMONIZE=y BR2_PACKAGE_PYTHON_FLASK_BABEL=y @@ -383,9 +385,11 @@ BR2_PACKAGE_LIBARCHIVE_BSDTAR=y BR2_PACKAGE_LIBARCHIVE_BSDCPIO=y BR2_PACKAGE_LIBARCHIVE_BSDCAT=y BR2_PACKAGE_LIBZIP=y +BR2_PACKAGE_LZ4=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_GNUTLS_OPENSSL=y BR2_PACKAGE_GNUTLS_TOOLS=y +BR2_PACKAGE_LIBNSS=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_LIBOPENSSL_BIN=y BR2_PACKAGE_LIBOPENSSL_ENGINES=y @@ -397,12 +401,13 @@ BR2_PACKAGE_LIBSVG_CAIRO=y BR2_PACKAGE_OPENJPEG=y BR2_PACKAGE_TIFF=y BR2_PACKAGE_WAFFLE=y +BR2_PACKAGE_WEBP=y +BR2_PACKAGE_WEBP_DEMUX=y BR2_PACKAGE_LIBCEC=y BR2_PACKAGE_LIBINPUT=y BR2_PACKAGE_LIBPCIACCESS=y BR2_PACKAGE_LIBV4L=y BR2_PACKAGE_LIBV4L_UTILS=y -BR2_PACKAGE_WIRINGPI=y BR2_PACKAGE_LIBFASTJSON=y BR2_PACKAGE_YAJL=y BR2_PACKAGE_LIBMATROSKA=y @@ -424,6 +429,7 @@ BR2_PACKAGE_CMOCKA=y BR2_PACKAGE_ELL=y BR2_PACKAGE_LIBCAP_NG=y BR2_PACKAGE_LINUX_PAM=y +BR2_PACKAGE_LLVM=y BR2_PACKAGE_PROTOBUF=y BR2_PACKAGE_LIBESTR=y BR2_PACKAGE_LIBUNISTRING=y @@ -489,7 +495,6 @@ BR2_PACKAGE_VIM=y # BR2_PACKAGE_VIM_RUNTIME is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" BR2_TARGET_ROOTFS_EXT2_SIZE="2560M" # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_CMAKE=y @@ -574,13 +579,11 @@ BR2_PACKAGE_SPOTIFYD=y BR2_PACKAGE_USERLAND_TOOLS=y BR2_PACKAGE_WIFI_CONNECT=y BR2_PACKAGE_PYTHON_ADAPT_PARSER=y -BR2_PACKAGE_PYTHON_COLORZERO=y BR2_PACKAGE_PYTHON_COVERALLS=y BR2_PACKAGE_PYTHON_DEPRECATED=y BR2_PACKAGE_PYTHON_FASTENERS=y BR2_PACKAGE_PYTHON_FEEDPARSER=y BR2_PACKAGE_PYTHON_GOOGLE_API_PYTHON_CLIENT=y -BR2_PACKAGE_PYTHON_GPIOZERO=y BR2_PACKAGE_PYTHON_GTTS=y BR2_PACKAGE_PYTHON_HUMANHASH3=y BR2_PACKAGE_PYTHON_LAZY=y diff --git a/buildroot-external/package/kf5-attica/kf5-attica.hash b/buildroot-external/package/kf5-attica/kf5-attica.hash index 413c934e..9c963da2 100644 --- a/buildroot-external/package/kf5-attica/kf5-attica.hash +++ b/buildroot-external/package/kf5-attica/kf5-attica.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a attica-5.73.0.tar.xz +sha256 fcc0b11620de9d88141fcb36aa2eddc19a78c023a2c753eb9de404271280288d attica-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-breeze-icons/kf5-breeze-icons.hash b/buildroot-external/package/kf5-breeze-icons/kf5-breeze-icons.hash index 5ef1d8f8..7b2bcc28 100644 --- a/buildroot-external/package/kf5-breeze-icons/kf5-breeze-icons.hash +++ b/buildroot-external/package/kf5-breeze-icons/kf5-breeze-icons.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b breeze-icons-5.73.0.tar.xz +sha256 21985f62c111e60ebd34bd632b3ee06bb01a1f9f1671d1295f0d24bc21e106a2 breeze-icons-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kactivities-stats/kf5-kactivities-stats.hash b/buildroot-external/package/kf5-kactivities-stats/kf5-kactivities-stats.hash index 36f61066..fe100290 100644 --- a/buildroot-external/package/kf5-kactivities-stats/kf5-kactivities-stats.hash +++ b/buildroot-external/package/kf5-kactivities-stats/kf5-kactivities-stats.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a kactivities-stats-5.73.0.tar.xz +sha256 eee926b1d49c460f1220957e52858df5271aee3b9c77b848e2969f0afe743aad kactivities-stats-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kactivities/kf5-kactivities.hash b/buildroot-external/package/kf5-kactivities/kf5-kactivities.hash index b673ef99..f77c9c4f 100644 --- a/buildroot-external/package/kf5-kactivities/kf5-kactivities.hash +++ b/buildroot-external/package/kf5-kactivities/kf5-kactivities.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a kactivities-5.73.0.tar.xz +sha256 d25fa31d9ad8bed6af1adbd589945494d1f5741e18e7bb5d67371749c6565e08 kactivities-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-karchive/kf5-karchive.hash b/buildroot-external/package/kf5-karchive/kf5-karchive.hash index 05d98a1b..ef3d2051 100644 --- a/buildroot-external/package/kf5-karchive/kf5-karchive.hash +++ b/buildroot-external/package/kf5-karchive/kf5-karchive.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f karchive-5.73.0.tar.xz +sha256 0c833c766d2301335490a1b36197bae20b2e45d1350f4f8100e6e00d5502eaab karchive-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kauth/kf5-kauth.hash b/buildroot-external/package/kf5-kauth/kf5-kauth.hash index 45767329..e4251552 100644 --- a/buildroot-external/package/kf5-kauth/kf5-kauth.hash +++ b/buildroot-external/package/kf5-kauth/kf5-kauth.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9 kauth-5.73.0.tar.xz +sha256 c2c316b783f3d531c6f3a308087dcdc59211920df8b10f6814272ebf6c8fd083 kauth-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kbookmarks/kf5-kbookmarks.hash b/buildroot-external/package/kf5-kbookmarks/kf5-kbookmarks.hash index 35d7f293..6d91c575 100644 --- a/buildroot-external/package/kf5-kbookmarks/kf5-kbookmarks.hash +++ b/buildroot-external/package/kf5-kbookmarks/kf5-kbookmarks.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51 kbookmarks-5.73.0.tar.xz +sha256 56320e443ba0ec52822b84a968ada0e34331b12251f84df839fc165fcb14e458 kbookmarks-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kcmutils/kf5-kcmutils.hash b/buildroot-external/package/kf5-kcmutils/kf5-kcmutils.hash index 36704384..9a28610c 100644 --- a/buildroot-external/package/kf5-kcmutils/kf5-kcmutils.hash +++ b/buildroot-external/package/kf5-kcmutils/kf5-kcmutils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9 kcmutils-5.73.0.tar.xz +sha256 dd7926548cd05b98c0013cbeac204e47860c517b9121a80c3a739bbbffaba3cd kcmutils-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kcodecs/kf5-kcodecs.hash b/buildroot-external/package/kf5-kcodecs/kf5-kcodecs.hash index e80c3683..a621bba0 100644 --- a/buildroot-external/package/kf5-kcodecs/kf5-kcodecs.hash +++ b/buildroot-external/package/kf5-kcodecs/kf5-kcodecs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67 kcodecs-5.73.0.tar.xz +sha256 cf4498c00368cc667910776cf54de02838f17b5f2d0bd48749ec5a2000346327 kcodecs-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kcompletion/kf5-kcompletion.hash b/buildroot-external/package/kf5-kcompletion/kf5-kcompletion.hash index b2dfee6f..588ae248 100644 --- a/buildroot-external/package/kf5-kcompletion/kf5-kcompletion.hash +++ b/buildroot-external/package/kf5-kcompletion/kf5-kcompletion.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a kcompletion-5.73.0.tar.xz +sha256 409b2759b6ac476b16fd6b5efd78381e9a840bae041fef35285404d2b79eeeff kcompletion-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kconfig/kf5-kconfig.hash b/buildroot-external/package/kf5-kconfig/kf5-kconfig.hash index 47edbf23..08580188 100644 --- a/buildroot-external/package/kf5-kconfig/kf5-kconfig.hash +++ b/buildroot-external/package/kf5-kconfig/kf5-kconfig.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e kconfig-5.73.0.tar.xz +sha256 38aa7cabcb042d3f2614d0229f7a4f65952b19b5c7edd78ee2b0401fd6dd4290 kconfig-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kconfigwidgets/kf5-kconfigwidgets.hash b/buildroot-external/package/kf5-kconfigwidgets/kf5-kconfigwidgets.hash index 8fe288c3..d2d35b58 100644 --- a/buildroot-external/package/kf5-kconfigwidgets/kf5-kconfigwidgets.hash +++ b/buildroot-external/package/kf5-kconfigwidgets/kf5-kconfigwidgets.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e kconfigwidgets-5.73.0.tar.xz +sha256 cd99dc233d1aaf30fbb910f2f268cffc1e11d3480b7c592d2a566aaf4812f083 kconfigwidgets-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kcrash/0001-No-X11.patch b/buildroot-external/package/kf5-kcrash/0001-No-X11.patch deleted file mode 100644 index 86fc8975..00000000 --- a/buildroot-external/package/kf5-kcrash/0001-No-X11.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c09ce373ae05594809d2bbf89d68dea167e9cae4 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Tue, 27 Oct 2020 14:44:47 +0100 -Subject: [PATCH 1/1] No X11 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 484a1bb..894ee75 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) - include(KDECMakeSettings) - - if (NOT APPLE) -- find_package(X11) -+# find_package(X11) - endif() - - set(HAVE_X11 ${X11_FOUND}) --- -2.20.1 - diff --git a/buildroot-external/package/kf5-kcrash/kf5-kcrash.hash b/buildroot-external/package/kf5-kcrash/kf5-kcrash.hash index 94e5cee1..2f1d71ae 100644 --- a/buildroot-external/package/kf5-kcrash/kf5-kcrash.hash +++ b/buildroot-external/package/kf5-kcrash/kf5-kcrash.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583 kcrash-5.73.0.tar.xz +sha256 1c8950bf699e4df86c2ebe29a364be53017b45d127c1d052c7ac4ef13b96db3a kcrash-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kdbusaddons/kf5-kdbusaddons.hash b/buildroot-external/package/kf5-kdbusaddons/kf5-kdbusaddons.hash index 9805958c..f525db0b 100644 --- a/buildroot-external/package/kf5-kdbusaddons/kf5-kdbusaddons.hash +++ b/buildroot-external/package/kf5-kdbusaddons/kf5-kdbusaddons.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba kdbusaddons-5.73.0.tar.xz +sha256 25826b091a22d876621dca040ca47ea1ec34119d300be91f19629a82c7f84af1 kdbusaddons-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kdeclarative/kf5-kdeclarative.hash b/buildroot-external/package/kf5-kdeclarative/kf5-kdeclarative.hash index 51c8c701..5cc33bc4 100644 --- a/buildroot-external/package/kf5-kdeclarative/kf5-kdeclarative.hash +++ b/buildroot-external/package/kf5-kdeclarative/kf5-kdeclarative.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598 kdeclarative-5.73.0.tar.xz +sha256 585b3b7d97c26542c8325050d1c4f7e36cf6111c43cf630cd2a729a36963109b kdeclarative-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kdecoration/kf5-kdecoration.hash b/buildroot-external/package/kf5-kdecoration/kf5-kdecoration.hash index 28de0f42..71b4a0fb 100644 --- a/buildroot-external/package/kf5-kdecoration/kf5-kdecoration.hash +++ b/buildroot-external/package/kf5-kdecoration/kf5-kdecoration.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8 kdecoration-5.18.5.tar.xz +sha256 x kdecoration-5.20.2.tar.xz diff --git a/buildroot-external/package/kf5-kdecoration/kf5-kdecoration.mk b/buildroot-external/package/kf5-kdecoration/kf5-kdecoration.mk index 258f1522..c012cc16 100644 --- a/buildroot-external/package/kf5-kdecoration/kf5-kdecoration.mk +++ b/buildroot-external/package/kf5-kdecoration/kf5-kdecoration.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_KDECORATION_VERSION = 5.18.5 +KF5_KDECORATION_VERSION = 5.20.2 KF5_KDECORATION_SITE = https://download.kde.org/stable/plasma/$(KF5_KDECORATION_VERSION) KF5_KDECORATION_SOURCE = kdecoration-$(KF5_KDECORATION_VERSION).tar.xz KF5_KDECORATION_LICENSE = BSD-3-Clause diff --git a/buildroot-external/package/kf5-kded/kf5-kded.hash b/buildroot-external/package/kf5-kded/kf5-kded.hash index df32b3cf..1b7e7f2c 100644 --- a/buildroot-external/package/kf5-kded/kf5-kded.hash +++ b/buildroot-external/package/kf5-kded/kf5-kded.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895 kded-5.73.0.tar.xz +sha256 x kded-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kdelibs4support/0001-No-X11.patch b/buildroot-external/package/kf5-kdelibs4support/0001-No-X11.patch deleted file mode 100644 index 74825352..00000000 --- a/buildroot-external/package/kf5-kdelibs4support/0001-No-X11.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10eedaf25c738042836e4cddc525deb693cb0794 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Wed, 28 Oct 2020 10:27:10 +0100 -Subject: [PATCH 1/1] No X11 - ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 17eb825d..2c79cede 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,9 +49,9 @@ if(WIN32) - find_package(KDEWin REQUIRED) - endif() - --if (NOT APPLE AND NOT WIN32) -- find_package(X11) --endif() -+#if (NOT APPLE AND NOT WIN32) -+# find_package(X11) -+#endif() - set(HAVE_X11 ${X11_FOUND}) - if (HAVE_X11) - add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND "Support for session management in KApplication") --- -2.20.1 - diff --git a/buildroot-external/package/kf5-kdelibs4support/kf5-kdelibs4support.hash b/buildroot-external/package/kf5-kdelibs4support/kf5-kdelibs4support.hash index a5f8d7c7..e471af80 100644 --- a/buildroot-external/package/kf5-kdelibs4support/kf5-kdelibs4support.hash +++ b/buildroot-external/package/kf5-kdelibs4support/kf5-kdelibs4support.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b kdelibs4support-5.73.0.tar.xz +sha256 x kdelibs4support-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kdesignerplugin/kf5-kdesignerplugin.hash b/buildroot-external/package/kf5-kdesignerplugin/kf5-kdesignerplugin.hash index 128bb834..b069344c 100644 --- a/buildroot-external/package/kf5-kdesignerplugin/kf5-kdesignerplugin.hash +++ b/buildroot-external/package/kf5-kdesignerplugin/kf5-kdesignerplugin.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2 kdesignerplugin-5.73.0.tar.xz +sha256 x kdesignerplugin-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kdesu/kf5-kdesu.hash b/buildroot-external/package/kf5-kdesu/kf5-kdesu.hash index 6f04c192..9ec8f795 100644 --- a/buildroot-external/package/kf5-kdesu/kf5-kdesu.hash +++ b/buildroot-external/package/kf5-kdesu/kf5-kdesu.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d kdesu-5.73.0.tar.xz +sha256 x kdesu-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kdoctools/kf5-kdoctools.hash b/buildroot-external/package/kf5-kdoctools/kf5-kdoctools.hash index b2942026..bf97bdad 100644 --- a/buildroot-external/package/kf5-kdoctools/kf5-kdoctools.hash +++ b/buildroot-external/package/kf5-kdoctools/kf5-kdoctools.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d kdoctools-5.73.0.tar.xz +sha256 4463dd3021ebff078a92d0556f37cbfa1b16ba970e8ad510bf397bd55f49381a kdoctools-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kemoticons/kf5-kemoticons.hash b/buildroot-external/package/kf5-kemoticons/kf5-kemoticons.hash index fcca5cce..554de755 100644 --- a/buildroot-external/package/kf5-kemoticons/kf5-kemoticons.hash +++ b/buildroot-external/package/kf5-kemoticons/kf5-kemoticons.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778 kemoticons-5.73.0.tar.xz +sha256 x kemoticons-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kglobalaccel/0001-No-X11.patch b/buildroot-external/package/kf5-kglobalaccel/0001-No-X11.patch deleted file mode 100644 index cdec9af5..00000000 --- a/buildroot-external/package/kf5-kglobalaccel/0001-No-X11.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9116b1bcc3a1230015c70af9116e4abb51f2d8ce Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Tue, 27 Oct 2020 15:02:48 +0100 -Subject: [PATCH 1/1] No X11 - ---- - CMakeLists.txt | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f08d6d5..e8629c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,15 +47,15 @@ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) - - # no X11 stuff on mac --if (NOT APPLE) -- find_package(XCB MODULE COMPONENTS XCB KEYSYMS XTEST XKB) -- set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" -- URL "http://xcb.freedesktop.org" -- TYPE OPTIONAL -- ) -- -- find_package(X11) --endif() -+#if (NOT APPLE) -+# find_package(XCB MODULE COMPONENTS XCB KEYSYMS XTEST XKB) -+# set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" -+# URL "http://xcb.freedesktop.org" -+# TYPE OPTIONAL -+# ) -+# -+# find_package(X11) -+#endif() - - set(HAVE_X11 0) - --- -2.20.1 - diff --git a/buildroot-external/package/kf5-kglobalaccel/kf5-kglobalaccel.hash b/buildroot-external/package/kf5-kglobalaccel/kf5-kglobalaccel.hash index 9cd19ced..0d4470b1 100644 --- a/buildroot-external/package/kf5-kglobalaccel/kf5-kglobalaccel.hash +++ b/buildroot-external/package/kf5-kglobalaccel/kf5-kglobalaccel.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f kglobalaccel-5.73.0.tar.xz +sha256 a4d0e1f87317870120772444fa6736ce020668675be08d5e445a3ce5a60355d4 kglobalaccel-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kguiaddons/kf5-kguiaddons.hash b/buildroot-external/package/kf5-kguiaddons/kf5-kguiaddons.hash index 73008126..1280d3bf 100644 --- a/buildroot-external/package/kf5-kguiaddons/kf5-kguiaddons.hash +++ b/buildroot-external/package/kf5-kguiaddons/kf5-kguiaddons.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350 kguiaddons-5.73.0.tar.xz +sha256 58aba1bd986020f7b4bde0d35a7b09730716cbdffde734e6d29cc9d18500253b kguiaddons-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-ki18n/kf5-ki18n.hash b/buildroot-external/package/kf5-ki18n/kf5-ki18n.hash index d3070267..a6bfb787 100644 --- a/buildroot-external/package/kf5-ki18n/kf5-ki18n.hash +++ b/buildroot-external/package/kf5-ki18n/kf5-ki18n.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689 ki18n-5.73.0.tar.xz +sha256 71f22a4ef4a9e750a1813c9fe37b552d9e053e6e2249079b5908d078160130d3 ki18n-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kiconthemes/kf5-kiconthemes.hash b/buildroot-external/package/kf5-kiconthemes/kf5-kiconthemes.hash index b6829475..209b7107 100644 --- a/buildroot-external/package/kf5-kiconthemes/kf5-kiconthemes.hash +++ b/buildroot-external/package/kf5-kiconthemes/kf5-kiconthemes.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356 kiconthemes-5.73.0.tar.xz +sha256 250b551ecfc5381c36267c51fdc86948ed85b1f477b12bd15a57d2d4e44a88db kiconthemes-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kidletime/0001-No-X11.patch b/buildroot-external/package/kf5-kidletime/0001-No-X11.patch deleted file mode 100644 index 363c4b02..00000000 --- a/buildroot-external/package/kf5-kidletime/0001-No-X11.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 32515bb6e2427c5792ee45173c9af52293cdfc25 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Wed, 28 Oct 2020 11:25:12 +0100 -Subject: [PATCH 1/1] No X11 - ---- - CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 447ff81..c8e4760 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -37,10 +37,10 @@ if(APPLE) - cmake_find_frameworks(CoreFoundation Carbon) - endif() - --if(NOT APPLE) -- find_package(X11) -- find_package(XCB COMPONENTS XCB) --endif() -+#if(NOT APPLE) -+# find_package(X11) -+# find_package(XCB COMPONENTS XCB) -+#endif() - - if(X11_FOUND) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) --- -2.20.1 - diff --git a/buildroot-external/package/kf5-kidletime/kf5-kidletime.hash b/buildroot-external/package/kf5-kidletime/kf5-kidletime.hash index 10345e87..612c72ac 100644 --- a/buildroot-external/package/kf5-kidletime/kf5-kidletime.hash +++ b/buildroot-external/package/kf5-kidletime/kf5-kidletime.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2 kidletime-5.73.0.tar.xz +sha256 x kidletime-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kinit/0001-No-X11.patch b/buildroot-external/package/kf5-kinit/0001-No-X11.patch deleted file mode 100644 index ba3d3e56..00000000 --- a/buildroot-external/package/kf5-kinit/0001-No-X11.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e7be823455a9b7c3be7abc60c1e757845ae18408 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Wed, 28 Oct 2020 12:07:34 +0100 -Subject: [PATCH 1/1] No X11 - ---- - CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bed6183..e41e8e4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,12 +32,12 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KINIT - include(ConfigureChecks.cmake) - - #optional features --if (NOT APPLE) -- find_package(X11) --endif() -+#if (NOT APPLE) -+# find_package(X11) -+#endif() - set(HAVE_X11 ${X11_FOUND}) - --find_package(XCB MODULE COMPONENTS XCB) -+#find_package(XCB MODULE COMPONENTS XCB) - set_package_properties(XCB PROPERTIES TYPE OPTIONAL) - set(HAVE_XCB ${XCB_XCB_FOUND}) - --- -2.20.1 - diff --git a/buildroot-external/package/kf5-kinit/kf5-kinit.hash b/buildroot-external/package/kf5-kinit/kf5-kinit.hash index c9c76952..7b994022 100644 --- a/buildroot-external/package/kf5-kinit/kf5-kinit.hash +++ b/buildroot-external/package/kf5-kinit/kf5-kinit.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770 kinit-5.73.0.tar.xz +sha256 x kinit-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kio/0001-CMakeList-do-not-overwrite-module-path.patch b/buildroot-external/package/kf5-kio/0001-CMakeList-do-not-overwrite-module-path.patch deleted file mode 100644 index 7f9b7810..00000000 --- a/buildroot-external/package/kf5-kio/0001-CMakeList-do-not-overwrite-module-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f6d020cedc5b5fe30ab9f66e50488452c8259377 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 27 Apr 2020 12:28:01 +0200 -Subject: [PATCH 1/1] CMakeList: do not overwrite module path - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 03921c2..67fcaa3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,7 +11,7 @@ set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Mod - feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) - - --set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) -+list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) - - include(KDEInstallDirs) - include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) --- -2.26.1 - diff --git a/buildroot-external/package/kf5-kio/0001-No-X11.patch b/buildroot-external/package/kf5-kio/0001-No-X11.patch deleted file mode 100644 index 75923ea1..00000000 --- a/buildroot-external/package/kf5-kio/0001-No-X11.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1bd3b99ffea595f324ea8995a7bc32c3b37bce6b Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Tue, 27 Oct 2020 15:49:28 +0100 -Subject: [PATCH 1/1] No X11 - ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1e4e8676..32b6c839 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -101,9 +101,9 @@ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of - PURPOSE "A MIT or HEIMDAL flavor of GSSAPI can be used" - ) - --if (NOT APPLE AND NOT WIN32) -- find_package(X11) --endif() -+#if (NOT APPLE AND NOT WIN32) -+# find_package(X11) -+#endif() - - set(HAVE_X11 ${X11_FOUND}) - if (HAVE_X11) --- -2.20.1 - diff --git a/buildroot-external/package/kf5-kio/kf5-kio.hash b/buildroot-external/package/kf5-kio/kf5-kio.hash index 61be1619..bfe8fc87 100644 --- a/buildroot-external/package/kf5-kio/kf5-kio.hash +++ b/buildroot-external/package/kf5-kio/kf5-kio.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66 kio-5.73.0.tar.xz +sha256 27af8d83d0ea6c68fc62675a0d0d34e94489e9e518c4a4c32fa9d4784510bc8e kio-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kirigami2/kf5-kirigami2.hash b/buildroot-external/package/kf5-kirigami2/kf5-kirigami2.hash index 84d41264..bffd20aa 100644 --- a/buildroot-external/package/kf5-kirigami2/kf5-kirigami2.hash +++ b/buildroot-external/package/kf5-kirigami2/kf5-kirigami2.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb kirigami2-5.73.0.tar.xz +sha256 cde28a432e2ce56aae6f29eb557dc838af6846eb7dcba587113f73ebf11fca7d kirigami2-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kitemmodels/kf5-kitemmodels.hash b/buildroot-external/package/kf5-kitemmodels/kf5-kitemmodels.hash index dfc85c5a..4286b5fb 100644 --- a/buildroot-external/package/kf5-kitemmodels/kf5-kitemmodels.hash +++ b/buildroot-external/package/kf5-kitemmodels/kf5-kitemmodels.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371 kitemmodels-5.73.0.tar.xz +sha256 x kitemmodels-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kitemviews/kf5-kitemviews.hash b/buildroot-external/package/kf5-kitemviews/kf5-kitemviews.hash index 87cbad8a..19a80c01 100644 --- a/buildroot-external/package/kf5-kitemviews/kf5-kitemviews.hash +++ b/buildroot-external/package/kf5-kitemviews/kf5-kitemviews.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727 kitemviews-5.73.0.tar.xz +sha256 071f2886cfb213c01cfeb26a9c98b26b720ff6928c5db04d4ead9ca34f72cac1 kitemviews-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kjobwidgets/0001-No-X11.patch b/buildroot-external/package/kf5-kjobwidgets/0001-No-X11.patch deleted file mode 100644 index 2ad52a9b..00000000 --- a/buildroot-external/package/kf5-kjobwidgets/0001-No-X11.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 72fd2e1837a5870c925235c3d7056c76abdf22a1 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Tue, 27 Oct 2020 15:15:11 +0100 -Subject: [PATCH 1/1] No X11 - ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a1a7e2..b832f4b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,9 +22,9 @@ include(ECMPoQmTools) - set(REQUIRED_QT_VERSION 5.12.0) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) - --if (NOT APPLE) -- find_package(X11) --endif() -+#if (NOT APPLE) -+# find_package(X11) -+#endif() - - set(HAVE_X11 ${X11_FOUND}) - --- -2.20.1 - diff --git a/buildroot-external/package/kf5-kjobwidgets/kf5-kjobwidgets.hash b/buildroot-external/package/kf5-kjobwidgets/kf5-kjobwidgets.hash index 0c3f30e3..d10b973a 100644 --- a/buildroot-external/package/kf5-kjobwidgets/kf5-kjobwidgets.hash +++ b/buildroot-external/package/kf5-kjobwidgets/kf5-kjobwidgets.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf kjobwidgets-5.73.0.tar.xz +sha256 6cac9b64d4b13211e5f3c001986933ae461af4d08ef1e5351e2cfd432c22b478 kjobwidgets-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-knewstuff/kf5-knewstuff.hash b/buildroot-external/package/kf5-knewstuff/kf5-knewstuff.hash index 1b69022f..144a8716 100644 --- a/buildroot-external/package/kf5-knewstuff/kf5-knewstuff.hash +++ b/buildroot-external/package/kf5-knewstuff/kf5-knewstuff.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e knewstuff-5.73.0.tar.xz +sha256 x knewstuff-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-knotifications/0001-No-X11.patch b/buildroot-external/package/kf5-knotifications/0001-No-X11.patch deleted file mode 100644 index f7d58fef..00000000 --- a/buildroot-external/package/kf5-knotifications/0001-No-X11.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 028fe875e3bedbe17f6e67a358f99bda5115bb9c Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Tue, 27 Oct 2020 15:25:53 +0100 -Subject: [PATCH 1/1] No X11 - ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6e5b861..5ffb90f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,9 +59,9 @@ include(KDEInstallDirs) - include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) - include(KDECMakeSettings) - --if (NOT APPLE AND NOT WIN32) -- find_package(X11) --endif() -+#if (NOT APPLE AND NOT WIN32) -+# find_package(X11) -+#endif() - - set(HAVE_X11 ${X11_FOUND}) - set(HAVE_XTEST ${X11_XTest_FOUND}) --- -2.20.1 - diff --git a/buildroot-external/package/kf5-knotifications/kf5-knotifications.hash b/buildroot-external/package/kf5-knotifications/kf5-knotifications.hash index ddb0c192..8c4e35eb 100644 --- a/buildroot-external/package/kf5-knotifications/kf5-knotifications.hash +++ b/buildroot-external/package/kf5-knotifications/kf5-knotifications.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c knotifications-5.73.0.tar.xz +sha256 15be8f602c3f364b0b72be837c41ddc622a5447129b9d3dcb355f297dc18f9db knotifications-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-knotifyconfig/kf5-knotifyconfig.hash b/buildroot-external/package/kf5-knotifyconfig/kf5-knotifyconfig.hash index 3b84d668..7b251e6b 100644 --- a/buildroot-external/package/kf5-knotifyconfig/kf5-knotifyconfig.hash +++ b/buildroot-external/package/kf5-knotifyconfig/kf5-knotifyconfig.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4 knotifyconfig-5.73.0.tar.xz +sha256 x knotifyconfig-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kpackage/kf5-kpackage.hash b/buildroot-external/package/kf5-kpackage/kf5-kpackage.hash index 14b38f81..8fc7ce9f 100644 --- a/buildroot-external/package/kf5-kpackage/kf5-kpackage.hash +++ b/buildroot-external/package/kf5-kpackage/kf5-kpackage.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f kpackage-5.73.0.tar.xz +sha256 9dd7b8fb029a52c886e2b6c43c4492720851b1242659ebd5dd4a066e569733eb kpackage-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kparts/kf5-kparts.hash b/buildroot-external/package/kf5-kparts/kf5-kparts.hash index 77172d3d..20809a4d 100644 --- a/buildroot-external/package/kf5-kparts/kf5-kparts.hash +++ b/buildroot-external/package/kf5-kparts/kf5-kparts.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2 kparts-5.73.0.tar.xz +sha256 x kparts-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kpeople/kf5-kpeople.hash b/buildroot-external/package/kf5-kpeople/kf5-kpeople.hash index fd28f603..24b14dc3 100644 --- a/buildroot-external/package/kf5-kpeople/kf5-kpeople.hash +++ b/buildroot-external/package/kf5-kpeople/kf5-kpeople.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4 kpeople-5.73.0.tar.xz +sha256 x kpeople-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kpty/kf5-kpty.hash b/buildroot-external/package/kf5-kpty/kf5-kpty.hash index b6249eb7..0e07cbf6 100644 --- a/buildroot-external/package/kf5-kpty/kf5-kpty.hash +++ b/buildroot-external/package/kf5-kpty/kf5-kpty.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c kpty-5.73.0.tar.xz +sha256 x kpty-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-krunner/kf5-krunner.hash b/buildroot-external/package/kf5-krunner/kf5-krunner.hash index 3184f709..0e2d4b27 100644 --- a/buildroot-external/package/kf5-krunner/kf5-krunner.hash +++ b/buildroot-external/package/kf5-krunner/kf5-krunner.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09 krunner-5.73.0.tar.xz +sha256 x krunner-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kscreen/kf5-kscreen.hash b/buildroot-external/package/kf5-kscreen/kf5-kscreen.hash index 9a7436f7..7730cfd5 100644 --- a/buildroot-external/package/kf5-kscreen/kf5-kscreen.hash +++ b/buildroot-external/package/kf5-kscreen/kf5-kscreen.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9b6238447a4a38babdff482724ae3d33786b211e8b4224aaadafaad7435f6ba2 kscreen-5.18.5.tar.xz +sha256 x kscreen-5.20.2.tar.xz diff --git a/buildroot-external/package/kf5-kscreen/kf5-kscreen.mk b/buildroot-external/package/kf5-kscreen/kf5-kscreen.mk index 80bb5b8b..248339ea 100644 --- a/buildroot-external/package/kf5-kscreen/kf5-kscreen.mk +++ b/buildroot-external/package/kf5-kscreen/kf5-kscreen.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_KSCREEN_VERSION = 5.18.5 +KF5_KSCREEN_VERSION = 5.20.2 KF5_KSCREEN_SITE = https://download.kde.org/stable/plasma/$(KF5_KSCREEN_VERSION) KF5_KSCREEN_SOURCE = kscreen-$(KF5_KSCREEN_VERSION).tar.xz KF5_KSCREEN_LICENSE = BSD-3-Clause diff --git a/buildroot-external/package/kf5-kscreenlocker/kf5-kscreenlocker.hash b/buildroot-external/package/kf5-kscreenlocker/kf5-kscreenlocker.hash index 3f9f047b..482fb4d6 100644 --- a/buildroot-external/package/kf5-kscreenlocker/kf5-kscreenlocker.hash +++ b/buildroot-external/package/kf5-kscreenlocker/kf5-kscreenlocker.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2 kscreenlocker-5.18.5.tar.xz +sha256 x kscreenlocker-5.20.2.tar.xz diff --git a/buildroot-external/package/kf5-kscreenlocker/kf5-kscreenlocker.mk b/buildroot-external/package/kf5-kscreenlocker/kf5-kscreenlocker.mk index 47d844a4..68b14dc1 100644 --- a/buildroot-external/package/kf5-kscreenlocker/kf5-kscreenlocker.mk +++ b/buildroot-external/package/kf5-kscreenlocker/kf5-kscreenlocker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_KSCREENLOCKER_VERSION = 5.18.5 +KF5_KSCREENLOCKER_VERSION = 5.20.2 KF5_KSCREENLOCKER_SITE = https://download.kde.org/stable/plasma/$(KF5_KSCREENLOCKER_VERSION) KF5_KSCREENLOCKER_SOURCE = kscreenlocker-$(KF5_KSCREENLOCKER_VERSION).tar.xz KF5_KSCREENLOCKER_LICENSE = BSD-3-Clause diff --git a/buildroot-external/package/kf5-kservice/kf5-kservice.hash b/buildroot-external/package/kf5-kservice/kf5-kservice.hash index 7b68a4c9..bc125e4f 100644 --- a/buildroot-external/package/kf5-kservice/kf5-kservice.hash +++ b/buildroot-external/package/kf5-kservice/kf5-kservice.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b kservice-5.73.0.tar.xz +sha256 17ceccf833d8da807dfaee2c3eb5c0ca7ee6b876c2454b5d6914a91eeb0a7f80 kservice-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-ksysguard/kf5-ksysguard.hash b/buildroot-external/package/kf5-ksysguard/kf5-ksysguard.hash index 27eea671..dc31199a 100644 --- a/buildroot-external/package/kf5-ksysguard/kf5-ksysguard.hash +++ b/buildroot-external/package/kf5-ksysguard/kf5-ksysguard.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4acb352698b612a21a5eccf22042ab46265d50bbf3aa85844bbca762a64c9e2f ksysguard-5.18.5.tar.xz +sha256 x ksysguard-5.20.2.tar.xz diff --git a/buildroot-external/package/kf5-ksysguard/kf5-ksysguard.mk b/buildroot-external/package/kf5-ksysguard/kf5-ksysguard.mk index 40a2e2cf..1f00ec39 100644 --- a/buildroot-external/package/kf5-ksysguard/kf5-ksysguard.mk +++ b/buildroot-external/package/kf5-ksysguard/kf5-ksysguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_KSYSGUARD_VERSION = 5.18.5 +KF5_KSYSGUARD_VERSION = 5.20.2 KF5_KSYSGUARD_SITE = https://download.kde.org/stable/plasma/$(KF5_KSYSGUARD_VERSION) KF5_KSYSGUARD_SOURCE = ksysguard-$(KF5_KSYSGUARD_VERSION).tar.xz KF5_KSYSGUARD_LICENSE = BSD-3-Clause diff --git a/buildroot-external/package/kf5-ktextwidgets/kf5-ktextwidgets.hash b/buildroot-external/package/kf5-ktextwidgets/kf5-ktextwidgets.hash index ce89118b..2aa4a03c 100644 --- a/buildroot-external/package/kf5-ktextwidgets/kf5-ktextwidgets.hash +++ b/buildroot-external/package/kf5-ktextwidgets/kf5-ktextwidgets.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5 ktextwidgets-5.73.0.tar.xz +sha256 6b92145ceaa758b1d73a337078771899ad14b8ade26c5388cb04f752b982521a ktextwidgets-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kunitconversion/kf5-kunitconversion.hash b/buildroot-external/package/kf5-kunitconversion/kf5-kunitconversion.hash index 2a96c52b..f2cf73d4 100644 --- a/buildroot-external/package/kf5-kunitconversion/kf5-kunitconversion.hash +++ b/buildroot-external/package/kf5-kunitconversion/kf5-kunitconversion.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935 kunitconversion-5.73.0.tar.xz +sha256 x kunitconversion-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kwallet/kf5-kwallet.hash b/buildroot-external/package/kf5-kwallet/kf5-kwallet.hash index 5a40d603..7085a517 100644 --- a/buildroot-external/package/kf5-kwallet/kf5-kwallet.hash +++ b/buildroot-external/package/kf5-kwallet/kf5-kwallet.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1 kwallet-5.73.0.tar.xz +sha256 x kwallet-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kwayland/kf5-kwayland.hash b/buildroot-external/package/kf5-kwayland/kf5-kwayland.hash index 7d5db37e..8d797578 100644 --- a/buildroot-external/package/kf5-kwayland/kf5-kwayland.hash +++ b/buildroot-external/package/kf5-kwayland/kf5-kwayland.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe kwayland-5.73.0.tar.xz +sha256 4476113932b26484698b09a4653c8ffc9772122f4ada42b0cb327527f8f2d9c0 kwayland-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kwidgetsaddons/kf5-kwidgetsaddons.hash b/buildroot-external/package/kf5-kwidgetsaddons/kf5-kwidgetsaddons.hash index 196c6eef..72463256 100644 --- a/buildroot-external/package/kf5-kwidgetsaddons/kf5-kwidgetsaddons.hash +++ b/buildroot-external/package/kf5-kwidgetsaddons/kf5-kwidgetsaddons.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6 kwidgetsaddons-5.73.0.tar.xz +sha256 9e46a967e7f98f570ab97d231e648770b0c6056a34d8efe0b3201a14f0e17bc0 kwidgetsaddons-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kwin/kf5-kwin.hash b/buildroot-external/package/kf5-kwin/kf5-kwin.hash index b19eaad4..d42f8451 100644 --- a/buildroot-external/package/kf5-kwin/kf5-kwin.hash +++ b/buildroot-external/package/kf5-kwin/kf5-kwin.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8 kwin-5.18.5.tar.xz +sha256 x kwin-5.20.2.tar.xz diff --git a/buildroot-external/package/kf5-kwin/kf5-kwin.mk b/buildroot-external/package/kf5-kwin/kf5-kwin.mk index 56734f13..72d202c0 100644 --- a/buildroot-external/package/kf5-kwin/kf5-kwin.mk +++ b/buildroot-external/package/kf5-kwin/kf5-kwin.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_KWIN_VERSION = 5.18.5 +KF5_KWIN_VERSION = 5.20.2 KF5_KWIN_SITE = https://download.kde.org/stable/plasma/$(KF5_KWIN_VERSION) KF5_KWIN_SOURCE = kwin-$(KF5_KWIN_VERSION).tar.xz KF5_KWIN_LICENSE = BSD-3-Clause diff --git a/buildroot-external/package/kf5-kwindowsystem/0001-No-X11.patch b/buildroot-external/package/kf5-kwindowsystem/0001-No-X11.patch deleted file mode 100644 index 8198b19d..00000000 --- a/buildroot-external/package/kf5-kwindowsystem/0001-No-X11.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7a81f31ac138413c2eb6ff0f3ab0c28e09c5fb8c Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Tue, 27 Oct 2020 14:13:22 +0100 -Subject: [PATCH 1/1] No X11 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b252a39..4098c14 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,7 +59,7 @@ if(WIN32) - endif() - - if (NOT APPLE) -- find_package(X11) -+# find_package(X11) - endif() - - set(KWINDOWSYSTEM_HAVE_X11 ${X11_FOUND}) --- -2.20.1 - diff --git a/buildroot-external/package/kf5-kwindowsystem/kf5-kwindowsystem.hash b/buildroot-external/package/kf5-kwindowsystem/kf5-kwindowsystem.hash index de6f98da..6668f29e 100644 --- a/buildroot-external/package/kf5-kwindowsystem/kf5-kwindowsystem.hash +++ b/buildroot-external/package/kf5-kwindowsystem/kf5-kwindowsystem.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8 kwindowsystem-5.73.0.tar.xz +sha256 4c180ec41aad90ed83e97db72216913e650b2719946803eec0d6e4cee7aab743 kwindowsystem-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-kxmlgui/kf5-kxmlgui.hash b/buildroot-external/package/kf5-kxmlgui/kf5-kxmlgui.hash index f5c3ca10..de271aee 100644 --- a/buildroot-external/package/kf5-kxmlgui/kf5-kxmlgui.hash +++ b/buildroot-external/package/kf5-kxmlgui/kf5-kxmlgui.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb kxmlgui-5.73.0.tar.xz +sha256 8d5a45cf5ddeb650f76f16872e2b6c7a8d808757fc23d3000e11803bf83f7c91 kxmlgui-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-libkscreen/kf5-libkscreen.hash b/buildroot-external/package/kf5-libkscreen/kf5-libkscreen.hash index bfac8990..dc86e8f3 100644 --- a/buildroot-external/package/kf5-libkscreen/kf5-libkscreen.hash +++ b/buildroot-external/package/kf5-libkscreen/kf5-libkscreen.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a962319000324200ec1abe3c58b1b8ab71ed4cc7c88a3c7e03a1c8eca86c287c libkscreen-5.18.5.tar.xz +sha256 x libkscreen-5.20.2.tar.xz diff --git a/buildroot-external/package/kf5-libkscreen/kf5-libkscreen.mk b/buildroot-external/package/kf5-libkscreen/kf5-libkscreen.mk index c7bdf153..9c95680b 100644 --- a/buildroot-external/package/kf5-libkscreen/kf5-libkscreen.mk +++ b/buildroot-external/package/kf5-libkscreen/kf5-libkscreen.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_LIBKSCREEN_VERSION = 5.18.5 +KF5_LIBKSCREEN_VERSION = 5.20.2 KF5_LIBKSCREEN_SITE = https://download.kde.org/stable/plasma/$(KF5_LIBKSCREEN_VERSION) KF5_LIBKSCREEN_SOURCE = libkscreen-$(KF5_LIBKSCREEN_VERSION).tar.xz KF5_LIBKSCREEN_LICENSE = BSD-3-Clause diff --git a/buildroot-external/package/kf5-libksysguard/kf5-libksysguard.hash b/buildroot-external/package/kf5-libksysguard/kf5-libksysguard.hash index 887aac94..0f325605 100644 --- a/buildroot-external/package/kf5-libksysguard/kf5-libksysguard.hash +++ b/buildroot-external/package/kf5-libksysguard/kf5-libksysguard.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d4d7030a2869a546a211844aa158dcef3598386cc035a8655529938ba102440b libksysguard-5.18.5.tar.xz +sha256 x libksysguard-5.20.2.tar.xz diff --git a/buildroot-external/package/kf5-plasma-framework/0001-No-X11.patch b/buildroot-external/package/kf5-plasma-framework/0001-No-X11.patch deleted file mode 100644 index cf19a9d1..00000000 --- a/buildroot-external/package/kf5-plasma-framework/0001-No-X11.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d7b6f9fe841076c573a1f1b70ae9eb944d7174fb Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Tue, 27 Oct 2020 16:54:50 +0100 -Subject: [PATCH 1/1] No X11 - ---- - CMakeLists.txt | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 31a3a4fb1..16e145bd5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -79,22 +79,22 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Tools to generate doc - ) - - #optional features --find_package(X11 MODULE) --set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -- URL "https://www.x.org/" -- TYPE OPTIONAL -- ) --find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) --set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" -- URL "https://xcb.freedesktop.org/" -- TYPE OPTIONAL -- ) --if(X11_FOUND AND XCB_XCB_FOUND) -- set(HAVE_X11 1) -- find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras) -+#find_package(X11 MODULE) -+#set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -+# URL "https://www.x.org/" -+# TYPE OPTIONAL -+# ) -+#find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) -+#set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" -+# URL "https://xcb.freedesktop.org/" -+# TYPE OPTIONAL -+# ) -+#if(X11_FOUND AND XCB_XCB_FOUND) -+# set(HAVE_X11 1) -+# find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras) - #X11_Xrender discovery is done by FindX11 - #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED") --endif() -+#endif() - - find_package(OpenGL) - set_package_properties(OpenGL PROPERTIES DESCRIPTION "The OpenGL libraries" --- -2.20.1 - diff --git a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.hash b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.hash index 9c3c5764..0f72be3c 100644 --- a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.hash +++ b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93 plasma-framework-5.73.0.tar.xz +sha256 a6a68cdfeaeded999ebe7207c524f8a4a6fd13562a6d95b9f6137730ada0697a plasma-framework-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk index c4ec3488..ab0b995c 100644 --- a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk +++ b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk @@ -13,8 +13,8 @@ KF5_PLASMA_FRAMEWORK_LICENSE_FILES = COPYING-CMAKE-SCRIPTS KF5_PLASMA_FRAMEWORK_DEPENDENCIES = host-pkgconf kf5-kdoctools kf5-kirigami2 KF5_PLASMA_FRAMEWORK_INSTALL_STAGING = YES -KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DHAVE_EGL=1 -KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DEGL_INCLUDE_DIR="$(STAGING_DIR)/usr/include" -KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DEGL_LIBRARY="$(STAGING_DIR)/usr/lib/libEGL.so" +KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DDISABLE_OPENGL=ON +#KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DEGL_INCLUDE_DIR="$(STAGING_DIR)/usr/include" +#KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DEGL_LIBRARY="$(STAGING_DIR)/usr/lib/libEGL.so" $(eval $(cmake-package)) diff --git a/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.hash b/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.hash index 4e35dd8a..6ffe56a8 100644 --- a/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.hash +++ b/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341 plasma-nano-5.18.5.tar.xz +sha256 x plasma-nano-5.20.2.tar.xz diff --git a/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.mk b/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.mk index 9288b1a1..52e8c0a8 100644 --- a/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.mk +++ b/buildroot-external/package/kf5-plasma-nano/kf5-plasma-nano.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_PLASMA_NANO_VERSION = 5.18.5 +KF5_PLASMA_NANO_VERSION = 5.20.2 KF5_PLASMA_NANO_SITE = https://download.kde.org/stable/plasma/$(KF5_PLASMA_NANO_VERSION) KF5_PLASMA_NANO_SOURCE = plasma-nano-$(KF5_PLASMA_NANO_VERSION).tar.xz KF5_PLASMA_NANO_LICENSE = BSD-3-Clause diff --git a/buildroot-external/package/kf5-plasma-pa/0001-Remove-KDoctools-requirement.patch b/buildroot-external/package/kf5-plasma-pa/0001-Remove-KDoctools-requirement.patch deleted file mode 100644 index 9e30e1c1..00000000 --- a/buildroot-external/package/kf5-plasma-pa/0001-Remove-KDoctools-requirement.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8ceb98d315404a1523974b7b2c2e1370b5ef61cd Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Sat, 10 Oct 2020 19:49:51 +0200 -Subject: [PATCH 1/1] Remove KDoctools requirement - ---- - CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eb6d5a8..8d81e02 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,7 +32,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - CoreAddons - Declarative -- DocTools - GlobalAccel - Notifications - I18n -@@ -79,7 +78,6 @@ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) - add_subdirectory(applet) - add_subdirectory(src) - add_subdirectory(data) --add_subdirectory(doc) - - # add clang-format target for all our real source files - file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) --- -2.20.1 - diff --git a/buildroot-external/package/kf5-plasma-pa/kf5-plasma-pa.hash b/buildroot-external/package/kf5-plasma-pa/kf5-plasma-pa.hash index 2dff57ef..5dfafa1a 100644 --- a/buildroot-external/package/kf5-plasma-pa/kf5-plasma-pa.hash +++ b/buildroot-external/package/kf5-plasma-pa/kf5-plasma-pa.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 28765c07f584e7688a85c9761155e606440936de2ebb678917dac2c85f5d0209 plasma-pa-5.18.5.tar.xz +sha256 x plasma-pa-5.20.2.tar.xz diff --git a/buildroot-external/package/kf5-plasma-pa/kf5-plasma-pa.mk b/buildroot-external/package/kf5-plasma-pa/kf5-plasma-pa.mk index e3e88da6..010a0264 100644 --- a/buildroot-external/package/kf5-plasma-pa/kf5-plasma-pa.mk +++ b/buildroot-external/package/kf5-plasma-pa/kf5-plasma-pa.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_PLASMA_PA_VERSION = 5.18.5 +KF5_PLASMA_PA_VERSION = 5.20.2 KF5_PLASMA_PA_SITE = https://download.kde.org/stable/plasma/$(KF5_PLASMA_PA_VERSION) KF5_PLASMA_PA_SOURCE = plasma-pa-$(KF5_PLASMA_PA_VERSION).tar.xz KF5_PLASMA_PA_LICENSE = BSD-3-Clause diff --git a/buildroot-external/package/kf5-plasma-workspace/0001-Remove-DocTools-dependency.patch b/buildroot-external/package/kf5-plasma-workspace/0001-Remove-DocTools-dependency.patch deleted file mode 100644 index 2e81c131..00000000 --- a/buildroot-external/package/kf5-plasma-workspace/0001-Remove-DocTools-dependency.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 812a82e51f6aab90ed115db0b43963514ca826e1 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Fri, 16 Oct 2020 15:27:12 +0200 -Subject: [PATCH 1/1] Remove DocTools dependency - ---- - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c2b93e3d9..f7a4917a9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,7 +26,7 @@ include(KDEPackageAppTemplates) - include(KDEClangFormat) - - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS -- Plasma DocTools Runner NotifyConfig Su NewStuff Wallet -+ Plasma Runner NotifyConfig Su NewStuff Wallet - IdleTime Declarative I18n KCMUtils TextWidgets KDELibs4Support Crash GlobalAccel - DBusAddons Wayland CoreAddons People ActivitiesStats) - find_package(KDED CONFIG REQUIRED) -@@ -149,7 +149,6 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) - # locate qdbus in the Qt path because not every distro makes a symlink at /usr/bin/qdbus - query_qmake(QtBinariesDir QT_INSTALL_BINS) - --add_subdirectory(doc) - add_subdirectory(libkworkspace) - add_subdirectory(libdbusmenuqt) - add_subdirectory(appmenu) --- -2.20.1 - diff --git a/buildroot-external/package/kf5-plasma-workspace/kf5-plasma-workspace.hash b/buildroot-external/package/kf5-plasma-workspace/kf5-plasma-workspace.hash index b8c53714..309aa0e7 100644 --- a/buildroot-external/package/kf5-plasma-workspace/kf5-plasma-workspace.hash +++ b/buildroot-external/package/kf5-plasma-workspace/kf5-plasma-workspace.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 14e82033be745f4db46a70d319e2c86012295ea31056092bc974004189b92354 plasma-workspace-5.18.5.tar.xz +sha256 x plasma-workspace-5.20.2.tar.xz diff --git a/buildroot-external/package/kf5-plasma-workspace/kf5-plasma-workspace.mk b/buildroot-external/package/kf5-plasma-workspace/kf5-plasma-workspace.mk index 8ebb552a..b10ed2d7 100644 --- a/buildroot-external/package/kf5-plasma-workspace/kf5-plasma-workspace.mk +++ b/buildroot-external/package/kf5-plasma-workspace/kf5-plasma-workspace.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_PLASMA_WORKSPACE_VERSION = 5.18.5 +KF5_PLASMA_WORKSPACE_VERSION = 5.20.2 KF5_PLASMA_WORKSPACE_SITE = https://download.kde.org/stable/plasma/$(KF5_PLASMA_WORKSPACE_VERSION) KF5_PLASMA_WORKSPACE_SOURCE = plasma-workspace-$(KF5_PLASMA_WORKSPACE_VERSION).tar.xz KF5_PLASMA_WORKSPACE_LICENSE = BSD-3-Clause diff --git a/buildroot-external/package/kf5-solid/kf5-solid.hash b/buildroot-external/package/kf5-solid/kf5-solid.hash index 59f21da5..bbf6f47d 100644 --- a/buildroot-external/package/kf5-solid/kf5-solid.hash +++ b/buildroot-external/package/kf5-solid/kf5-solid.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933 solid-5.73.0.tar.xz +sha256 471bb76ca0971ab945f2270490b1f72300d86b2b36094ac610e5af69df738a77 solid-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-sonnet/kf5-sonnet.hash b/buildroot-external/package/kf5-sonnet/kf5-sonnet.hash index b78f195d..030f9ec4 100644 --- a/buildroot-external/package/kf5-sonnet/kf5-sonnet.hash +++ b/buildroot-external/package/kf5-sonnet/kf5-sonnet.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c sonnet-5.73.0.tar.xz +sha256 626055b262b3a43e6e947cf7f0383565324f42d6b24ab07b98c6cf054271c9e0 sonnet-5.75.0.tar.xz diff --git a/buildroot-external/package/kf5-threadweaver/kf5-threadweaver.hash b/buildroot-external/package/kf5-threadweaver/kf5-threadweaver.hash index 67f8cf78..befc770c 100644 --- a/buildroot-external/package/kf5-threadweaver/kf5-threadweaver.hash +++ b/buildroot-external/package/kf5-threadweaver/kf5-threadweaver.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38 threadweaver-5.73.0.tar.xz +sha256 x threadweaver-5.75.0.tar.xz diff --git a/buildroot-external/package/python-colorzero/Config.in b/buildroot-external/package/python-colorzero/Config.in deleted file mode 100644 index 631929f8..00000000 --- a/buildroot-external/package/python-colorzero/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_COLORZERO - bool "python-colorzero" - help - Yet another Python color library. - - http://colorzero.readthedocs.io/ diff --git a/buildroot-external/package/python-colorzero/python-colorzero.hash b/buildroot-external/package/python-colorzero/python-colorzero.hash deleted file mode 100644 index c8749468..00000000 --- a/buildroot-external/package/python-colorzero/python-colorzero.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/colorzero/json -md5 7581c4b7fc5f52bf41422e4bbb29731a colorzero-1.1.tar.gz -sha256 acba47119b5d8555680d3cda9afe6ccc5481385ccc3c00084dd973f7aa184599 colorzero-1.1.tar.gz -# Locally computed sha256 checksums -sha256 47778d78e05bb6c39c022814e3712a0327c6418c7251757e72167ab8ff12bb4d LICENSE.txt diff --git a/buildroot-external/package/python-colorzero/python-colorzero.mk b/buildroot-external/package/python-colorzero/python-colorzero.mk deleted file mode 100644 index 7ee4eab2..00000000 --- a/buildroot-external/package/python-colorzero/python-colorzero.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-colorzero -# -################################################################################ - -PYTHON_COLORZERO_VERSION = 1.1 -PYTHON_COLORZERO_SOURCE = colorzero-$(PYTHON_COLORZERO_VERSION).tar.gz -PYTHON_COLORZERO_SITE = https://files.pythonhosted.org/packages/08/0e/826b882db4da2970f53331969d66efc2da2071ffd9a8824601d0feff513d -PYTHON_COLORZERO_SETUP_TYPE = setuptools -PYTHON_COLORZERO_LICENSE = BSD-3-Clause -PYTHON_COLORZERO_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-gpiozero/Config.in b/buildroot-external/package/python-gpiozero/Config.in deleted file mode 100644 index eae21642..00000000 --- a/buildroot-external/package/python-gpiozero/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_GPIOZERO - bool "python-gpiozero" - help - A simple interface to GPIO devices with Raspberry Pi.. - - https://github.com/RPi-Distro/python-gpiozero diff --git a/buildroot-external/package/python-gpiozero/python-gpiozero.hash b/buildroot-external/package/python-gpiozero/python-gpiozero.hash deleted file mode 100644 index 32efb319..00000000 --- a/buildroot-external/package/python-gpiozero/python-gpiozero.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/gpiozero/json -md5 1b138b727e71e976675773e2131a8297 gpiozero-1.4.1.tar.gz -sha256 b4b074e56dea12c21b05e6feef792719a392a245f5e685bc56be3dc2546f8609 gpiozero-1.4.1.tar.gz diff --git a/buildroot-external/package/python-gpiozero/python-gpiozero.mk b/buildroot-external/package/python-gpiozero/python-gpiozero.mk deleted file mode 100644 index 7ee696c8..00000000 --- a/buildroot-external/package/python-gpiozero/python-gpiozero.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# python-gpiozero -# -################################################################################ - -PYTHON_GPIOZERO_VERSION = 1.4.1 -PYTHON_GPIOZERO_SOURCE = gpiozero-$(PYTHON_GPIOZERO_VERSION).tar.gz -PYTHON_GPIOZERO_SITE = https://files.pythonhosted.org/packages/3b/50/377575ff8fbdb672c27869ce536813cafdd94f5e14b5bf377edabb8a8097 -PYTHON_GPIOZERO_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/buildroot-patches/0001-Downgrade-python-idna-to-2.7.patch b/buildroot-patches/0001-Downgrade-python-idna-to-2.7.patch index fb5a7903..516a0b3a 100644 --- a/buildroot-patches/0001-Downgrade-python-idna-to-2.7.patch +++ b/buildroot-patches/0001-Downgrade-python-idna-to-2.7.patch @@ -1,6 +1,6 @@ -From 1f1bad956ef4517ffddee70c748f9210ae23fc76 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Sat, 21 Dec 2019 19:09:45 +0100 +From 972430b0e4a341fc6f90fae6d75ce18ea65e7690 Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Thu, 29 Oct 2020 19:25:47 +0100 Subject: [PATCH 1/1] Downgrade python-idna to 2.7 --- @@ -9,32 +9,32 @@ Subject: [PATCH 1/1] Downgrade python-idna to 2.7 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash -index ddfd44e97c..60ccbba654 100644 +index 50897f045b..067dc15598 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json - md5 2e9ae0b4a0b26d1747c6127cdb060bc1 idna-2.8.tar.gz --sha256 c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 idna-2.8.tar.gz -+sha256 684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16 idna-2.7.tar.gz + md5 870b8b80267f00f0faf1b7ba4bdbf14e idna-2.9.tar.gz +-sha256 7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb idna-2.9.tar.gz ++sha256 684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16 idna-2.7.tar.gz # Locally computed sha256 checksums - sha256 0d4bc7abd48dcfb14e24254ee404066737ff0167144e222914a2113b8794683e LICENSE.rst + sha256 412014420d2473dba06117c3d4d9e0eecaa6dde0ca30cd951f4ec2be39426f32 LICENSE.rst diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk -index 1dae47bb2b..d5c57955a3 100644 +index eb4c1036cf..e6ee4c87ef 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_IDNA_VERSION = 2.8 +-PYTHON_IDNA_VERSION = 2.9 +PYTHON_IDNA_VERSION = 2.7 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz --PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/ad/13/eb56951b6f7950cadb579ca166e448ba77f9d24efc03edd7e55fa57d04b7 +-PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/19/57503b5de719ee45e83472f339f617b0c01ad75cba44aba1e4c97c2b0abd +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935 - PYTHON_IDNA_LICENSE = BSD-3-Clause + PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.rst PYTHON_IDNA_SETUP_TYPE = setuptools -- -2.24.0.rc1 +2.20.1 diff --git a/buildroot-patches/0002-Upgrade-python-pillow-to-7.1.2.patch b/buildroot-patches/0002-Upgrade-python-pillow-to-7.1.2.patch deleted file mode 100644 index 613f3f3e..00000000 --- a/buildroot-patches/0002-Upgrade-python-pillow-to-7.1.2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6b95294b24c271290d56bc7356ddb89c4d106804 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Thu, 14 May 2020 19:46:33 +0200 -Subject: [PATCH 1/1] Upgrade python-pillow to 7.1.2 - ---- - package/python-pillow/python-pillow.hash | 2 +- - package/python-pillow/python-pillow.mk | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash -index 0d66c4bb3c..a5fdaa06ad 100644 ---- a/package/python-pillow/python-pillow.hash -+++ b/package/python-pillow/python-pillow.hash -@@ -1,5 +1,5 @@ - # md5, sha256 from https://pypi.org/project/Pillow/ - md5 d099946335c1ba372f5b1fa68ca71645 Pillow-7.0.0.tar.gz --sha256 4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946 Pillow-7.0.0.tar.gz -+sha256 a0b49960110bc6ff5fead46013bcb8825d101026d466f3a4de3476defe0fb0dd Pillow-7.1.2.tar.gz - # Locally computed sha256 checksums - sha256 04a04a908e52921829c7f51528e5619c79becdde99c484ab7d4f235e2927968c LICENSE -diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk -index 5ff2dcfdb6..2832eeee0b 100644 ---- a/package/python-pillow/python-pillow.mk -+++ b/package/python-pillow/python-pillow.mk -@@ -4,8 +4,8 @@ - # - ################################################################################ - --PYTHON_PILLOW_VERSION = 7.0.0 --PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/39/47/f28067b187dd664d205f75b07dcc6e0e95703e134008a14814827eebcaab -+PYTHON_PILLOW_VERSION = 7.1.2 -+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/ce/ef/e793f6ffe245c960c42492d0bb50f8d14e2ba223f1922a5c3c81569cec44 - PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz - PYTHON_PILLOW_LICENSE = PIL Software License - PYTHON_PILLOW_LICENSE_FILES = LICENSE --- -2.20.1 - diff --git a/buildroot-patches/0003-Downgrade-python-psutil-to-5.6.6.patch b/buildroot-patches/0003-Downgrade-python-psutil-to-5.6.6.patch index ccf1836f..590c6495 100644 --- a/buildroot-patches/0003-Downgrade-python-psutil-to-5.6.6.patch +++ b/buildroot-patches/0003-Downgrade-python-psutil-to-5.6.6.patch @@ -1,40 +1,57 @@ -From 6ada66130fb2300d9ab7ff14e98e3fc79ecba056 Mon Sep 17 00:00:00 2001 +From 55bbd8b116f02fb714558b82e16e5b190994219f Mon Sep 17 00:00:00 2001 From: j1nx -Date: Thu, 14 May 2020 19:38:22 +0200 +Date: Thu, 29 Oct 2020 19:47:27 +0100 Subject: [PATCH 1/1] Downgrade python-psutil to 5.6.6 --- package/python-psutil/python-psutil.hash | 2 +- package/python-psutil/python-psutil.mk | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + package/python3-psutil/python3-psutil.mk | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash -index 7f3d629d66..9e273580b7 100644 +index 0000d6033c..e715e3f26f 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json - md5 b2c94e0368fc6e6f237a7252f8e85ca2 psutil-5.6.7.tar.gz --sha256 ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa psutil-5.6.7.tar.gz -+sha256 ad21281f7bd6c57578dd53913d2d44218e9e29fd25128d10ff7819ef16fa46e7 psutil-5.6.6.tar.gz + md5 ed7b0f11ed214bcabbe76b7cf52f3ae3 psutil-5.7.0.tar.gz +-sha256 685ec16ca14d079455892f25bd124df26ff9137664af445563c1bd36629b5e0e psutil-5.7.0.tar.gz ++sha256 ad21281f7bd6c57578dd53913d2d44218e9e29fd25128d10ff7819ef16fa46e7 psutil-5.6.6.tar.gz # Locally computed sha256 checksums - sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE + sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk -index 62a94f3c41..5d18b6c001 100644 +index 08bb2fd7bd..f1dbf84e20 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk -@@ -4,9 +4,9 @@ - # +@@ -5,9 +5,9 @@ ################################################################################ --PYTHON_PSUTIL_VERSION = 5.6.7 + # Please keep in sync with package/python3-psutil/python3-psutil.mk +-PYTHON_PSUTIL_VERSION = 5.7.0 +PYTHON_PSUTIL_VERSION = 5.6.6 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz --PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/73/93/4f8213fbe66fc20cb904f35e6e04e20b47b85bee39845cc66a0bcf5ccdcb +-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/c4/b8/3512f0e93e0db23a71d82485ba256071ebef99b227351f0f5540f744af41 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/5f/dc/edf6758183afc7591a16bd4b8a44d8eea80aca1327ea60161dd3bad9ad22 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE +diff --git a/package/python3-psutil/python3-psutil.mk b/package/python3-psutil/python3-psutil.mk +index ddd4b6b7d3..a368d643a1 100644 +--- a/package/python3-psutil/python3-psutil.mk ++++ b/package/python3-psutil/python3-psutil.mk +@@ -5,9 +5,9 @@ + ################################################################################ + + # Please keep in sync with package/python-psutil/python-psutil.mk +-PYTHON3_PSUTIL_VERSION = 5.7.0 ++PYTHON3_PSUTIL_VERSION = 5.6.6 + PYTHON3_PSUTIL_SOURCE = psutil-$(PYTHON3_PSUTIL_VERSION).tar.gz +-PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/c4/b8/3512f0e93e0db23a71d82485ba256071ebef99b227351f0f5540f744af41 ++PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/5f/dc/edf6758183afc7591a16bd4b8a44d8eea80aca1327ea60161dd3bad9ad22 + PYTHON3_PSUTIL_SETUP_TYPE = setuptools + PYTHON3_PSUTIL_LICENSE = BSD-3-Clause + PYTHON3_PSUTIL_LICENSE_FILES = LICENSE -- 2.20.1 diff --git a/buildroot-patches/0005-Downgrade-python-six-to-1.13.0.patch b/buildroot-patches/0005-Downgrade-python-six-to-1.13.0.patch index ca6b7039..6b296573 100644 --- a/buildroot-patches/0005-Downgrade-python-six-to-1.13.0.patch +++ b/buildroot-patches/0005-Downgrade-python-six-to-1.13.0.patch @@ -1,6 +1,6 @@ -From 65b865ff92de541c8ce6565928fb25b451cbff18 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Tue, 17 Mar 2020 09:04:33 +0100 +From 6247525c7f76f33cbbbb7ee447c6acbb23114ecd Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Thu, 29 Oct 2020 19:52:13 +0100 Subject: [PATCH 1/1] Downgrade python-six to 1.13.0 --- @@ -9,32 +9,32 @@ Subject: [PATCH 1/1] Downgrade python-six to 1.13.0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-six/python-six.hash b/package/python-six/python-six.hash -index 0d1e75fe9e..dc87604cd2 100644 +index 9945ffd1d7..22aca3f4bd 100644 --- a/package/python-six/python-six.hash +++ b/package/python-six/python-six.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/six/json - md5 21674588a57e649d1a6d977ec3122140 six-1.14.0.tar.gz --sha256 236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a six-1.14.0.tar.gz -+sha256 30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66 six-1.13.0.tar.gz + md5 9f90a0eaa0ea7747fda01ca79d21ebcb six-1.15.0.tar.gz +-sha256 30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 six-1.15.0.tar.gz ++sha256 30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66 six-1.13.0.tar.gz # Locally computed sha256 checksums - sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 LICENSE + sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 LICENSE diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk -index 8acc739f2e..906c268d74 100644 +index e7621f5ecb..906c268d74 100644 --- a/package/python-six/python-six.mk +++ b/package/python-six/python-six.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_SIX_VERSION = 1.14.0 +-PYTHON_SIX_VERSION = 1.15.0 +PYTHON_SIX_VERSION = 1.13.0 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz --PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/21/9f/b251f7f8a76dec1d6651be194dfba8fb8d7781d10ab3987190de8391d08e +-PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/6b/34/415834bfdafca3c5f451532e8a8d9ba89a21c9743a0c59fbd0205c7f9426 +PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/94/3e/edcf6fef41d89187df7e38e868b2dd2182677922b600e880baad7749c865 PYTHON_SIX_SETUP_TYPE = setuptools PYTHON_SIX_LICENSE = MIT PYTHON_SIX_LICENSE_FILES = LICENSE -- -2.25.0 +2.20.1 diff --git a/buildroot-patches/0007-Downgrade-python-requests-to-2.20.0.patch b/buildroot-patches/0007-Downgrade-python-requests-to-2.20.0.patch index 77b0ed4f..4aee9726 100644 --- a/buildroot-patches/0007-Downgrade-python-requests-to-2.20.0.patch +++ b/buildroot-patches/0007-Downgrade-python-requests-to-2.20.0.patch @@ -1,40 +1,57 @@ -From eee6e117ed8af312a85cc0f564146d468c43b1a3 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 28 Oct 2019 14:24:52 +0100 +From 664c2f65454cf57848eafd133c72517af207e2fe Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Thu, 29 Oct 2020 19:59:59 +0100 Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0 --- - package/python-requests/python-requests.hash | 1 + + package/python-requests/python-requests.hash | 2 +- package/python-requests/python-requests.mk | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) + package/python3-requests/python3-requests.mk | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash -index 42f45d3a44..c7c1e0f427 100644 +index b252e3a781..d4ef9e903a 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash -@@ -1,5 +1,6 @@ +@@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json - md5 ee28bee2de76e9198fc41e48f3a7dd47 requests-2.22.0.tar.gz - sha256 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 requests-2.22.0.tar.gz -+sha256 99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c requests-2.20.0.tar.gz + md5 abfdc28db1065bbd0bc32592ac9d27a6 requests-2.23.0.tar.gz +-sha256 b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6 requests-2.23.0.tar.gz ++sha256 99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c requests-2.20.0.tar.gz # Locally computed sha256 checksums - sha256 be41abac2c40f8530307e8d172c590b476f4a488bc6a68f8de57b7cf64786687 LICENSE + sha256 8837a2f33a61bcee175c028ff16d1c160aba48a3aebe1495ace709be4e62636b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk -index e64db94523..358835d816 100644 +index 9d36346b65..38dae8d8bf 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk -@@ -4,9 +4,9 @@ - # +@@ -5,9 +5,9 @@ ################################################################################ --PYTHON_REQUESTS_VERSION = 2.22.0 + # Please keep in sync with package/python3-requests/python3-requests.mk +-PYTHON_REQUESTS_VERSION = 2.23.0 +PYTHON_REQUESTS_VERSION = 2.20.0 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz --PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/01/62/ddcf76d1d19885e8579acb1b1df26a852b03472c0e46d2b959a714c90608 +-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/f5/4f/280162d4bd4d8aad241a21aecff7a6e46891b905a4341e7ab549ebaf7915 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/97/10/92d25b93e9c266c94b76a5548f020f3f1dd0eb40649cb1993532c0af8f4c PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE +diff --git a/package/python3-requests/python3-requests.mk b/package/python3-requests/python3-requests.mk +index e2bb00eab2..a1f2567115 100644 +--- a/package/python3-requests/python3-requests.mk ++++ b/package/python3-requests/python3-requests.mk +@@ -5,9 +5,9 @@ + ################################################################################ + + # Please keep in sync with package/python-requests/python-requests.mk +-PYTHON3_REQUESTS_VERSION = 2.23.0 ++PYTHON3_REQUESTS_VERSION = 2.20.0 + PYTHON3_REQUESTS_SOURCE = requests-$(PYTHON3_REQUESTS_VERSION).tar.gz +-PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/f5/4f/280162d4bd4d8aad241a21aecff7a6e46891b905a4341e7ab549ebaf7915 ++PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/97/10/92d25b93e9c266c94b76a5548f020f3f1dd0eb40649cb1993532c0af8f4c + PYTHON3_REQUESTS_SETUP_TYPE = setuptools + PYTHON3_REQUESTS_LICENSE = Apache-2.0 + PYTHON3_REQUESTS_LICENSE_FILES = LICENSE -- -2.11.0 +2.20.1 diff --git a/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch b/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch index 366ac6fb..1846c50c 100644 --- a/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch +++ b/buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch @@ -1,12 +1,13 @@ -From c6ba7bfcbb098882e62354cfd9979d458c57c71c Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 13 Apr 2020 14:16:48 +0200 +From 04b2b1e2bc267a68b8b377d070a655a47e901744 Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Thu, 29 Oct 2020 20:05:23 +0100 Subject: [PATCH 1/1] Downgrade python-pyyaml to 5.1.2 --- package/python-pyyaml/python-pyyaml.hash | 2 +- package/python-pyyaml/python-pyyaml.mk | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + package/python3-pyyaml/python3-pyyaml.mk | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash index 90e1f2199e..fb6cd3b365 100644 @@ -20,13 +21,13 @@ index 90e1f2199e..fb6cd3b365 100644 # Locally computed sha256 checksums sha256 c40112449f254b9753045925248313e9270efa36d226b22d82d4cc6c43c57f29 LICENSE diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk -index 78506390a4..165a938f11 100644 +index 7bbae309c6..7cdd8edefb 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk -@@ -4,9 +4,9 @@ - # +@@ -5,9 +5,9 @@ ################################################################################ + # Please keep in sync package/python3-pyyaml/python3-pyyaml.mk -PYTHON_PYYAML_VERSION = 5.3.1 +PYTHON_PYYAML_VERSION = 5.1.2 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz @@ -35,6 +36,22 @@ index 78506390a4..165a938f11 100644 PYTHON_PYYAML_SETUP_TYPE = distutils PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE +diff --git a/package/python3-pyyaml/python3-pyyaml.mk b/package/python3-pyyaml/python3-pyyaml.mk +index c0dcebf4fc..6c149168ae 100644 +--- a/package/python3-pyyaml/python3-pyyaml.mk ++++ b/package/python3-pyyaml/python3-pyyaml.mk +@@ -5,9 +5,9 @@ + ################################################################################ + + # Please keep in sync with package/python-pyyaml/python-pyyaml.mk +-PYTHON3_PYYAML_VERSION = 5.3.1 ++PYTHON3_PYYAML_VERSION = 5.1.2 + PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz +-PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c ++PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe + PYTHON3_PYYAML_SETUP_TYPE = distutils + PYTHON3_PYYAML_LICENSE = MIT + PYTHON3_PYYAML_LICENSE_FILES = LICENSE -- -2.25.0 +2.20.1 diff --git a/buildroot-patches/0011-Downgrade-python-ifaddr-to-0.1.4.patch b/buildroot-patches/0011-Downgrade-python-ifaddr-to-0.1.4.patch index 6507e3ab..f9503b81 100644 --- a/buildroot-patches/0011-Downgrade-python-ifaddr-to-0.1.4.patch +++ b/buildroot-patches/0011-Downgrade-python-ifaddr-to-0.1.4.patch @@ -1,50 +1,49 @@ -From b5914a701cd7d5cdf1eeefd33ea0fa5217a99818 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 28 Oct 2019 16:05:40 +0100 +From 879e3e878a75ec0d60fbefa24ab995f50630f7b2 Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Thu, 29 Oct 2020 20:49:46 +0100 Subject: [PATCH 1/1] Downgrade python-ifaddr to 0.1.4 --- - package/python-ifaddr/python-ifaddr.hash | 6 ++---- - package/python-ifaddr/python-ifaddr.mk | 14 +++++++++----- - 2 files changed, 11 insertions(+), 9 deletions(-) + package/python-ifaddr/python-ifaddr.hash | 2 +- + package/python-ifaddr/python-ifaddr.mk | 12 +++++++++--- + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/python-ifaddr/python-ifaddr.hash b/package/python-ifaddr/python-ifaddr.hash -index 18df40ac4c..6c0a802b4b 100644 +index 57b155caa5..af1b89966d 100644 --- a/package/python-ifaddr/python-ifaddr.hash +++ b/package/python-ifaddr/python-ifaddr.hash -@@ -1,5 +1,3 @@ +@@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ifaddr/json --md5 cc1b7f0a587ef38491f07e50bf91d82e ifaddr-0.1.6.tar.gz --sha256 c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93 ifaddr-0.1.6.tar.gz --# Locally calculated --sha256 926c6fdac9ede91ae54c67066597466b04f9b4f956a24f9c77931e7765607b2c setup.py -+md5 37bf17655723fc085156bf7c595abd04 ifaddr-0.1.4.zip -+sha256 cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b ifaddr-0.1.4.zip + md5 97c4eb7505643b5f1fe17733cb42abd9 ifaddr-0.1.7.tar.gz +-sha256 1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 ifaddr-0.1.7.tar.gz ++sha256 cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b ifaddr-0.1.4.zip + # Locally computed sha256 checksums + sha256 8700856576ae2bc80c63bc970250510d9213fb02fed006d5f22742c9ddde24d7 LICENSE.txt diff --git a/package/python-ifaddr/python-ifaddr.mk b/package/python-ifaddr/python-ifaddr.mk -index 23c4ee365e..d2044f39ca 100644 +index f1154d9de8..1203afa724 100644 --- a/package/python-ifaddr/python-ifaddr.mk +++ b/package/python-ifaddr/python-ifaddr.mk -@@ -4,11 +4,15 @@ +@@ -4,11 +4,17 @@ # ################################################################################ --PYTHON_IFADDR_VERSION = 0.1.6 +-PYTHON_IFADDR_VERSION = 0.1.7 -PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).tar.gz --PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/9f/54/d92bda685093ebc70e2057abfa83ef1b3fb0ae2b6357262a3e19dfe96bb8 +-PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/3d/fc/4ce147e3997cd0ea470ad27112087545cf83bf85015ddb3054673cb471bb +PYTHON_IFADDR_VERSION = 0.1.4 +PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).zip +PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/12/40/97ef30db32e0c798fc557af403ea263dbeae8d334571603f02e19f4021a0 PYTHON_IFADDR_SETUP_TYPE = setuptools --PYTHON_IFADDR_LICENSE = MIT --PYTHON_IFADDR_LICENSE_FILES = setup.py -+ + PYTHON_IFADDR_LICENSE = MIT + PYTHON_IFADDR_LICENSE_FILES = LICENSE.txt + +define PYTHON_IFADDR_EXTRACT_CMDS + $(UNZIP) -d $(@D) $(DL_DIR)/python-ifaddr/$(PYTHON_IFADDR_SOURCE) + mv $(@D)/ifaddr-$(PYTHON_IFADDR_VERSION)/* $(@D) + $(RM) -r $(@D)/ifaddr-$(PYTHON_IFADDR_VERSION) +endef - ++ $(eval $(python-package)) -- -2.11.0 +2.20.1 diff --git a/buildroot-patches/0015-Bump-python-pip-to-20.2.2.patch b/buildroot-patches/0015-Bump-python-pip-to-20.2.2.patch index c91552f9..7fd87e64 100644 --- a/buildroot-patches/0015-Bump-python-pip-to-20.2.2.patch +++ b/buildroot-patches/0015-Bump-python-pip-to-20.2.2.patch @@ -1,42 +1,36 @@ -From 9ac74c4cd711044959a3e30bda42cc55a55d66ae Mon Sep 17 00:00:00 2001 +From be12f06ce0920419b0e75f94d4f839078cd41b8b Mon Sep 17 00:00:00 2001 From: j1nx -Date: Mon, 24 Aug 2020 11:15:44 +0200 +Date: Thu, 29 Oct 2020 20:53:35 +0100 Subject: [PATCH 1/1] Bump python-pip to 20.2.2 -Shortly after 19.3.1 PR7002 got merged; -https://github.com/pypa/pip/pull/7002 - -This makes sure that pip install defaults to --user in case the -install folder is not writable as in our case. This prevents MSM -to switch to sudo pip install. --- package/python-pip/python-pip.hash | 2 +- package/python-pip/python-pip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash -index 7d02a51023..da969a78cf 100644 +index 58bc239154..39f04e606e 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json - md5 1aaaf90fbafc50e7ba1e66ffceb00960 pip-19.3.1.tar.gz --sha256 21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7 pip-19.3.1.tar.gz + md5 7d42ba49b809604f0df3d55df1c3fd86 pip-20.0.2.tar.gz +-sha256 7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f pip-20.0.2.tar.gz +sha256 58a3b0b55ee2278104165c7ee7bc8e2db6f635067f3c66cf637113ec5aa71584 pip-20.2.2.tar.gz # Locally computed sha256 checksums sha256 5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk -index b8be234d24..e48f923616 100644 +index cc40eecdfe..e48f923616 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_PIP_VERSION = 19.3.1 +-PYTHON_PIP_VERSION = 20.0.2 +PYTHON_PIP_VERSION = 20.2.2 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz --PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/ce/ea/9b445176a65ae4ba22dce1d93e4b5fe182f953df71a145f557cffaffc1bf +-PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/8e/76/66066b7bc71817238924c7e4b448abdb17eb0c92d645769c223f9ace478f +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/73/8e/7774190ac616c69194688ffce7c1b2a097749792fea42e390e7ddfdef8bc PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT diff --git a/buildroot-patches/0105-Upgrade-cargo-and-rust-to-latest-versions-and-don-t-.patch b/buildroot-patches/0105-Upgrade-cargo-and-rust-to-latest-versions-and-don-t-.patch deleted file mode 100644 index a2f94610..00000000 --- a/buildroot-patches/0105-Upgrade-cargo-and-rust-to-latest-versions-and-don-t-.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 66373ff1dca694571a954fafa1d6a96668eae4d9 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Sat, 11 Apr 2020 16:36:05 +0200 -Subject: [PATCH 1/1] Upgrade cargo and rust to latest versions and don't - bother the offline build / vendor stuff - ---- - package/cargo-bin/cargo-bin.hash | 2 +- - package/cargo-bin/cargo-bin.mk | 2 +- - package/cargo/cargo.hash | 4 ++-- - package/cargo/cargo.mk | 34 +++----------------------------- - package/rust-bin/rust-bin.hash | 7 ++++--- - package/rust-bin/rust-bin.mk | 2 +- - package/rust/rust.mk | 2 +- - 7 files changed, 13 insertions(+), 40 deletions(-) - -diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash -index 0e9e9c5c61..1d5b600dab 100644 ---- a/package/cargo-bin/cargo-bin.hash -+++ b/package/cargo-bin/cargo-bin.hash -@@ -6,7 +6,7 @@ sha256 13acdb3c9f2505805ceed8a696f5f62ab8cd73e443cd43d6edd588aad88e1c32 cargo-0 - sha256 6628db22370f397676195555d768f0449a60f0a694bcac24611f4cd1cfc97cdc cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz - # From https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 - # Verified using https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.asc --sha256 c2c31db68c4dcb50ad856a19e6f11489a0d4df1212f31bd068dfbb73c5425761 cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz -+sha256 9b6ae643fa240c5ecbc1dc390f4020b6a683f25bac6f7437ebd4b9d32a8d0b6c cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz - # Locally generated - sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE - sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk -index 3614f7a53d..87c528a200 100644 ---- a/package/cargo-bin/cargo-bin.mk -+++ b/package/cargo-bin/cargo-bin.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --CARGO_BIN_VERSION = 0.33.0 -+CARGO_BIN_VERSION = 0.41.0 - CARGO_BIN_SITE = https://static.rust-lang.org/dist - CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz - CARGO_BIN_LICENSE = Apache-2.0 or MIT -diff --git a/package/cargo/cargo.hash b/package/cargo/cargo.hash -index baa2cfbc33..e16d727b61 100644 ---- a/package/cargo/cargo.hash -+++ b/package/cargo/cargo.hash -@@ -1,6 +1,6 @@ - # Locally generated --sha256 1a4bae6910ca895157a1abe8225eb2b7e9b49ee1ee1e4e72fb81cb8e1446bff9 cargo-0.26.0.tar.gz --sha256 dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz -+sha256 77b2e5b5207ed30dd6e6af934663f0c4553968dce575f95ca7e141444b6e9704 cargo-0.41.0.tar.gz -+sha256 531bd9147b15ea9c061e24038c2100c4beac8b023d2877db1bb5d85efeefe76e rust-installer-9f66c14c3f91a48a118c7817f434167b311c3515.tar.gz - sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE - sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT - sha256 8bd89f9222dc80292f4107347103b693ac66f3a083371f0629ccf42338abe880 LICENSE-THIRD-PARTY -diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk -index a387281b4c..6541d26c44 100644 ---- a/package/cargo/cargo.mk -+++ b/package/cargo/cargo.mk -@@ -4,22 +4,16 @@ - # - ################################################################################ - --CARGO_VERSION = 0.26.0 -+CARGO_VERSION = 0.41.0 - CARGO_SITE = $(call github,rust-lang,cargo,$(CARGO_VERSION)) - CARGO_LICENSE = Apache-2.0 or MIT - CARGO_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT - --CARGO_DEPS_SHA512 = 6ed2a1644c9b18fc24ddad5350d41b6c36cd5b62de4cf0b748a57b589f4f0ac12f91461989158d58d0892bf6fc2c1626cf574e7e2b9da4b0e35f72dfd88f9048 --CARGO_DEPS_SITE = https://src.fedoraproject.org/repo/pkgs/cargo/$(CARGO_DEPS_SOURCE)/sha512/$(CARGO_DEPS_SHA512) --CARGO_DEPS_SOURCE = cargo-$(CARGO_VERSION)-vendor.tar.xz -- --CARGO_INSTALLER_VERSION = 4f994850808a572e2cc8d43f968893c8e942e9bf -+CARGO_INSTALLER_VERSION = 9f66c14c3f91a48a118c7817f434167b311c3515 - CARGO_INSTALLER_SITE = $(call github,rust-lang,rust-installer,$(CARGO_INSTALLER_VERSION)) - CARGO_INSTALLER_SOURCE = rust-installer-$(CARGO_INSTALLER_VERSION).tar.gz - --HOST_CARGO_EXTRA_DOWNLOADS = \ -- $(CARGO_DEPS_SITE)/$(CARGO_DEPS_SOURCE) \ -- $(CARGO_INSTALLER_SITE)/$(CARGO_INSTALLER_SOURCE) -+HOST_CARGO_EXTRA_DOWNLOADS = $(CARGO_INSTALLER_SITE)/$(CARGO_INSTALLER_SOURCE) - - HOST_CARGO_DEPENDENCIES = \ - $(BR2_CMAKE_HOST_DEPENDENCY) \ -@@ -34,15 +28,6 @@ HOST_CARGO_DEPENDENCIES = \ - HOST_CARGO_SNAP_BIN = $(HOST_CARGO_BIN_DIR)/cargo/bin/cargo - HOST_CARGO_HOME = $(HOST_DIR)/share/cargo - --define HOST_CARGO_EXTRACT_DEPS -- @mkdir -p $(@D)/vendor -- $(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \ -- $(HOST_CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \ -- $(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) - --endef -- --HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS -- - define HOST_CARGO_EXTRACT_INSTALLER - @mkdir -p $(@D)/src/rust-installer - $(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \ -@@ -52,19 +37,6 @@ endef - - HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_INSTALLER - --define HOST_CARGO_SETUP_DEPS -- mkdir -p $(@D)/.cargo -- ( \ -- echo "[source.crates-io]"; \ -- echo "registry = 'https://github.com/rust-lang/crates.io-index'"; \ -- echo "replace-with = 'vendored-sources'"; \ -- echo "[source.vendored-sources]"; \ -- echo "directory = '$(@D)/vendor'"; \ -- ) > $(@D)/.cargo/config --endef -- --HOST_CARGO_PRE_CONFIGURE_HOOKS += HOST_CARGO_SETUP_DEPS -- - HOST_CARGO_SNAP_OPTS = \ - --release \ - $(if $(VERBOSE),--verbose) -diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash -index 96d81a347c..a4efa14021 100644 ---- a/package/rust-bin/rust-bin.hash -+++ b/package/rust-bin/rust-bin.hash -@@ -3,7 +3,7 @@ - sha256 90b6414eddbce4a245cdcaea8353d3a637ef565d2bd119e25a6c2bf3e38cdf63 rustc-1.33.0-i686-unknown-linux-gnu.tar.xz - # From https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 - # Verified using https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc --sha256 57c5ced1a826d34f26e50adf041528dd0000f2a59e8be32d2359386843382ce1 rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz -+sha256 b1c00618b7a98156e88b14682508a503284f85748eab23de749a20dcc8847111 rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz - # From https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.sha256 - # Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.asc - sha256 3e3449dada8306b3ff91f23c7803c7312a47e93af140f757b29b74f1e226a505 rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz -@@ -12,7 +12,7 @@ sha256 3e3449dada8306b3ff91f23c7803c7312a47e93af140f757b29b74f1e226a505 rust-st - sha256 ddb372a43fb2ba9949e78643df43d6ae447b70cefd440ccdd6b9f6c2ff929ea7 rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz - # From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 - # Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.asc --sha256 1142d5064d8cbfab16ab71130e5a84804a1ebdfeb10173e6238adc0d757937b6 rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz -+sha256 f16b2cf9103127140f85d21c2753d85d45b90a9309967e3a788867fd7d95a6c1 rust-std-1.40.0-arm-unknown-linux-gnueabihf.tar.xz - # From https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 - # Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.asc - sha256 8492b5c91a9ea7ee7e22881382c1b9ad8bb9a4147aff0dfee09940b34783e3d5 rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz -@@ -42,7 +42,8 @@ sha256 4bc32bf4660a9fc5cd2af9e09f1bfb668b335442097fed6f3892b50950e97d3c rust-st - sha256 984d3ca2a47db04345a2bddd657761f66d209ef95a02097ad4bd549f45a0dc9f rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz - # From https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 - # Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc --sha256 6f20343ed73faf5fdfc423bec38a9bb1910a0a962af6f2dddd7184407543ed0e rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz -+sha256 5a0b14a51f51b0194f70a2023749d9cb49c3b2e11f0d4c8232960b91fad336ac rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz - # Locally generated -+sha256 1abd1865e8339c2cac6992a11f6f98b66fa2b97f67acaddcf1992e39a7001bfc rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz - sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE - sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk -index a374215e20..8d2f3c9eca 100644 ---- a/package/rust-bin/rust-bin.mk -+++ b/package/rust-bin/rust-bin.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --RUST_BIN_VERSION = 1.33.0 -+RUST_BIN_VERSION = 1.40.0 - RUST_BIN_SITE = https://static.rust-lang.org/dist - RUST_BIN_LICENSE = Apache-2.0 or MIT - RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -diff --git a/package/rust/rust.mk b/package/rust/rust.mk -index 5d14fc6682..74e5c50e59 100644 ---- a/package/rust/rust.mk -+++ b/package/rust/rust.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --RUST_VERSION = 1.33.0 -+RUST_VERSION = 1.40.0 - RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz - RUST_SITE = https://static.rust-lang.org/dist - RUST_LICENSE = Apache-2.0 or MIT --- -2.17.1 - diff --git a/buildroot-patches/0106-Bump-RPI-Firmware-version.patch b/buildroot-patches/0106-Bump-RPI-Firmware-version.patch index 7cbd4c00..b85ec5c9 100644 --- a/buildroot-patches/0106-Bump-RPI-Firmware-version.patch +++ b/buildroot-patches/0106-Bump-RPI-Firmware-version.patch @@ -1,6 +1,6 @@ -From 0368dda1a3e50fb96110b4634a1d2dfef3060bc5 Mon Sep 17 00:00:00 2001 +From b38f0ed890f671542f36a4fa745430caf585ae7b Mon Sep 17 00:00:00 2001 From: j1nx -Date: Mon, 1 Jun 2020 16:49:12 +0200 +Date: Thu, 29 Oct 2020 21:07:31 +0100 Subject: [PATCH 1/1] Bump RPI Firmware version --- @@ -9,24 +9,24 @@ Subject: [PATCH 1/1] Bump RPI Firmware version 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash -index 59ab1da0c6..0506961472 100644 +index 32f2076d6e..a6d704b229 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed --sha256 31a84340be08be319570a9d1439f25c0e3513fed73065a56aa5dd61dd605d5d9 rpi-firmware-01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5.tar.gz -+sha256 753365ab553cb857f36d10d9f2819a040773a5c7170fde174019a1429a2df914 rpi-firmware-f0eab3a24f42c06fb6f2360140a00873c2793b1f.tar.gz - sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom +-sha256 bad3eedb256631bdce1e7d3a0ac59fdd38923a68579089a6b64029c5ff7d68f4 rpi-firmware-542aceb30364db3ce87d532ea90451f46bbb84e9.tar.gz ++sha256 05423c51bea350fccf9b2303da175b325c9ff77fcc9b800c2af78596e9503f2a rpi-firmware-0c3ecac52e4ef4dde82e6261b917fd77a884be37.tar.gz + sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk -index 6fee60b08c..6053a12ba9 100644 +index 8aa855d0ef..aa10db1945 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ --RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5 -+RPI_FIRMWARE_VERSION = f0eab3a24f42c06fb6f2360140a00873c2793b1f +-RPI_FIRMWARE_VERSION = 542aceb30364db3ce87d532ea90451f46bbb84e9 ++RPI_FIRMWARE_VERSION = 0c3ecac52e4ef4dde82e6261b917fd77a884be37 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom diff --git a/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch b/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch index be5b2e07..6cf1a389 100644 --- a/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch +++ b/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch @@ -1,6 +1,6 @@ -From fa1d7e1ef1cc188a887717c70bf4312518caae2d Mon Sep 17 00:00:00 2001 +From d42b83d821604f3a922389c0f4e2ab2260def7d7 Mon Sep 17 00:00:00 2001 From: j1nx -Date: Mon, 1 Jun 2020 16:56:31 +0200 +Date: Thu, 29 Oct 2020 21:12:53 +0100 Subject: [PATCH 1/1] Bump RPI Wifi Firmware version --- @@ -9,25 +9,25 @@ Subject: [PATCH 1/1] Bump RPI Wifi Firmware version 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash -index 5de9e0f13f..90aa03218f 100644 +index b8931d2c45..9afc5a96b0 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated --sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-wifi-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz -+sha256 6dc1c480e9de30453fd242ffa492bb4df6c8bc2a9f0de9d8b2c21bf8cbf32ba7 rpi-wifi-firmware-98e815735e2c805d65994ccc608f399595b74438.tar.gz - sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +-sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz ++sha256 cbdcfcbea0f352a79a45c1b27895f9f0a5014134cb90e84d8d5a1eda0bbf7f7c rpi-wifi-firmware-5113681d6dcd46581a1882cbeb3d5cf1ddbf7676.tar.gz + sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk -index 9dd1854b9a..0c697bddbe 100644 +index 6be02509fe..3277a6e4a0 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,14 +4,14 @@ # ################################################################################ --RPI_WIFI_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 +-RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 -RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) -+RPI_WIFI_FIRMWARE_VERSION = 98e815735e2c805d65994ccc608f399595b74438 ++RPI_WIFI_FIRMWARE_VERSION = 5113681d6dcd46581a1882cbeb3d5cf1ddbf7676 +RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx diff --git a/buildroot-patches/0110-Bump-and-patch-KF5.patch b/buildroot-patches/0110-Bump-and-patch-KF5.patch index 31de24b6..6b48b927 100644 --- a/buildroot-patches/0110-Bump-and-patch-KF5.patch +++ b/buildroot-patches/0110-Bump-and-patch-KF5.patch @@ -19,7 +19,7 @@ index 733e267fdb..bf017ed377 100644 @@ -1,3 +1,4 @@ # Locally calculated sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz -+sha256 c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4 extra-cmake-modules-5.73.0.tar.xz ++sha256 878d47a901056d5303bf37414d787046e1d38fac2bd9f2f5ddd00a9dd6b9f4eb extra-cmake-modules-5.75.0.tar.xz sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk index 3c4281b960..d3aad89264 100644 @@ -37,7 +37,7 @@ index 0cd8dcfc15..415c084cad 100644 @@ -1,3 +1,4 @@ # Locally calculated sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz -+sha256 24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51 kcoreaddons-5.73.0.tar.xz ++sha256 9ca2cf82ddc12e27ff73aaefdf616c3eb6552a3a5531f014b5bf52a34a4c73f9 kcoreaddons-5.75.0.tar.xz sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk index 76be8876cc..dbde5d3285 100644 @@ -75,7 +75,7 @@ index 8ccada455e..a57d848e07 100644 @@ -1,3 +1,4 @@ # Locally calculated sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz -+sha256 b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f networkmanager-qt-5.73.0.tar.xz ++sha256 ba9d15eb5e0e624ffaac591cdaad43dc62e60ccfa25b98be686b58800b41018b networkmanager-qt-5.75.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk index 8360fc9b63..f744939ecf 100644 @@ -86,7 +86,7 @@ index 8360fc9b63..f744939ecf 100644 ################################################################################ -KF5_VERSION_MAJOR = 5.47 -+KF5_VERSION_MAJOR = 5.73 ++KF5_VERSION_MAJOR = 5.75 KF5_VERSION = $(KF5_VERSION_MAJOR).0 KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR) diff --git a/buildroot-patches/0114-Add-and-build-the-qtdesigner-tools.patch b/buildroot-patches/0114-Add-and-build-the-qtdesigner-tools.patch index 9ec8e49a..e472887b 100644 --- a/buildroot-patches/0114-Add-and-build-the-qtdesigner-tools.patch +++ b/buildroot-patches/0114-Add-and-build-the-qtdesigner-tools.patch @@ -1,20 +1,20 @@ -From ad5ead73536b5558b5f8457f54d8eb9076ac5b7d Mon Sep 17 00:00:00 2001 +From 633e0713a0248f1e01e8b539105607e949c3ea64 Mon Sep 17 00:00:00 2001 From: j1nx -Date: Wed, 28 Oct 2020 10:20:56 +0100 +Date: Thu, 29 Oct 2020 21:30:49 +0100 Subject: [PATCH 1/1] Add and build the qtdesigner tools --- - .../qt5tools/0001-Build-designer-tools.patch | 53 +++++++++++++++++++ + .../qt5tools/0002-Build-designer-tools.patch | 53 +++++++++++++++++++ package/qt5/qt5tools/Config.in | 5 ++ package/qt5/qt5tools/qt5tools.mk | 3 ++ 3 files changed, 61 insertions(+) - create mode 100644 package/qt5/qt5tools/0001-Build-designer-tools.patch + create mode 100644 package/qt5/qt5tools/0002-Build-designer-tools.patch -diff --git a/package/qt5/qt5tools/0001-Build-designer-tools.patch b/package/qt5/qt5tools/0001-Build-designer-tools.patch +diff --git a/package/qt5/qt5tools/0002-Build-designer-tools.patch b/package/qt5/qt5tools/0002-Build-designer-tools.patch new file mode 100644 index 0000000000..2a8389e6a1 --- /dev/null -+++ b/package/qt5/qt5tools/0001-Build-designer-tools.patch ++++ b/package/qt5/qt5tools/0002-Build-designer-tools.patch @@ -0,0 +1,53 @@ +From 8441d3adeb285862632e4d05c60af2dc17ab31f3 Mon Sep 17 00:00:00 2001 +From: j1nx @@ -84,19 +84,19 @@ index 60106c1ee3..b538c0f05c 100644 + endif diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk -index 0d00022998..9100d21ccd 100644 +index 0543afd8f7..68abe42cb5 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk -@@ -50,6 +50,9 @@ QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths +@@ -44,6 +44,9 @@ QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo +QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_DESIGNER) += designer +QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_DESIGNER) += designer + - define QT5TOOLS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) - endef + define QT5TOOLS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) sub-src-qmake_all + $(foreach p,$(QT5TOOLS_BUILD_DIRS_y), \ -- 2.20.1