summaryrefslogtreecommitdiffstats
path: root/source/l/qt5
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/qt5')
-rwxr-xr-xsource/l/qt5/fetch_sources.sh4
-rw-r--r--source/l/qt5/patches/qt5-webengine-gcc12.patch13
-rwxr-xr-xsource/l/qt5/qt5.SlackBuild5
3 files changed, 20 insertions, 2 deletions
diff --git a/source/l/qt5/fetch_sources.sh b/source/l/qt5/fetch_sources.sh
index 4859cf30a..c589534b1 100755
--- a/source/l/qt5/fetch_sources.sh
+++ b/source/l/qt5/fetch_sources.sh
@@ -20,7 +20,7 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-BRANCH="5.15.3"
+BRANCH="5.15.4"
rm -f qt-everywhere-src-*.tar*
@@ -31,7 +31,7 @@ cd qt5
./init-repository
# Sync qtwebengine version with the rest of qt5
- sed -i -E "s/5.15.(.*)/5.15.3/" qtwebengine/.qmake.conf
+ sed -i -E "s/5.15.(.*)/5.15.4/" qtwebengine/.qmake.conf
for i in $(find . -type d -name "qt*" -maxdepth 1); do
cd $i
diff --git a/source/l/qt5/patches/qt5-webengine-gcc12.patch b/source/l/qt5/patches/qt5-webengine-gcc12.patch
new file mode 100644
index 000000000..46f2dbfe1
--- /dev/null
+++ b/source/l/qt5/patches/qt5-webengine-gcc12.patch
@@ -0,0 +1,13 @@
+diff --git a/chromium/third_party/skia/src/utils/SkParseColor.cpp b/chromium/third_party/skia/src/utils/SkParseColor.cpp
+index 7260365b2c6..b5a6aae3596 100644
+--- a/chromium/third_party/skia/src/utils/SkParseColor.cpp
++++ b/chromium/third_party/skia/src/utils/SkParseColor.cpp
+@@ -8,6 +8,8 @@
+
+ #include "include/utils/SkParse.h"
+
++#include <iterator>
++
+ static constexpr const char* gColorNames[] = {
+ "aliceblue",
+ "antiquewhite",
diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild
index cc3731f92..3cdb22cb7 100755
--- a/source/l/qt5/qt5.SlackBuild
+++ b/source/l/qt5/qt5.SlackBuild
@@ -135,6 +135,11 @@ cd qtwebengine
zcat $CWD/patches/qt5-qtwebengine-gcc11.patch.gz | patch -p1 --verbose || exit 1
cd - 1>/dev/null
+# Fix build with gcc12:
+cd qtwebengine/src/3rdparty
+ zcat $CWD/patches/qt5-webengine-gcc12.patch.gz | patch -p1 --verbose || exit 1
+cd - 1>/dev/null
+
# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
# and for it breaks KWin compilation with:
# /usr/include/c++/9.1.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory