Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2019-09-23 12:39:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-qt5" Mon Sep 23 12:39:18 2019 rev:16 rq:732423 version:1.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2018-04-29 19:37:38.937751398 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new.7948/fcitx-qt5.changes 2019-09-23 12:39:50.609586013 +0200 @@ -1,0 +2,6 @@ +Sat Sep 21 15:38:37 UTC 2019 - Yunhe Guo <[email protected]> + +- Add upstream patch fix-remove-paths-warnings.patch +- Change COPYING from %doc to %license + +------------------------------------------------------------------- New: ---- fix-remove-paths-warnings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-qt5.spec ++++++ --- /var/tmp/diff_new_pack.UUaQKy/_old 2019-09-23 12:39:51.245585908 +0200 +++ /var/tmp/diff_new_pack.UUaQKy/_new 2019-09-23 12:39:51.249585908 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx-qt5 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -27,6 +27,7 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM: fix compilation with Qt 5.11 (missing include) Patch0: fix-compilation-with-qt-5.11.patch +Patch1: fix-remove-paths-warnings.patch BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: fcitx-devel >= 4.2.9.1 @@ -71,7 +72,7 @@ %files -f fcitx-qt5.lang %defattr(-,root,root) -%doc COPYING +%license COPYING %dir %{_libdir}/fcitx/qt %{_libdir}/fcitx/libexec/fcitx-qt5-gui-wrapper %{_libdir}/libFcitxQt5*Addons.so.1 ++++++ fix-remove-paths-warnings.patch ++++++ diff --git a/platforminputcontext/fcitxwatcher.cpp b/platforminputcontext/fcitxwatcher.cpp index 1a2b4baa215237012fdd0c62e793d786d4e58b0c..6165a5bdd45146efc83545982cf37a5927c5613e 100644 --- a/platforminputcontext/fcitxwatcher.cpp +++ b/platforminputcontext/fcitxwatcher.cpp @@ -256,8 +256,12 @@ void FcitxWatcher::watchSocketFile() { } void FcitxWatcher::unwatchSocketFile() { - m_fsWatcher->removePaths(m_fsWatcher->files()); - m_fsWatcher->removePaths(m_fsWatcher->directories()); + if (!m_fsWatcher->files().isEmpty()) { + m_fsWatcher->removePaths(m_fsWatcher->files()); + } + if (!m_fsWatcher->directories().isEmpty()) { + m_fsWatcher->removePaths(m_fsWatcher->directories()); + } m_fsWatcher->disconnect(SIGNAL(fileChanged(QString))); m_fsWatcher->disconnect(SIGNAL(directoryChanged(QString))); }
