Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package fcitx5-configtool for
openSUSE:Factory checked in at 2025-06-23 15:04:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx5-configtool (Old)
and /work/SRC/openSUSE:Factory/.fcitx5-configtool.new.7067 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-configtool"
Mon Jun 23 15:04:21 2025 rev:16 rq:1287704 version:5.1.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx5-configtool/fcitx5-configtool.changes
2025-06-14 16:19:08.361756103 +0200
+++
/work/SRC/openSUSE:Factory/.fcitx5-configtool.new.7067/fcitx5-configtool.changes
2025-06-23 15:05:28.326232538 +0200
@@ -1,0 +2,12 @@
+Sun Jun 22 03:46:19 UTC 2025 - Marguerite Su <i...@marguerite.su>
+
+- update version 5.1.10
+ * Port to StandardPaths
+ * remove header that's not in Qt5
+ * Remove QQmlTypeNotAavailable
+ * Drop Qt5 code
+ * Lower Qt6 version requirement
+- drop fcitx5-configtool-gcc7.patch, upstreamed
+- upstream dropped Qt5 code, switch from _multibuild to single build
+
+-------------------------------------------------------------------
Old:
----
_multibuild
fcitx5-configtool-5.1.9.tar.zst
fcitx5-configtool-gcc7.patch
New:
----
fcitx5-configtool-5.1.10.tar.zst
----------(Old B)----------
Old: * Lower Qt6 version requirement
- drop fcitx5-configtool-gcc7.patch, upstreamed
- upstream dropped Qt5 code, switch from _multibuild to single build
----------(Old E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fcitx5-configtool.spec ++++++
--- /var/tmp/diff_new_pack.OjLJqr/_old 2025-06-23 15:05:29.178268084 +0200
+++ /var/tmp/diff_new_pack.OjLJqr/_new 2025-06-23 15:05:29.182268251 +0200
@@ -16,54 +16,26 @@
#
-%global flavor @BUILD_FLAVOR@%{nil}
-%global sname fcitx5-configtool
-%if "%{flavor}" == ""
-%global pname %sname
-%else
-%global pname %{sname}-%{flavor}
-%endif
-
-# define lua macro to distinguish older kcm places from newer ones
-%define is_old_kcm %{lua: if posix.access("%{_datadir}/kservices5") then
print(1) else print(0) end}
-
-Name: %pname
-Version: 5.1.9
+Name: fcitx5-configtool
+Version: 5.1.10
Release: 0
Summary: Configuration tool for fcitx5
License: GPL-2.0-or-later
Group: System/I18n/Chinese
URL: https://github.com/fcitx/fcitx5-configtool
-Source:
https://download.fcitx-im.org/fcitx5/%{sname}/%{sname}-%{version}.tar.zst
-Patch1: %{sname}-gcc7.patch
+Source:
https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.zst
BuildRequires: cmake
BuildRequires: extra-cmake-modules
BuildRequires: fcitx5-devel
BuildRequires: fcitx5-qt-devel
BuildRequires: gcc-c++
-BuildRequires: pkgconfig
-BuildRequires: update-desktop-files
-%if "%{flavor}" == ""
-BuildRequires: libQt5QuickControls2-devel
-BuildRequires: libqt5-qtbase-devel
-BuildRequires: libqt5-qtsvg-devel
-BuildRequires: libqt5-qtx11extras-devel
-BuildRequires: cmake(KF5CoreAddons)
-BuildRequires: cmake(KF5Declarative)
-BuildRequires: cmake(KF5I18n)
-BuildRequires: cmake(KF5IconThemes)
-BuildRequires: cmake(KF5ItemViews)
-BuildRequires: cmake(KF5Kirigami2)
-BuildRequires: cmake(KF5Package)
-BuildRequires: cmake(KF5Plasma)
-BuildRequires: cmake(KF5WidgetsAddons)
-Conflicts: %{sname}-qt6
-%endif
-%if "%{flavor}" == "qt6"
BuildRequires: libplasma6-devel
+BuildRequires: pkgconfig
BuildRequires: qt6-concurrent-devel
BuildRequires: qt6-quickcontrols2-devel
BuildRequires: qt6-widgets-devel
+BuildRequires: update-desktop-files
+BuildRequires: zstd
BuildRequires: cmake(KF6CoreAddons)
BuildRequires: cmake(KF6Declarative)
BuildRequires: cmake(KF6I18n)
@@ -73,80 +45,54 @@
BuildRequires: cmake(KF6Kirigami)
BuildRequires: cmake(KF6Package)
BuildRequires: cmake(KF6Svg)
-Conflicts: %{sname}
-%endif
-BuildRequires: zstd
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(xkbfile)
Supplements: fcitx5
+Obsoletes: %{name}-qt6 <= 5.10.9
Provides: fcitx-config-gtk3 = %{version}
Obsoletes: fcitx-config-gtk3 <= 0.4.10
%description
Configuration tool for fcitx5
-%if "%{flavor}" == ""
-%package -n kcm_fcitx5
+%package kcm6
Summary: Configuration module for fcitx5
Group: System/I18n/Chinese
Supplements: (fcitx5 and plasma5-workspace)
+Supplements: (fcitx5 and plasma6-workspace)
+Obsoletes: kcm_fcitx5 <= 5.1.9
Provides: kcm5-fcitx = %{version}
Provides: kf5-kcm-fcitx = %{version}
Provides: kf5-kcm-fcitx-icons = %{version}
Obsoletes: kcm5-fcitx <= 0.5.6
Obsoletes: kf5-kcm-fcitx <= 0.5.6
Obsoletes: kf5-kcm-fcitx-icons <= 0.5.6
-Conflicts: %{sname}-kcm6
-%description -n kcm_fcitx5
+%description kcm6
Configuration module for fcitx5
-%endif
-
-%if "%{flavor}" == "qt6"
-%package -n %{sname}-kcm6
-Summary: Configuration module for fcitx5
-Group: System/I18n/Chinese
-Supplements: (fcitx5 and plasma6-workspace)
-Conflicts: kcm_fcitx5
-
-%description -n %{sname}-kcm6
-Configuration module for fcitx5
-%endif
%prep
-%setup -q -n %{sname}-%{version}
-%autopatch -p1
+%setup -q
%build
-%if "%{flavor}" == ""
-%cmake -DUSE_QT6=OFF
-%endif
-%if "%{flavor}" == "qt6"
%cmake
-%endif
%make_build
%install
%cmake_install
%find_lang kcm_fcitx5
-%find_lang %{sname}
+%find_lang %{name}
%suse_update_desktop_file kbd-layout-viewer5 Qt KDE Utility DesktopUtility
%suse_update_desktop_file org.fcitx.fcitx5-migrator Qt KDE Utility
DesktopUtility
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%if "%{flavor}" == ""
-%post -n kcm_fcitx5 -p /sbin/ldconfig
-%postun -n kcm_fcitx5 -p /sbin/ldconfig
-%endif
-%if "%{flavor}" == "qt6"
-%post -n %{sname}-kcm6 -p /sbin/ldconfig
-%postun -n %{sname}-kcm6 -p /sbin/ldconfig
-%endif
+%post -n %{name}-kcm6 -p /sbin/ldconfig
+%postun -n %{name}-kcm6 -p /sbin/ldconfig
-%files -f %{sname}.lang
+%files -f %{name}.lang
%license LICENSES
%{_bindir}/fcitx5-config-qt
%{_bindir}/fcitx5-migrator
@@ -156,29 +102,8 @@
%{_libdir}/libFcitx5Migrator.so*
%{_datadir}/applications/kbd-layout-viewer5.desktop
-%if "%{flavor}" == ""
-%files -n kcm_fcitx5 -f kcm_fcitx5.lang
-%{_bindir}/fcitx5-plasma-theme-generator
-%if 0%{?is_old_kcm}
-%dir %{_libdir}/qt5/plugins/kcms
-%dir %{_datadir}/kservices5
-%{_libdir}/qt5/plugins/kcms/kcm_fcitx5.so
-%{_datadir}/kservices5/kcm_fcitx5.desktop
-%else
-%dir %{_datadir}/kpackage
-%dir %{_datadir}/kpackage/kcms
-%dir %{_libdir}/qt5/plugins/plasma
-%dir %{_libdir}/qt5/plugins/plasma/kcms
-%dir %{_libdir}/qt5/plugins/plasma/kcms/systemsettings
-%{_libdir}/qt5/plugins/plasma/kcms/systemsettings/kcm_fcitx5.so
-%{_datadir}/applications/kcm_fcitx5.desktop
-%{_datadir}/kpackage/kcms/kcm_fcitx5
-%endif
-%endif
-%if "%{flavor}" == "qt6"
-%files -n %{sname}-kcm6 -f kcm_fcitx5.lang
+%files -n %{name}-kcm6 -f kcm_fcitx5.lang
%{_bindir}/fcitx5-plasma-theme-generator
%{_libdir}/qt6/plugins/plasma/kcms/systemsettings/kcm_fcitx5.so
%{_datadir}/applications/kcm_fcitx5.desktop
-%endif
++++++ fcitx5-configtool-5.1.9.tar.zst -> fcitx5-configtool-5.1.10.tar.zst
++++++
++++ 10830 lines of diff (skipped)
