commit fcitx-qt5 for openSUSE:Factory
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 + +- 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))); }
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2018-04-29 19:37:37 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Sun Apr 29 19:37:37 2018 rev:15 rq:602233 version:1.2.2 Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2018-02-13 10:29:48.308225137 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2018-04-29 19:37:38.937751398 +0200 @@ -1,0 +2,6 @@ +Sat Apr 28 06:50:53 UTC 2018 - lbeltr...@kde.org + +- Add upstream patch fix-compilation-with-qt-5.11.patch: + * Fix compilation with Qt 5.11 (missing include) + +--- New: fix-compilation-with-qt-5.11.patch Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.htUxjb/_old 2018-04-29 19:37:39.677724262 +0200 +++ /var/tmp/diff_new_pack.htUxjb/_new 2018-04-29 19:37:39.681724115 +0200 @@ -20,11 +20,13 @@ Version:1.2.2 Release:0 Summary:Fcitx QT5 Input Context -License:GPL-2.0+ AND GPL-3.0+ AND BSD-3-Clause +License:GPL-2.0-or-later AND GPL-3.0-or-later AND BSD-3-Clause Group: System/I18n/Chinese Url:https://github.com/fcitx/fcitx-qt5 Source: https://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM: fix compilation with Qt 5.11 (missing include) +Patch0: fix-compilation-with-qt-5.11.patch BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: fcitx-devel >= 4.2.9.1 @@ -53,6 +55,7 @@ %prep %setup -q +%autopatch -p1 %build %cmake .. ++ fix-compilation-with-qt-5.11.patch ++ >From af033e3d5305108eecc568adff7f8b2da5831ed6 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 25 Mar 2018 10:16:16 -0700 Subject: [PATCH] Fix #34 Add include --- quickphrase-editor/batchdialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/quickphrase-editor/batchdialog.cpp b/quickphrase-editor/batchdialog.cpp index 5b4c72c..4038db5 100644 --- a/quickphrase-editor/batchdialog.cpp +++ b/quickphrase-editor/batchdialog.cpp @@ -17,6 +17,7 @@ * * ***/ +#include #include "batchdialog.h" #include "common.h" #include "ui_batchdialog.h"
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2018-02-13 10:29:40 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Tue Feb 13 10:29:40 2018 rev:14 rq:575530 version:1.2.2 Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2017-12-19 10:58:57.180002013 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2018-02-13 10:29:48.308225137 +0100 @@ -1,0 +2,7 @@ +Sat Feb 10 22:11:52 UTC 2018 - opens...@trummer.xyz + +- update version 1.2.2 + * We already changed reset of code to use "isRelease" for +filterEventFallback. This check should be changed accordingly. + +--- Old: fcitx-qt5-1.2.1.tar.xz New: fcitx-qt5-1.2.2.tar.xz Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.H6ajKt/_old 2018-02-13 10:29:50.000164173 +0100 +++ /var/tmp/diff_new_pack.H6ajKt/_new 2018-02-13 10:29:50.000164173 +0100 @@ -1,7 +1,7 @@ # # spec file for package fcitx-qt5 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,13 +17,13 @@ Name: fcitx-qt5 -Version:1.2.1 +Version:1.2.2 Release:0 Summary:Fcitx QT5 Input Context License:GPL-2.0+ AND GPL-3.0+ AND BSD-3-Clause Group: System/I18n/Chinese Url:https://github.com/fcitx/fcitx-qt5 -Source: http://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz +Source: https://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: cmake BuildRequires: extra-cmake-modules ++ fcitx-qt5-1.2.1.tar.xz -> fcitx-qt5-1.2.2.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-1.2.1/platforminputcontext/qfcitxplatforminputcontext.cpp new/fcitx-qt5-1.2.2/platforminputcontext/qfcitxplatforminputcontext.cpp --- old/fcitx-qt5-1.2.1/platforminputcontext/qfcitxplatforminputcontext.cpp 2017-11-22 20:30:46.0 +0100 +++ new/fcitx-qt5-1.2.2/platforminputcontext/qfcitxplatforminputcontext.cpp 2018-01-25 00:54:09.0 +0100 @@ -19,6 +19,7 @@ */ #include +#include #include #include #include @@ -64,15 +65,6 @@ return locale; } -struct xkb_context *_xkb_context_new_helper() { -struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); -if (context) { -xkb_context_set_log_level(context, XKB_LOG_LEVEL_CRITICAL); -} - -return context; -} - static bool objectAcceptsInputMethod() { bool enabled = false; QObject *object = qApp->focusObject(); @@ -85,6 +77,15 @@ return enabled; } +struct xkb_context *_xkb_context_new_helper() { +struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); +if (context) { +xkb_context_set_log_level(context, XKB_LOG_LEVEL_CRITICAL); +} + +return context; +} + QFcitxPlatformInputContext::QFcitxPlatformInputContext() : m_watcher(new FcitxWatcher(this)), m_cursorPos(0), m_useSurroundingText(false), @@ -705,7 +706,7 @@ if (!proxy->processKeyEventResult(*watcher)) { filtered = -filterEventFallback(sym, code, state, type == QEvent::KeyPress); +filterEventFallback(sym, code, state, type == QEvent::KeyRelease); } else { filtered = true; }
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2017-12-19 10:58:55 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Tue Dec 19 10:58:55 2017 rev:13 rq:558108 version:1.2.1 Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2017-02-15 10:05:47.321410843 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2017-12-19 10:58:57.180002013 +0100 @@ -1,0 +2,27 @@ +Sat Dec 2 05:24:58 UTC 2017 - i...@marguerite.su + +- update version 1.2.1 + * fix issue #27 and #28 + * Add relative rect support +- changes in version 1.2.0 + * Relicense platforminputcontext/ to BSD + * do the real unwatch + * prefer to recheck the availability after original service gone + * set display type for fcitx5 + * add fcitx 5 format support + * Adapt changes in fcitx5-qt to fix commitPreedit. + * implement compatibility layer for fcitx5 + * try to reimplement im module with lgpl free code + * make sure that quickphrae editor does not compile with qt4 header + * move quickphrase editor to fcitx-qt5 +- changes in version 1.1.1 + * fix high dpi screen position, only happen when you have two +high dpi screen + * use new cmake for package config + * enforce cmake 3.1 + * handle the missing password flag + * QInputMethod::update shouldn't be used by input method, +just do query + * workaround some qquickwidget bug + +--- Old: fcitx-qt5-1.1.0.tar.xz New: fcitx-qt5-1.2.1.tar.xz Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.RBJdBN/_old 2017-12-19 10:58:57.931965713 +0100 +++ /var/tmp/diff_new_pack.RBJdBN/_new 2017-12-19 10:58:57.931965713 +0100 @@ -17,10 +17,10 @@ Name: fcitx-qt5 -Version:1.1.0 +Version:1.2.1 Release:0 Summary:Fcitx QT5 Input Context -License:GPL-2.0+ +License:GPL-2.0+ AND GPL-3.0+ AND BSD-3-Clause Group: System/I18n/Chinese Url:https://github.com/fcitx/fcitx-qt5 Source: http://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz @@ -32,6 +32,7 @@ BuildRequires: libicu-devel BuildRequires: libqt5-qtbase-devel BuildRequires: libqt5-qtbase-private-headers-devel +BuildRequires: libqt5-qtx11extras-devel BuildRequires: libxkbcommon-devel BuildRequires: xz # fcitx-qt5 is using private QPA API, which can, and does break BC even in point releases, @@ -60,15 +61,19 @@ %install %cmake_install +%find_lang fcitx-qt5 + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files +%files -f fcitx-qt5.lang %defattr(-,root,root) %doc COPYING +%dir %{_libdir}/fcitx/qt %{_libdir}/fcitx/libexec/fcitx-qt5-gui-wrapper %{_libdir}/libFcitxQt5*Addons.so.1 %{_libdir}/libFcitxQt5*Addons.so.1.0 +%{_libdir}/fcitx/qt/libfcitx-quickphrase-editor5.so %dir %{_libdir}/qt5/plugins/ %dir %{_libdir}/qt5/plugins/platforminputcontexts/ %{_libdir}/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so ++ fcitx-qt5-1.1.0.tar.xz -> fcitx-qt5-1.2.1.tar.xz ++ 31926 lines of diff (skipped)
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2017-02-15 10:05:46 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2016-12-03 18:28:06.0 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2017-02-15 10:05:47.321410843 +0100 @@ -1,0 +2,7 @@ +Sat Feb 11 22:55:55 UTC 2017 - i...@marguerite.su + +- update version 1.1.0 + * added guiwrapper for fcitx-qt5 + * fix build and add support for webengine + +--- Old: fcitx-qt5-1.0.6.tar.xz New: fcitx-qt5-1.1.0.tar.xz Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.Q8SAyp/_old 2017-02-15 10:05:47.697357889 +0100 +++ /var/tmp/diff_new_pack.Q8SAyp/_new 2017-02-15 10:05:47.701357326 +0100 @@ -1,7 +1,7 @@ # # spec file for package fcitx-qt5 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,7 +17,7 @@ Name: fcitx-qt5 -Version:1.0.6 +Version:1.1.0 Release:0 Summary:Fcitx QT5 Input Context License:GPL-2.0+ @@ -34,10 +34,11 @@ BuildRequires: libqt5-qtbase-private-headers-devel BuildRequires: libxkbcommon-devel BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build # fcitx-qt5 is using private QPA API, which can, and does break BC even in point releases, # so we need to hardcode libQt5Gui5 version %requires_eq libQt5Gui5 +BuildRoot: %{_tmppath}/%{name}-%{version}-build + %description A QT5 input context plugin of Fcitx IM Framework. @@ -60,12 +61,12 @@ %cmake_install %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc COPYING +%{_libdir}/fcitx/libexec/fcitx-qt5-gui-wrapper %{_libdir}/libFcitxQt5*Addons.so.1 %{_libdir}/libFcitxQt5*Addons.so.1.0 %dir %{_libdir}/qt5/plugins/ ++ fcitx-qt5-1.0.6.tar.xz -> fcitx-qt5-1.1.0.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-1.0.6/.gitignore new/fcitx-qt5-1.1.0/.gitignore --- old/fcitx-qt5-1.0.6/.gitignore 2016-10-13 01:26:34.0 +0200 +++ new/fcitx-qt5-1.1.0/.gitignore 2017-02-08 06:58:26.0 +0100 @@ -6,3 +6,4 @@ *.kate-swp *.orig tags +run.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-1.0.6/CMakeLists.txt new/fcitx-qt5-1.1.0/CMakeLists.txt --- old/fcitx-qt5-1.0.6/CMakeLists.txt 2016-10-13 01:26:34.0 +0200 +++ new/fcitx-qt5-1.1.0/CMakeLists.txt 2017-02-08 06:58:26.0 +0100 @@ -2,7 +2,7 @@ project(fcitx-qt5) -set(FcitxQt5_VERSION 1.0.0) +set(FcitxQt5_VERSION 1.1.0) set(REQUIRED_QT_VERSION 5.1.0) find_package(ECM 1.4.0 REQUIRED NO_MODULE) @@ -29,12 +29,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Widgets) find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED Private) find_package(XKBCommon 0.5.0 REQUIRED COMPONENTS XKBCommon) -pkg_check_modules(FCITX_UTILS fcitx-utils REQUIRED) -pkg_check_modules(FCITX_CONFIG fcitx-config REQUIRED) +find_package(Fcitx 4.2.8 REQUIRED) +find_package(LibIntl REQUIRED) set(FcitxQt5_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/FcitxQt5) add_subdirectory(dbusaddons) add_subdirectory(widgetsaddons) add_subdirectory(platforminputcontext) +add_subdirectory(guiwrapper) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-1.0.6/cmake/FindLibIntl.cmake new/fcitx-qt5-1.1.0/cmake/FindLibIntl.cmake --- old/fcitx-qt5-1.0.6/cmake/FindLibIntl.cmake 1970-01-01 01:00:00.0 +0100 +++ new/fcitx-qt5-1.1.0/cmake/FindLibIntl.cmake 2017-02-08 06:58:26.0 +0100 @@ -0,0 +1,41 @@ +# - find where dlopen and friends are located. +# LIBINTL_FOUND - system has dynamic linking interface available +# LIBINTL_INCLUDE_DIR - where dlfcn.h is located. +# LIBINTL_LIBRARY - libraries needed to use dlopen + +include(CheckFunctionExists) + +find_path(LIBINTL_INCLUDE_DIR NAMES libintl.h) +find_library(LIBINTL_LIBRARY NAMES intl) +if(LIBINTL_LIBRARY) + set(LIBINTL_FOUND TRUE) +else(LIBINTL_LIBRARY) + check_function_exists(dgettext LIBINTL_FOUND) + # If dlopen can be found without linking in dl then dlopen is part + # of libc,
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2016-12-03 18:28:05 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2015-12-24 12:17:27.0 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2016-12-03 18:28:06.0 +0100 @@ -1,0 +2,13 @@ +Sat Dec 3 04:17:29 UTC 2016 - i...@marguerite.su + +- update version 1.0.6 + * [qt5]fix inconsistency between qstring and ucs4 string +when handle surrounding + * [qt5]fromUcs4 expect a null terminated string by default, +give it a size + * [qt5]use new connection syntax + * [qt5]use more nullptr + * [qt5]remove usage of QPointer in icdata + * [qt5]don't crash if window->screen() is null + +--- Old: fcitx-qt5-1.0.5.tar.xz New: fcitx-qt5-1.0.6.tar.xz Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.E0u64S/_old 2016-12-03 18:28:08.0 +0100 +++ /var/tmp/diff_new_pack.E0u64S/_new 2016-12-03 18:28:08.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package fcitx-qt5 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,7 +17,7 @@ Name: fcitx-qt5 -Version:1.0.5 +Version:1.0.6 Release:0 Summary:Fcitx QT5 Input Context License:GPL-2.0+ ++ fcitx-qt5-1.0.5.tar.xz -> fcitx-qt5-1.0.6.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-1.0.5/dbusaddons/fcitxqtconnection.cpp new/fcitx-qt5-1.0.6/dbusaddons/fcitxqtconnection.cpp --- old/fcitx-qt5-1.0.5/dbusaddons/fcitxqtconnection.cpp2015-12-18 01:02:37.0 +0100 +++ new/fcitx-qt5-1.0.6/dbusaddons/fcitxqtconnection.cpp2016-10-13 01:26:34.0 +0200 @@ -101,7 +101,7 @@ ,m_displayNumber(-1) ,m_serviceName(QString("%1-%2").arg("org.fcitx.Fcitx").arg(displayNumber())) ,m_connection(0) -,m_serviceWatcher(new QDBusServiceWatcher(conn)) +,m_serviceWatcher(new QDBusServiceWatcher(this)) ,m_watcher(new QFileSystemWatcher(this)) ,m_autoReconnect(true) ,m_connectedOnce(false) @@ -130,8 +130,8 @@ m_watcher->addPath(info.filePath()); } -connect(m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(socketFileChanged())); -connect(m_watcher, SIGNAL(directoryChanged(QString)), this, SLOT(socketFileChanged())); +connect(m_watcher, &QFileSystemWatcher::fileChanged, this, &FcitxQtConnectionPrivate::socketFileChanged); +connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &FcitxQtConnectionPrivate::socketFileChanged); m_initialized = true; } @@ -139,8 +139,8 @@ m_serviceWatcher->removeWatchedService(m_serviceName); m_watcher->removePaths(m_watcher->files()); m_watcher->removePaths(m_watcher->directories()); -m_watcher->disconnect(SIGNAL(fileChanged(QString))); -m_watcher->disconnect(SIGNAL(directoryChanged(QString))); +disconnect(m_watcher, &QFileSystemWatcher::fileChanged, this, &FcitxQtConnectionPrivate::socketFileChanged); +disconnect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &FcitxQtConnectionPrivate::socketFileChanged); m_initialized = false; } @@ -166,7 +166,7 @@ #else QFile file1("/var/lib/dbus/machine-id"); QFile file2("/etc/machine-id"); -QFile* fileToRead = NULL; +QFile* fileToRead = nullptr; if (file1.open(QIODevice::ReadOnly)) { fileToRead = &file1; } @@ -273,7 +273,7 @@ return; } - m_serviceWatcher->disconnect(SIGNAL(serviceOwnerChanged(QString,QString,QString))); +disconnect(m_serviceWatcher, &QDBusServiceWatcher::serviceOwnerChanged, this, &FcitxQtConnectionPrivate::imChanged); QString addr = address(); if (!addr.isNull()) { QDBusConnection connection(QDBusConnection::connectToBus(addr, "fcitx")); @@ -287,7 +287,7 @@ if (!m_connection) { QDBusConnection* connection = new QDBusConnection(QDBusConnection::sessionBus()); -connect(m_serviceWatcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)), this, SLOT(imChanged(QString,QString,QString))); +connect(m_serviceWatcher, &QDBusServiceWatcher::serviceOwnerChanged, this, &FcitxQtConnectionPrivate::imChanged); QDBusReply re
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2015-12-24 12:17:13 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2015-09-02 00:36:46.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2015-12-24 12:17:27.0 +0100 @@ -1,0 +2,11 @@ +Wed Dec 23 06:49:41 UTC 2015 - i...@marguerite.su + +- update version 1.0.5 + * implement locale in platform context + * use link_directories for widgetaddons + * use the correct var name + * use some c++11 featues and fix ic not get recreated when +fcitx restarts + * clean proxy even it's invalid + +--- Old: fcitx-qt5-1.0.4.tar.xz New: fcitx-qt5-1.0.5.tar.xz Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.EJUZPY/_old 2015-12-24 12:17:28.0 +0100 +++ /var/tmp/diff_new_pack.EJUZPY/_new 2015-12-24 12:17:28.0 +0100 @@ -17,7 +17,7 @@ Name: fcitx-qt5 -Version:1.0.4 +Version:1.0.5 Release:0 Summary:Fcitx QT5 Input Context License:GPL-2.0+ @@ -27,7 +27,7 @@ Source99: baselibs.conf BuildRequires: cmake BuildRequires: extra-cmake-modules -BuildRequires: fcitx-devel >= 4.2.8.6 +BuildRequires: fcitx-devel >= 4.2.9.1 BuildRequires: gcc-c++ BuildRequires: libicu-devel BuildRequires: libqt5-qtbase-devel ++ fcitx-qt5-1.0.4.tar.xz -> fcitx-qt5-1.0.5.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-1.0.4/CMakeLists.txt new/fcitx-qt5-1.0.5/CMakeLists.txt --- old/fcitx-qt5-1.0.4/CMakeLists.txt 2015-07-09 06:04:21.0 +0200 +++ new/fcitx-qt5-1.0.5/CMakeLists.txt 2015-12-18 01:02:37.0 +0100 @@ -16,6 +16,16 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) +include(CheckCXXCompilerFlag) + +check_cxx_compiler_flag("-std=c++11" SUPPORT_CXX11) + +if(NOT SUPPORT_CXX11) +message(FATAL_ERROR "need c++ 11 compatible compiler to compile") +endif() + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall") + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Widgets) find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED Private) find_package(XKBCommon 0.5.0 REQUIRED COMPONENTS XKBCommon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-1.0.4/dbusaddons/fcitxqtinputcontextproxy.cpp new/fcitx-qt5-1.0.5/dbusaddons/fcitxqtinputcontextproxy.cpp --- old/fcitx-qt5-1.0.4/dbusaddons/fcitxqtinputcontextproxy.cpp 2015-07-09 06:04:21.0 +0200 +++ new/fcitx-qt5-1.0.5/dbusaddons/fcitxqtinputcontextproxy.cpp 2015-12-18 01:02:37.0 +0100 @@ -1,8 +1,8 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxy -c FcitxQtInputContextProxy interfaces/org.fcitx.Fcitx.InputContext.xml -i fcitxqtformattedpreedit.h -i fcitxqt_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxy -c FcitxQtInputContextProxy interfaces/org.fcitx.Fcitx.InputContext.xml -i fcitxqtformattedpreedit.h -i fcitxqtdbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). + * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd. * * This is an auto-generated file. * This file may have been hand-edited. Look for HAND-EDIT comments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-1.0.4/dbusaddons/fcitxqtinputcontextproxy.h new/fcitx-qt5-1.0.5/dbusaddons/fcitxqtinputcontextproxy.h --- old/fcitx-qt5-1.0.4/dbusaddons/fcitxqtinputcontextproxy.h 2015-07-09 06:04:21.0 +0200 +++ new/fcitx-qt5-1.0.5/dbusaddons/fcitxqtinputcontextproxy.h 2015-12-18 01:02:37.0 +0100 @@ -1,15 +1,15 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxy -c FcitxQtInputContextProxy interfaces/org.fcitx.Fcitx.InputContext.xml -i fcitxqtformattedpreedit.h -i fcitxqt_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxy -c FcitxQtInputContextProxy interfaces/org.fcitx.Fcitx.InputContext.xml -i fcitxqtformattedpreedit.h -i fcitxqtdbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). + * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd. * * This is an auto-generated file. * Do not edit! All changes made to it will be lost.
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2015-09-02 00:36:44 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2015-07-14 17:44:17.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2015-09-02 00:36:46.0 +0200 @@ -1,0 +2,6 @@ +Mon Aug 31 09:56:45 UTC 2015 - i...@marguerite.su + +- update version 1.0.4 + * fix the coordinates for high dpi in qt5 + +--- Old: fcitx-qt5-1.0.3.tar.xz New: fcitx-qt5-1.0.4.tar.xz Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.YpdbYl/_old 2015-09-02 00:36:47.0 +0200 +++ /var/tmp/diff_new_pack.YpdbYl/_new 2015-09-02 00:36:47.0 +0200 @@ -17,12 +17,12 @@ Name: fcitx-qt5 -Version:1.0.3 +Version:1.0.4 Release:0 Summary:Fcitx QT5 Input Context License:GPL-2.0+ Group: System/I18n/Chinese -Url:https://fcitx.org +Url:https://github.com/fcitx/fcitx-qt5 Source: http://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: cmake ++ fcitx-qt5-1.0.3.tar.xz -> fcitx-qt5-1.0.4.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-1.0.3/platforminputcontext/qfcitxplatforminputcontext.cpp new/fcitx-qt5-1.0.4/platforminputcontext/qfcitxplatforminputcontext.cpp --- old/fcitx-qt5-1.0.3/platforminputcontext/qfcitxplatforminputcontext.cpp 2015-07-03 05:02:17.0 +0200 +++ new/fcitx-qt5-1.0.4/platforminputcontext/qfcitxplatforminputcontext.cpp 2015-07-09 06:04:21.0 +0200 @@ -350,9 +350,11 @@ r.moveTopLeft(inputWindow->mapToGlobal(r.topLeft())); +qreal scale = inputWindow->devicePixelRatio(); if (data->rect != r) { data->rect = r; -proxy->SetCursorRect(r.x(), r.y(), r.width(), r.height()); +proxy->SetCursorRect(r.x() * scale, r.y() * scale, + r.width() * scale, r.height() * scale); } }
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2015-07-14 17:43:12 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2015-06-01 09:56:11.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2015-07-14 17:44:17.0 +0200 @@ -1,0 +2,6 @@ +Thu Jul 9 13:49:42 UTC 2015 - i...@marguerite.su + +- update version 1.0.3 + * fix build w/ qt 5.5 + +--- Old: fcitx-qt5-1.0.2.tar.xz New: fcitx-qt5-1.0.3.tar.xz Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.XOlpOr/_old 2015-07-14 17:44:18.0 +0200 +++ /var/tmp/diff_new_pack.XOlpOr/_new 2015-07-14 17:44:18.0 +0200 @@ -17,7 +17,7 @@ Name: fcitx-qt5 -Version:1.0.2 +Version:1.0.3 Release:0 Summary:Fcitx QT5 Input Context License:GPL-2.0+ ++ fcitx-qt5-1.0.2.tar.xz -> fcitx-qt5-1.0.3.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-1.0.2/platforminputcontext/main.h new/fcitx-qt5-1.0.3/platforminputcontext/main.h --- old/fcitx-qt5-1.0.2/platforminputcontext/main.h 2015-04-21 21:21:32.0 +0200 +++ new/fcitx-qt5-1.0.3/platforminputcontext/main.h 2015-07-03 05:02:17.0 +0200 @@ -29,7 +29,7 @@ { Q_OBJECT public: -Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "fcitx.json") +Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "fcitx.json") QStringList keys() const; QFcitxPlatformInputContext *create(const QString& system, const QStringList& paramList); };
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2015-06-01 09:56:10 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2015-04-13 20:31:05.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2015-06-01 09:56:11.0 +0200 @@ -1,0 +2,10 @@ +Sat May 30 16:11:57 UTC 2015 - i...@marguerite.su + +- update version 1.0.2 + * fix google code issue 748 + * fix dependency check + * fix leak + * use xkbcommon for compose + * install to lib instead of data + +--- Old: fcitx-qt5-1.0.1.tar.xz New: fcitx-qt5-1.0.2.tar.xz Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.NrtuZk/_old 2015-06-01 09:56:11.0 +0200 +++ /var/tmp/diff_new_pack.NrtuZk/_new 2015-06-01 09:56:11.0 +0200 @@ -17,7 +17,7 @@ Name: fcitx-qt5 -Version:1.0.1 +Version:1.0.2 Release:0 Summary:Fcitx QT5 Input Context License:GPL-2.0+ @@ -32,6 +32,7 @@ BuildRequires: libicu-devel BuildRequires: libqt5-qtbase-devel BuildRequires: libqt5-qtbase-private-headers-devel +BuildRequires: libxkbcommon-devel BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build # fcitx-qt5 is using private QPA API, which can, and does break BC even in point releases, @@ -75,6 +76,6 @@ %defattr(-,root,root) %{_includedir}/FcitxQt5 %{_libdir}/libFcitxQt5*Addons.so -%{_datadir}/cmake/FcitxQt5*Addons/ +%{_libdir}/cmake/FcitxQt5*Addons/ %changelog ++ fcitx-qt5-1.0.1.tar.xz -> fcitx-qt5-1.0.2.tar.xz ++ 4984 lines of diff (skipped)
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2015-04-13 20:31:04 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2014-12-16 14:48:28.0 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2015-04-13 20:31:05.0 +0200 @@ -1,0 +2,18 @@ +Thu Apr 2 14:28:35 UTC 2015 - i...@marguerite.su + +- update version 1.0.1 + * small fix against 1.0.0 +- changes from 0.1.3 to 1.0.0 + * add COPYING + * use platform name to check x11 + * access window function when context destructs is a bad thing + * reorganize fcitx-qt5 library +- changes from 0.1.2 to 0.1.3 + * remove debug message + * fix fcitx-qt5 display number resolution + * fix pkg-config file + * use filterEvent instead of x11FilterEvent + * update dbus support + * use new qt5 library name + +--- Old: fcitx-qt5-0.1.2.tar.xz New: fcitx-qt5-1.0.1.tar.xz Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.7fE8UK/_old 2015-04-13 20:31:05.0 +0200 +++ /var/tmp/diff_new_pack.7fE8UK/_new 2015-04-13 20:31:05.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx-qt5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,7 +17,7 @@ Name: fcitx-qt5 -Version:0.1.2 +Version:1.0.1 Release:0 Summary:Fcitx QT5 Input Context License:GPL-2.0+ @@ -26,7 +26,8 @@ Source: http://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: cmake -BuildRequires: fcitx-devel >= 4.2.3 +BuildRequires: extra-cmake-modules +BuildRequires: fcitx-devel >= 4.2.8.6 BuildRequires: gcc-c++ BuildRequires: libicu-devel BuildRequires: libqt5-qtbase-devel @@ -63,16 +64,17 @@ %files %defattr(-,root,root) -%{_libdir}/lib%{name}.so.0 -%{_libdir}/lib%{name}.so.0.1 +%doc COPYING +%{_libdir}/libFcitxQt5*Addons.so.1 +%{_libdir}/libFcitxQt5*Addons.so.1.0 %dir %{_libdir}/qt5/plugins/ %dir %{_libdir}/qt5/plugins/platforminputcontexts/ %{_libdir}/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so %files devel %defattr(-,root,root) -%{_includedir}/%{name} -%{_libdir}/lib%{name}.so -%{_libdir}/pkgconfig/%{name}.pc +%{_includedir}/FcitxQt5 +%{_libdir}/libFcitxQt5*Addons.so +%{_datadir}/cmake/FcitxQt5*Addons/ %changelog ++ fcitx-qt5-0.1.2.tar.xz -> fcitx-qt5-1.0.1.tar.xz ++ 25322 lines of diff (skipped)
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2014-12-16 14:48:37 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2014-09-17 17:25:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2014-12-16 14:48:28.0 +0100 @@ -1,0 +2,6 @@ +Fri Dec 12 16:51:22 UTC 2014 - hrvoje.sen...@gmail.com + +- fcitx-qt5 is using private QPA API, which can, and does break BC + even in point releases, so we need to hardcode libQt5Gui5 version + +--- Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.oC89Us/_old 2014-12-16 14:48:30.0 +0100 +++ /var/tmp/diff_new_pack.oC89Us/_new 2014-12-16 14:48:30.0 +0100 @@ -33,7 +33,9 @@ BuildRequires: libqt5-qtbase-private-headers-devel BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build - +# fcitx-qt5 is using private QPA API, which can, and does break BC even in point releases, +# so we need to hardcode libQt5Gui5 version +%requires_eq libQt5Gui5 %description A QT5 input context plugin of Fcitx IM Framework. -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2014-09-17 17:24:58 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2014-06-10 14:39:04.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2014-09-17 17:25:02.0 +0200 @@ -1,0 +2,11 @@ +Mon Sep 15 06:23:33 UTC 2014 - i...@marguerite.su + +- add baselibs.conf to Source + +--- +Thu Sep 11 19:11:45 UTC 2014 - hrvoje.sen...@gmail.com + +- Fix baselibs requires, and shlib find-requires works + also with baselibs + +--- Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.cposx2/_old 2014-09-17 17:25:04.0 +0200 +++ /var/tmp/diff_new_pack.cposx2/_new 2014-09-17 17:25:04.0 +0200 @@ -24,6 +24,7 @@ Group: System/I18n/Chinese Url:https://fcitx.org Source: http://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz +Source99: baselibs.conf BuildRequires: cmake BuildRequires: fcitx-devel >= 4.2.3 BuildRequires: gcc-c++ ++ baselibs.conf ++ --- /var/tmp/diff_new_pack.cposx2/_old 2014-09-17 17:25:04.0 +0200 +++ /var/tmp/diff_new_pack.cposx2/_new 2014-09-17 17:25:04.0 +0200 @@ -1,2 +1 @@ -fcitx-qt5 - requires "libfcitx-4_2_8- = " +fcitx-qt5 \ No newline at end of file -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx-qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2014-06-10 14:39:03 Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) Package is "fcitx-qt5" Changes: --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2014-04-25 16:09:17.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2014-06-10 14:39:04.0 +0200 @@ -1,0 +2,6 @@ +Mon Jun 9 05:03:02 UTC 2014 - i...@marguerite.su + +- update version 0.1.2 + * Fix github issue fcitx/fcitx-qt5#2 + +--- Old: fcitx-qt5-0.1.1.tar.xz New: fcitx-qt5-0.1.2.tar.xz Other differences: -- ++ fcitx-qt5.spec ++ --- /var/tmp/diff_new_pack.VSmB6n/_old 2014-06-10 14:39:04.0 +0200 +++ /var/tmp/diff_new_pack.VSmB6n/_new 2014-06-10 14:39:04.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx-qt5 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: fcitx-qt5 -Version:0.1.1 +Version:0.1.2 Release:0 -License:GPL-2.0+ Summary:Fcitx QT5 Input Context -Url:https://fcitx.org +License:GPL-2.0+ Group: System/I18n/Chinese +Url:https://fcitx.org Source: http://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz BuildRequires: cmake BuildRequires: fcitx-devel >= 4.2.3 ++ fcitx-qt5-0.1.1.tar.xz -> fcitx-qt5-0.1.2.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-0.1.1/CMakeLists.txt new/fcitx-qt5-0.1.2/CMakeLists.txt --- old/fcitx-qt5-0.1.1/CMakeLists.txt 2013-01-25 19:22:13.0 +0100 +++ new/fcitx-qt5-0.1.2/CMakeLists.txt 2014-04-10 07:39:37.0 +0200 @@ -6,7 +6,6 @@ find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) -find_package(Qt5Widgets REQUIRED) find_package(Qt5DBus REQUIRED) include(GNUInstallDirs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-qt5-0.1.1/src/qfcitxplatforminputcontext.cpp new/fcitx-qt5-0.1.2/src/qfcitxplatforminputcontext.cpp --- old/fcitx-qt5-0.1.1/src/qfcitxplatforminputcontext.cpp 2013-01-25 19:22:13.0 +0100 +++ new/fcitx-qt5-0.1.2/src/qfcitxplatforminputcontext.cpp 2014-04-10 07:39:37.0 +0200 @@ -626,7 +626,9 @@ (press) ? FCITX_PRESS_KEY : FCITX_RELEASE_KEY, QDateTime::currentDateTime().toTime_t() ); -result.waitForFinished(); +do { +QCoreApplication::processEvents (QEventLoop::WaitForMoreEvents); +} while (QCoreApplication::hasPendingEvents () || !result.isFinished ()); if (!m_connection->isConnected() || !result.isFinished() || result.isError() || result.value() <= 0) { return x11FilterEventFallback(keyval, keycode, state, press); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org