From afc1c75b83c26a36a46e5abd45ec5515d101708d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Fri, 10 May 2019 09:28:18 -0500
Subject: [PATCH] Fix install targets for generated private headers (#1702858)

---
 ...argets-for-generated-private-headers.patch | 33 +++++++++++++++++++
 qt5-qtbase.spec                               |  7 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 0129-Fix-install-targets-for-generated-private-headers.patch

diff --git a/0129-Fix-install-targets-for-generated-private-headers.patch b/0129-Fix-install-targets-for-generated-private-headers.patch
new file mode 100644
index 0000000..efce764
--- /dev/null
+++ b/0129-Fix-install-targets-for-generated-private-headers.patch
@@ -0,0 +1,33 @@
+From 8e6231f4ebd0957920b740fb0cc96af0ac66e6cf Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@qt.io>
+Date: Wed, 30 Jan 2019 16:16:58 +0100
+Subject: [PATCH 129/525] Fix install targets for generated private headers
+
+Header files of modules that specify generated_privates are usually
+not yet available at qmake-time. Thus, the installation rule must not
+check for the file's existence.
+
+Change-Id: Ifc7ff95422912d255744c9006382ff181176ae77
+Fixes: QTBUG-71340
+Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
+Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
+---
+ mkspecs/features/qt_installs.prf | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
+index 8f98987b99..1ebca17366 100644
+--- a/mkspecs/features/qt_installs.prf
++++ b/mkspecs/features/qt_installs.prf
+@@ -38,6 +38,8 @@ qt_install_headers {
+ 
+     private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES
+     private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
++    generated_privates: \
++        private_headers.CONFIG += no_check_exist
+     INSTALLS += private_headers
+ 
+     qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES
+-- 
+2.21.0
+
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index ac50102..678b450 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -53,7 +53,7 @@ BuildRequires: pkgconfig(libsystemd)
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
 Version: 5.12.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -129,6 +129,7 @@ Patch68: qtbase-everywhere-src-5.11.1-python3.patch
 # glibc stat
 
 ## upstream patches
+Patch129: 0129-Fix-install-targets-for-generated-private-headers.patch
 Patch234: 0234-Blacklist-nouveau-and-llvmpipe-for-multithreading.patch
 
 # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
@@ -378,6 +379,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 %setup -q -n %{qt_module}-everywhere-src-%{version}
 
 ## upstream fixes
+%patch129 -p1 -b .0129
 %patch234 -p1 -b .0234
 
 %patch4 -p1 -b .QTBUG-35459
@@ -1018,6 +1020,9 @@ fi
 
 
 %changelog
+* Fri May 10 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-7
+- Fix install targets for generated private headers (#1702858)
+
 * Wed May 08 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-6
 - Blacklist nouveau and llvmpipe for multithreading (#1706420)
 - drop BR: pkgconfig(glesv2) on f31+, no longer provided in mesa-19.1+