Hello community,

here is the log from the commit of package libqt5-qtbase for openSUSE:Factory 
checked in at 2017-08-08 11:57:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old)
 and      /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqt5-qtbase"

Tue Aug  8 11:57:28 2017 rev:62 rq:514205 version:5.9.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes      
2017-07-08 12:25:21.842922770 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 
2017-08-08 11:57:28.690908738 +0200
@@ -1,0 +2,18 @@
+Thu Aug  3 08:56:09 UTC 2017 - m...@suse.com
+
+- Remove openSUSE specific %ifs (bsc#1051900)
+
+-------------------------------------------------------------------
+Tue Jul 25 11:13:53 UTC 2017 - fab...@ritter-vogt.de
+
+- Add patch to not abort if no $DISPLAY is available (boo#1050046)
+  * dont-abort-missing-display.patch
+
+-------------------------------------------------------------------
+Mon Jul 24 19:26:00 UTC 2017 - fab...@ritter-vogt.de
+
+- Add patch to fix include path for private headers of modules
+  built in a shadow directory (QTBUG-37417)
+  * force-cmake-private-headers.patch
+
+-------------------------------------------------------------------

New:
----
  dont-abort-missing-display.patch
  force-cmake-private-headers.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt5-qtbase.spec ++++++
--- /var/tmp/diff_new_pack.x7F4Ib/_old  2017-08-08 11:57:30.670629909 +0200
+++ /var/tmp/diff_new_pack.x7F4Ib/_new  2017-08-08 11:57:30.686627656 +0200
@@ -60,6 +60,10 @@
 Patch13:        0001-Fix-open-chmod-race-condition-in-QSaveFile.patch
 # PATCH-FIX-OPENSUSE (?)
 Patch14:        0001-Fix-at-spi2-build.patch
+# PATCH-FIX-OPENSUSE
+Patch15:        force-cmake-private-headers.patch
+# PATCH-FIX-OPENSUSE
+Patch16:       dont-abort-missing-display.patch
 # patches 1000-2000 and above from upstream 5.9 branch #
 # patches 2000-3000 and above from upstream 5.10/dev branch #
 BuildRequires:  alsa-devel
@@ -104,9 +108,7 @@
 BuildRequires:  xz
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
-%if 0%{?is_opensuse} 
 BuildRequires:  pkgconfig(harfbuzz)
-%endif
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(libinput)
 BuildRequires:  pkgconfig(libudev)
@@ -151,6 +153,8 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,zlib}
@@ -750,9 +754,7 @@
        -system-libjpeg \
        -openssl-linked \
        -system-libpng \
-%if 0%{?is_opensuse}
        -system-harfbuzz \
-%endif
        -fontconfig \
        -system-freetype \
        -cups \
@@ -1059,9 +1061,7 @@
 %{libqt5_libdir}/sse2/libQt5Gui.so.*
 %endif
 %{libqt5_libdir}/libQt5EglFSDeviceIntegration.so.*
-%if 0%{?is_opensuse}
 %{libqt5_libdir}/libQt5EglFsKmsSupport.so.*
-%endif
 %{libqt5_libdir}/libQt5XcbQpa.so.*
 %{libqt5_plugindir}/generic
 %{libqt5_plugindir}/imageformats
@@ -1083,10 +1083,8 @@
 %{libqt5_libdir}/libQt5Gui.prl
 %{libqt5_libdir}/libQt5EglFSDeviceIntegration.so
 %{libqt5_libdir}/libQt5EglFSDeviceIntegration.prl
-%if 0%{?is_opensuse}
 %{libqt5_libdir}/libQt5EglFsKmsSupport.prl
 %{libqt5_libdir}/libQt5EglFsKmsSupport.so
-%endif
 %{libqt5_libdir}/cmake/Qt5Gui/
 %{libqt5_libdir}/pkgconfig/Qt5Gui.pc
 %{libqt5_includedir}/QtGui/

++++++ dont-abort-missing-display.patch ++++++
From: Fabian Vogt <fab...@ritter-vogt.de>
Subject: Do not abort if no $DISPLAY available

This is annoying and also generates coredumps for no reason.

Index: qtbase-opensource-src-5.9.1/src/plugins/platforms/xcb/qxcbconnection.cpp
===================================================================
--- 
qtbase-opensource-src-5.9.1.orig/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ qtbase-opensource-src-5.9.1/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -571,8 +571,10 @@ QXcbConnection::QXcbConnection(QXcbNativ
     m_connection = xcb_connect(m_displayName.constData(), 
&m_primaryScreenNumber);
 #endif //XCB_USE_XLIB
 
-    if (Q_UNLIKELY(!m_connection || xcb_connection_has_error(m_connection)))
-        qFatal("QXcbConnection: Could not connect to display %s", 
m_displayName.constData());
+    if (Q_UNLIKELY(!m_connection || xcb_connection_has_error(m_connection))) {
+        qCritical("QXcbConnection: Could not connect to display %s", 
m_displayName.constData());
+        exit(1);
+    }
 
 
     m_reader = new QXcbEventReader(this);
++++++ force-cmake-private-headers.patch ++++++
From: Fabian Vogt <fab...@ritter-vogt.de>
Subject: Forcee inclusion of _PRIVATE_INCLUDE_DIRS to CMakeConfig files
References: QTBUG-37417

This is broken for shadow builds otherwise.

Index: qtbase-opensource-src-5.9.1/mkspecs/features/create_cmake.prf
===================================================================
--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/create_cmake.prf
+++ qtbase-opensource-src-5.9.1/mkspecs/features/create_cmake.prf
@@ -30,7 +30,6 @@ CMAKE_MODULE_NAME = $$cmakeModuleName($$
 
 split_incpath {
     CMAKE_ADD_SOURCE_INCLUDE_DIRS = true
-    CMAKE_NO_PRIVATE_INCLUDES = true # Don't add private includes in the build 
dir which don't exist
     CMAKE_SOURCE_INCLUDES = \
         $$cmakeTargetPaths($$QT_MODULE_INCLUDE_BASE 
$$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME})
     CMAKE_SOURCE_PRIVATE_INCLUDES = \
@@ -53,8 +52,6 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*"
     CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
 }
 
-!exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = 
true
-
 CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
 contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
     CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/

Reply via email to