Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2020-12-11 20:16:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcm5-fcitx"
Fri Dec 11 20:16:08 2020 rev:14 rq:854772 version:0.5.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes 2020-12-10
15:58:26.478871617 +0100
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.2328/kcm5-fcitx.changes
2020-12-11 20:16:12.020646832 +0100
@@ -1,0 +2,6 @@
+Fri Dec 11 07:35:09 UTC 2020 - Marguerite Su <i...@marguerite.su>
+
+- fix-building-with-qt-5.12.patch does not work as it said, it should
+ detect Qt version by itself
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kcm5-fcitx.spec ++++++
--- /var/tmp/diff_new_pack.g3QZy4/_old 2020-12-11 20:16:12.664647099 +0100
+++ /var/tmp/diff_new_pack.g3QZy4/_new 2020-12-11 20:16:12.668647101 +0100
@@ -93,9 +93,7 @@
%prep
%setup -q -n kcm-fcitx-%{version}
-%if %{?pkg_vcmp:%{pkg_vcmp libqt5-qtbase-devel < 5.13.0}}%{!?pkg_vcmp:0}
%patch0 -p1
-%endif
%build
%cmake_kf5 -d build
++++++ fix-building-with-qt-5.12.patch ++++++
--- /var/tmp/diff_new_pack.g3QZy4/_old 2020-12-11 20:16:12.688647109 +0100
+++ /var/tmp/diff_new_pack.g3QZy4/_new 2020-12-11 20:16:12.692647111 +0100
@@ -2,21 +2,35 @@
===================================================================
--- kcm-fcitx-0.5.6.orig/src/impage.cpp
+++ kcm-fcitx-0.5.6/src/impage.cpp
-@@ -674,7 +674,7 @@ void IMPage::Private::moveDownIM()
+@@ -22,6 +22,7 @@
+ #include <QStyledItemDelegate>
+ #include <QPainter>
+ #include <QCollator>
++#include <QtGlobal>
+
+ // KDE
+ #include <KStringHandler>
+@@ -674,7 +675,11 @@ void IMPage::Private::moveDownIM()
}
if (curIMIdx >= 0 && nextIMIdx >= 0 && curIMIdx != nextIMIdx) {
-- m_list.swapItemsAt(curIMIdx, nextIMIdx);
++#if (QT_VERSION < QT_VERSION_CHECK(5,13,0))
+ m_list.swap(curIMIdx, nextIMIdx);
++#else
+ m_list.swapItemsAt(curIMIdx, nextIMIdx);
++#endif
std::stable_sort(m_list.begin(), m_list.end());
emit updateIMList(m_list,
curIndex.data(FcitxIMUniqueNameRole).toString());
emit changed();
-@@ -720,7 +720,7 @@ void IMPage::Private::moveUpIM()
+@@ -720,7 +725,11 @@ void IMPage::Private::moveUpIM()
}
if (curIMIdx >= 0 && nextIMIdx >= 0 && curIMIdx != nextIMIdx) {
-- m_list.swapItemsAt(curIMIdx, nextIMIdx);
++#if (QT_VERSION < QT_VERSION_CHECK(5,13,0))
+ m_list.swap(curIMIdx, nextIMIdx);
++#else
+ m_list.swapItemsAt(curIMIdx, nextIMIdx);
++#endif
std::stable_sort(m_list.begin(), m_list.end());
emit updateIMList(m_list,
curIndex.data(FcitxIMUniqueNameRole).toString());
emit changed();
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
