Hello community, here is the log from the commit of package kcm5-fcitx for openSUSE:Factory checked in at 2020-12-10 15:58:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old) and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcm5-fcitx" Thu Dec 10 15:58:25 2020 rev:13 rq:854462 version:0.5.6 Changes: -------- --- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes 2020-09-29 19:01:57.673784991 +0200 +++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.2328/kcm5-fcitx.changes 2020-12-10 15:58:26.478871617 +0100 @@ -1,0 +2,8 @@ +Wed Dec 9 08:27:36 UTC 2020 - Antonio Larrosa <alarr...@suse.com> + +- Add patch to build with Qt 5.12 which doesn't have + QList::swapItemsAt. The patch is only applied if Qt < 5.13 is being + used to build the package. + * fix-building-with-qt-5.12.patch + +------------------------------------------------------------------- New: ---- fix-building-with-qt-5.12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm5-fcitx.spec ++++++ --- /var/tmp/diff_new_pack.vQT1En/_old 2020-12-10 15:58:27.134872233 +0100 +++ /var/tmp/diff_new_pack.vQT1En/_new 2020-12-10 15:58:27.138872237 +0100 @@ -26,6 +26,7 @@ URL: http://github.com/fcitx/kcm-fcitx Source: http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-%{version}.tar.xz Source1: input-keyboard.svg +Patch0: fix-building-with-qt-5.12.patch BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: fcitx-devel @@ -92,6 +93,9 @@ %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 ++++++ Index: kcm-fcitx-0.5.6/src/impage.cpp =================================================================== --- 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() } if (curIMIdx >= 0 && nextIMIdx >= 0 && curIMIdx != nextIMIdx) { - m_list.swapItemsAt(curIMIdx, nextIMIdx); + m_list.swap(curIMIdx, nextIMIdx); 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() } if (curIMIdx >= 0 && nextIMIdx >= 0 && curIMIdx != nextIMIdx) { - m_list.swapItemsAt(curIMIdx, nextIMIdx); + m_list.swap(curIMIdx, nextIMIdx); 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
