qt5: 5.12.4 -> 5.13.1

qt5/.signature

@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/SQwese/2wNQ1hRJW/1VmPwwil6ah2H0Edq7W4w+bFn8bPlpnSIJatd6tyHHma90NkA8ea8l9m66AgophCrs3QQ=
-SHA256 (Pkgfile) = c60b0a8048a5b180618cae4d3b0b97d3442ee7f546f5cf05adb22e5735f16d19
-SHA256 (.footprint) = f89028592a8441a23df52775b4e018154a57ce914c96fa51b1718bb89cf99a31
-SHA256 (qt-everywhere-src-5.12.4.tar.xz) = 85da5e0ee498759990180d5b8192efaa6060a313c5018b772f57d446bdd425e1
+RWSE3ohX2g5d/XRjnZ7m350U7S0xV5VWEhN2UdHpVzJp3bevop7Cy+m1j+nQw/Z2aizXTC09hlskKxqvXp3ZbUTW36xRyiOXYg0=
+SHA256 (Pkgfile) = c3431df5ba5b1099efc4fda0b23ed0388432db22b1a4450c4f5e58ea90ddbf34
+SHA256 (.footprint) = a42c919ae7ca17438743ae6fc4b892bd082f620653db40dd6aa5d74787484542
+SHA256 (qt-everywhere-src-5.13.1.tar.xz) = adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e
 SHA256 (qt5-logo.png) = ae1335ecd1cd2d17032184895ab298a636cdfa8121b0ed71307c4f2b23ec928e
-SHA256 (QTBUG-76625.patch) = 1c4e7e006185186ab3ffd02815db40ded2ff97944b0e58d6f6cb0868b1f0bab6
+SHA256 (qtbug-77364.patch) = dc742814ab0c1b63da5916d96e3ef01fa96007c385ed033ae5b3a8cd8608c119

qt5/Pkgfile

@@ -4,16 +4,16 @@
 # Depends on: dbus gdk-pixbuf gst-plugins-base libepoxy libmng libxkbcommon xorg-libxcomposite xorg-libxcursor xorg-libxi xorg-libxinerama xorg-xcb-util-image xorg-xcb-util-keysyms xorg-xcb-util-wm
 
 name=qt5
-version=5.12.4
-release=2
+version=5.13.1
+release=1
 source=(https://download.qt.io/official_releases/qt/${version::4}/$version/single/qt-everywhere-src-$version.tar.xz
-	qt5-logo.png QTBUG-76625.patch)
+	qt5-logo.png qtbug-77364.patch)
 
 build() {
 	cd qt-everywhere-src-$version
 
-	# https://bugreports.qt.io/browse/QTBUG-76625
-	patch -p1 -d qtbase -i $SRC/QTBUG-76625.patch
+	# https://bugreports.qt.io/browse/QTBUG-77364
+	patch -p1 -d qtbase -i $SRC/qtbug-77364.patch
 
 	# Respect system CXX
 	[ "$CXX" ] || CXX=g++
@@ -35,7 +35,7 @@ build() {
 	export LD_LIBRARY_PATH="$QTDIR/qtbase/lib:$QTDIR/qttools/lib:$LD_LIBRARY_PATH"
 	export QT_PLUGIN_PATH="$QTDIR/qtbase/plugins"
 
-	prt-get isinst ccache && PKGMK_QT5+=' -ccache'
+	prt-get isinst ccache && PKGMK_QT5+=' -ccache' && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
 
 	./configure $PKGMK_QT5 \
 		-prefix /usr/ \

qt5/QTBUG-76625.patch

@@ -1,71 +0,0 @@
-From 205225994c631aa1310778c304b7ee62ee2701ef Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann <joerg.bornemann@qt.io>
-Date: Wed, 31 Jul 2019 10:55:14 +0200
-Subject: [PATCH] Fix dependency_libs entry of .la files
-
-Libtool cannot cope with absolute paths in the dependency_libs entry.
-We split absolute paths into -L and -l here.
-
-Change-Id: I30bf11e490d1993d2a4d88c114e07bbae12def6d
-Fixes: QTBUG-76625
-Reviewed-by: Kai Koehne <kai.koehne@qt.io>
----
-
-diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
-index d9bcccf..abc3714 100644
---- a/qmake/generators/unix/unixmake2.cpp
-+++ b/qmake/generators/unix/unixmake2.cpp
-@@ -1450,7 +1450,36 @@
- void
- UnixMakefileGenerator::writeLibtoolFile()
- {
-+    auto fixDependencyLibs
-+            = [this](const ProStringList &libs)
-+              {
-+                  ProStringList result;
-+                  for (auto lib : libs) {
-+                      auto fi = fileInfo(lib.toQString());
-+                      if (fi.isAbsolute()) {
-+                          const QString libDirArg = "-L" + fi.path();
-+                          if (!result.contains(libDirArg))
-+                              result += libDirArg;
-+                          QString namespec = fi.fileName();
-+                          int dotPos = namespec.lastIndexOf('.');
-+                          if (dotPos != -1 && namespec.startsWith("lib")) {
-+                              namespec.truncate(dotPos);
-+                              namespec.remove(0, 3);
-+                          } else {
-+                              debug_msg(1, "Ignoring dependency library %s",
-+                                        lib.toLatin1().constData());
-+                              continue;
-+                          }
-+                          result += "-l" + namespec;
-+                      } else {
-+                          result += lib;
-+                      }
-+                  }
-+                  return result;
-+              };
-+
-     QString fname = libtoolFileName(), lname = fname;
-+    debug_msg(1, "Writing libtool file %s", fname.toLatin1().constData());
-     mkdir(fileInfo(fname).path());
-     int slsh = lname.lastIndexOf(Option::dir_sep);
-     if(slsh != -1)
-@@ -1488,12 +1517,11 @@
-                          << ".a'\n\n";
- 
-     t << "# Libraries that this one depends upon.\n";
-+    static const ProKey libVars[] = { "LIBS", "QMAKE_LIBS" };
-     ProStringList libs;
--    libs << "LIBS" << "QMAKE_LIBS";
--    t << "dependency_libs='";
--    for (ProStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it)
--        t << fixLibFlags((*it).toKey()).join(' ') << ' ';
--    t << "'\n\n";
-+    for (auto var : libVars)
-+        libs += fixLibFlags(var);
-+    t << "dependency_libs='" << fixDependencyLibs(libs).join(' ') << "'\n\n";
- 
-     t << "# Version information for " << lname << "\n";
-     int maj = project->first("VER_MAJ").toInt();

qt5/qtbug-77364.patch

@@ -0,0 +1,12 @@
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
+index 04290a4ce1..27773d5762 100644
+--- a/src/widgets/kernel/qwidget.cpp
++++ b/src/widgets/kernel/qwidget.cpp
+@@ -6446,7 +6446,7 @@ void QWidget::setFocusProxy(QWidget * w)
+ 
+     if (changingAppFocusWidget) {
+         QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
+-        QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this;
++        QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason);
+     }
+ }