Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5-base-5.15.12

Browse Source
This commit is contained in:
Rmys
2023-12-29 22:08:16 +03:00
parent 3d15bfcc72
commit 22d190455e
5 changed files with 50 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-declarative/files/qt_kde.patch
+3 -16
View File
@@ -1,16 +1,3 @@
diff --git a/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
index d54b7e9492..b5c5f6a2b0 100644
--- a/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
+++ b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
@@ -225,7 +225,7 @@ void OSAllocator::commit(void* address, size_t bytes, bool writable, bool execut
while (madvise(address, bytes, MADV_WILLNEED)) {
if (errno != EAGAIN)
- CRASH();
+ break; // We don't have to crash here. MADV_WILLNEED is only advisory
}
#elif HAVE(MADV_FREE_REUSE)
diff --git a/src/qml/animations/qcontinuinganimationgroupjob.cpp b/src/qml/animations/qcontinuinganimationgroupjob.cpp
index 88c0e9e60e..61a9dc36f8 100644
--- a/src/qml/animations/qcontinuinganimationgroupjob.cpp
@@ -1720,7 +1707,7 @@ index 0000000000..bd88d14c76
+ property var selfAsBroken: self as Broken
+}
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 1be1533b63..dfc82011c6 100644
index ac6634290a..d16d117d65 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -337,6 +337,7 @@ private slots:
@@ -1731,8 +1718,8 @@ index 1be1533b63..dfc82011c6 100644
void ambiguousContainingType();
void staticConstexprMembers();
@@ -5939,6 +5940,21 @@ void tst_qqmllanguage::bindingAliasToComponentUrl()
}
@@ -5951,6 +5952,21 @@ void tst_qqmllanguage::badGroupedProperty()
.arg(url.toString()));
}
+void tst_qqmllanguage::objectAsBroken()
desktop/toolkit/qt5/qt5-declarative/pspec.xml
+16 -9
View File
@@ -11,15 +11,15 @@
<Summary>Classes for QML and JavaScript languages</Summary>
<Description>Classes for QML and JavaScript languages</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="17387ae285db520c6306c8748c441575998f490d" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz</Archive>
<Archive sha1sum="860624df6d3245ad7288425a9dc6e4b7374df0bf" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtdeclarative-everywhere-opensource-src-5.15.12.tar.xz</Archive>
<BuildDependencies>
<Dependency>python3</Dependency>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency>libxkbcommon-devel</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<!-- <Dependency versionFrom="5.15.11">qt5-xmlpatterns-devel</Dependency> -->
<!-- <Dependency versionFrom="5.15.11">qt5-assistant-devel</Dependency> -->
<Dependency versionFrom="5.15.11">qt5-sql-sqlite</Dependency>
<!-- <Dependency versionFrom="5.15.12">qt5-xmlpatterns-devel</Dependency> -->
<!-- <Dependency versionFrom="5.15.12">qt5-assistant-devel</Dependency> -->
<Dependency versionFrom="5.15.12">qt5-sql-sqlite</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">qt_kde.patch</Patch>
@@ -31,9 +31,9 @@
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<!-- <Dependency>libglvnd</Dependency> -->
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency>libglvnd</Dependency>
<!-- <Dependency versionFrom="5.15.11">qt5-xmlpatterns</Dependency> -->
<!-- <Dependency versionFrom="5.15.12">qt5-xmlpatterns</Dependency> -->
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -53,7 +53,7 @@
<Path fileType="header">/usr/include/qt5</Path>
</Files>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency release="current">qt5-declarative</Dependency>
</RuntimeDependencies>
</Package>
@@ -61,7 +61,7 @@
<!--Package>
<Name>qt5-declarative-docs</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc/qt5</Path>
@@ -69,6 +69,13 @@
</Package-->
<History>
<Update release="45">
<Date>2023-12-29</Date>
<Version>5.15.12</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="44">
<Date>2023-12-09</Date>
<Version>5.15.11</Version>