diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/packages/bluez-5.71-x86_64-2_slack15.0.txt (renamed from patches/packages/bluez-5.71-x86_64-1_slack15.0.txt) | 0 | ||||
| -rw-r--r-- | patches/packages/libssh-0.10.6-x86_64-1_slack15.0.txt (renamed from patches/packages/libssh-0.10.5-x86_64-1_slack15.0.txt) | 0 | ||||
| -rw-r--r-- | patches/packages/mozilla-firefox-115.6.0esr-x86_64-1_slack15.0.txt (renamed from patches/packages/mozilla-firefox-115.5.0esr-x86_64-1_slack15.0.txt) | 0 | ||||
| -rw-r--r-- | patches/packages/mozilla-thunderbird-115.6.0-x86_64-1_slack15.0.txt (renamed from patches/packages/mozilla-thunderbird-115.5.2-x86_64-1_slack15.0.txt) | 0 | ||||
| -rw-r--r-- | patches/source/bluez/1528118a8f84b4b178729c1f9fc3f6d858c04f9f.patch | 35 | ||||
| -rwxr-xr-x | patches/source/bluez/bluez.SlackBuild | 5 | ||||
| -rw-r--r-- | patches/source/mozilla-firefox/firefox.desktop (renamed from patches/source/mozilla-firefox/mozilla-firefox.desktop) | 0 | ||||
| -rwxr-xr-x | patches/source/mozilla-firefox/mozilla-firefox.SlackBuild | 2 |
8 files changed, 40 insertions, 2 deletions
diff --git a/patches/packages/bluez-5.71-x86_64-1_slack15.0.txt b/patches/packages/bluez-5.71-x86_64-2_slack15.0.txt index 3142d4fd0..3142d4fd0 100644 --- a/patches/packages/bluez-5.71-x86_64-1_slack15.0.txt +++ b/patches/packages/bluez-5.71-x86_64-2_slack15.0.txt diff --git a/patches/packages/libssh-0.10.5-x86_64-1_slack15.0.txt b/patches/packages/libssh-0.10.6-x86_64-1_slack15.0.txt index 0126bf828..0126bf828 100644 --- a/patches/packages/libssh-0.10.5-x86_64-1_slack15.0.txt +++ b/patches/packages/libssh-0.10.6-x86_64-1_slack15.0.txt diff --git a/patches/packages/mozilla-firefox-115.5.0esr-x86_64-1_slack15.0.txt b/patches/packages/mozilla-firefox-115.6.0esr-x86_64-1_slack15.0.txt index 9d8594319..9d8594319 100644 --- a/patches/packages/mozilla-firefox-115.5.0esr-x86_64-1_slack15.0.txt +++ b/patches/packages/mozilla-firefox-115.6.0esr-x86_64-1_slack15.0.txt diff --git a/patches/packages/mozilla-thunderbird-115.5.2-x86_64-1_slack15.0.txt b/patches/packages/mozilla-thunderbird-115.6.0-x86_64-1_slack15.0.txt index 5acb7b92e..5acb7b92e 100644 --- a/patches/packages/mozilla-thunderbird-115.5.2-x86_64-1_slack15.0.txt +++ b/patches/packages/mozilla-thunderbird-115.6.0-x86_64-1_slack15.0.txt diff --git a/patches/source/bluez/1528118a8f84b4b178729c1f9fc3f6d858c04f9f.patch b/patches/source/bluez/1528118a8f84b4b178729c1f9fc3f6d858c04f9f.patch new file mode 100644 index 000000000..c09a54daf --- /dev/null +++ b/patches/source/bluez/1528118a8f84b4b178729c1f9fc3f6d858c04f9f.patch @@ -0,0 +1,35 @@ +From 1528118a8f84b4b178729c1f9fc3f6d858c04f9f Mon Sep 17 00:00:00 2001 +From: Xiao Yao <xiaoyao@rock-chips.com> +Date: Sun, 17 Dec 2023 21:50:12 +0800 +Subject: [PATCH] adapter: Fix link key address type for old kernels + +Fixes: https://github.com/bluez/bluez/issues/686 + +Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com> +--- + src/adapter.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/adapter.c b/src/adapter.c +index ee70b00d2..b4628a411 100644 +--- a/src/adapter.c ++++ b/src/adapter.c +@@ -4347,7 +4347,17 @@ static void load_link_keys(struct btd_adapter *adapter, GSList *keys, + struct link_key_info *info = l->data; + + bacpy(&key->addr.bdaddr, &info->bdaddr); +- key->addr.type = info->bdaddr_type; ++ ++ /* ++ * According to the Bluetooth specification, the address ++ * type of the link key is not fixed. However, the ++ * load_link_keys function in the old kernel code requires ++ * that the address type must be BREDR. Since the address ++ * type is not actually used by the link key, to maintain ++ * compatibility with older kernel versions, the addr.type ++ * of the link key is set to BDADDR_BREDR. ++ */ ++ key->addr.type = BDADDR_BREDR; + key->type = info->type; + memcpy(key->val, info->key, 16); + key->pin_len = info->pin_len; diff --git a/patches/source/bluez/bluez.SlackBuild b/patches/source/bluez/bluez.SlackBuild index 69c9083a3..5912a7dd3 100755 --- a/patches/source/bluez/bluez.SlackBuild +++ b/patches/source/bluez/bluez.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bluez VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1_slack15.0} +BUILD=${BUILD:-2_slack15.0} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -78,6 +78,9 @@ find . \ zcat $CWD/bluez-5.51-obexd_without_systemd-1.patch.gz | patch -p1 --verbose || exit 1 +# Fix regression in 5.71: +cat $CWD/1528118a8f84b4b178729c1f9fc3f6d858c04f9f.patch | patch -p1 --verbose || exit 1 + sed -i -e 's|-lreadline|\0 -lncursesw|g' Makefile.{in,tools} autoreconf -vif diff --git a/patches/source/mozilla-firefox/mozilla-firefox.desktop b/patches/source/mozilla-firefox/firefox.desktop index 9c7478b05..9c7478b05 100644 --- a/patches/source/mozilla-firefox/mozilla-firefox.desktop +++ b/patches/source/mozilla-firefox/firefox.desktop diff --git a/patches/source/mozilla-firefox/mozilla-firefox.SlackBuild b/patches/source/mozilla-firefox/mozilla-firefox.SlackBuild index 100d85c32..b2da5322e 100755 --- a/patches/source/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/patches/source/mozilla-firefox/mozilla-firefox.SlackBuild @@ -363,7 +363,7 @@ rm -rf $PKG/usr/include mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins mkdir -p $PKG/usr/share/applications -cat $CWD/mozilla-firefox.desktop > $PKG/usr/share/applications/mozilla-firefox.desktop +cat $CWD/firefox.desktop > $PKG/usr/share/applications/firefox.desktop # Need some default icons in the right place: for i in 16 22 24 32 48 256; do |