commit qt5platform-plugins for openSUSE:Factory

Thu, 01 Jun 2023 08:20:18 -0700 

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package qt5platform-plugins for 
openSUSE:Factory checked in at 2023-06-01 17:19:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt5platform-plugins (Old)
 and      /work/SRC/openSUSE:Factory/.qt5platform-plugins.new.2531 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qt5platform-plugins"

Thu Jun  1 17:19:55 2023 rev:16 rq:1090219 version:5.6.12

Changes:
--------
--- /work/SRC/openSUSE:Factory/qt5platform-plugins/qt5platform-plugins.changes  
2023-04-27 20:02:29.830476712 +0200
+++ 
/work/SRC/openSUSE:Factory/.qt5platform-plugins.new.2531/qt5platform-plugins.changes
        2023-06-01 17:20:08.446381030 +0200
@@ -1,0 +2,11 @@
+Thu Jun  1 08:00:09 UTC 2023 - Hillwood Yang <[email protected]>
+
+- Refresh support-Qt-5_15_9.patch, fix crash bug 
+
+-------------------------------------------------------------------
+Wed May 31 08:52:06 UTC 2023 - Hillwood Yang <[email protected]>
+
+- Update version to 5.6.12
+  * Fix bugs
+
+-------------------------------------------------------------------

Old:
----
  qt5platform-plugins-5.6.9.tar.gz

New:
----
  qt5platform-plugins-5.6.12.tar.gz

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

Other differences:
------------------
++++++ qt5platform-plugins.spec ++++++
--- /var/tmp/diff_new_pack.B2rXHF/_old  2023-06-01 17:20:08.946383994 +0200
+++ /var/tmp/diff_new_pack.B2rXHF/_new  2023-06-01 17:20:08.950384018 +0200
@@ -21,7 +21,7 @@
 # %define   qt_version      5.15.5
 
 Name:           qt5platform-plugins
-Version:        5.6.9
+Version:        5.6.12
 Release:        0
 Summary:        Qt platform integration plugins
 License:        LGPL-3.0-or-later
@@ -108,11 +108,13 @@
 # sed -i '/wayland/d' qt5platform-plugins.pro
 
 %build
+export Qt_version="`rpm -q --queryformat '%%{VERSION}' libQt5Core5|cut -c 1-6`"
 qmake-qt5 DEFINES+=QT_NO_DEBUG_OUTPUT \
           PREFIX=%{_prefix} \
           LIB_INSTALL_DIR=%{_libdir} \
           LIBSUFFIX=%{lib} \
-          CONFIG+=DISABLE_WAYLAND
+          CONFIG+=DISABLE_WAYLAND \
+          
QT_XCB_PRIVATE_INCLUDE=%{_builddir}/%{name}-%{version}/xcb/libqt5xcbqpa-dev/$Qt_version
 %make_build
 
 %install

++++++ qt5platform-plugins-5.6.9.tar.gz -> qt5platform-plugins-5.6.12.tar.gz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qt5platform-plugins-5.6.9/.github/ISSUE_TEMPLATE/config.yml 
new/qt5platform-plugins-5.6.12/.github/ISSUE_TEMPLATE/config.yml
--- old/qt5platform-plugins-5.6.9/.github/ISSUE_TEMPLATE/config.yml     
1970-01-01 01:00:00.000000000 +0100
+++ new/qt5platform-plugins-5.6.12/.github/ISSUE_TEMPLATE/config.yml    
2023-05-15 02:26:30.000000000 +0200
@@ -0,0 +1,20 @@
+blank_issues_enabled: false
+contact_links:
+  - name: BUG Report | 缺陷报告
+    url: 
https://github.com/linuxdeepin/dtk/issues/new?assignees=&labels=&template=bug-report.yml
+    about: Please create bug reports to the issue board in our dtk repo.
+  
+  - name: docs-update | 文档补充
+    url: 
https://github.com/linuxdeepin/dtk/issues/new?assignees=&labels=&template=docs-update.yml
+    about: Please create docs-update to the issue board in our dtk repo.
+
+  - name: unit-test-report | 单元测试报告
+    url: 
https://github.com/linuxdeepin/dtk/issues/new?assignees=&labels=&template=unit-test-report.yml
+    about: Please create unit-test-report to the issue board in our dtk repo.
+
+  - name: Feature Request | 特性请求
+    url: 
https://github.com/linuxdeepin/developer-center/discussions/new?category=features-request-ideas-%E7%89%B9%E6%80%A7%E8%AF%B7%E6%B1%82-%E5%A4%B4%E8%84%91%E9%A3%8E%E6%9A%B4
+    about: Please create feature requests to the discussion board in our 
developer-center repo.
+  - name: General Discussion & Questions | 常规讨论与问答
+    url: 
https://github.com/linuxdeepin/developer-center/discussions/categories/q-a-%E9%97%AE%E7%AD%94%E6%9D%BF%E5%9D%97
+    about: Please use the discussion board in our developer-center repo.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qt5platform-plugins-5.6.9/.github/workflows/call-build-deb.yml 
new/qt5platform-plugins-5.6.12/.github/workflows/call-build-deb.yml
--- old/qt5platform-plugins-5.6.9/.github/workflows/call-build-deb.yml  
2023-04-03 04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/.github/workflows/call-build-deb.yml 
1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-name: Call build-deb
-on:
-  pull_request_target:
-    paths-ignore:
-      - ".github/workflows/**"
-    types: [ opened, closed, synchronize ]
-
-concurrency:
-  group: ${{ github.workflow }}-pull/${{ github.event.number }}
-  cancel-in-progress: true
-
-jobs:
-  check_job:
-    if: github.event.action != 'closed' || github.event.pull_request.merged
-    uses: linuxdeepin/.github/.github/workflows/build-deb.yml@master
-    secrets:
-      BridgeToken: ${{ secrets.BridgeToken }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qt5platform-plugins-5.6.9/.github/workflows/call-chatOps.yml 
new/qt5platform-plugins-5.6.12/.github/workflows/call-chatOps.yml
--- old/qt5platform-plugins-5.6.9/.github/workflows/call-chatOps.yml    
2023-04-03 04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/.github/workflows/call-chatOps.yml   
2023-05-15 02:26:30.000000000 +0200
@@ -6,5 +6,4 @@
 jobs:
   chatopt:
     uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qt5platform-plugins-5.6.9/.github/workflows/call-tag-build.yml 
new/qt5platform-plugins-5.6.12/.github/workflows/call-tag-build.yml
--- old/qt5platform-plugins-5.6.9/.github/workflows/call-tag-build.yml  
2023-04-03 04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/.github/workflows/call-tag-build.yml 
1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-name: tag build
-on:
-  push:
-    tags: "*"
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    uses: linuxdeepin/.github/.github/workflows/tag-build.yml@master
-    secrets: inherit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qt5platform-plugins-5.6.9/.obs/workflows.yml 
new/qt5platform-plugins-5.6.12/.obs/workflows.yml
--- old/qt5platform-plugins-5.6.9/.obs/workflows.yml    2023-04-03 
04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/.obs/workflows.yml   2023-05-15 
02:26:30.000000000 +0200
@@ -23,6 +23,13 @@
             architectures:
               - x86_64
 
+          - name: archlinux
+            paths:
+              - target_project: deepin:CI
+                target_repository: archlinux
+            architectures:
+              - x86_64
+
   filters:
     event: pull_request
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qt5platform-plugins-5.6.9/archlinux/PKGBUILD 
new/qt5platform-plugins-5.6.12/archlinux/PKGBUILD
--- old/qt5platform-plugins-5.6.9/archlinux/PKGBUILD    2023-04-03 
04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/archlinux/PKGBUILD   2023-05-15 
02:26:30.000000000 +0200
@@ -2,6 +2,9 @@
 pkgname=deepin-qt5platform-plugins-git
 pkgver=5.0.40.r14.gf817781
 pkgrel=1
+sourcename=dde-qt5platform-plugins
+sourcetars=("$sourcename"_"$pkgver".tar.xz)
+sourcedir="qt5platform-plugins"
 pkgdesc='Qt platform plugins for DDE'
 arch=('x86_64' 'aarch64')
 url="https://github.com/linuxdeepin/qt5platform-plugins";
@@ -11,11 +14,11 @@
 depends=('cairo' 'kwayland' 'qt5-wayland' 'qt5-x11extras')
 makedepends=('git' 'expac' 'qt5-xcb-private-headers' 'libglvnd' 'libxcb')
 groups=('deepin-git')
-source=('source.tar.gz')
+source=("${sourcetars[@]}")
 sha512sums=('SKIP')
 
 prepare() {
-    cd $deepin_source_name
+  cd $sourcedir
 
   rm -r xcb/libqt5xcbqpa-dev wayland/qtwayland-dev
   # Disable wayland for now: 
https://github.com/linuxdeepin/qt5platform-plugins/issues/47
@@ -27,12 +30,12 @@
 }
 
 build() {
-  cd $deepin_source_name
+  cd $sourcedir
   qmake-qt5 PREFIX=/usr QT_XCB_PRIVATE_INCLUDE=/usr/include/qtxcb-private
   make
 }
 
 package() {
-  cd $deepin_source_name
+  cd $sourcedir
   make INSTALL_ROOT="$pkgdir" install
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qt5platform-plugins-5.6.9/debian/changelog 
new/qt5platform-plugins-5.6.12/debian/changelog
--- old/qt5platform-plugins-5.6.9/debian/changelog      2023-04-03 
04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/debian/changelog     2023-05-15 
02:26:30.000000000 +0200
@@ -1,3 +1,11 @@
+dde-qt5platform-plugins (5.6.11) unstable; urgency=medium
+
+  * Release 5.6.11
+  * FIX dtk#63
+  * FIX bug-195723 primary screen not right at startup
+
+ -- Deepin Packages Builder <[email protected]>  Mon, 08 May 2023 13:57:30 
+0800
+
 dde-qt5platform-plugins (5.6.9) unstable; urgency=medium
 
   * Release 5.6.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qt5platform-plugins-5.6.9/wayland/dwayland/dhighdpi.cpp 
new/qt5platform-plugins-5.6.12/wayland/dwayland/dhighdpi.cpp
--- old/qt5platform-plugins-5.6.9/wayland/dwayland/dhighdpi.cpp 2023-04-03 
04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/wayland/dwayland/dhighdpi.cpp        
2023-05-15 02:26:30.000000000 +0200
@@ -107,7 +107,9 @@
 
     int dpi = 0;
 
-    QVariant value = dXSettings->globalSettings()->setting("Qt/DPI/" + 
s->name().toLocal8Bit());    bool ok = false;
+    QVariant value = dXSettings->globalSettings()->setting("Qt/DPI/" + 
s->name().toLocal8Bit());
+
+    bool ok = false;
 
     dpi = value.toInt(&ok);
 
@@ -118,7 +120,9 @@
     }
 
     // fallback
-    if (!ok) {
+    if (!ok || dpi == 0) {
+        qWarning() << "dpi is invalid got from xsettings(Qt/DPI/ and Xft/DPI), 
"
+                      "fallback to get dpi from QWaylandScreen::logicalDpi()";
         return s->QtWaylandClient::QWaylandScreen::logicalDpi();
     }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qt5platform-plugins-5.6.9/wayland/dwayland/dnotitlebarwindowhelper_wl.cpp 
new/qt5platform-plugins-5.6.12/wayland/dwayland/dnotitlebarwindowhelper_wl.cpp
--- 
old/qt5platform-plugins-5.6.9/wayland/dwayland/dnotitlebarwindowhelper_wl.cpp   
    2023-04-03 04:29:54.000000000 +0200
+++ 
new/qt5platform-plugins-5.6.12/wayland/dwayland/dnotitlebarwindowhelper_wl.cpp  
    2023-05-15 02:26:30.000000000 +0200
@@ -15,6 +15,7 @@
 #include <QMetaProperty>
 #include <QScreen>
 #include <qpa/qplatformwindow.h>
+#include <QtWaylandClientVersion>
 
 #define private public
 #include "QtWaylandClient/private/qwaylandintegration_p.h"
@@ -215,10 +216,9 @@
 {
     // QWaylandWindow::startSystemMove
     if (window && window->handle()) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+#if QTWAYLANDCLIENT_VERSION < QT_VERSION_CHECK(5, 15, 0)
                 static_cast<QtWaylandClient::QWaylandWindow 
*>(window->handle())->startSystemMove(QCursor::pos());
-#endif
-#if QT_VERSION > QT_VERSION_CHECK(5, 14, 9)
+#else
                 static_cast<QtWaylandClient::QWaylandWindow 
*>(window->handle())->startSystemMove();
 #endif
     }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qt5platform-plugins-5.6.9/wayland/dwayland/dwaylandintegration.cpp 
new/qt5platform-plugins-5.6.12/wayland/dwayland/dwaylandintegration.cpp
--- old/qt5platform-plugins-5.6.9/wayland/dwayland/dwaylandintegration.cpp      
2023-04-03 04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/wayland/dwayland/dwaylandintegration.cpp     
2023-05-15 02:26:30.000000000 +0200
@@ -194,6 +194,9 @@
     // 增加rect的属性，保存主屏的具体坐标，不依靠å…
¶name判断(根据name查找对应的屏幕时概率性出错，æ 
¹æ®ä¸»å±çš„rect确定哪一个QScreen才是主屏)
     
dXSettings->globalSettings()->registerCallbackForProperty(XSETTINGS_PRIMARY_MONITOR_RECT,
 onPrimaryRectChanged, 
reinterpret_cast<void*>(XSettingType::Dde_PrimaryMonitorRect));
 
+    //初始化时应该设一次主屏，防止应用启动时主屏闪变
+    onPrimaryRectChanged(nullptr, XSETTINGS_PRIMARY_MONITOR_RECT, QVariant(), 
reinterpret_cast<void*>(XSettingType::Dde_PrimaryMonitorRect));
+
     QTimer *m_delayTimer = new QTimer;
     m_delayTimer->setInterval(10);
     m_delayTimer->setSingleShot(true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qt5platform-plugins-5.6.9/wayland/wayland-shell/dwaylandshellmanager.cpp 
new/qt5platform-plugins-5.6.12/wayland/wayland-shell/dwaylandshellmanager.cpp
--- 
old/qt5platform-plugins-5.6.9/wayland/wayland-shell/dwaylandshellmanager.cpp    
    2023-04-03 04:29:54.000000000 +0200
+++ 
new/qt5platform-plugins-5.6.12/wayland/wayland-shell/dwaylandshellmanager.cpp   
    2023-05-15 02:26:30.000000000 +0200
@@ -349,10 +349,10 @@
     HookOverride(window, &QPlatformWindow::frameMargins, 
DWaylandShellManager::frameMargins);
     HookOverride(window, &QPlatformWindow::setWindowFlags, 
DWaylandShellManager::setWindowFlags);
 
-    QObject::connect(window, &QWaylandWindow::wlSurfaceCreated, [window] {
-        handleGeometryChange(window);
-        handleWindowStateChanged(window);
-    });
+    if (window->wlSurface())
+        onWlSurfaceCreated(window);
+    else
+        QObject::connect(window, &QWaylandWindow::wlSurfaceCreated, 
std::bind(onWlSurfaceCreated, window));
 
     // 设置窗口位置, 
默认都需要设置，同时判断如果窗口并没有移动过，则不需要再设置位置，而是由窗管默认平铺显示
     bool bSetPosition = true;
@@ -386,13 +386,6 @@
         window->sendProperty(QStringLiteral(_DWAYALND_ "staysontop"), true);
     }
 
-    // 如果kwayland的server窗口装
饰已转变完成，则为窗口创建边框
-    if (kwayland_ssd) {
-        QObject::connect(window, &QWaylandWindow::wlSurfaceCreated, 
std::bind(createServerDecoration, window));
-    } else {
-        qDebug()<<"====kwayland_ssd creat failed";
-    }
-
     return surface;
 }
 
@@ -781,6 +774,13 @@
     }
 }
 
+void DWaylandShellManager::onWlSurfaceCreated(QWaylandWindow *window)
+{
+    handleGeometryChange(window);
+    handleWindowStateChanged(window);
+    createServerDecoration(window);
+}
+
 /*
  * @brief setCursorPoint  设置光标在屏幕中的绝对位置
  * @param pos
@@ -901,6 +901,12 @@
 
 void DWaylandShellManager::createServerDecoration(QWaylandWindow *window)
 {
+    // 如果kwayland的server窗口装
饰已转变完成，则为窗口创建边框
+    if (!kwayland_ssd) {
+        qDebug()<<"====kwayland_ssd creat failed";
+        return;
+    }
+
     // 通过窗口属性控制是否显示最小化和最大化按钮
     QWaylandShellSurface *q_shell_surface = window->shellSurface();
     if (q_shell_surface) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qt5platform-plugins-5.6.9/wayland/wayland-shell/dwaylandshellmanager.h 
new/qt5platform-plugins-5.6.12/wayland/wayland-shell/dwaylandshellmanager.h
--- old/qt5platform-plugins-5.6.9/wayland/wayland-shell/dwaylandshellmanager.h  
2023-04-03 04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/wayland/wayland-shell/dwaylandshellmanager.h 
2023-05-15 02:26:30.000000000 +0200
@@ -103,6 +103,7 @@
     static void updateWindowBlurAreasForWM(QWaylandWindow *wlWindow, const 
QString &name, const QVariant &value);
     static void setDockAppItemMinimizedGeometry(QWaylandShellSurface *surface, 
const QVariant var);
 
+    static void onWlSurfaceCreated(QWaylandWindow *window);
 private:
     // 
用于记录设置过以_DWAYALND_开头的属性，当kwyalnd_shell对象创建以后要使这些属性生效
     static QList<QPointer<QWaylandWindow>> send_property_window_list;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qt5platform-plugins-5.6.9/xcb/dhighdpi.cpp 
new/qt5platform-plugins-5.6.12/xcb/dhighdpi.cpp
--- old/qt5platform-plugins-5.6.9/xcb/dhighdpi.cpp      2023-04-03 
04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/xcb/dhighdpi.cpp     2023-05-15 
02:26:30.000000000 +0200
@@ -116,7 +116,9 @@
     }
 
     // fallback
-    if (!ok) {
+    if (!ok || dpi == 0) {
+        qWarning() << "dpi is invalid got from xsettings(Qt/DPI/ and Xft/DPI), 
"
+                      "fallback to get dpi from QXcbScreen::logicalDpi()";
         return s->QXcbScreen::logicalDpi();
     }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qt5platform-plugins-5.6.9/xcb/windoweventhook.cpp 
new/qt5platform-plugins-5.6.12/xcb/windoweventhook.cpp
--- old/qt5platform-plugins-5.6.9/xcb/windoweventhook.cpp       2023-04-03 
04:29:54.000000000 +0200
+++ new/qt5platform-plugins-5.6.12/xcb/windoweventhook.cpp      2023-05-15 
02:26:30.000000000 +0200
@@ -263,6 +263,10 @@
         dropData->setProperty("IsDirectSaveMode", directSaveMode);
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
+        // Drop coming from another app? Update buttons.
+        if (!drag->currentDrag())
+            QGuiApplicationPrivate::mouse_buttons = 
window->connection()->queryMouseButtons();
+
         QPlatformDropQtResponse response = 
QWindowSystemInterface::handleDrop(drag->currentWindow.data(),
                                                                             
dropData, drag->currentPosition,
                                                                               
supported_drop_actions,

++++++ support-Qt-5_15_9.patch ++++++
++++ 831 lines (skipped)
++++ between 
/work/SRC/openSUSE:Factory/qt5platform-plugins/support-Qt-5_15_9.patch
++++ and 
/work/SRC/openSUSE:Factory/.qt5platform-plugins.new.2531/support-Qt-5_15_9.patch

Reply via email to