commit 7bbf3c2e0293d740ceace31caf16d3a9d2849ff7 Author: Danny Rawlins <contact@romster.me> Date: Tue Feb 22 09:13:56 2022 +1100 qt5: upstream patches from kde/lfs diff --git a/qt5/.footprint b/qt5/.footprint index a347d6147..a20b8a9ed 100644 --- a/qt5/.footprint +++ b/qt5/.footprint @@ -74,6 +74,8 @@ lrwxrwxrwx root/root usr/bin/qmlscene -> ../lib/qt5/bin/qmlscene lrwxrwxrwx root/root usr/bin/qmlscene-qt5 -> ../lib/qt5/bin/qmlscene lrwxrwxrwx root/root usr/bin/qmltestrunner -> ../lib/qt5/bin/qmltestrunner lrwxrwxrwx root/root usr/bin/qmltestrunner-qt5 -> ../lib/qt5/bin/qmltestrunner +lrwxrwxrwx root/root usr/bin/qmltime -> ../lib/qt5/bin/qmltime +lrwxrwxrwx root/root usr/bin/qmltime-qt5 -> ../lib/qt5/bin/qmltime lrwxrwxrwx root/root usr/bin/qmltyperegistrar -> ../lib/qt5/bin/qmltyperegistrar lrwxrwxrwx root/root usr/bin/qmltyperegistrar-qt5 -> ../lib/qt5/bin/qmltyperegistrar lrwxrwxrwx root/root usr/bin/qscxmlc -> ../lib/qt5/bin/qscxmlc @@ -8822,6 +8824,7 @@ drwxr-xr-x root/root usr/lib/qt5/bin/ -rwxr-xr-x root/root usr/lib/qt5/bin/qmlprofiler -rwxr-xr-x root/root usr/lib/qt5/bin/qmlscene -rwxr-xr-x root/root usr/lib/qt5/bin/qmltestrunner +-rwxr-xr-x root/root usr/lib/qt5/bin/qmltime -rwxr-xr-x root/root usr/lib/qt5/bin/qmltyperegistrar -rwxr-xr-x root/root usr/lib/qt5/bin/qscxmlc -rwxr-xr-x root/root usr/lib/qt5/bin/qtattributionsscanner diff --git a/qt5/.signature b/qt5/.signature index e5048feb6..04ace5fff 100644 --- a/qt5/.signature +++ b/qt5/.signature @@ -1,8 +1,9 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WUvqEglgs19kHuAwlpReMp9CGp4s7BtqrUvbFERZEDh/D+shW/x3wbMLz1Ihb+pbiYY0QT7iHGlOQtk01qeqg4= -SHA256 (Pkgfile) = a7b960d5d2cd67569969adaa9168d29cc5606068a215fe0709c82dcd8291ea32 -SHA256 (.footprint) = cd747f02bb34a0c1e8ed0edfbda866740d6ab9940824b2c6848ee51bb0ecf64c +RWSE3ohX2g5d/Vql+ZFqooByI/oDWCsuyVpnCwLdwT8m4JpvPZathdpt4YoR86VSUzo63iaA7bqOyK7BxUDMAw9Bt+cidYx29QI= +SHA256 (Pkgfile) = 4cb530fd06ac9d024f2e4db86f9f769d3c7d35da825f7d9988e217943f1528cc +SHA256 (.footprint) = 8109efe4cb1e2c73428eb285caaededb5212398ef197f8ea8b5a13d46718d318 SHA256 (qt-everywhere-src-5.15.2.tar.xz) = 3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240 +SHA256 (qt-everywhere-src-5.15.2-kf5.15-2.patch) = 4594c294be060ba6136f73eaf76843f79dd7f5756fe2e0f4bb4abd61406f6b88 SHA256 (qt5-cflags.patch) = cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c SHA256 (qt5-logo.png) = ae1335ecd1cd2d17032184895ab298a636cdfa8121b0ed71307c4f2b23ec928e SHA256 (qtbase-everywhere-src-5.11.1-python3.patch) = 5218cf7651f21a865fc1d8b18753e0eb0c1c412acbac080cd9d61f95b69589e5 diff --git a/qt5/Pkgfile b/qt5/Pkgfile index 7675f72d5..b27d87866 100644 --- a/qt5/Pkgfile +++ b/qt5/Pkgfile @@ -6,8 +6,9 @@ name=qt5 version=5.15.2 -release=2 +release=3 source=(https://download.qt.io/official_releases/qt/${version::4}/$version/single/qt-everywhere-src-$version.tar.xz + https://www.linuxfromscratch.org/patches/blfs/svn/qt-everywhere-src-5.15.2-k... qt5-cflags.patch qt5-logo.png qtbase-everywhere-src-5.11.1-python3.patch @@ -20,13 +21,14 @@ source=(https://download.qt.io/official_releases/qt/${version::4}/$version/singl build() { cd qt-everywhere-src-$version + patch -p1 -i $SRC/qt-everywhere-src-5.15.2-kf5.15-2.patch patch -d qtbase -p1 -i $SRC/qt5-cflags.patch patch -d qtbase -p1 -i $SRC/qtbase-everywhere-src-5.11.1-python3.patch patch -d qtbase -p1 -i $SRC/qtbase-everywhere-src-5.14.2-no_relocatable.patch patch -d qtbase -p1 -i $SRC/qtbase-everywhere-src-5.15.2-libglvnd.patch patch -d qtbase -p1 -i $SRC/qtbase-filechooser-portal-send-window-id-in-hex.patch patch -d qtbase -p1 -i $SRC/qtbase-use-wayland-on-gnome.patch - patch -p1 -i $SRC/qt-everywhere-src-5.15.2-CVE-2021-3481-1.patch + #patch -p1 -i $SRC/qt-everywhere-src-5.15.2-CVE-2021-3481-1.patch export PYTHON='/usr/bin/python3' mkdir $SRC/bin