mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2025-06-05 22:19:21 +02:00
Update buildroot-patches
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -1,40 +0,0 @@
|
|||||||
From e657b7bb989c40d4329f7fc69a23398d7c590706 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Wed, 16 Dec 2020 14:18:49 +0100
|
|
||||||
Subject: [PATCH 1/1] Downgrade python-idna to 2.7
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-idna/python-idna.hash | 2 +-
|
|
||||||
package/python-idna/python-idna.mk | 4 ++--
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash
|
|
||||||
index c5f7378fda..d5a204b780 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 7a910c706db30d758f377db2762c0f9a idna-2.10.tar.gz
|
|
||||||
-sha256 b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6 idna-2.10.tar.gz
|
|
||||||
+sha256 684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16 idna-2.7.tar.gz
|
|
||||||
# Locally computed sha256 checksums
|
|
||||||
sha256 412014420d2473dba06117c3d4d9e0eecaa6dde0ca30cd951f4ec2be39426f32 LICENSE.rst
|
|
||||||
diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk
|
|
||||||
index b4d9839e29..e6ee4c87ef 100644
|
|
||||||
--- a/package/python-idna/python-idna.mk
|
|
||||||
+++ b/package/python-idna/python-idna.mk
|
|
||||||
@@ -4,9 +4,9 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_IDNA_VERSION = 2.10
|
|
||||||
+PYTHON_IDNA_VERSION = 2.7
|
|
||||||
PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz
|
|
||||||
-PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/ea/b7/e0e3c1c467636186c39925827be42f16fee389dc404ac29e930e9136be70
|
|
||||||
+PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935
|
|
||||||
PYTHON_IDNA_LICENSE = BSD-3-Clause
|
|
||||||
PYTHON_IDNA_LICENSE_FILES = LICENSE.rst
|
|
||||||
PYTHON_IDNA_SETUP_TYPE = setuptools
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,39 +0,0 @@
|
|||||||
From 82ced2ca075eb1c2eff5574d6ef7f38f4f52aacd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Steenbergen <info@j1nx.nl>
|
|
||||||
Date: Sat, 18 Sep 2021 22:41:09 +0200
|
|
||||||
Subject: [PATCH 1/1] Downgrade python-pillow to 8.2.0
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-pillow/python-pillow.hash | 5 ++---
|
|
||||||
package/python-pillow/python-pillow.mk | 2 +-
|
|
||||||
2 files changed, 3 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
|
|
||||||
index 3b5bdf2535..8beaf555e7 100644
|
|
||||||
--- a/package/python-pillow/python-pillow.hash
|
|
||||||
+++ b/package/python-pillow/python-pillow.hash
|
|
||||||
@@ -1,6 +1,5 @@
|
|
||||||
-# md5, sha256 from https://pypi.org/pypi/pillow/json
|
|
||||||
-md5 a7fc550b80819eab11e01cc097913700 Pillow-8.3.2.tar.gz
|
|
||||||
-sha256 dde3f3ed8d00c72631bc19cbfff8ad3b6215062a5eed402381ad365f82f0c18c Pillow-8.3.2.tar.gz
|
|
||||||
+# sha256 from https://pypi.org/pypi/pillow/json
|
|
||||||
+sha256 a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1 Pillow-8.2.0.tar.gz
|
|
||||||
|
|
||||||
# Locally computed sha256 checksums
|
|
||||||
sha256 5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4 LICENSE
|
|
||||||
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
|
|
||||||
index 168c9d632c..da9c2b1885 100644
|
|
||||||
--- a/package/python-pillow/python-pillow.mk
|
|
||||||
+++ b/package/python-pillow/python-pillow.mk
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_PILLOW_VERSION = 8.3.2
|
|
||||||
+PYTHON_PILLOW_VERSION = 8.2.0
|
|
||||||
PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/90/d4/a7c9b6c5d176654aa3dbccbfd0be4fd3a263355dc24122a5f1937bdc2689
|
|
||||||
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
|
|
||||||
PYTHON_PILLOW_LICENSE = HPND
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
@@ -1,57 +0,0 @@
|
|||||||
From 88f235b94b843df9f97d1d7011817e576dbc1ad8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Wed, 16 Dec 2020 15:24:58 +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 ++--
|
|
||||||
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 1a053cc368..4d65173819 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 50bf39b4faa268ba1da8a9730bb38bb6 psutil-5.7.2.tar.gz
|
|
||||||
-sha256 90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb psutil-5.7.2.tar.gz
|
|
||||||
+sha256 ad21281f7bd6c57578dd53913d2d44218e9e29fd25128d10ff7819ef16fa46e7 psutil-5.6.6.tar.gz
|
|
||||||
# Locally computed sha256 checksums
|
|
||||||
sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE
|
|
||||||
diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk
|
|
||||||
index 19d97a6f97..f1dbf84e20 100644
|
|
||||||
--- a/package/python-psutil/python-psutil.mk
|
|
||||||
+++ b/package/python-psutil/python-psutil.mk
|
|
||||||
@@ -5,9 +5,9 @@
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
# Please keep in sync with package/python3-psutil/python3-psutil.mk
|
|
||||||
-PYTHON_PSUTIL_VERSION = 5.7.2
|
|
||||||
+PYTHON_PSUTIL_VERSION = 5.6.6
|
|
||||||
PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
|
|
||||||
-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/aa/3e/d18f2c04cf2b528e18515999b0c8e698c136db78f62df34eee89cee205f1
|
|
||||||
+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 febf0d3edb..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.2
|
|
||||||
+PYTHON3_PSUTIL_VERSION = 5.6.6
|
|
||||||
PYTHON3_PSUTIL_SOURCE = psutil-$(PYTHON3_PSUTIL_VERSION).tar.gz
|
|
||||||
-PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/aa/3e/d18f2c04cf2b528e18515999b0c8e698c136db78f62df34eee89cee205f1
|
|
||||||
+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
|
|
||||||
|
|
@@ -1,40 +0,0 @@
|
|||||||
From 132d418ad686aadf646ba7a8c90774e460f05690 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Thu, 18 Mar 2021 10:01:14 +0100
|
|
||||||
Subject: [PATCH 1/1] Downgrade python-serial to 3.0
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-serial/python-serial.hash | 2 +-
|
|
||||||
package/python-serial/python-serial.mk | 4 ++--
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-serial/python-serial.hash b/package/python-serial/python-serial.hash
|
|
||||||
index d885d3c0c8..dff215eff2 100644
|
|
||||||
--- a/package/python-serial/python-serial.hash
|
|
||||||
+++ b/package/python-serial/python-serial.hash
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# md5, sha256 from https://pypi.org/pypi/pyserial/json
|
|
||||||
md5 1cf25a76da59b530dbfc2cf99392dc83 pyserial-3.5.tar.gz
|
|
||||||
-sha256 3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb pyserial-3.5.tar.gz
|
|
||||||
+sha256 056c2d96c83c009d8d04aad43a90f91f10f6a97d42c0d9656c2655c63fb8ff07 pyserial-3.0.tar.gz
|
|
||||||
# Locally computed sha256 checksums
|
|
||||||
sha256 f91cb9813de6a5b142b8f7f2dede630b5134160aedaeaf55f4d6a7e2593ca3f3 LICENSE.txt
|
|
||||||
diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
|
|
||||||
index 249ea9d5a3..70cf6452f5 100644
|
|
||||||
--- a/package/python-serial/python-serial.mk
|
|
||||||
+++ b/package/python-serial/python-serial.mk
|
|
||||||
@@ -4,9 +4,9 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_SERIAL_VERSION = 3.5
|
|
||||||
+PYTHON_SERIAL_VERSION = 3.0
|
|
||||||
PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
|
|
||||||
-PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/1e/7d/ae3f0a63f41e4d2f6cb66a5b57197850f919f59e558159a4dd3a818f5082
|
|
||||||
+PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/69/89/24fc8c26e23710a0d8fdf9e8134b28ceeab421d3f3e0165ceca6bdb98193
|
|
||||||
PYTHON_SERIAL_LICENSE = BSD-3-Clause
|
|
||||||
PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt
|
|
||||||
PYTHON_SERIAL_SETUP_TYPE = setuptools
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,40 +0,0 @@
|
|||||||
From 5ff0bedcd37c0a205084b2c0c48e64a432610948 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Steenbergen <info@j1nx.nl>
|
|
||||||
Date: Tue, 17 Mar 2020 09:14:28 +0100
|
|
||||||
Subject: [PATCH 1/1] Downgrade python-websocket-client to 0.54.0
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-websocket-client/python-websocket-client.hash | 2 +-
|
|
||||||
package/python-websocket-client/python-websocket-client.mk | 4 ++--
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash
|
|
||||||
index 968c1ab211..f46db3cc82 100644
|
|
||||||
--- a/package/python-websocket-client/python-websocket-client.hash
|
|
||||||
+++ b/package/python-websocket-client/python-websocket-client.hash
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# md5, sha256 from https://pypi.org/pypi/websocket-client/json
|
|
||||||
md5 8061820da5e1de26a6a1a6996d4eebd5 websocket_client-0.57.0.tar.gz
|
|
||||||
-sha256 d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010 websocket_client-0.57.0.tar.gz
|
|
||||||
+sha256 e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849 websocket_client-0.54.0.tar.gz
|
|
||||||
# Locally computed sha256 checksums
|
|
||||||
sha256 a47b06717e8a3cf01d1307141287b1b4fa17fe4bb8785633d2fc6f57cb71d05e LICENSE
|
|
||||||
diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk
|
|
||||||
index 58cb597c22..98cc941efe 100644
|
|
||||||
--- a/package/python-websocket-client/python-websocket-client.mk
|
|
||||||
+++ b/package/python-websocket-client/python-websocket-client.mk
|
|
||||||
@@ -4,9 +4,9 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_WEBSOCKET_CLIENT_VERSION = 0.57.0
|
|
||||||
+PYTHON_WEBSOCKET_CLIENT_VERSION = 0.54.0
|
|
||||||
PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz
|
|
||||||
-PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/8b/0f/52de51b9b450ed52694208ab952d5af6ebbcbce7f166a48784095d930d8c
|
|
||||||
+PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/35/d4/14e446a82bc9172d088ebd81c0b02c5ca8481bfeecb13c9ef07998f9249b
|
|
||||||
PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools
|
|
||||||
# Project was under LGPL-2.1+, but was relicensed under
|
|
||||||
# BSD-3-Clause. The LICENSE file contains the BSD-3-Clause text, but
|
|
||||||
--
|
|
||||||
2.25.0
|
|
||||||
|
|
25
buildroot-patches/0006-Enable-pulseaudio-alsa-plugin.patch
Normal file
25
buildroot-patches/0006-Enable-pulseaudio-alsa-plugin.patch
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
From a4dc9c913d1bd908a5e508e7a09d882c8390b9ec Mon Sep 17 00:00:00 2001
|
||||||
|
From: j1nx <p.steenbergen@j1nx.nl>
|
||||||
|
Date: Mon, 9 May 2022 10:38:32 +0200
|
||||||
|
Subject: [PATCH 1/1] Enable pulseaudio alsa-plugin
|
||||||
|
|
||||||
|
---
|
||||||
|
package/alsa-plugins/alsa-plugins.mk | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk
|
||||||
|
index 396f47adaf..b905d30eac 100644
|
||||||
|
--- a/package/alsa-plugins/alsa-plugins.mk
|
||||||
|
+++ b/package/alsa-plugins/alsa-plugins.mk
|
||||||
|
@@ -14,8 +14,6 @@ ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib
|
||||||
|
ALSA_PLUGINS_CONF_OPTS = \
|
||||||
|
--disable-jack \
|
||||||
|
--disable-usbstream \
|
||||||
|
- --disable-pulseaudio \
|
||||||
|
- --disable-libav \
|
||||||
|
--disable-maemo-plugin \
|
||||||
|
--disable-maemo-resource-manager \
|
||||||
|
--with-speex=no
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
@@ -1,40 +0,0 @@
|
|||||||
From 20473efe71d8d6aafb9b8604478c0dad88315368 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Thu, 7 Jan 2021 15:54:31 +0100
|
|
||||||
Subject: [PATCH 1/1] Downgrade python-arrow to 0.12.0
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-arrow/python-arrow.hash | 2 +-
|
|
||||||
package/python-arrow/python-arrow.mk | 4 ++--
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-arrow/python-arrow.hash b/package/python-arrow/python-arrow.hash
|
|
||||||
index 90e0533232..9d52c2623c 100644
|
|
||||||
--- a/package/python-arrow/python-arrow.hash
|
|
||||||
+++ b/package/python-arrow/python-arrow.hash
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# md5, sha256 from https://pypi.org/pypi/arrow/json
|
|
||||||
md5 554f18b0e23182ee0e8cb2a882d2f607 arrow-0.15.2.tar.gz
|
|
||||||
-sha256 10257c5daba1a88db34afa284823382f4963feca7733b9107956bed041aff24f arrow-0.15.2.tar.gz
|
|
||||||
+sha256 a15ecfddf334316e3ac8695e48c15d1be0d6038603b33043930dcf0e675c86ee arrow-0.12.0.tar.gz
|
|
||||||
# Locally computed sha256 checksums
|
|
||||||
sha256 a4b7601be50569c2c96a9818fc809b0149410c84c99714d60c9d4fb0ae861fa2 LICENSE
|
|
||||||
diff --git a/package/python-arrow/python-arrow.mk b/package/python-arrow/python-arrow.mk
|
|
||||||
index f8326288b2..d945e76831 100644
|
|
||||||
--- a/package/python-arrow/python-arrow.mk
|
|
||||||
+++ b/package/python-arrow/python-arrow.mk
|
|
||||||
@@ -4,9 +4,9 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_ARROW_VERSION = 0.15.2
|
|
||||||
+PYTHON_ARROW_VERSION = 0.12.0
|
|
||||||
PYTHON_ARROW_SOURCE = arrow-$(PYTHON_ARROW_VERSION).tar.gz
|
|
||||||
-PYTHON_ARROW_SITE = https://files.pythonhosted.org/packages/43/0e/47416c54ad7742981bf77fdfc405987551ab14b181a6140c8cd2a5823872
|
|
||||||
+PYTHON_ARROW_SITE = https://files.pythonhosted.org/packages/90/48/7ecfce4f2830f59dfacbb2b5a31e3ff1112b731a413724be40f57faa4450
|
|
||||||
PYTHON_ARROW_SETUP_TYPE = setuptools
|
|
||||||
PYTHON_ARROW_LICENSE = Apache-2.0
|
|
||||||
PYTHON_ARROW_LICENSE_FILES = LICENSE
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,40 +0,0 @@
|
|||||||
From 8f9cad2b43052880a35c4b33bcf20fbf43adf5e6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Thu, 18 Mar 2021 15:14:11 +0100
|
|
||||||
Subject: [PATCH 1/1] Downgrade python-pyjwt to 1.6.4
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-pyjwt/python-pyjwt.hash | 2 +-
|
|
||||||
package/python-pyjwt/python-pyjwt.mk | 4 ++--
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash
|
|
||||||
index 10875510f0..249ffa285c 100644
|
|
||||||
--- a/package/python-pyjwt/python-pyjwt.hash
|
|
||||||
+++ b/package/python-pyjwt/python-pyjwt.hash
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# md5, sha256 from https://pypi.org/pypi/PyJWT/json
|
|
||||||
md5 7a1b1c8bfeb67c31ee4fdadefe5ff4b8 PyJWT-2.0.0.tar.gz
|
|
||||||
-sha256 7a2b271c6dac2fda9e0c33d176c4253faba2c6c6b3a99c7f28a32c3c97522779 PyJWT-2.0.0.tar.gz
|
|
||||||
+sha256 4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176 PyJWT-1.6.4.tar.gz
|
|
||||||
# Locally computed sha256 checksums
|
|
||||||
sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE
|
|
||||||
diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk
|
|
||||||
index 9215911389..18b7976b19 100644
|
|
||||||
--- a/package/python-pyjwt/python-pyjwt.mk
|
|
||||||
+++ b/package/python-pyjwt/python-pyjwt.mk
|
|
||||||
@@ -4,9 +4,9 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_PYJWT_VERSION = 2.0.0
|
|
||||||
+PYTHON_PYJWT_VERSION = 1.6.4
|
|
||||||
PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz
|
|
||||||
-PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/14/6d/096dc269d105ba374d6bfd3ecb22b516795ca0572499820dadc8178d9ae1
|
|
||||||
+PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/00/5e/b358c9bb24421e6155799d995b4aa3aa3307ffc7ecae4ad9d29fd7e07a73
|
|
||||||
PYTHON_PYJWT_SETUP_TYPE = setuptools
|
|
||||||
PYTHON_PYJWT_LICENSE = MIT
|
|
||||||
PYTHON_PYJWT_LICENSE_FILES = LICENSE
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,57 +0,0 @@
|
|||||||
From ef42b24ee3a4c4ddf58a56a4e35d07cc8942d45f Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Mon, 29 Mar 2021 10:54:29 +0200
|
|
||||||
Subject: [PATCH 1/1] Downgrade python-pyyaml to 5.4
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-pyyaml/python-pyyaml.hash | 2 +-
|
|
||||||
package/python-pyyaml/python-pyyaml.mk | 4 ++--
|
|
||||||
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 82b2f4f880..93d1af5879 100644
|
|
||||||
--- a/package/python-pyyaml/python-pyyaml.hash
|
|
||||||
+++ b/package/python-pyyaml/python-pyyaml.hash
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# md5, sha256 from https://pypi.org/pypi/PyYAML/json
|
|
||||||
md5 46e25294c7efec23d4072ed6a7777f46 PyYAML-5.4.1.tar.gz
|
|
||||||
-sha256 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e PyYAML-5.4.1.tar.gz
|
|
||||||
+sha256 3c49e39ac034fd64fd576d63bb4db53cda89b362768a67f07749d55f128ac18a PyYAML-5.4.tar.gz
|
|
||||||
# Locally computed sha256 checksums
|
|
||||||
sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE
|
|
||||||
diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk
|
|
||||||
index c9013de8ec..fb3f42251b 100644
|
|
||||||
--- a/package/python-pyyaml/python-pyyaml.mk
|
|
||||||
+++ b/package/python-pyyaml/python-pyyaml.mk
|
|
||||||
@@ -5,9 +5,9 @@
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
# Please keep in sync package/python3-pyyaml/python3-pyyaml.mk
|
|
||||||
-PYTHON_PYYAML_VERSION = 5.4.1
|
|
||||||
+PYTHON_PYYAML_VERSION = 5.4
|
|
||||||
PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz
|
|
||||||
-PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d
|
|
||||||
+PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/b5/fd/15638de2da0a5aa91c095718444624aa565f766fc178249ca6faa372f71a
|
|
||||||
PYTHON_PYYAML_SETUP_TYPE = setuptools
|
|
||||||
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 f758341502..0ed35c5335 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.4.1
|
|
||||||
+PYTHON3_PYYAML_VERSION = 5.4
|
|
||||||
PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz
|
|
||||||
-PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d
|
|
||||||
+PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/b5/fd/15638de2da0a5aa91c095718444624aa565f766fc178249c
|
|
||||||
PYTHON3_PYYAML_SETUP_TYPE = setuptools
|
|
||||||
PYTHON3_PYYAML_LICENSE = MIT
|
|
||||||
PYTHON3_PYYAML_LICENSE_FILES = LICENSE
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -0,0 +1,26 @@
|
|||||||
|
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
|
||||||
|
index ef38d03253..cce92db81b 100644
|
||||||
|
--- a/package/qt5/qt5base/qt5base.mk
|
||||||
|
+++ b/package/qt5/qt5base/qt5base.mk
|
||||||
|
@@ -297,10 +297,9 @@ endef
|
||||||
|
endif
|
||||||
|
|
||||||
|
# This allows to use ccache when available
|
||||||
|
-define QT5BASE_CONFIGURE_HOSTCC
|
||||||
|
- $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf
|
||||||
|
- $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf
|
||||||
|
-endef
|
||||||
|
+ifeq ($(BR2_CCACHE),y)
|
||||||
|
+QT5BASE_CONFIGURE_OPTS += -ccache
|
||||||
|
+endif
|
||||||
|
|
||||||
|
# Must be last so can override all options set by Buildroot
|
||||||
|
QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
|
||||||
|
@@ -316,7 +315,6 @@ define QT5BASE_CONFIGURE_CMDS
|
||||||
|
touch $(QT5BASE_ARCH_CONFIG_FILE)
|
||||||
|
$(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC)
|
||||||
|
$(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBEXECINFO)
|
||||||
|
- $(QT5BASE_CONFIGURE_HOSTCC)
|
||||||
|
(cd $(@D); \
|
||||||
|
$(TARGET_MAKE_ENV) \
|
||||||
|
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
@@ -1,55 +0,0 @@
|
|||||||
From 6c79cb88b85de52152a28c8c2a7ca09047b6baae Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Steenbergen <info@j1nx.nl>
|
|
||||||
Date: Tue, 17 Mar 2020 12:34:20 +0100
|
|
||||||
Subject: [PATCH 1/1] Downgrade python-dateutil to 2.6.0
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-dateutil/Config.in | 2 +-
|
|
||||||
package/python-dateutil/python-dateutil.hash | 8 +++-----
|
|
||||||
package/python-dateutil/python-dateutil.mk | 5 ++---
|
|
||||||
3 files changed, 6 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-dateutil/Config.in b/package/python-dateutil/Config.in
|
|
||||||
index 1a36a150b1..56a1d838f7 100644
|
|
||||||
--- a/package/python-dateutil/Config.in
|
|
||||||
+++ b/package/python-dateutil/Config.in
|
|
||||||
@@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_DATEUTIL
|
|
||||||
help
|
|
||||||
Extensions to the standard Python datetime module.
|
|
||||||
|
|
||||||
- https://dateutil.readthedocs.io
|
|
||||||
+ https://dateutil.readthedocs.org
|
|
||||||
diff --git a/package/python-dateutil/python-dateutil.hash b/package/python-dateutil/python-dateutil.hash
|
|
||||||
index f3dc69f272..adc24bdd16 100644
|
|
||||||
--- a/package/python-dateutil/python-dateutil.hash
|
|
||||||
+++ b/package/python-dateutil/python-dateutil.hash
|
|
||||||
@@ -1,5 +1,3 @@
|
|
||||||
-# md5, sha256 from https://pypi.org/pypi/python-dateutil/json
|
|
||||||
-md5 f2a1d4b680b297b367a974664ca3a4f6 python-dateutil-2.8.1.tar.gz
|
|
||||||
-sha256 73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c python-dateutil-2.8.1.tar.gz
|
|
||||||
-# Locally computed sha256 checksums
|
|
||||||
-sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE
|
|
||||||
+# md5 from https://pypi.python.org/pypi/python-dateutil/json, sha256 locally computed
|
|
||||||
+md5 6e38f91e8c94c15a79ce22768dfeca87 python-dateutil-2.6.0.tar.gz
|
|
||||||
+sha256 62a2f8df3d66f878373fd0072eacf4ee52194ba302e00082828e0d263b0418d2 python-dateutil-2.6.0.tar.gz
|
|
||||||
diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk
|
|
||||||
index 759261d2d1..41dee2d1cd 100644
|
|
||||||
--- a/package/python-dateutil/python-dateutil.mk
|
|
||||||
+++ b/package/python-dateutil/python-dateutil.mk
|
|
||||||
@@ -4,11 +4,10 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_DATEUTIL_VERSION = 2.8.1
|
|
||||||
-PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/be/ed/5bbc91f03fa4c839c4c7360375da77f9659af5f7086b7a7bdda65771c8e0
|
|
||||||
+PYTHON_DATEUTIL_VERSION = 2.6.0
|
|
||||||
+PYTHON_DATEUTIL_SITE = https://pypi.python.org/packages/51/fc/39a3fbde6864942e8bb24c93663734b74e281b984d1b8c4f95d64b0c21f6
|
|
||||||
PYTHON_DATEUTIL_SETUP_TYPE = setuptools
|
|
||||||
PYTHON_DATEUTIL_LICENSE = BSD-3-Clause
|
|
||||||
PYTHON_DATEUTIL_LICENSE_FILES = LICENSE
|
|
||||||
-PYTHON_DATEUTIL_DEPENDENCIES = host-python-setuptools-scm
|
|
||||||
|
|
||||||
$(eval $(python-package))
|
|
||||||
--
|
|
||||||
2.25.0
|
|
||||||
|
|
@@ -0,0 +1,51 @@
|
|||||||
|
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
|
||||||
|
index 5751d6cb70..143926b743 100644
|
||||||
|
--- a/package/qt5/Config.in
|
||||||
|
+++ b/package/qt5/Config.in
|
||||||
|
@@ -68,6 +68,7 @@ source "package/qt5/qt5wayland/Config.in"
|
||||||
|
source "package/qt5/qt5webchannel/Config.in"
|
||||||
|
source "package/qt5/qt5webkit/Config.in"
|
||||||
|
source "package/qt5/qt5webengine/Config.in"
|
||||||
|
+source "package/qt5/qt5webengine-chromium-catapult/Config.in"
|
||||||
|
source "package/qt5/qt5websockets/Config.in"
|
||||||
|
source "package/qt5/qt5webview/Config.in"
|
||||||
|
source "package/qt5/qt5x11extras/Config.in"
|
||||||
|
diff --git a/package/qt5/qt5webengine-chromium-catapult/Config.in b/package/qt5/qt5webengine-chromium-catapult/Config.in
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..471c2a2dbc
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/package/qt5/qt5webengine-chromium-catapult/Config.in
|
||||||
|
@@ -0,0 +1,4 @@
|
||||||
|
+# Not user-selectable, it is only needed to be copied
|
||||||
|
+# into the chromium source tree.
|
||||||
|
+config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT
|
||||||
|
+ bool
|
||||||
|
diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..8190a6dd5d
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+# Locally calculated
|
||||||
|
+sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz
|
||||||
|
+sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE
|
||||||
|
diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..5d0db1e790
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk
|
||||||
|
@@ -0,0 +1,14 @@
|
||||||
|
+################################################################################
|
||||||
|
+#
|
||||||
|
+# qt5webengine-chromium-catapult
|
||||||
|
+#
|
||||||
|
+################################################################################
|
||||||
|
+
|
||||||
|
+QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189
|
||||||
|
+QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git
|
||||||
|
+QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git
|
||||||
|
+QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause
|
||||||
|
+QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE
|
||||||
|
+QT5WEBENGINE_CHROMIUM_CATAPULT_INSTALL_TARGET = NO
|
||||||
|
+
|
||||||
|
+$(eval $(generic-package))
|
@@ -1,49 +0,0 @@
|
|||||||
From 879e3e878a75ec0d60fbefa24ab995f50630f7b2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
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 | 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 57b155caa5..af1b89966d 100644
|
|
||||||
--- a/package/python-ifaddr/python-ifaddr.hash
|
|
||||||
+++ b/package/python-ifaddr/python-ifaddr.hash
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# md5, sha256 from https://pypi.org/pypi/ifaddr/json
|
|
||||||
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 f1154d9de8..1203afa724 100644
|
|
||||||
--- a/package/python-ifaddr/python-ifaddr.mk
|
|
||||||
+++ b/package/python-ifaddr/python-ifaddr.mk
|
|
||||||
@@ -4,11 +4,17 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_IFADDR_VERSION = 0.1.7
|
|
||||||
-PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).tar.gz
|
|
||||||
-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 = 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.20.1
|
|
||||||
|
|
4479
buildroot-patches/0011-qt5webengine-chromium-new-package.patch
Normal file
4479
buildroot-patches/0011-qt5webengine-chromium-new-package.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
|||||||
From 7fe0154f1cb34c51426eb984c0c2a75c354cbe65 Mon Sep 17 00:00:00 2001
|
From 5a4d685f68ce0db24bc700e6f69b601e2dda0ee7 Mon Sep 17 00:00:00 2001
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
From: j1nx <p.steenbergen@j1nx.nl>
|
||||||
Date: Wed, 16 Dec 2020 19:23:40 +0100
|
Date: Thu, 5 May 2022 12:25:44 +0200
|
||||||
Subject: [PATCH 1/1] Bump RPI Firmware version
|
Subject: [PATCH 1/1] Bump rpi-firmware to version to 1.20220331
|
||||||
|
|
||||||
---
|
---
|
||||||
package/rpi-firmware/rpi-firmware.hash | 2 +-
|
package/rpi-firmware/rpi-firmware.hash | 2 +-
|
||||||
@@ -9,27 +9,27 @@ Subject: [PATCH 1/1] Bump RPI Firmware version
|
|||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
|
diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
|
||||||
index 8730ec959b..d10a8b1db9 100644
|
index ec13115f3b..3170bb41bb 100644
|
||||||
--- a/package/rpi-firmware/rpi-firmware.hash
|
--- a/package/rpi-firmware/rpi-firmware.hash
|
||||||
+++ b/package/rpi-firmware/rpi-firmware.hash
|
+++ b/package/rpi-firmware/rpi-firmware.hash
|
||||||
@@ -1,3 +1,3 @@
|
@@ -1,3 +1,3 @@
|
||||||
# Locally computed
|
# Locally computed
|
||||||
-sha256 ae4e317681995e0f7becd7900ae667cba394e3a0b7ca93a267f3303df7284697 rpi-firmware-d016a6eb01c8c7326a89cb42809fed2a21525de5.tar.gz
|
-sha256 33aea2cb9c3be94c3dd6a96fbb3443eee5af1dc5fc9140e1fadc50832983064e rpi-firmware-3f20b832b27cd730deb6419b570f31a98167eef6.tar.gz
|
||||||
+sha256 480eeaf07e2945c326f92172a9aa8189f9166efb293237c66d57ac364ca63f75 rpi-firmware-4877a7d918be6fab22ce5d345feefd9c43200a90.tar.gz
|
+sha256 a4d9a2d28bca88f8c6f2b8282dbb12789d2363d83cc6534392766276873d2d35 rpi-firmware-61966732d03de9b71baf561f920e018b54c241ac.tar.gz
|
||||||
sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom
|
sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom
|
||||||
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
|
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
|
||||||
index 8b2b2c7154..6099e1f170 100644
|
index d4d1d07b3f..4e92dffa04 100644
|
||||||
--- a/package/rpi-firmware/rpi-firmware.mk
|
--- a/package/rpi-firmware/rpi-firmware.mk
|
||||||
+++ b/package/rpi-firmware/rpi-firmware.mk
|
+++ b/package/rpi-firmware/rpi-firmware.mk
|
||||||
@@ -4,7 +4,7 @@
|
@@ -4,7 +4,7 @@
|
||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
-RPI_FIRMWARE_VERSION = d016a6eb01c8c7326a89cb42809fed2a21525de5
|
-RPI_FIRMWARE_VERSION = 3f20b832b27cd730deb6419b570f31a98167eef6
|
||||||
+RPI_FIRMWARE_VERSION = 4877a7d918be6fab22ce5d345feefd9c43200a90
|
+RPI_FIRMWARE_VERSION = 61966732d03de9b71baf561f920e018b54c241ac
|
||||||
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
|
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
|
||||||
RPI_FIRMWARE_LICENSE = BSD-3-Clause
|
RPI_FIRMWARE_LICENSE = BSD-3-Clause
|
||||||
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
|
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
|
||||||
--
|
--
|
||||||
2.20.1
|
2.34.1
|
||||||
|
|
@@ -1,46 +0,0 @@
|
|||||||
From 4253b377a283a743a7eefe9eb2be4faa0009de6f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Steenbergen <info@j1nx.nl>
|
|
||||||
Date: Sat, 21 Mar 2020 14:03:20 +0100
|
|
||||||
Subject: [PATCH 1/1] Downgrade python-alsaaudio to 0.8.2
|
|
||||||
|
|
||||||
This reverts commit 1dd077a0b1cabd64583b917a5e51ba43ed451691.
|
|
||||||
---
|
|
||||||
package/python-alsaaudio/python-alsaaudio.hash | 9 ++++-----
|
|
||||||
package/python-alsaaudio/python-alsaaudio.mk | 6 +++---
|
|
||||||
2 files changed, 7 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-alsaaudio/python-alsaaudio.hash b/package/python-alsaaudio/python-alsaaudio.hash
|
|
||||||
index 476bc8f1a1..92277ec393 100644
|
|
||||||
--- a/package/python-alsaaudio/python-alsaaudio.hash
|
|
||||||
+++ b/package/python-alsaaudio/python-alsaaudio.hash
|
|
||||||
@@ -1,5 +1,4 @@
|
|
||||||
-# md5, sha256 from https://pypi.org/pypi/pyalsaaudio/json
|
|
||||||
-md5 b46f69561bc85fc52e698b2440ca251e pyalsaaudio-0.8.4.tar.gz
|
|
||||||
-sha256 84e8f8da544d7f4bd96479ce4a237600077984d9be1d7f16c1d9a492ecf50085 pyalsaaudio-0.8.4.tar.gz
|
|
||||||
-# Locally computed sha256 checksums
|
|
||||||
-sha256 ef6ba930f96986d78082e67c817ac617b9e833d60d5a0460f24c9c674a010935 LICENSE
|
|
||||||
+# From https://pypi.python.org/pypi?:action=show_md5&digest=1f22415a3d8da4b303182ad81c2d062e
|
|
||||||
+md5 1f22415a3d8da4b303182ad81c2d062e pyalsaaudio-0.8.2.tar.gz
|
|
||||||
+# Locally calculated
|
|
||||||
+sha256 b6df486f1c4035041a5f3800496b86c64e48e4a7d47f94dcbca11b0187aa3a15 pyalsaaudio-0.8.2.tar.gz
|
|
||||||
diff --git a/package/python-alsaaudio/python-alsaaudio.mk b/package/python-alsaaudio/python-alsaaudio.mk
|
|
||||||
index 3344583cf7..73a7e74b03 100644
|
|
||||||
--- a/package/python-alsaaudio/python-alsaaudio.mk
|
|
||||||
+++ b/package/python-alsaaudio/python-alsaaudio.mk
|
|
||||||
@@ -4,10 +4,10 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_ALSAAUDIO_VERSION = 0.8.4
|
|
||||||
+PYTHON_ALSAAUDIO_VERSION = 0.8.2
|
|
||||||
PYTHON_ALSAAUDIO_SOURCE = pyalsaaudio-$(PYTHON_ALSAAUDIO_VERSION).tar.gz
|
|
||||||
-PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/52/b6/44871791929d9d7e11325af0b7be711388dfeeab17147988f044a41a6d83
|
|
||||||
-PYTHON_ALSAAUDIO_SETUP_TYPE = setuptools
|
|
||||||
+PYTHON_ALSAAUDIO_SITE = https://pypi.python.org/packages/source/p/pyalsaaudio
|
|
||||||
+PYTHON_ALSAAUDIO_SETUP_TYPE = distutils
|
|
||||||
PYTHON_ALSAAUDIO_LICENSE = Python-2.0
|
|
||||||
PYTHON_ALSAAUDIO_LICENSE_FILES = LICENSE
|
|
||||||
PYTHON_ALSAAUDIO_DEPENDENCIES = alsa-lib
|
|
||||||
--
|
|
||||||
2.25.0
|
|
||||||
|
|
1466
buildroot-patches/0013-qt5webengine-bump-to-version-5.15.8.patch
Normal file
1466
buildroot-patches/0013-qt5webengine-bump-to-version-5.15.8.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,23 +0,0 @@
|
|||||||
From d9887a607e129081ed759c122c2d4d9c47b78482 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Steenbergen <info@j1nx.nl>
|
|
||||||
Date: Mon, 29 Oct 2018 14:09:20 +0100
|
|
||||||
Subject: [PATCH 1/1] Remove python-ipaddress python2 dependency
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-ipaddress/Config.in | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-ipaddress/Config.in b/package/python-ipaddress/Config.in
|
|
||||||
index b2b9f0b1c3..badd8eeaed 100644
|
|
||||||
--- a/package/python-ipaddress/Config.in
|
|
||||||
+++ b/package/python-ipaddress/Config.in
|
|
||||||
@@ -1,6 +1,5 @@
|
|
||||||
config BR2_PACKAGE_PYTHON_IPADDRESS
|
|
||||||
bool "python-ipaddress"
|
|
||||||
- depends on BR2_PACKAGE_PYTHON
|
|
||||||
help
|
|
||||||
Python 3.3's ipaddress for older Python versions.
|
|
||||||
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -0,0 +1,95 @@
|
|||||||
|
From 9e90a55123a5f483db0b8cd39c68b3e2c30c0c96 Mon Sep 17 00:00:00 2001
|
||||||
|
From: j1nx <p.steenbergen@j1nx.nl>
|
||||||
|
Date: Sat, 26 Mar 2022 14:37:24 +0100
|
||||||
|
Subject: [PATCH 1/1] rm-chromium-breakpad-fix-build-with-glibc-2.34-patch
|
||||||
|
|
||||||
|
---
|
||||||
|
...m-breakpad-fix-build-with-glibc-2.34.patch | 76 -------------------
|
||||||
|
1 file changed, 76 deletions(-)
|
||||||
|
delete mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch
|
||||||
|
|
||||||
|
diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch
|
||||||
|
deleted file mode 100644
|
||||||
|
index 44a6424c7d..0000000000
|
||||||
|
--- a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,76 +0,0 @@
|
||||||
|
-From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001
|
||||||
|
-From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
-Date: Wed, 4 Aug 2021 19:11:06 +0200
|
||||||
|
-Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34
|
||||||
|
-
|
||||||
|
-* fixes:
|
||||||
|
-[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o
|
||||||
|
-FAILED: obj/third_party/breakpad/client/exception_handler.o
|
||||||
|
-/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o
|
||||||
|
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()':
|
||||||
|
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)'
|
||||||
|
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||||
|
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
|
||||||
|
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
|
||||||
|
- from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
|
||||||
|
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
|
||||||
|
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
|
||||||
|
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)'
|
||||||
|
- 254 | max(const _Tp& __a, const _Tp& __b)
|
||||||
|
- | ^~~
|
||||||
|
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed:
|
||||||
|
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
|
||||||
|
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||||
|
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
|
||||||
|
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
|
||||||
|
- from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
|
||||||
|
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
|
||||||
|
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
|
||||||
|
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)'
|
||||||
|
- 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
|
||||||
|
- | ^~~
|
||||||
|
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed:
|
||||||
|
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
|
||||||
|
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||||
|
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
|
||||||
|
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
|
||||||
|
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
|
||||||
|
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)'
|
||||||
|
- 3461 | max(initializer_list<_Tp> __l)
|
||||||
|
- | ^~~
|
||||||
|
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed:
|
||||||
|
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int'
|
||||||
|
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||||
|
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
|
||||||
|
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
|
||||||
|
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
|
||||||
|
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)'
|
||||||
|
- 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
|
||||||
|
- | ^~~
|
||||||
|
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed:
|
||||||
|
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int'
|
||||||
|
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||||
|
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
|
||||||
|
-
|
||||||
|
-Adapted from:
|
||||||
|
-https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch
|
||||||
|
-
|
||||||
|
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||||
|
----
|
||||||
|
- .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +-
|
||||||
|
- 1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
-
|
||||||
|
-diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
-index ca353c40997..2e43ba6fc04 100644
|
||||||
|
---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
-+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
-@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
|
||||||
|
- // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
|
||||||
|
- // the alternative stack. Ensure that the size of the alternative stack is
|
||||||
|
- // large enough.
|
||||||
|
-- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||||
|
-+ static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ);
|
||||||
|
-
|
||||||
|
- // Only set an alternative stack if there isn't already one, or if the current
|
||||||
|
- // one is too small.
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
@@ -1,41 +0,0 @@
|
|||||||
From bb2f5b4eadd153adfad5a1fbffcf3d1e484f6700 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Steenbergen <info@j1nx.nl>
|
|
||||||
Date: Wed, 8 Sep 2021 12:10:19 +0200
|
|
||||||
Subject: [PATCH 1/1] Bump python-pip to 21.2.4
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-pip/python-pip.hash | 7 ++-----
|
|
||||||
package/python-pip/python-pip.mk | 4 ++--
|
|
||||||
2 files changed, 4 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash
|
|
||||||
index 58bc239154..6d53ceb9bb 100644
|
|
||||||
--- a/package/python-pip/python-pip.hash
|
|
||||||
+++ b/package/python-pip/python-pip.hash
|
|
||||||
@@ -1,5 +1,2 @@
|
|
||||||
-# md5, sha256 from https://pypi.org/pypi/pip/json
|
|
||||||
-md5 7d42ba49b809604f0df3d55df1c3fd86 pip-20.0.2.tar.gz
|
|
||||||
-sha256 7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f pip-20.0.2.tar.gz
|
|
||||||
-# Locally computed sha256 checksums
|
|
||||||
-sha256 5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431 LICENSE.txt
|
|
||||||
+# sha256 from https://pypi.org/pypi/pip/json
|
|
||||||
+sha256 0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b pip-21.2.4.tar.gz
|
|
||||||
diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk
|
|
||||||
index f881a3ce55..81fc87d5f0 100644
|
|
||||||
--- a/package/python-pip/python-pip.mk
|
|
||||||
+++ b/package/python-pip/python-pip.mk
|
|
||||||
@@ -4,9 +4,9 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_PIP_VERSION = 20.0.2
|
|
||||||
+PYTHON_PIP_VERSION = 21.2.4
|
|
||||||
PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz
|
|
||||||
-PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/8e/76/66066b7bc71817238924c7e4b448abdb17eb0c92d645769c223f9ace478f
|
|
||||||
+PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/52/e1/06c018197d8151383f66ebf6979d951995cf495629fc54149491f5d157d0
|
|
||||||
PYTHON_PIP_SETUP_TYPE = setuptools
|
|
||||||
PYTHON_PIP_LICENSE = MIT
|
|
||||||
PYTHON_PIP_LICENSE_FILES = LICENSE.txt
|
|
||||||
--
|
|
||||||
2.31.0
|
|
||||||
|
|
24
buildroot-patches/0015-No-system-icu-for-qt5webengine.patch
Normal file
24
buildroot-patches/0015-No-system-icu-for-qt5webengine.patch
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
From 678531a2fbec870613eec7eed646b4422a4f9684 Mon Sep 17 00:00:00 2001
|
||||||
|
From: j1nx <p.steenbergen@j1nx.nl>
|
||||||
|
Date: Thu, 7 Apr 2022 14:17:28 +0200
|
||||||
|
Subject: [PATCH 1/1] No system-icu for qt5webengine
|
||||||
|
|
||||||
|
---
|
||||||
|
package/qt5/qt5webengine/qt5webengine.mk | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
|
||||||
|
index 836ba62189..c028246589 100644
|
||||||
|
--- a/package/qt5/qt5webengine/qt5webengine.mk
|
||||||
|
+++ b/package/qt5/qt5webengine/qt5webengine.mk
|
||||||
|
@@ -87,7 +87,6 @@ QT5WEBENGINE_DEPENDENCIES += \
|
||||||
|
QT5WEBENGINE_CONF_OPTS += \
|
||||||
|
-webengine-embedded-build \
|
||||||
|
-webengine-ffmpeg \
|
||||||
|
- -webengine-icu \
|
||||||
|
-webengine-opus \
|
||||||
|
-webengine-webchannel \
|
||||||
|
-webengine-webp \
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
45
buildroot-patches/0016-Disable-QT-suppor-for-VLC.patch
Normal file
45
buildroot-patches/0016-Disable-QT-suppor-for-VLC.patch
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
From 0830e3edbb1347f0a264dc9a2f308a6876e916d6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: j1nx <p.steenbergen@j1nx.nl>
|
||||||
|
Date: Thu, 7 Apr 2022 14:25:17 +0200
|
||||||
|
Subject: [PATCH 1/1] Disable QT suppor for VLC
|
||||||
|
|
||||||
|
---
|
||||||
|
package/vlc/vlc.mk | 15 ++-------------
|
||||||
|
1 file changed, 2 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
|
||||||
|
index b793e0efe0..f3f6c90c88 100644
|
||||||
|
--- a/package/vlc/vlc.mk
|
||||||
|
+++ b/package/vlc/vlc.mk
|
||||||
|
@@ -86,6 +86,8 @@ VLC_CONF_OPTS += \
|
||||||
|
--disable-wasapi \
|
||||||
|
--disable-x262 \
|
||||||
|
--disable-zvbi \
|
||||||
|
+ --disable-qt \
|
||||||
|
+ --disable-skins2 \
|
||||||
|
--enable-run-as-root
|
||||||
|
|
||||||
|
# Uses __atomic_fetch_add_4
|
||||||
|
@@ -483,19 +485,6 @@ else
|
||||||
|
VLC_CONF_OPTS += --disable-pulse
|
||||||
|
endif
|
||||||
|
|
||||||
|
-ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS)$(BR2_PACKAGE_QT5SVG),yy)
|
||||||
|
-VLC_CONF_OPTS += --enable-qt
|
||||||
|
-VLC_DEPENDENCIES += qt5base qt5svg
|
||||||
|
-ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT)$(BR2_PACKAGE_XLIB_LIBXINERAMA)$(BR2_PACKAGE_XLIB_LIBXPM),yyy)
|
||||||
|
-VLC_CONF_OPTS += --enable-skins2
|
||||||
|
-VLC_DEPENDENCIES += xlib_libXext xlib_libXinerama xlib_libXpm
|
||||||
|
-else
|
||||||
|
-VLC_CONF_OPTS += --disable-skins2
|
||||||
|
-endif
|
||||||
|
-else
|
||||||
|
-VLC_CONF_OPTS += --disable-qt --disable-skins2
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
ifeq ($(BR2_PACKAGE_SDL_IMAGE),y)
|
||||||
|
VLC_CONF_OPTS += --enable-sdl-image
|
||||||
|
VLC_DEPENDENCIES += sdl_image
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
@@ -1,40 +0,0 @@
|
|||||||
From 2eca8ca8678ce0fbce34c5180c2d81a368d71ca9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Mon, 16 Nov 2020 20:30:05 +0100
|
|
||||||
Subject: [PATCH 1/1] Downgrade python-tornado to 6.0.3
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-tornado/python-tornado.hash | 2 +-
|
|
||||||
package/python-tornado/python-tornado.mk | 4 ++--
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash
|
|
||||||
index e9fbbedf65..5c24ed92cd 100644
|
|
||||||
--- a/package/python-tornado/python-tornado.hash
|
|
||||||
+++ b/package/python-tornado/python-tornado.hash
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# md5, sha256 from https://pypi.org/pypi/tornado/json
|
|
||||||
md5 cf39425f3d7eba9a54287f3e795a2f23 tornado-6.0.4.tar.gz
|
|
||||||
-sha256 0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc tornado-6.0.4.tar.gz
|
|
||||||
+sha256 c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9 tornado-6.0.3.tar.gz
|
|
||||||
# Locally computed sha256 checksums
|
|
||||||
sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE
|
|
||||||
diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk
|
|
||||||
index 15f3b83689..e326fadcb5 100644
|
|
||||||
--- a/package/python-tornado/python-tornado.mk
|
|
||||||
+++ b/package/python-tornado/python-tornado.mk
|
|
||||||
@@ -4,9 +4,9 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_TORNADO_VERSION = 6.0.4
|
|
||||||
+PYTHON_TORNADO_VERSION = 6.0.3
|
|
||||||
PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz
|
|
||||||
-PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/95/84/119a46d494f008969bf0c775cb2c6b3579d3c4cc1bb1b41a022aa93ee242
|
|
||||||
+PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/30/78/2d2823598496127b21423baffaa186b668f73cd91887fcef78b6eade136b
|
|
||||||
PYTHON_TORNADO_LICENSE = Apache-2.0
|
|
||||||
PYTHON_TORNADO_LICENSE_FILES = LICENSE
|
|
||||||
PYTHON_TORNADO_SETUP_TYPE = setuptools
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,23 +0,0 @@
|
|||||||
From 5768521e67fd2522e08039f5d6f1c22cf04c1667 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Thu, 15 Apr 2021 20:02:56 +0200
|
|
||||||
Subject: [PATCH 1/1] Make python-rpi-gpio available
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-rpi-gpio/Config.in | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in
|
|
||||||
index 4f59ebdb06..f34036ec3e 100644
|
|
||||||
--- a/package/python-rpi-gpio/Config.in
|
|
||||||
+++ b/package/python-rpi-gpio/Config.in
|
|
||||||
@@ -1,6 +1,5 @@
|
|
||||||
config BR2_PACKAGE_PYTHON_RPI_GPIO
|
|
||||||
bool "python-rpi-gpio"
|
|
||||||
- depends on BR2_arm
|
|
||||||
help
|
|
||||||
A Python module to control the GPIO on a Raspberry Pi.
|
|
||||||
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,21 +0,0 @@
|
|||||||
From 42cd487bdaad006ba0a7792487a920c660e3d395 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Steenbergen <info@j1nx.nl>
|
|
||||||
Date: Thu, 23 Sep 2021 08:47:00 +0200
|
|
||||||
Subject: [PATCH 1/1] Make host-python-pybind available
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-pybind/python-pybind.mk | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk
|
|
||||||
index a6a1bdb976..ec3a96ca64 100644
|
|
||||||
--- a/package/python-pybind/python-pybind.mk
|
|
||||||
+++ b/package/python-pybind/python-pybind.mk
|
|
||||||
@@ -11,3 +11,4 @@ PYTHON_PYBIND_LICENSE_FILES = LICENSE
|
|
||||||
PYTHON_PYBIND_SETUP_TYPE = setuptools
|
|
||||||
|
|
||||||
$(eval $(python-package))
|
|
||||||
+$(eval $(host-python-package))
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
@@ -1,71 +0,0 @@
|
|||||||
From 8ec2e51cb1d1378358ea616b0225d5dd71c4adf9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Mon, 24 Jan 2022 19:23:11 +0100
|
|
||||||
Subject: [PATCH 1/1] Bump python-filelock to 3.4.2
|
|
||||||
|
|
||||||
---
|
|
||||||
.../0001-Add-hardcoded-version.patch | 23 +++++++++++++++++++
|
|
||||||
package/python-filelock/python-filelock.hash | 5 +---
|
|
||||||
package/python-filelock/python-filelock.mk | 4 ++--
|
|
||||||
3 files changed, 26 insertions(+), 6 deletions(-)
|
|
||||||
create mode 100644 package/python-filelock/0001-Add-hardcoded-version.patch
|
|
||||||
|
|
||||||
diff --git a/package/python-filelock/0001-Add-hardcoded-version.patch b/package/python-filelock/0001-Add-hardcoded-version.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..a4d7619d72
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/package/python-filelock/0001-Add-hardcoded-version.patch
|
|
||||||
@@ -0,0 +1,23 @@
|
|
||||||
+From 4ab85a0bf4fbfcbefcefd20009fd768e0585c129 Mon Sep 17 00:00:00 2001
|
|
||||||
+From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
+Date: Mon, 24 Jan 2022 19:18:01 +0100
|
|
||||||
+Subject: [PATCH 1/1] Add hardcoded version
|
|
||||||
+
|
|
||||||
+---
|
|
||||||
+ setup.cfg | 1 +
|
|
||||||
+ 1 file changed, 1 insertion(+)
|
|
||||||
+
|
|
||||||
+diff --git a/setup.cfg b/setup.cfg
|
|
||||||
+index fdbc33a..52d36c0 100644
|
|
||||||
+--- a/setup.cfg
|
|
||||||
++++ b/setup.cfg
|
|
||||||
+@@ -1,5 +1,6 @@
|
|
||||||
+ [metadata]
|
|
||||||
+ name = filelock
|
|
||||||
++version = 3.4.2
|
|
||||||
+ description = A platform independent file lock.
|
|
||||||
+ long_description = file: README.md
|
|
||||||
+ long_description_content_type = text/markdown
|
|
||||||
+--
|
|
||||||
+2.20.1
|
|
||||||
+
|
|
||||||
diff --git a/package/python-filelock/python-filelock.hash b/package/python-filelock/python-filelock.hash
|
|
||||||
index d50d2d561c..593b2756e8 100644
|
|
||||||
--- a/package/python-filelock/python-filelock.hash
|
|
||||||
+++ b/package/python-filelock/python-filelock.hash
|
|
||||||
@@ -1,5 +1,2 @@
|
|
||||||
# md5, sha256 from https://pypi.org/pypi/filelock/json
|
|
||||||
-md5 c1fe6d9a7433a7ca6ce4f36e273317d1 filelock-3.0.12.tar.gz
|
|
||||||
-sha256 18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59 filelock-3.0.12.tar.gz
|
|
||||||
-# Locally computed sha256 checksums
|
|
||||||
-sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE
|
|
||||||
+sha256 38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80 filelock-3.4.2.tar.gz
|
|
||||||
diff --git a/package/python-filelock/python-filelock.mk b/package/python-filelock/python-filelock.mk
|
|
||||||
index 35b3374d29..e8ebc7540b 100644
|
|
||||||
--- a/package/python-filelock/python-filelock.mk
|
|
||||||
+++ b/package/python-filelock/python-filelock.mk
|
|
||||||
@@ -4,9 +4,9 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-PYTHON_FILELOCK_VERSION = 3.0.12
|
|
||||||
+PYTHON_FILELOCK_VERSION = 3.4.2
|
|
||||||
PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz
|
|
||||||
-PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/14/ec/6ee2168387ce0154632f856d5cc5592328e9cf93127c5c9aeca92c8c16cb
|
|
||||||
+PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/11/d1/22318a1b5bb06c9be4c065ad6a09cb7bfade737758dc08235c99cd6cf216
|
|
||||||
PYTHON_FILELOCK_SETUP_TYPE = setuptools
|
|
||||||
PYTHON_FILELOCK_LICENSE = Public Domain
|
|
||||||
PYTHON_FILELOCK_LICENSE_FILES = LICENSE
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,57 +0,0 @@
|
|||||||
From 9b56f21cd64c04bd98dce25ab41b2c1776866dc7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Sat, 12 Mar 2022 08:41:59 +0100
|
|
||||||
Subject: [PATCH 1/1] Bump python-request to 2.26.0
|
|
||||||
|
|
||||||
---
|
|
||||||
package/python-requests/python-requests.hash | 2 +-
|
|
||||||
package/python-requests/python-requests.mk | 4 ++--
|
|
||||||
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 e07c7bf5cc..0c862ed622 100644
|
|
||||||
--- a/package/python-requests/python-requests.hash
|
|
||||||
+++ b/package/python-requests/python-requests.hash
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# md5, sha256 from https://pypi.org/pypi/requests/json
|
|
||||||
md5 514d6f7eba77ada0b8c98ec7818828db requests-2.25.1.tar.gz
|
|
||||||
-sha256 27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 requests-2.25.1.tar.gz
|
|
||||||
+sha256 b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7 requests-2.26.0.tar.gz
|
|
||||||
# Locally computed sha256 checksums
|
|
||||||
sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE
|
|
||||||
diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk
|
|
||||||
index 5d0f545ffb..ef2ca8732a 100644
|
|
||||||
--- a/package/python-requests/python-requests.mk
|
|
||||||
+++ b/package/python-requests/python-requests.mk
|
|
||||||
@@ -5,9 +5,9 @@
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
# Please keep in sync with package/python3-requests/python3-requests.mk
|
|
||||||
-PYTHON_REQUESTS_VERSION = 2.25.1
|
|
||||||
+PYTHON_REQUESTS_VERSION = 2.26.0
|
|
||||||
PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz
|
|
||||||
-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b
|
|
||||||
+PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/e7/01/3569e0b535fb2e4a6c384bdbed00c55b9d78b5084e0fb7f4d0bf523d7670
|
|
||||||
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 dbb3f21490..3051756255 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.25.1
|
|
||||||
+PYTHON3_REQUESTS_VERSION = 2.26.0
|
|
||||||
PYTHON3_REQUESTS_SOURCE = requests-$(PYTHON3_REQUESTS_VERSION).tar.gz
|
|
||||||
-PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b
|
|
||||||
+PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/e7/01/3569e0b535fb2e4a6c384bdbed00c55b9d78b5084e0fb7f4d0bf523d7670
|
|
||||||
PYTHON3_REQUESTS_SETUP_TYPE = setuptools
|
|
||||||
PYTHON3_REQUESTS_LICENSE = Apache-2.0
|
|
||||||
PYTHON3_REQUESTS_LICENSE_FILES = LICENSE
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,44 +0,0 @@
|
|||||||
From cdc6fdd79eb4d308a3203ed27b10a94579a803fe Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Sun, 13 Mar 2022 15:41:22 +0100
|
|
||||||
Subject: [PATCH 1/1] Add temp silence logger patch
|
|
||||||
|
|
||||||
---
|
|
||||||
.../python-filelock/0002-Silence-logger.patch | 25 +++++++++++++++++++
|
|
||||||
1 file changed, 25 insertions(+)
|
|
||||||
create mode 100644 package/python-filelock/0002-Silence-logger.patch
|
|
||||||
|
|
||||||
diff --git a/package/python-filelock/0002-Silence-logger.patch b/package/python-filelock/0002-Silence-logger.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..1c18aca964
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/package/python-filelock/0002-Silence-logger.patch
|
|
||||||
@@ -0,0 +1,25 @@
|
|
||||||
+From d9c9e6f1c0e3ad12e6924f74b3c3f0df37f8a2e6 Mon Sep 17 00:00:00 2001
|
|
||||||
+From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
+Date: Sun, 13 Mar 2022 15:39:55 +0100
|
|
||||||
+Subject: [PATCH 1/1] Silence logger
|
|
||||||
+
|
|
||||||
+---
|
|
||||||
+ src/filelock/_api.py | 2 +-
|
|
||||||
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
+
|
|
||||||
+diff --git a/src/filelock/_api.py b/src/filelock/_api.py
|
|
||||||
+index 3551d5d..343ab96 100644
|
|
||||||
+--- a/src/filelock/_api.py
|
|
||||||
++++ b/src/filelock/_api.py
|
|
||||||
+@@ -12,7 +12,7 @@ from typing import Any
|
|
||||||
+ from ._error import Timeout
|
|
||||||
+
|
|
||||||
+ _LOGGER = logging.getLogger("filelock")
|
|
||||||
+-
|
|
||||||
++_LOGGER.setLevel(logging.WARNING)
|
|
||||||
+
|
|
||||||
+ # This is a helper class which is returned by :meth:`BaseFileLock.acquire` and wraps the lock to make sure __enter__
|
|
||||||
+ # is not called twice when entering the with statement. If we would simply return *self*, the lock would be acquired
|
|
||||||
+--
|
|
||||||
+2.20.1
|
|
||||||
+
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,75 +0,0 @@
|
|||||||
From c69b94f5a260dea78f913c70741c034618c5c981 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Tue, 4 Aug 2020 15:49:45 +0200
|
|
||||||
Subject: [PATCH 1/1] Compiling Raspberry Pi Overlays from kernel sources.
|
|
||||||
|
|
||||||
---
|
|
||||||
linux/Config.in | 7 +++++++
|
|
||||||
linux/linux.mk | 7 +++++++
|
|
||||||
package/rpi-firmware/Config.in | 7 +++----
|
|
||||||
3 files changed, 17 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/linux/Config.in b/linux/Config.in
|
|
||||||
index c19ccb70a8..743b9290aa 100644
|
|
||||||
--- a/linux/Config.in
|
|
||||||
+++ b/linux/Config.in
|
|
||||||
@@ -417,6 +417,13 @@ config BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
+config BR2_LINUX_KERNEL_DTS_OVERLAYS_SUPPORT
|
|
||||||
+ bool "Build Device Tree Overlays"
|
|
||||||
+ depends on BR2_LINUX_KERNEL_DTS_SUPPORT
|
|
||||||
+ help
|
|
||||||
+ Build in-tree device tree overlays.
|
|
||||||
+ Currently supports Raspberry Pi kernels.
|
|
||||||
+
|
|
||||||
config BR2_LINUX_KERNEL_INSTALL_TARGET
|
|
||||||
bool "Install kernel image to /boot in target"
|
|
||||||
depends on !BR2_TARGET_ROOTFS_INITRAMFS
|
|
||||||
diff --git a/linux/linux.mk b/linux/linux.mk
|
|
||||||
index ae1edbeb55..7acd1d9998 100644
|
|
||||||
--- a/linux/linux.mk
|
|
||||||
+++ b/linux/linux.mk
|
|
||||||
@@ -430,6 +430,12 @@ define LINUX_INSTALL_DTB
|
|
||||||
endef
|
|
||||||
endif # BR2_LINUX_KERNEL_APPENDED_DTB
|
|
||||||
endif # BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
|
|
||||||
+ifeq ($(BR2_LINUX_KERNEL_DTS_OVERLAYS_SUPPORT),y)
|
|
||||||
+define LINUX_INSTALL_DTB_OVERLAYS
|
|
||||||
+ mkdir -p $(1)
|
|
||||||
+ cp $(LINUX_ARCH_PATH)/boot/dts/overlays/*.dtbo $(1)
|
|
||||||
+endef
|
|
||||||
+endif # BR2_LINUX_KERNEL_DTS_OVERLAYS
|
|
||||||
endif # BR2_LINUX_KERNEL_DTS_SUPPORT
|
|
||||||
|
|
||||||
ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
|
|
||||||
@@ -510,6 +516,7 @@ endef
|
|
||||||
define LINUX_INSTALL_IMAGES_CMDS
|
|
||||||
$(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR))
|
|
||||||
$(call LINUX_INSTALL_DTB,$(BINARIES_DIR))
|
|
||||||
+ $(call LINUX_INSTALL_DTB_OVERLAYS,$(BINARIES_DIR)/overlays)
|
|
||||||
endef
|
|
||||||
|
|
||||||
ifeq ($(BR2_STRIP_strip),y)
|
|
||||||
diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in
|
|
||||||
index f5a25c5680..066d32168d 100644
|
|
||||||
--- a/package/rpi-firmware/Config.in
|
|
||||||
+++ b/package/rpi-firmware/Config.in
|
|
||||||
@@ -84,10 +84,9 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS
|
|
||||||
config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
|
|
||||||
bool "Install DTB overlays"
|
|
||||||
default y
|
|
||||||
- depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS \
|
|
||||||
- || BR2_LINUX_KERNEL_DTS_SUPPORT
|
|
||||||
- select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT \
|
|
||||||
- if BR2_LINUX_KERNEL_DTS_SUPPORT
|
|
||||||
+ depends on (BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS \
|
|
||||||
+ || BR2_LINUX_KERNEL_DTS_SUPPORT) && \
|
|
||||||
+ !BR2_LINUX_KERNEL_DTS_OVERLAYS_SUPPORT
|
|
||||||
help
|
|
||||||
Say 'y' here if you need to load one or more of the DTB
|
|
||||||
overlays, to support HATs (Hardware Attached on Top, add-on
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,35 +0,0 @@
|
|||||||
From 38af7d5488f929672c7ec7d62a0523a51b565eda Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Steenbergen <info@j1nx.nl>
|
|
||||||
Date: Wed, 8 Sep 2021 12:25:11 +0200
|
|
||||||
Subject: [PATCH 1/1] Bump RPI Wifi Firmware version
|
|
||||||
|
|
||||||
---
|
|
||||||
package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +-
|
|
||||||
package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
|
|
||||||
index 71e323e806..3bd62306eb 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 cf806f6bdba0f803b90bc210f524a6ac37bac7ad19306c61474bb2dc59875e87 rpi-wifi-firmware-9c0ffe9a7f0753b36ed88f7981905a989d940ea9.tar.gz
|
|
||||||
+sha256 0e7fcfe75a8990815a184dc55f8fdf5d0644d351a15a7aef865ff90ff4ca8eb4 rpi-wifi-firmware-883b72628de1d7efa45b421da0cbf175ac2374f8.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 24ba5941b0..28926ff4f0 100644
|
|
||||||
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
|
|
||||||
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-RPI_WIFI_FIRMWARE_VERSION = 9c0ffe9a7f0753b36ed88f7981905a989d940ea9
|
|
||||||
+RPI_WIFI_FIRMWARE_VERSION = 883b72628de1d7efa45b421da0cbf175ac2374f8
|
|
||||||
RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
|
|
||||||
RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
|
|
||||||
RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
|
|
||||||
--
|
|
||||||
2.31.0
|
|
||||||
|
|
@@ -1,66 +0,0 @@
|
|||||||
From e1136f863032a8c35fc80a86687b4e4b901b052c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Steenbergen <info@j1nx.nl>
|
|
||||||
Date: Wed, 8 Sep 2021 12:33:06 +0200
|
|
||||||
Subject: [PATCH 1/1] Bump and patch KF5
|
|
||||||
|
|
||||||
---
|
|
||||||
.../kf5-extra-cmake-modules.hash | 2 +-
|
|
||||||
.../kf5-extra-cmake-modules.mk | 1 +
|
|
||||||
package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash | 2 +-
|
|
||||||
package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 13 ++++++++++++-
|
|
||||||
.../kf5-networkmanager-qt.hash | 2 +-
|
|
||||||
package/kf5/kf5.mk | 2 +-
|
|
||||||
6 files changed, 17 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
|
|
||||||
index 733e267fdb..7d742a2e04 100644
|
|
||||||
--- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
|
|
||||||
+++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
|
|
||||||
@@ -1,3 +1,3 @@
|
|
||||||
# Locally calculated
|
|
||||||
-sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz
|
|
||||||
+sha256 5972ec6d78c3e95ab9cbecdb0661c158570e868466357c5cec2b63a4251ecce4 extra-cmake-modules-5.82.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
|
|
||||||
--- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk
|
|
||||||
+++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk
|
|
||||||
@@ -15,3 +15,4 @@ KF5_EXTRA_CMAKE_MODULES_INSTALL_STAGING = YES
|
|
||||||
KF5_EXTRA_CMAKE_MODULES_INSTALL_TARGET = NO
|
|
||||||
|
|
||||||
$(eval $(cmake-package))
|
|
||||||
+$(eval $(host-cmake-package))
|
|
||||||
diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
|
|
||||||
index 0cd8dcfc15..1a476915c4 100644
|
|
||||||
--- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
|
|
||||||
+++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
|
|
||||||
@@ -1,3 +1,3 @@
|
|
||||||
# Locally calculated
|
|
||||||
-sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz
|
|
||||||
+sha256 12077aac579065ca5ca877aee3bbdce65c52b6d0e9ef8b1fc0e127dd2e7f6843 kcoreaddons-5.82.0.tar.xz
|
|
||||||
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
|
|
||||||
diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
|
|
||||||
index 8ccada455e..72b67dff96 100644
|
|
||||||
--- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
|
|
||||||
+++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
|
|
||||||
@@ -1,3 +1,3 @@
|
|
||||||
# Locally calculated
|
|
||||||
-sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz
|
|
||||||
+sha256 14f9fe4a6caa3f1cb97927f525ebe10816203b8a7e7f8ec7016bc895f378c7f1 networkmanager-qt-5.82.0.tar.xz
|
|
||||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
|
||||||
diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk
|
|
||||||
index 8360fc9b63..49451cb907 100644
|
|
||||||
--- a/package/kf5/kf5.mk
|
|
||||||
+++ b/package/kf5/kf5.mk
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
-KF5_VERSION_MAJOR = 5.47
|
|
||||||
+KF5_VERSION_MAJOR = 5.82
|
|
||||||
KF5_VERSION = $(KF5_VERSION_MAJOR).0
|
|
||||||
KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.31.0
|
|
||||||
|
|
@@ -1,25 +0,0 @@
|
|||||||
From 2ba0b9c352b311c168d93a71e44ac60dfc08c1d5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Thu, 14 May 2020 08:09:49 +0200
|
|
||||||
Subject: [PATCH 1/1] Hardcode NINJA concurrent threads to 2
|
|
||||||
|
|
||||||
---
|
|
||||||
package/qt5/qt5webengine/qt5webengine.mk | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
|
|
||||||
index 898725937b..0543998a5d 100644
|
|
||||||
--- a/package/qt5/qt5webengine/qt5webengine.mk
|
|
||||||
+++ b/package/qt5/qt5webengine/qt5webengine.mk
|
|
||||||
@@ -52,7 +52,7 @@ define QT5WEBENGINE_PYTHON2_SYMLINK
|
|
||||||
endef
|
|
||||||
QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
|
|
||||||
|
|
||||||
-QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
|
|
||||||
+QT5WEBENGINE_ENV += NINJAFLAGS="-j2"
|
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
|
||||||
define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,24 +0,0 @@
|
|||||||
From 1517c7c719f5cd5b03f643a2db792f9202929c22 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Mon, 1 Jun 2020 16:36:17 +0200
|
|
||||||
Subject: [PATCH 1/1] No parallel builds for wpewebkit (to prevent memory
|
|
||||||
issues at buildtime)
|
|
||||||
|
|
||||||
---
|
|
||||||
package/wpewebkit/wpewebkit.mk | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk
|
|
||||||
index a6124d3529..e54dcbdae8 100644
|
|
||||||
--- a/package/wpewebkit/wpewebkit.mk
|
|
||||||
+++ b/package/wpewebkit/wpewebkit.mk
|
|
||||||
@@ -72,4 +72,6 @@ ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y)
|
|
||||||
WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON
|
|
||||||
endif
|
|
||||||
|
|
||||||
+WPEWEBKIT_MAKE=$(MAKE1)
|
|
||||||
+
|
|
||||||
$(eval $(cmake-package))
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,23 +0,0 @@
|
|||||||
From 64916a5b7e9cc3061e97699378fba9ec8c630eaa Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Mon, 1 Jun 2020 20:49:56 +0200
|
|
||||||
Subject: [PATCH 1/1] No parallel build for spidermonkey
|
|
||||||
|
|
||||||
---
|
|
||||||
package/spidermonkey/spidermonkey.mk | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/package/spidermonkey/spidermonkey.mk b/package/spidermonkey/spidermonkey.mk
|
|
||||||
index 50afdc1758..4586137b54 100644
|
|
||||||
--- a/package/spidermonkey/spidermonkey.mk
|
|
||||||
+++ b/package/spidermonkey/spidermonkey.mk
|
|
||||||
@@ -61,4 +61,6 @@ define SPIDERMONKEY_CLEANUP
|
|
||||||
endef
|
|
||||||
SPIDERMONKEY_POST_INSTALL_TARGET_HOOKS += SPIDERMONKEY_CLEANUP
|
|
||||||
|
|
||||||
+SPIDERMONKEY_MAKE=$(MAKE1)
|
|
||||||
+
|
|
||||||
$(eval $(autotools-package))
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,35 +0,0 @@
|
|||||||
From 4a26b5d65bcfccaff6d32f751e668d663c883f1e Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Fri, 26 Mar 2021 09:59:24 +0100
|
|
||||||
Subject: [PATCH 1/1] Fix qt5webengine host dependencies
|
|
||||||
|
|
||||||
---
|
|
||||||
package/qt5/qt5webengine/qt5webengine.mk | 12 ++++++++++++
|
|
||||||
1 file changed, 12 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
|
|
||||||
index 7e557725d3..6ac99823e4 100644
|
|
||||||
--- a/package/qt5/qt5webengine/qt5webengine.mk
|
|
||||||
+++ b/package/qt5/qt5webengine/qt5webengine.mk
|
|
||||||
@@ -29,6 +29,18 @@ endif
|
|
||||||
|
|
||||||
QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss
|
|
||||||
|
|
||||||
+ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y)
|
|
||||||
+QT5WEBENGINE_DEPENDENCIES += host-freetype
|
|
||||||
+endif
|
|
||||||
+
|
|
||||||
+ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y)
|
|
||||||
+QT5WEBENGINE_DEPENDENCIES += host-libjpeg
|
|
||||||
+endif
|
|
||||||
+
|
|
||||||
+ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
|
|
||||||
+QT5WEBENGINE_DEPENDENCIES += host-harfbuzz
|
|
||||||
+endif
|
|
||||||
+
|
|
||||||
QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg
|
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y)
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@@ -1,120 +0,0 @@
|
|||||||
From 7c3c982668b9233dd0cd9f8e8eb26f1f112dd1f4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Steenbergen <info@j1nx.nl>
|
|
||||||
Date: Tue, 2 Nov 2021 11:48:31 +0100
|
|
||||||
Subject: [PATCH 1/1] Fix QT5 GCC-11 build issues
|
|
||||||
|
|
||||||
---
|
|
||||||
.../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 +++++++++++++++++++
|
|
||||||
.../0008-Add-missing-limits-include.patch | 32 ++++++++++
|
|
||||||
2 files changed, 93 insertions(+)
|
|
||||||
create mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
|
|
||||||
create mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch
|
|
||||||
|
|
||||||
diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..d20600c6ce
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
|
|
||||||
@@ -0,0 +1,61 @@
|
|
||||||
+From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001
|
|
||||||
+From: Ville Voutilainen <ville.voutilainen@qt.io>
|
|
||||||
+Date: Mon, 18 Jan 2021 09:58:17 +0200
|
|
||||||
+Subject: [PATCH] Build fixes for GCC 11
|
|
||||||
+
|
|
||||||
+Task-number: QTBUG-89977
|
|
||||||
+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
|
|
||||||
+Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
||||||
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
||||||
+[Retrieved (and backported) from:
|
|
||||||
+https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9]
|
|
||||||
+Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
|
|
||||||
+---
|
|
||||||
+ src/corelib/text/qbytearraymatcher.h | 2 ++
|
|
||||||
+ src/corelib/tools/qsharedpointer_impl.h | 3 ---
|
|
||||||
+ src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
|
|
||||||
+ 3 files changed, 3 insertions(+), 4 deletions(-)
|
|
||||||
+
|
|
||||||
+diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
|
|
||||||
+index 0eedfc1d20..f5f9bef7b8 100644
|
|
||||||
+--- a/src/corelib/text/qbytearraymatcher.h
|
|
||||||
++++ b/src/corelib/text/qbytearraymatcher.h
|
|
||||||
+@@ -42,6 +42,8 @@
|
|
||||||
+
|
|
||||||
+ #include <QtCore/qbytearray.h>
|
|
||||||
+
|
|
||||||
++#include <limits>
|
|
||||||
++
|
|
||||||
+ QT_BEGIN_NAMESPACE
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
|
|
||||||
+index 790c187cb9..4aee98af53 100644
|
|
||||||
+--- a/src/corelib/tools/qsharedpointer_impl.h
|
|
||||||
++++ b/src/corelib/tools/qsharedpointer_impl.h
|
|
||||||
+@@ -155,9 +155,6 @@ namespace QtSharedPointer {
|
|
||||||
+ #endif
|
|
||||||
+ inline void checkQObjectShared(...) { }
|
|
||||||
+ inline void setQObjectShared(...) { }
|
|
||||||
+-
|
|
||||||
+- inline void operator delete(void *ptr) { ::operator delete(ptr); }
|
|
||||||
+- inline void operator delete(void *, void *) { }
|
|
||||||
+ };
|
|
||||||
+ // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
|
|
||||||
+
|
|
||||||
+diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
|
|
||||||
+index 9e7e1a5572..f0866a90ac 100644
|
|
||||||
+--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
|
|
||||||
++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
|
|
||||||
+@@ -698,7 +698,7 @@ void QXcbWindow::show()
|
|
||||||
+ if (isTransient(window())) {
|
|
||||||
+ const QWindow *tp = window()->transientParent();
|
|
||||||
+ if (tp && tp->handle())
|
|
||||||
+- transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
|
|
||||||
++ transientXcbParent = tp->handle()->winId();
|
|
||||||
+ // Default to client leader if there is no transient parent, else modal dialogs can
|
|
||||||
+ // be hidden by their parents.
|
|
||||||
+ if (!transientXcbParent)
|
|
||||||
+--
|
|
||||||
+2.31.1
|
|
||||||
+
|
|
||||||
diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..e489f2e551
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/package/qt5/qt5base/0008-Add-missing-limits-include.patch
|
|
||||||
@@ -0,0 +1,32 @@
|
|
||||||
+From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001
|
|
||||||
+From: Nicolas Fella <nicolas.fella@kdab.com>
|
|
||||||
+Date: Sun, 20 Jun 2021 17:36:41 +0200
|
|
||||||
+Subject: [PATCH] Add missing limits include
|
|
||||||
+
|
|
||||||
+The code uses std::numeric_limits but is lacking the appropriate include
|
|
||||||
+
|
|
||||||
+Pick-to: 5.15 6.1 6.2
|
|
||||||
+Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd
|
|
||||||
+Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
||||||
+
|
|
||||||
+[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b]
|
|
||||||
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
||||||
+---
|
|
||||||
+ src/corelib/tools/qoffsetstringarray_p.h | 1 +
|
|
||||||
+ 1 file changed, 1 insertion(+)
|
|
||||||
+
|
|
||||||
+diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h
|
|
||||||
+index 4dd9e960..e26a57ff 100644
|
|
||||||
+--- a/src/corelib/tools/qoffsetstringarray_p.h
|
|
||||||
++++ b/src/corelib/tools/qoffsetstringarray_p.h
|
|
||||||
+@@ -55,6 +55,7 @@
|
|
||||||
+
|
|
||||||
+ #include <tuple>
|
|
||||||
+ #include <array>
|
|
||||||
++#include <limits>
|
|
||||||
+
|
|
||||||
+ QT_BEGIN_NAMESPACE
|
|
||||||
+
|
|
||||||
+--
|
|
||||||
+2.32.0
|
|
||||||
+
|
|
||||||
--
|
|
||||||
2.33.1
|
|
||||||
|
|
Reference in New Issue
Block a user