Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2017-09-15 21:08:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Fri Sep 15 21:08:33 2017 rev:66 rq:525883 version:5.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2017-09-04 12:18:43.891904719 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2017-09-15 21:08:35.082623720 +0200 @@ -1,0 +2,13 @@ +Wed Sep 13 12:38:49 UTC 2017 - fab...@ritter-vogt.de + +- Add patch to fix crash with XLIB_SKIP_ARGB_VISUALS set: + * qglxconvenience-avoid-null-pointer-deref.patch (boo#1057971, kde#384540) + +------------------------------------------------------------------- +Thu Aug 31 11:36:32 UTC 2017 - christo...@krop.fr + +- Add 0001-Fix-Qt5DBusMacros.cmake-for-CMake-3.9.patch. + Fixes a race condition when building KMail due to the DBus + interface files being used in several places. + +------------------------------------------------------------------- New: ---- 0001-Fix-Qt5DBusMacros.cmake-for-CMake-3.9.patch qglxconvenience-avoid-null-pointer-deref.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.ldTJ5C/_old 2017-09-15 21:08:36.858374406 +0200 +++ /var/tmp/diff_new_pack.ldTJ5C/_new 2017-09-15 21:08:36.862373844 +0200 @@ -67,8 +67,12 @@ # PATCH-FIX-UPSTREAM Patch17: qapplication-emit-palettechanged.patch # patches 1000-2000 and above from upstream 5.9 branch # +# PATCH-FIX-UPSTREAM 0001-Fix-Qt5DBusMacros.cmake-for-CMake-3.9.patch -- Skip automoc for generated headers +Patch1000: 0001-Fix-Qt5DBusMacros.cmake-for-CMake-3.9.patch # patches 2000-3000 and above from upstream 5.10/dev branch # Patch2000: 0001-QSslSocket-OpenSSL-1.1-backend.patch +# PATCH-FIX-UPSTREAM (https://codereview.qt-project.org/#/c/205268/) +Patch4000: qglxconvenience-avoid-null-pointer-deref.patch BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: double-conversion-devel @@ -159,7 +163,9 @@ %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch1000 -p1 %patch2000 -p1 +%patch4000 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,zlib} ++++++ 0001-Fix-Qt5DBusMacros.cmake-for-CMake-3.9.patch ++++++ >From f7aaff01de9d5555e333cedcbbc07236cd653d0a Mon Sep 17 00:00:00 2001 From: David Faure <david.fa...@kdab.com> Date: Sun, 2 Jul 2017 18:10:39 +0200 Subject: [PATCH] Fix Qt5DBusMacros.cmake for CMake 3.9 CMake gained support for running AUTOMOC on generated headers, so we need to mark them with SKIP_AUTOMOC since we're generating moc files for those already. Otherwise we get duplicated symbols. Change-Id: Iabd387832cfc74809fc5e6ff4782f4fc83cc07d8 Reviewed-by: Thiago Macieira <thiago.macie...@intel.com> Reviewed-by: Rolf Eike Beer <e...@emlix.com> Reviewed-by: Kevin Funk <kevin.f...@kdab.com> Reviewed-by: Stephen Kelly <steve...@gmail.com> --- src/dbus/Qt5DBusMacros.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dbus/Qt5DBusMacros.cmake b/src/dbus/Qt5DBusMacros.cmake index ef3eb73276..0bd7364637 100644 --- a/src/dbus/Qt5DBusMacros.cmake +++ b/src/dbus/Qt5DBusMacros.cmake @@ -62,6 +62,7 @@ function(QT5_ADD_DBUS_INTERFACE _sources _interface _basename) DEPENDS ${_infile} VERBATIM) set_source_files_properties("${_impl}" PROPERTIES SKIP_AUTOMOC TRUE) + set_source_files_properties("${_header}" PROPERTIES SKIP_AUTOMOC TRUE) qt5_generate_moc("${_header}" "${_moc}") @@ -147,6 +148,7 @@ function(QT5_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optio qt5_generate_moc("${_header}" "${_moc}") set_source_files_properties("${_impl}" PROPERTIES SKIP_AUTOMOC TRUE) + set_source_files_properties("${_header}" PROPERTIES SKIP_AUTOMOC TRUE) macro_add_file_dependencies("${_impl}" "${_moc}") list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}") -- 2.14.1 ++++++ qglxconvenience-avoid-null-pointer-deref.patch ++++++ >From 37b279dda0387ad917da586c19c0605c0be10afc Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik <k...@privat.broulik.de> Date: Tue, 12 Sep 2017 16:18:58 +0200 Subject: [PATCH] qglxconvenience: Avoid null pointer dereference References: boo#1057971, kde#384540 glXGetVisualFromFBConfig according to documentation can return NULL [1]. This may result in a crash when running Qt applications using ARGB windows with XLIB_SKIP_ARGB_VISUALS defined. [1] https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/glXGetVisualFromFBConfig.xml Change-Id: Ie076a1e906ed632543bdab03ef365f699533a61a --- src/platformsupport/glxconvenience/qglxconvenience.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp index 8c26550..46bd579 100644 --- a/src/platformsupport/glxconvenience/qglxconvenience.cpp +++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp @@ -202,6 +202,8 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format GLXFBConfig candidate = configs[i]; QXlibPointer<XVisualInfo> visual(glXGetVisualFromFBConfig(display, candidate)); + if (!visual) + continue; const int actualRed = qPopulationCount(visual->red_mask); const int actualGreen = qPopulationCount(visual->green_mask); -- 2.7.4
