diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 426b6f8..417bcb5 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.4 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -136,7 +136,8 @@ Patch110: 0010-Work-around-crash-where-a-destroyed-window-becomes-f.patch Patch154: 0054-Fix-crash-when-app-is-going-to-shutdown-but-conf-man.patch Patch156: 0056-QHighDpi-Replace-fromNative-toNative-with-scale.patch Patch166: 0066-High-DPI-Fix-crash-in-QWindow-mapFromGlobal.patch -Patch200: 0100-QHighDpi-fromNativePixels-use-correct-screen.patch +## omit for now, appears to introduce symbol incompatibilities +#Patch200: 0100-QHighDpi-fromNativePixels-use-correct-screen.patch # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Those themes are there for platform integration. If the required libraries are @@ -410,7 +411,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. %patch154 -p1 %patch156 -p1 %patch166 -p1 -%patch200 -p1 +#patch200 -p1 # move some bundled libs to ensure they're not accidentally used pushd src/3rdparty @@ -1030,6 +1031,9 @@ fi %changelog +* Fri Jun 28 2019 Rex Dieter - 5.12.4-3 +- omit QTBUG-73231 patch fix, appears to introduce incompatible symbols + * Wed Jun 26 2019 Rex Dieter - 5.12.4-2 - pull in some upstream crash fixes