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

Merge pull request #13118 from Rmys/master

Browse Source 
qt5-base-5.15.12
This commit is contained in:
Rmys
2023-12-29 22:12:50 +03:00
committed by GitHub
parent ddb003c886 fa1a8d5802
commit 627895015c
11 changed files with 163 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-3d/pspec.xml
+16 -9
View File
@@ -15,24 +15,24 @@
<PartOf>desktop</PartOf>
<Summary>C++ and QML APIs for easy inclusion of 3D graphics</Summary>
<Description>C++ and QML APIs for easy inclusion of 3D graphics</Description>
<Archive sha1sum="bb4186cef645b916e3faaf0fb99a79bb6d7e96e9" type="tarxz">https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qt3d-everywhere-opensource-src-5.15.11.tar.xz</Archive>
<Archive sha1sum="572f6d2f88d411f17d87312f1a5025681504e7f5" type="tarxz">https://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qt3d-everywhere-opensource-src-5.15.12.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
<Dependency versionFrom="3.3.1">assimp-devel</Dependency>
<Dependency>vulkan-headers</Dependency>
<Dependency>zlib-devel</Dependency>
<!-- <Dependency versionFrom="5.15.11">qt5-xmlpatterns-devel</Dependency> -->
<!-- <Dependency versionFrom="5.15.11">qt5-imageformats</Dependency> -->
<!-- <Dependency versionFrom="5.15.12">qt5-xmlpatterns-devel</Dependency> -->
<!-- <Dependency versionFrom="5.15.12">qt5-imageformats</Dependency> -->
</BuildDependencies>
</Source>
<Package>
<Name>qt5-3d</Name>
<Summary>C++ and QML APIs for easy inclusion of 3D graphics</Summary>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative</Dependency>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="3.3.1">assimp</Dependency>
</RuntimeDependencies>
@@ -48,8 +48,8 @@
<Name>qt5-3d-devel</Name>
<Summary>Development files for qt5-3d</Summary>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
<Dependency release="current">qt5-3d</Dependency>
</RuntimeDependencies>
<Files>
@@ -60,6 +60,13 @@
</Package>
<History>
<Update release="24">
<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="23">
<Date>2023-10-07</Date>
<Version>5.15.11</Version>
desktop/toolkit/qt5/qt5-canvas3d/pspec.xml
+11 -4
View File
@@ -17,16 +17,16 @@
<Description>A JavaScript 3D rendering API for Qt Quick</Description>
<Archive sha1sum="a085bbf2c30ad10c0661c801f0871ff33d05631d" type="targz">https://github.com/qt/qtcanvas3d/archive/refs/tags/v5.12.12.tar.gz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>qt5-canvas3d</Name>
<Summary>A JavaScript 3D rendering API for Qt Quick</Summary>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
@@ -35,6 +35,13 @@
</Files>
</Package>
<History>
<Update release="22">
<Date>2023-12-29</Date>
<Version>5.12.12</Version>
<Comment>Rebuild qt-5.15.12.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="21">
<Date>2023-10-07</Date>
<Version>5.12.12</Version>
desktop/toolkit/qt5/qt5-charts/pspec.xml
+13 -6
View File
@@ -11,18 +11,18 @@
<License>GPL3</License>
<Summary>Provides a set of easy to use chart components</Summary>
<Description>Provides a set of easy to use chart components</Description>
<Archive sha1sum="ef741717a5d64971fd234bbabd6295fe5b1653a8" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtcharts-everywhere-opensource-src-5.15.11.tar.xz</Archive>
<Archive sha1sum="2419796dad6221bc445496770fba46954583be63" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtcharts-everywhere-opensource-src-5.15.12.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>qt5-charts</Name>
<Summary>Provides a set of easy to use chart components</Summary>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
@@ -36,7 +36,7 @@
<Name>qt5-charts-devel</Name>
<Summary>Development files for qt5-charts</Summary>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency release="current">qt5-charts</Dependency>
</RuntimeDependencies>
<Files>
@@ -47,6 +47,13 @@
</Package>
<History>
<Update release="23">
<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="22">
<Date>2023-10-07</Date>
<Version>5.15.11</Version>
desktop/toolkit/qt5/qt5-connectivity/pspec.xml
+15 -8
View File
@@ -11,21 +11,21 @@
<Summary>Provides access to Bluetooth hardware</Summary>
<Description>Provides access to Bluetooth hardware</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="c09ecc53eb311a2c79c59f2ccfecd945ac6f0b2d" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtconnectivity-everywhere-opensource-src-5.15.11.tar.xz</Archive>
<Archive sha1sum="f53fb0b291324f862ff8306ec8e7e26118f542d0" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtconnectivity-everywhere-opensource-src-5.15.12.tar.xz</Archive>
<BuildDependencies>
<Dependency>bluez-libs-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>qt5-connectivity</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative</Dependency>
<Dependency>bluez-libs</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
@@ -46,7 +46,7 @@
</Files>
<RuntimeDependencies>
<Dependency release="current">qt5-connectivity</Dependency>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
</RuntimeDependencies>
</Package>
@@ -61,6 +61,13 @@
</Package>
<History>
<Update release="28">
<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="27">
<Date>2023-10-07</Date>
<Version>5.15.11</Version>
desktop/toolkit/qt5/qt5-datavis3d/pspec.xml
+14 -7
View File
@@ -12,18 +12,18 @@
<PartOf>desktop</PartOf>
<Summary>Provides a set of easy to use chart components</Summary>
<Description>Qt Data Visualization module</Description>
<Archive sha1sum="69bfdcac17cf927d00ee3f000bf209636eea9afe" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtdatavis3d-everywhere-opensource-src-5.15.11.tar.xz</Archive>
<Archive sha1sum="ca9c238201b47fc338d92ffedc37c4087445bcae" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtdatavis3d-everywhere-opensource-src-5.15.12.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>qt5-datavis3d</Name>
<Summary>Qt Data Visualization module</Summary>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
@@ -37,8 +37,8 @@
<Name>qt5-datavis3d-devel</Name>
<Summary>Development files for qt5-datavis3d</Summary>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
<Dependency release="current">qt5-datavis3d</Dependency>
</RuntimeDependencies>
<Files>
@@ -49,6 +49,13 @@
</Package>
<History>
<Update release="23">
<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="22">
<Date>2023-10-07</Date>
<Version>5.15.11</Version>
desktop/toolkit/qt5/qt5-gamepad/pspec.xml
+13 -6
View File
@@ -15,12 +15,12 @@
<PartOf>desktop</PartOf>
<Summary>A JavaScript 3D rendering API for Qt Quick</Summary>
<Description>Adds support for getting events from gamepad devices</Description>
<Archive sha1sum="1b7035bf4f16c1b46af6c9837a92e89906fcb628" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtgamepad-everywhere-opensource-src-5.15.11.tar.xz</Archive>
<Archive sha1sum="76baff82e18b74716950b20cdef5ce89c14e2165" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtgamepad-everywhere-opensource-src-5.15.12.tar.xz</Archive>
<BuildDependencies>
<Dependency>eudev-devel</Dependency>
<Dependency>libsdl2-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
@@ -30,8 +30,8 @@
<Dependency>eudev</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libsdl2</Dependency>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -45,7 +45,7 @@
<Name>qt5-gamepad-devel</Name>
<Summary>Development files for qt5-gamepad</Summary>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency release="current">qt5-gamepad</Dependency>
</RuntimeDependencies>
<Files>
@@ -56,6 +56,13 @@
</Package>
<History>
<Update release="23">
<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="22">
<Date>2023-10-07</Date>
<Version>5.15.11</Version>
desktop/toolkit/qt5/qt5-scxml/pspec.xml
+14 -7
View File
@@ -14,18 +14,18 @@
<License>LGPL3</License>
<Summary>Provides a set of easy to use chart components</Summary>
<Description>Provides a set of easy to use chart components</Description>
<Archive sha1sum="f2c5114004cc57115ebff2dd6467e46e3550853b" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtscxml-everywhere-opensource-src-5.15.11.tar.xz</Archive>
<Archive sha1sum="2f10f10b19d6b9fbed7dbbed40a29c1e39d4d2c8" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtscxml-everywhere-opensource-src-5.15.12.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>qt5-scxml</Name>
<Summary>Provides a set of easy to use chart components</Summary>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
@@ -41,8 +41,8 @@
<Summary>Development files for qt5-scxml</Summary>
<RuntimeDependencies>
<Dependency release="current">qt5-scxml</Dependency>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/qt5</Path>
@@ -52,6 +52,13 @@
</Package>
<History>
<Update release="23">
<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="22">
<Date>2023-10-07</Date>
<Version>5.15.11</Version>
desktop/toolkit/qt5/qt5-tools/files/qt_kde.patch
+24
View File
@@ -104,3 +104,27 @@ index 6a45e57be..0ccf59f3c 100644
set(qm_dep "${ts_stamp_file}")
else()
set(qm_dep "${_abs_FILE}")
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp
index 539a603da..a41b99cec 100644
--- a/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/clangcodeparser.cpp
@@ -1395,8 +1395,7 @@ void ClangCodeParser::buildPCH()
args_.push_back("-xc++");
CXTranslationUnit tu;
QString tmpHeader = pchFileDir_->path() + "/" + module;
- QFile tmpHeaderFile(tmpHeader);
- if (tmpHeaderFile.open(QIODevice::Text | QIODevice::WriteOnly)) {
+ { QFile tmpHeaderFile(tmpHeader); if (tmpHeaderFile.open(QIODevice::Text | QIODevice::WriteOnly)) {
QTextStream out(&tmpHeaderFile);
if (header.isEmpty()) {
for (auto it = allHeaders_.constKeyValueBegin();
@@ -1421,8 +1420,7 @@ void ClangCodeParser::buildPCH()
out << line << "\n";
}
}
- tmpHeaderFile.close();
- }
+ } }
if (printParsingErrors_ == 0)
qCWarning(lcQdoc) << "clang not printing errors; include paths were guessed";
CXErrorCode err =
desktop/toolkit/qt5/qt5-tools/pspec.xml
+15 -8
View File
@@ -11,15 +11,15 @@
<Summary>A cross-platform application and UI framework (Development Tools, QtHelp)</Summary>
<Description>A cross-platform application and UI framework (Development Tools, QtHelp)</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="16261f5ea7d361f59fbd87c04adae09d837624d9" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz</Archive>
<Archive sha1sum="74d5d91cef382c75933f71c438fb320f6f84ec98" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qttools-everywhere-opensource-src-5.15.12.tar.xz</Archive>
<BuildDependencies>
<Dependency>llvm</Dependency>
<Dependency versionFrom="21.1.2">mesa-devel</Dependency>
<Dependency versionFrom="12.0.0">llvm-clang-devel</Dependency>
<Dependency versionFrom="12.0.0">lld-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency>icon-theme-hicolor</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">qt_kde.patch</Patch>
@@ -32,8 +32,8 @@
<Dependency>libgcc</Dependency>
<Dependency>llvm-libs</Dependency>
<Dependency>llvm-clang</Dependency>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/qdistancefieldgenerator</Path>
@@ -70,7 +70,7 @@
<Package>
<Name>qt5-assistant-devel</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency release="current">qt5-assistant</Dependency>
<Dependency versionFrom="10.0.1">llvm-clang-devel</Dependency>
</RuntimeDependencies>
@@ -86,8 +86,8 @@
<Name>qt5-designer</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/designer</Path>
@@ -188,6 +188,13 @@
</Package>
<History>
<Update release="42">
<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="41">
<Date>2023-10-17</Date>
<Version>5.15.11</Version>
desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch
+14 -14
View File
@@ -567,10 +567,10 @@ index 9cf1483c..6f667398 100644
diff --git a/src/client/qwaylanddatasource.cpp b/src/client/qwaylanddatasource.cpp
index 9b17cdfa..1a6b9835 100644
index c2bc9dc4..321170a6 100644
--- a/src/client/qwaylanddatasource.cpp
+++ b/src/client/qwaylanddatasource.cpp
@@ -71,11 +71,6 @@ QWaylandDataSource::~QWaylandDataSource()
@@ -72,11 +72,6 @@ QWaylandDataSource::~QWaylandDataSource()
destroy();
}
@@ -582,7 +582,7 @@ index 9b17cdfa..1a6b9835 100644
void QWaylandDataSource::data_source_cancelled()
{
Q_EMIT cancelled();
@@ -101,7 +96,32 @@ void QWaylandDataSource::data_source_send(const QString &mime_type, int32_t fd)
@@ -110,7 +105,32 @@ void QWaylandDataSource::data_source_send(const QString &mime_type, int32_t fd)
void QWaylandDataSource::data_source_target(const QString &mime_type)
{
@@ -1388,7 +1388,7 @@ index 47696a6a..9435e961 100644
reset();
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index 08e8adb8..34c185a3 100644
index b0e9692b..ab978d3f 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -310,8 +310,7 @@ void QWaylandInputDevice::Pointer::updateCursor()
@@ -1512,7 +1512,7 @@ index bf54a1a0..9763c312 100644
return nullptr;
diff --git a/src/client/qwaylandprimaryselectionv1.cpp b/src/client/qwaylandprimaryselectionv1.cpp
index 78b1de13..cf3b4b22 100644
index 7805dd73..dac532b2 100644
--- a/src/client/qwaylandprimaryselectionv1.cpp
+++ b/src/client/qwaylandprimaryselectionv1.cpp
@@ -54,11 +54,6 @@ QWaylandPrimarySelectionDeviceManagerV1::QWaylandPrimarySelectionDeviceManagerV1
@@ -1735,7 +1735,7 @@ index e01632da..f3fae438 100644
QSize size() const override { return mImage.size(); }
int scale() const override { return int(mImage.devicePixelRatio()); }
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 5a390434..d3958d46 100644
index d57094a7..7a9bccc1 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -76,7 +76,6 @@ QWaylandWindow *QWaylandWindow::mMouseGrab = nullptr;
@@ -2052,7 +2052,7 @@ index 5a390434..d3958d46 100644
int scale = newScreen->isPlaceholder() ? 1 : static_cast<QWaylandScreen *>(newScreen)->scale();
if (scale != mScale) {
@@ -1084,14 +1111,14 @@ bool QWaylandWindow::isActive() const
@@ -1087,14 +1114,14 @@ bool QWaylandWindow::isActive() const
return mDisplay->isWindowActivated(this);
}
@@ -2070,7 +2070,7 @@ index 5a390434..d3958d46 100644
}
bool QWaylandWindow::setMouseGrabEnabled(bool grab)
@@ -1105,10 +1132,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab)
@@ -1108,10 +1135,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab)
return true;
}
@@ -2090,7 +2090,7 @@ index 5a390434..d3958d46 100644
mLastReportedWindowStates = states;
}
@@ -1150,19 +1185,24 @@ void QWaylandWindow::timerEvent(QTimerEvent *event)
@@ -1153,19 +1188,24 @@ void QWaylandWindow::timerEvent(QTimerEvent *event)
if (event->timerId() != mFrameCallbackCheckIntervalTimerId)
return;
@@ -2126,7 +2126,7 @@ index 5a390434..d3958d46 100644
}
void QWaylandWindow::requestUpdate()
@@ -1171,8 +1211,11 @@ void QWaylandWindow::requestUpdate()
@@ -1174,8 +1214,11 @@ void QWaylandWindow::requestUpdate()
Q_ASSERT(hasPendingUpdateRequest()); // should be set by QPA
// If we have a frame callback all is good and will be taken care of there
@@ -2140,7 +2140,7 @@ index 5a390434..d3958d46 100644
// If we've already called deliverUpdateRequest(), but haven't seen any attach+commit/swap yet
// This is a somewhat redundant behavior and might indicate a bug in the calling code, so log
@@ -1185,7 +1228,12 @@ void QWaylandWindow::requestUpdate()
@@ -1188,7 +1231,12 @@ void QWaylandWindow::requestUpdate()
// so use invokeMethod to delay the delivery a bit.
QMetaObject::invokeMethod(this, [this] {
// Things might have changed in the meantime
@@ -2154,7 +2154,7 @@ index 5a390434..d3958d46 100644
deliverUpdateRequest();
}, Qt::QueuedConnection);
}
@@ -1196,19 +1244,18 @@ void QWaylandWindow::requestUpdate()
@@ -1199,19 +1247,18 @@ void QWaylandWindow::requestUpdate()
void QWaylandWindow::handleUpdate()
{
qCDebug(lcWaylandBackingstore) << "handleUpdate" << QThread::currentThread();
@@ -2179,7 +2179,7 @@ index 5a390434..d3958d46 100644
mFrameCallback = wl_surface_frame(wrappedSurface);
wl_proxy_wrapper_destroy(wrappedSurface);
wl_callback_add_listener(mFrameCallback, &QWaylandWindow::callbackListener, this);
@@ -1218,6 +1265,8 @@ void QWaylandWindow::handleUpdate()
@@ -1221,6 +1268,8 @@ void QWaylandWindow::handleUpdate()
// Start a timer for handling the case when the compositor stops sending frame callbacks.
if (mFrameCallbackTimeout > 0) {
QMetaObject::invokeMethod(this, [this] {
@@ -2188,7 +2188,7 @@ index 5a390434..d3958d46 100644
if (mWaitingForFrameCallback) {
if (mFrameCallbackCheckIntervalTimerId < 0)
mFrameCallbackCheckIntervalTimerId = startTimer(mFrameCallbackTimeout);
@@ -1278,6 +1327,20 @@ void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea)
@@ -1281,6 +1330,20 @@ void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea)
wl_region_destroy(region);
}
desktop/toolkit/qt5/qt5-wayland/pspec.xml
+14 -7
View File
@@ -11,7 +11,7 @@
<Summary>Provides APIs for Wayland</Summary>
<Description>Provides APIs for Wayland</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="128bfcec7c647689fd6faf99b20fe955fd828592" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtwayland-everywhere-opensource-src-5.15.11.tar.xz</Archive>
<Archive sha1sum="bc6b7b7719361c4f4968eb649a2909ec67e5ffe2" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtwayland-everywhere-opensource-src-5.15.12.tar.xz</Archive>
<BuildDependencies>
<Dependency>libgcc</Dependency>
<Dependency>libX11-devel</Dependency>
@@ -28,8 +28,8 @@
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<Dependency versionFrom="2.50.2">glib2-devel</Dependency>
<Dependency versionFrom="2.7.1">freetype-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">qt_kde.patch</Patch>
@@ -51,8 +51,8 @@
<Dependency versionFrom="13.0.4">mesa</Dependency>
<Dependency versionFrom="2.50.2">glib2</Dependency>
<Dependency versionFrom="2.7.1">freetype</Dependency>
<Dependency versionFrom="5.15.11">qt5-base</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.12">qt5-base</Dependency>
<Dependency versionFrom="5.15.12">qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -66,7 +66,7 @@
<Name>qt5-wayland-devel</Name>
<RuntimeDependencies>
<Dependency release="current">qt5-wayland</Dependency>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.12">qt5-base-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/pkgconfig</Path>
@@ -77,7 +77,7 @@
<Package>
<Name>qt5-wayland-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</Path>
@@ -85,6 +85,13 @@
</Package>
<History>
<Update release="38">
<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="37">
<Date>2023-11-11</Date>
<Version>5.15.11</Version>