colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt6.qtdeclarative: refresh patches

This commit is contained in:
Nick Cao 2024-02-07 11:52:44 -05:00
parent abf354c5e5
commit 54fe58fae2
No known key found for this signature in database
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
View File

@ -11,8 +11,8 @@ qtModule {
propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl python3 ];
patches = [
# prevent headaches from stale qmlcache data
../patches/qtdeclarative-default-disable-qmlcache.patch
../patches/0001-qtdeclarative-disable-qml-disk-cache.patch
# add version specific QML import path
../patches/qtdeclarative-qml-paths.patch
../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch
];
}

9
pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch → pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch
View File

@ -1,4 +1,4 @@
From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 10 Oct 2023 11:12:27 -0400
Subject: [PATCH] qtdeclarative: disable qml disk cache
@ -8,10 +8,10 @@ Subject: [PATCH] qtdeclarative: disable qml disk cache
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index d1b4c4fff6..50f8a07420 100644
index 506b920142..3cadb4fe06 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const
@@ -2202,11 +2202,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const
{
if (forceDiskCache())
return DiskCache::Enabled;
@ -24,6 +24,3 @@ index d1b4c4fff6..50f8a07420 100644
}
void ExecutionEngine::callInContext(QV4::Function *function, QObject *self,
--
2.42.0

13
pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch → pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch
View File

@ -1,8 +1,17 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 7 Feb 2024 11:49:04 -0500
Subject: [PATCH] qtdeclarative: also use versioned qml paths
---
src/qml/qml/qqmlimport.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index 2e482c220d..4873809bec 100644
index f9cc8da240..f8cb033be0 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -1517,6 +1517,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
@@ -1520,6 +1520,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
// env import paths
addEnvImportPath("QML_IMPORT_PATH");
addEnvImportPath("QML2_IMPORT_PATH");