commit fcitx5-qt for openSUSE:Factory

6 Jan 2025

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package fcitx5-qt for openSUSE:Factory checked in at 2025-01-06 16:05:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx5-qt (Old)
 and      /work/SRC/openSUSE:Factory/.fcitx5-qt.new.1881 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "fcitx5-qt"

Mon Jan  6 16:05:15 2025 rev:15 rq:1235012 version:5.1.8

Changes:
--------

--- /work/SRC/openSUSE:Factory/fcitx5-qt/fcitx5-qt.changes	2024-10-15 14:59:15.598814708 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx5-qt.new.1881/fcitx5-qt.changes	2025-01-06 16:05:46.603155528 +0100
@@ -1,0 +2,6 @@
+Sun Jan  5 05:42:10 UTC 2025 - Marguerite Su <i@marguerite.su>
+
+- Update to 5.1.8
+  * bugfix for pinyin dict manager
+
+-------------------------------------------------------------------

Old:
----
  fcitx5-qt-5.1.7.tar.zst

New:
----
  fcitx5-qt-5.1.8.tar.zst

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

Other differences:
------------------
++++++ fcitx5-qt.spec ++++++
--- /var/tmp/diff_new_pack.Ol4KZs/_old	2025-01-06 16:05:47.235181760 +0100
+++ /var/tmp/diff_new_pack.Ol4KZs/_new	2025-01-06 16:05:47.239181927 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package fcitx5-qt
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
 
 %define build_qt5 1
 Name:           fcitx5-qt
-Version:        5.1.7
+Version:        5.1.8
 Release:        0
 Summary:        Qt library and IM module for fcitx5
 License:        BSD-3-Clause AND LGPL-2.1-or-later

++++++ fcitx5-qt-5.1.7.tar.zst -> fcitx5-qt-5.1.8.tar.zst ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.7/CMakeLists.txt new/fcitx5-qt-5.1.8/CMakeLists.txt
--- old/fcitx5-qt-5.1.7/CMakeLists.txt	2024-10-08 21:48:59.000000000 +0200
+++ new/fcitx5-qt-5.1.8/CMakeLists.txt	2024-10-18 02:39:59.000000000 +0200
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(fcitx5-qt VERSION 5.1.7)
+project(fcitx5-qt VERSION 5.1.8)
 set(FCITX5_QT_VERSION ${PROJECT_VERSION})
 
 set(REQUIRED_QT4_VERSION 4.8.0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.7/qt5/guiwrapper/mainwindow.cpp new/fcitx5-qt-5.1.8/qt5/guiwrapper/mainwindow.cpp
--- old/fcitx5-qt-5.1.7/qt5/guiwrapper/mainwindow.cpp	2024-10-08 21:48:59.000000000 +0200
+++ new/fcitx5-qt-5.1.8/qt5/guiwrapper/mainwindow.cpp	2024-10-18 02:39:59.000000000 +0200
@@ -9,10 +9,13 @@
 #include "fcitxqtconfiguifactory.h"
 #include "fcitxqtcontrollerproxy.h"
 #include "fcitxqtwatcher.h"
+#include <QCloseEvent>
 #include <QDebug>
 #include <QLocale>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QShowEvent>
+#include <QWidget>
 #include <QWindow>
 #include <fcitx-utils/i18n.h>
 
@@ -20,7 +23,7 @@
 
 MainWindow::MainWindow(const QString &path, FcitxQtConfigUIWidget *pluginWidget,
                        QWidget *parent)
-    : QDialog(parent), path_(path), watcher_(new FcitxQtWatcher(this)),
+    : QWidget(parent), path_(path), watcher_(new FcitxQtWatcher(this)),
       pluginWidget_(pluginWidget), proxy_(0) {
     setupUi(this);
     watcher_->setConnection(QDBusConnection::sessionBus());
@@ -145,6 +148,12 @@
     connect(this, &QObject::destroyed, mainWindow, &QObject::deleteLater);
     subWindow->setTransientParent(mainWindow);
 
-    QDialog::showEvent(event);
+    QWidget::showEvent(event);
+}
+
+void MainWindow::closeEvent(QCloseEvent *event) {
+    QWidget::closeEvent(event);
+
+    qApp->quit();
 }
 } // namespace fcitx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.7/qt5/guiwrapper/mainwindow.h new/fcitx5-qt-5.1.8/qt5/guiwrapper/mainwindow.h
--- old/fcitx5-qt-5.1.7/qt5/guiwrapper/mainwindow.h	2024-10-08 21:48:59.000000000 +0200
+++ new/fcitx5-qt-5.1.8/qt5/guiwrapper/mainwindow.h	2024-10-18 02:39:59.000000000 +0200
@@ -14,12 +14,13 @@
 #include "fcitxqtconfiguiwidget.h"
 #include "ui_mainwindow.h"
 #include <QDBusPendingCallWatcher>
+#include <QWidget>
 
 namespace fcitx {
 
 class FcitxQtControllerProxy;
 class FcitxQtWatcher;
-class MainWindow : public QDialog, public Ui::MainWindow {
+class MainWindow : public QWidget, public Ui::MainWindow {
     Q_OBJECT
 public:
     explicit MainWindow(const QString &path,
@@ -35,6 +36,7 @@
 
 protected:
     void showEvent(QShowEvent *event) override;
+    void closeEvent(QCloseEvent *event) override;
 
 private Q_SLOTS:
     void saveFinished();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.7/qt5/guiwrapper/wrapperapp.cpp new/fcitx5-qt-5.1.8/qt5/guiwrapper/wrapperapp.cpp
--- old/fcitx5-qt-5.1.7/qt5/guiwrapper/wrapperapp.cpp	2024-10-08 21:48:59.000000000 +0200
+++ new/fcitx5-qt-5.1.8/qt5/guiwrapper/wrapperapp.cpp	2024-10-18 02:39:59.000000000 +0200
@@ -14,6 +14,7 @@
 #include <QWindow>
 #include <fcitx-utils/i18n.h>
 #include <fcitx-utils/standardpath.h>
+#include <qnamespace.h>
 
 namespace fcitx {
 
@@ -69,15 +70,14 @@
         mainWindow_ = new MainWindow(path, widget);
         if (ok && winid) {
             mainWindow_->setParentWindow(winid);
+            mainWindow_->setWindowModality(Qt::WindowModal);
+            mainWindow_->setWindowFlag(Qt::Dialog);
         }
         QMetaObject::invokeMethod(this, "run", Qt::QueuedConnection);
     }
 }
 
-void WrapperApp::run() {
-    mainWindow_->exec();
-    QMetaObject::invokeMethod(this, "quit", Qt::QueuedConnection);
-}
+void WrapperApp::run() { mainWindow_->show(); }
 
 WrapperApp::~WrapperApp() {
     if (mainWindow_) {

    

Source-Sync

tags

participants (1)