Hello community,
here is the log from the commit of package libqt5-qtx11extras for
openSUSE:Factory checked in at 2016-06-25 01:55:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtx11extras (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtx11extras"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtx11extras/libqt5-qtx11extras.changes
2016-05-17 17:06:19.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new/libqt5-qtx11extras.changes
2016-06-25 01:55:41.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 8 14:15:24 UTC 2016 - [email protected]
+
+- Update to 5.6.1
+ * For more details please see:
+ http://blog.qt.io/blog/2016/06/08/qt-5-6-1-released/
+
+-------------------------------------------------------------------
Old:
----
qtx11extras-opensource-src-5.6.0.tar.xz
New:
----
qtx11extras-opensource-src-5.6.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtx11extras.spec ++++++
--- /var/tmp/diff_new_pack.bud6WR/_old 2016-06-25 01:55:42.000000000 +0200
+++ /var/tmp/diff_new_pack.bud6WR/_new 2016-06-25 01:55:42.000000000 +0200
@@ -21,16 +21,17 @@
%define libname libQt5X11Extras5
Name: libqt5-qtx11extras
-Version: 5.6.0
+Version: 5.6.1
Release: 0
%define base_name libqt5
-%define real_version 5.6.0
-%define so_version 5.6.0
+%define real_version 5.6.1
+%define so_version 5.6.1
%define tar_version qtx11extras-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
BuildRequires: fdupes
-BuildRequires: libQt5Gui-private-headers-devel
+BuildRequires: libQt5Gui-private-headers-devel >= %{version}
+BuildRequires: libQt5PlatformHeaders-devel >= %{version}
%if %qt5_snapshot
#to create the forwarding headers
BuildRequires: perl
++++++ qtx11extras-opensource-src-5.6.0.tar.xz ->
qtx11extras-opensource-src-5.6.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtx11extras-opensource-src-5.6.0/.qmake.conf
new/qtx11extras-opensource-src-5.6.1/.qmake.conf
--- old/qtx11extras-opensource-src-5.6.0/.qmake.conf 2015-08-21
15:00:41.000000000 +0200
+++ new/qtx11extras-opensource-src-5.6.1/.qmake.conf 2016-03-05
22:08:05.000000000 +0100
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.6.0
+MODULE_VERSION = 5.6.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtx11extras-opensource-src-5.6.0/.tag
new/qtx11extras-opensource-src-5.6.1/.tag
--- old/qtx11extras-opensource-src-5.6.0/.tag 2015-08-21 15:00:41.000000000
+0200
+++ new/qtx11extras-opensource-src-5.6.1/.tag 2016-03-05 22:08:05.000000000
+0100
@@ -1 +1 @@
-d64ee96f0df4d3baa6959b8552bc59d53cb0b451
+f27489d66cc6d8263130451c26c7e4ae40acc6b4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtx11extras-opensource-src-5.6.0/include/QtX11Extras/qtx11extrasversion.h
new/qtx11extras-opensource-src-5.6.1/include/QtX11Extras/qtx11extrasversion.h
---
old/qtx11extras-opensource-src-5.6.0/include/QtX11Extras/qtx11extrasversion.h
2016-03-13 17:25:41.000000000 +0100
+++
new/qtx11extras-opensource-src-5.6.1/include/QtX11Extras/qtx11extrasversion.h
2016-06-02 09:03:53.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTX11EXTRAS_VERSION_H
#define QT_QTX11EXTRAS_VERSION_H
-#define QTX11EXTRAS_VERSION_STR "5.6.0"
+#define QTX11EXTRAS_VERSION_STR "5.6.1"
-#define QTX11EXTRAS_VERSION 0x050600
+#define QTX11EXTRAS_VERSION 0x050601
#endif // QT_QTX11EXTRAS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtx11extras-opensource-src-5.6.0/src/x11extras/qx11info_x11.cpp
new/qtx11extras-opensource-src-5.6.1/src/x11extras/qx11info_x11.cpp
--- old/qtx11extras-opensource-src-5.6.0/src/x11extras/qx11info_x11.cpp
2015-08-21 15:00:41.000000000 +0200
+++ new/qtx11extras-opensource-src-5.6.1/src/x11extras/qx11info_x11.cpp
2016-03-05 22:08:05.000000000 +0100
@@ -43,6 +43,7 @@
#include <qpa/qplatformnativeinterface.h>
#include <qpa/qplatformwindow.h>
+#include <QtPlatformHeaders/qxcbscreenfunctions.h>
#include <qscreen.h>
#include <qwindow.h>
#include <qguiapplication.h>
@@ -50,6 +51,14 @@
QT_BEGIN_NAMESPACE
+static QScreen *findScreenForVirtualDesktop(int virtualDesktopNumber)
+{
+ foreach (QScreen *screen, QGuiApplication::screens()) {
+ if (QXcbScreenFunctions::virtualDesktopNumber(screen) ==
virtualDesktopNumber)
+ return screen;
+ }
+ return Q_NULLPTR;
+}
/*!
\class QX11Info
@@ -103,11 +112,11 @@
return qRound(scr->logicalDotsPerInchX());
}
- QList<QScreen *> screens = QGuiApplication::screens();
- if (screen >= screens.size())
+ QScreen *scr = findScreenForVirtualDesktop(screen);
+ if (!scr)
return 0;
- return screens[screen]->logicalDotsPerInchX();
+ return scr->logicalDotsPerInchX();
}
/*!
@@ -130,11 +139,11 @@
return qRound(scr->logicalDotsPerInchY());
}
- QList<QScreen *> screens = QGuiApplication::screens();
- if (screen > screens.size())
+ QScreen *scr = findScreenForVirtualDesktop(screen);
+ if (!scr)
return 0;
- return screens[screen]->logicalDotsPerInchY();
+ return scr->logicalDotsPerInchY();
}
/*!
@@ -151,11 +160,13 @@
{
if (!qApp)
return 0;
- Q_UNUSED(screen);
QPlatformNativeInterface *native = qApp->platformNativeInterface();
if (!native)
return 0;
- return
static_cast<xcb_window_t>(reinterpret_cast<quintptr>(native->nativeResourceForIntegration(QByteArrayLiteral("rootwindow"))));
+ QScreen *scr = screen == -1 ? QGuiApplication::primaryScreen() :
findScreenForVirtualDesktop(screen);
+ if (!scr)
+ return 0;
+ return
static_cast<xcb_window_t>(reinterpret_cast<quintptr>(native->nativeResourceForScreen(QByteArrayLiteral("rootwindow"),
scr)));
}
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtx11extras-opensource-src-5.6.0/src/x11extras/x11extras.pro
new/qtx11extras-opensource-src-5.6.1/src/x11extras/x11extras.pro
--- old/qtx11extras-opensource-src-5.6.0/src/x11extras/x11extras.pro
2015-08-21 15:00:41.000000000 +0200
+++ new/qtx11extras-opensource-src-5.6.1/src/x11extras/x11extras.pro
2016-03-05 22:08:05.000000000 +0100
@@ -4,9 +4,9 @@
QMAKE_DOCS = $$PWD/doc/qtx11extras.qdocconf
-load(qt_module)
-
-QT += gui-private
+QT_PRIVATE += gui-private
HEADERS += qx11info_x11.h
SOURCES += qx11info_x11.cpp
+
+load(qt_module)
