From 0a0521428c732c398681f0bd2eabc78932703c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 15 Jun 2024 15:39:30 +0200 Subject: [PATCH 1/3] Remove Qt packages for EOL systems. --- hifi_qt.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hifi_qt.py b/hifi_qt.py index bb8afa3523..ad5401aaf3 100644 --- a/hifi_qt.py +++ b/hifi_qt.py @@ -170,9 +170,7 @@ endif() if distro.id() == 'ubuntu': u_major = int( distro.major_version() ) - if u_major == 18: - self.qtUrl = 'http://motofckr9k.ddns.net/vircadia_packages/qt5-install-5.15.2-ubuntu-18.04-aarch64_test.tar.xz' - elif u_major == 20: + if u_major == 20: self.qtUrl = self.assets_url + '/dependencies/qt5/qt5-install-5.15.9-2023.05.21-kde_fb3ec282151b1ee281a24f0545a40ac6438537c2-ubuntu-20.04-aarch64.tar.xz' elif u_major > 20: self.__no_qt_package_error() @@ -182,9 +180,7 @@ endif() elif distro.id() == 'debian': u_major = int( distro.major_version() ) - if u_major == 10: - self.qtUrl = 'https://data.moto9000.moe/vircadia_packages/qt5-install-5.15.2-debian-10-aarch64.tar.xz' - elif u_major > 10: + if u_major > 10: self.__no_qt_package_error() else: self.__unsupported_error() From 245da8eb195f3d4b30d1472bd0fdff7890f76b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 15 Jun 2024 15:39:58 +0200 Subject: [PATCH 2/3] Remove external reference to FloofChat.js. --- scripts/defaultScripts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index c3b432cea4..1cbadadb67 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -47,7 +47,7 @@ var DEFAULT_SCRIPTS_SEPARATE = [ "communityScripts/notificationCore/notificationCore.js", "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js", {"stable": "system/more/app-more.js", "beta": "https://more.overte.org/more/app-more.js"}, - {"stable": "communityScripts/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"} + "communityScripts/chat/FloofChat.js", //"system/chat.js" ]; From 0ad492c48f2f3d2775643da142b0e3119b75e87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 15 Jun 2024 15:40:56 +0200 Subject: [PATCH 3/3] Remove broken external reference from tools/nitpick/AppDataHighFidelity/Interface.json --- tools/nitpick/AppDataHighFidelity/Interface.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nitpick/AppDataHighFidelity/Interface.json b/tools/nitpick/AppDataHighFidelity/Interface.json index bf3519fcb6..1c8ccad6e7 100644 --- a/tools/nitpick/AppDataHighFidelity/Interface.json +++ b/tools/nitpick/AppDataHighFidelity/Interface.json @@ -38,7 +38,7 @@ "Avatar/animGraphURL": "", "Avatar/attachmentData/size": 0, "Avatar/avatarEntityData/size": 0, - "Avatar/collisionSoundURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/sounds/Collisions-otherorganic/Body_Hits_Impact.wav", + "Avatar/collisionSoundURL": "", "Avatar/displayName": "", "Avatar/dominantHand": "right", "Avatar/flyingHMD": false,