commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2020-09-29 19:01:31
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.4249 (New)
Package is "kcm5-fcitx"
Tue Sep 29 19:01:31 2020 rev:12 rq:838151 version:0.5.6
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2020-02-22
19:08:31.962596953 +0100
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.4249/kcm5-fcitx.changes
2020-09-29 19:01:57.673784991 +0200
@@ -1,0 +2,8 @@
+Mon Sep 28 04:27:56 UTC 2020 - Marguerite Su
+
+- update version 0.5.6
+ * [kcm] try qt5 wrapper before qt4
+ * [kcm] use non neg value as role
+- drop kcm5-fcitx-po.patch, no more kcm-fcitx
+
+---
Old:
kcm-fcitx-0.5.5.tar.xz
kcm5-fcitx-po.patch
New:
kcm-fcitx-0.5.6.tar.xz
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.X1VuM8/_old 2020-09-29 19:01:58.565786075 +0200
+++ /var/tmp/diff_new_pack.X1VuM8/_new 2020-09-29 19:01:58.565786075 +0200
@@ -18,7 +18,7 @@
%definepkgname kf5-kcm-fcitx
Name: kcm5-fcitx
-Version:0.5.5
+Version:0.5.6
Release:0
Summary:KF5 control module for Fcitx
License:GPL-2.0-or-later
@@ -26,8 +26,6 @@
URL:http://github.com/fcitx/kcm-fcitx
Source:
http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-%{version}.tar.xz
Source1:input-keyboard.svg
-#PATCH-FIX-OPENSUSE rename po to kcm5_fcitx to avoid conflict w/ kcm_fcitx
-Patch0: %{name}-po.patch
BuildRequires: cmake
BuildRequires: extra-cmake-modules
BuildRequires: fcitx-devel
@@ -94,7 +92,6 @@
%prep
%setup -q -n kcm-fcitx-%{version}
-%patch0 -p1
%build
%cmake_kf5 -d build
@@ -111,20 +108,19 @@
rsvg-convert -h $i -w $i %{SOURCE1} -o
%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/devices/input-keyboard.png
done
-%find_lang kcm5_fcitx
+%find_lang kcm_fcitx
%{kf5_post_install}
%post -n %{pkgname} -p /sbin/ldconfig
%postun -n %{pkgname} -p /sbin/ldconfig
-%files -n %{pkgname} -f kcm5_fcitx.lang
+%files -n %{pkgname} -f kcm_fcitx.lang
%defattr(-,root,root,-)
-%config %{_sysconfdir}/xdg/fcitx-skin.knsrc
%{_bindir}/kbd-layout-viewer
%{_libdir}/qt5/plugins/kcm_fcitx.so
%{_datadir}/kservices5/kcm_fcitx.desktop
-%{_datadir}/kservices5/kbd-layout-viewer.desktop
+%{_datadir}/applications/kbd-layout-viewer.desktop
%files -n %{pkgname}-icons
%defattr(-,root,root,-)
++ kcm-fcitx-0.5.5.tar.xz -> kcm-fcitx-0.5.6.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcm-fcitx-0.5.5/CMakeLists.txt
new/kcm-fcitx-0.5.6/CMakeLists.txt
--- old/kcm-fcitx-0.5.5/CMakeLists.txt 2017-09-15 08:09:08.0 +0200
+++ new/kcm-fcitx-0.5.6/CMakeLists.txt 2020-06-01 23:50:20.0 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
project(kcm-fcitx)
-set(QT_MIN_VERSION "5.3.0")
+set(QT_MIN_VERSION "5.11.0")
find_package(ECM 1.0.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cmake)
include(KDEInstallDirs)
@@ -12,14 +12,13 @@
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets
X11Extras)
-find_package(KF5 REQUIRED COMPONENTS
+find_package(KF5 5.64 REQUIRED COMPONENTS
CoreAddons
WidgetsAddons
ConfigWidgets
ItemViews
I18n
KIO
-NewStuff
)
find_package(FcitxQt5DBusAddons 1.1.0 REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcm-fcitx-0.5.5/layout/CMakeLists.txt
new/kcm-fcitx-0.5.6/layout/CMakeLists.txt
--- old/kcm-fcitx-0.5.5/layout/CMakeLists.txt 2017-09-15 08:09:08.0
+0200
+++ new/kcm-fcitx-0.5.6/layout/CMakeLists.txt 2020-06-01 23:50:20.0
+0200
@@ -19,4 +19,4 @@
kbd-layout-viewer.desktop.in
"${CMAKE_CURRENT_BINARY_DIR}/kbd-layout-viewer.desktop")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kbd-layout-viewer.desktop"
- DESTINATION ${CMAKE_INSTALL_KSERVICES5DIR})
+ DESTINATION ${CMAKE_INSTALL_APPDIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcm-fcitx-0.5.5/layout/keyboardlayoutwidget.cpp
new/kcm-fcitx-0.5.6/layout/keyboardlayoutwidget.cpp
--- old/kcm-fcitx-0.5.5/layout/keyboardlayoutwidget.cpp 2017-09-15
08:09:08.0 +0200
+++ new/kcm-fcitx-0.5.6/layout/keyboardlayoutwidget.cpp 2020-06-01
23:50:20.0 +0200
@@ -480,7 +480,7 @@
}
}
-qSort(keyboardItems.begin(), keyboardItems.end(), DrawingItemCompare());
+
commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2020-02-22 19:08:27
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.26092 (New)
Package is "kcm5-fcitx"
Sat Feb 22 19:08:27 2020 rev:11 rq:778121 version:0.5.5
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2019-10-27
13:41:51.665328278 +0100
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.26092/kcm5-fcitx.changes
2020-02-22 19:08:31.962596953 +0100
@@ -1,0 +2,6 @@
+Thu Feb 20 10:14:34 UTC 2020 - Max Lin
+
+- Leap 15.2 and SLE15 SP2 has newer librsvg, extend the conditional
+ for "BuildRequires: rsvg-convert"
+
+---
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.6asol3/_old 2020-02-22 19:08:32.494598013 +0100
+++ /var/tmp/diff_new_pack.6asol3/_new 2020-02-22 19:08:32.506598037 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kcm5-fcitx
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
Summary:KF5 control module for Fcitx
License:GPL-2.0-or-later
Group: System/I18n/Chinese
-Url:http://github.com/fcitx/kcm-fcitx
+URL:http://github.com/fcitx/kcm-fcitx
Source:
http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-%{version}.tar.xz
Source1:input-keyboard.svg
#PATCH-FIX-OPENSUSE rename po to kcm5_fcitx to avoid conflict w/ kcm_fcitx
@@ -45,7 +45,7 @@
BuildRequires: libqt5-qtbase-devel
BuildRequires: libqt5-qtx11extras-devel
BuildRequires: libtool
-%if 0%{suse_version} >= 1550
+%if 0%{suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: rsvg-convert
%else
BuildRequires: rsvg-view
commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2019-10-27 13:41:44
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.2990 (New)
Package is "kcm5-fcitx"
Sun Oct 27 13:41:44 2019 rev:10 rq:743100 version:0.5.5
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2018-03-12
12:13:56.358725538 +0100
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.2990/kcm5-fcitx.changes
2019-10-27 13:41:51.665328278 +0100
@@ -1,0 +2,6 @@
+Wed Oct 23 17:28:57 CEST 2019 - r...@suse.de
+
+- fix build-requires for factory/tumbleweed
+ rsvg-convert tool is now in rsvg-convert package
+
+---
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.IroQmA/_old 2019-10-27 13:41:52.169328885 +0100
+++ /var/tmp/diff_new_pack.IroQmA/_new 2019-10-27 13:41:52.173328891 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kcm5-fcitx
#
-# 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/
#
@@ -45,7 +45,11 @@
BuildRequires: libqt5-qtbase-devel
BuildRequires: libqt5-qtx11extras-devel
BuildRequires: libtool
+%if 0%{suse_version} >= 1550
+BuildRequires: rsvg-convert
+%else
BuildRequires: rsvg-view
+%endif
BuildRequires: xz
BuildRequires: pkgconfig(xkbfile)
Requires: fcitx-kcm-icons
commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2018-03-12 12:13:50
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new (New)
Package is "kcm5-fcitx"
Mon Mar 12 12:13:50 2018 rev:9 rq:585782 version:0.5.5
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2017-12-19
10:51:32.985445162 +0100
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new/kcm5-fcitx.changes
2018-03-12 12:13:56.358725538 +0100
@@ -1,0 +2,6 @@
+Mon Mar 12 08:57:16 UTC 2018 - wer...@suse.de
+
+- Repair next removed dependency, that is add build require
+ pkgconfig(xkbfile)
+
+---
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.8yGo99/_old 2018-03-12 12:13:57.210695139 +0100
+++ /var/tmp/diff_new_pack.8yGo99/_new 2018-03-12 12:13:57.214694997 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kcm5-fcitx
#
-# 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
@@ -21,7 +21,7 @@
Version:0.5.5
Release:0
Summary:KF5 control module for Fcitx
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/I18n/Chinese
Url:http://github.com/fcitx/kcm-fcitx
Source:
http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-%{version}.tar.xz
@@ -47,10 +47,10 @@
BuildRequires: libtool
BuildRequires: rsvg-view
BuildRequires: xz
+BuildRequires: pkgconfig(xkbfile)
Requires: fcitx-kcm-icons
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
%description
KF5 control module for Fcitx.
commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2017-12-19 10:51:31
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new (New)
Package is "kcm5-fcitx"
Tue Dec 19 10:51:31 2017 rev:8 rq:547532 version:0.5.5
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2017-08-22
11:10:17.286803347 +0200
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new/kcm5-fcitx.changes
2017-12-19 10:51:32.985445162 +0100
@@ -1,0 +2,10 @@
+Sat Dec 2 05:51:36 UTC 2017 - i...@marguerite.su
+
+- update version 0.5.5
+ * try qt5 wrapper before qt4
+ * Use the correct dependency
+ * try best to fit text in the rect
+ * we don't listen to xkb event, why we would wother request it
+ * revive the layout viewer
+
+---
Old:
kcm-fcitx-0.5.4.tar.xz
New:
kcm-fcitx-0.5.5.tar.xz
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.gvn4iJ/_old 2017-12-19 10:51:33.653412917 +0100
+++ /var/tmp/diff_new_pack.gvn4iJ/_new 2017-12-19 10:51:33.653412917 +0100
@@ -18,7 +18,7 @@
%definepkgname kf5-kcm-fcitx
Name: kcm5-fcitx
-Version:0.5.4
+Version:0.5.5
Release:0
Summary:KF5 control module for Fcitx
License:GPL-2.0+
@@ -43,6 +43,7 @@
BuildRequires: knewstuff-devel
BuildRequires: kwidgetsaddons-devel
BuildRequires: libqt5-qtbase-devel
+BuildRequires: libqt5-qtx11extras-devel
BuildRequires: libtool
BuildRequires: rsvg-view
BuildRequires: xz
@@ -116,8 +117,10 @@
%files -n %{pkgname} -f kcm5_fcitx.lang
%defattr(-,root,root,-)
%config %{_sysconfdir}/xdg/fcitx-skin.knsrc
+%{_bindir}/kbd-layout-viewer
%{_libdir}/qt5/plugins/kcm_fcitx.so
%{_datadir}/kservices5/kcm_fcitx.desktop
+%{_datadir}/kservices5/kbd-layout-viewer.desktop
%files -n %{pkgname}-icons
%defattr(-,root,root,-)
++ kcm-fcitx-0.5.4.tar.xz -> kcm-fcitx-0.5.5.tar.xz ++
5965 lines of diff (skipped)
commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2017-08-22 11:10:13
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new (New)
Package is "kcm5-fcitx"
Tue Aug 22 11:10:13 2017 rev:7 rq:517943 version:0.5.4
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2017-02-15
10:05:52.448688635 +0100
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new/kcm5-fcitx.changes
2017-08-22 11:10:17.286803347 +0200
@@ -1,0 +2,6 @@
+Sun Aug 20 22:56:31 UTC 2017 - zai...@opensuse.org
+
+- Drop conditional libunique-devel and libunique1-devel
+ BuildRequires: Obsolete and unused.
+
+---
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.Awu9CC/_old 2017-08-22 11:10:18.106687902 +0200
+++ /var/tmp/diff_new_pack.Awu9CC/_new 2017-08-22 11:10:18.110687339 +0200
@@ -48,11 +48,7 @@
BuildRequires: xz
Requires: fcitx-kcm-icons
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} <= 1140
-BuildRequires: libunique-devel
-%else
-BuildRequires: libunique1-devel
-%endif
+
%description
KF5 control module for Fcitx.
commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2017-02-15 10:05:51
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new (New)
Package is "kcm5-fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2015-12-24
12:17:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new/kcm5-fcitx.changes
2017-02-15 10:05:52.448688635 +0100
@@ -1,0 +2,6 @@
+Sat Feb 11 23:04:16 UTC 2017 - i...@marguerite.su
+
+- update version 0.5.4
+ * use gui wrapper instead of embed.
+
+---
Old:
kcm-fcitx-0.5.3.tar.xz
New:
kcm-fcitx-0.5.4.tar.xz
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.0czHhI/_old 2017-02-15 10:05:52.884627230 +0100
+++ /var/tmp/diff_new_pack.0czHhI/_new 2017-02-15 10:05:52.888626668 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kcm5-fcitx
#
-# Copyright (c) 2015 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,9 +17,8 @@
%definepkgname kf5-kcm-fcitx
-
Name: kcm5-fcitx
-Version:0.5.3
+Version:0.5.4
Release:0
Summary:KF5 control module for Fcitx
License:GPL-2.0+
@@ -28,18 +27,11 @@
Source:
http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-%{version}.tar.xz
Source1:input-keyboard.svg
#PATCH-FIX-OPENSUSE rename po to kcm5_fcitx to avoid conflict w/ kcm_fcitx
-Patch: %{name}-po.patch
-BuildRequires: fcitx-devel
-BuildRequires: fcitx-qt5-devel
-BuildRequires: libqt5-qtbase-devel
-BuildRequires: rsvg-view
-%if 0%{?suse_version} <= 1140
-BuildRequires: libunique-devel
-%else
-BuildRequires: libunique1-devel
-%endif
+Patch0: %{name}-po.patch
BuildRequires: cmake
BuildRequires: extra-cmake-modules
+BuildRequires: fcitx-devel
+BuildRequires: fcitx-qt5-devel
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: intltool
@@ -50,10 +42,17 @@
BuildRequires: kitemviews-devel
BuildRequires: knewstuff-devel
BuildRequires: kwidgetsaddons-devel
+BuildRequires: libqt5-qtbase-devel
BuildRequires: libtool
+BuildRequires: rsvg-view
BuildRequires: xz
Requires: fcitx-kcm-icons
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} <= 1140
+BuildRequires: libunique-devel
+%else
+BuildRequires: libunique1-devel
+%endif
%description
KF5 control module for Fcitx.
@@ -65,13 +64,13 @@
Group: System/I18n/Chinese
Requires: fcitx-qt5
Requires: plasma5-workspace
-Provides: locale(plasma5-workspace:ko;zh_CN;zh_SG)
Supplements:packageand(fcitx:plasma5-workspace)
+Provides: locale(plasma5-workspace:ko;zh_CN;zh_SG)
# for better user experience
Provides: fcitx-config-kde5 = %{version}
Provides: fcitx-config-kf5 = %{version}
Obsoletes: fcitx-config-kde5 < %{version}
-%fcitx_requires
+%{fcitx_requires}
%description -n %{pkgname}
KF5 control module for Fcitx.
@@ -82,11 +81,11 @@
Summary:Keyboard icons for %{pkgname}
Group: System/I18n/Chinese
Requires: %{pkgname} = %{version}
+Supplements:packageand(%{pkgname}:plasma5-workspace-branding-openSUSE)
+Conflicts: otherproviders(fcitx-kcm-icons)
Provides: fcitx-config-kde5-icons = %{version}
Obsoletes: fcitx-config-kde5-icons < %{version}
Provides: fcitx-kcm-icons = %{version}
-Conflicts: otherproviders(fcitx-kcm-icons)
-Supplements:packageand(%{pkgname}:plasma5-workspace-branding-openSUSE)
BuildArch: noarch
%description -n %{pkgname}-icons
@@ -94,11 +93,11 @@
%prep
%setup -q -n kcm-fcitx-%{version}
-%patch -p1
+%patch0 -p1
%build
%cmake_kf5 -d build
-make
+make %{?_smp_mflags}
%install
pushd build
@@ -113,10 +112,9 @@
%find_lang kcm5_fcitx
-%kf5_post_install
+%{kf5_post_install}
%post -n %{pkgname} -p /sbin/ldconfig
-
%postun -n %{pkgname} -p /sbin/ldconfig
%files -n %{pkgname} -f kcm5_fcitx.lang
++ kcm-fcitx-0.5.3.tar.xz -> kcm-fcitx-0.5.4.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcm-fcitx-0.5.3/CMakeLists.txt
new/kcm-fcitx-0.5.4/CMakeLists.txt
--- old/kcm-fcitx-0.5.3/CMakeLists.txt 2015-12-17 22:47:03.0 +0100
+++ new/kcm-fcitx-0.5.4/CMakeLists.txt 2017-02-08 18:22:35.0 +0100
@@ -22,8 +22,8 @@
NewStuff
)
-find_package(FcitxQt5DBusAddons
commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2015-12-24 12:17:15
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new (New)
Package is "kcm5-fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2015-12-21
12:05:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new/kcm5-fcitx.changes
2015-12-24 12:17:28.0 +0100
@@ -1,0 +2,10 @@
+Wed Dec 23 07:07:52 UTC 2015 - i...@marguerite.su
+
+- update version 0.5.3
+ * revert to QTreeView implementation, KCategorizedView is buggy
+ * blindly make use of iso_639 for translation, fcitx uses it
+anyway.
+- drop patch: 0001-kcm-revert-to-QTreeView-implementation-KCategorizedV.patch
+ upstreamed
+
+---
Old:
0001-kcm-revert-to-QTreeView-implementation-KCategorizedV.patch
kcm-fcitx-0.5.2.tar.xz
New:
kcm-fcitx-0.5.3.tar.xz
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.VwvtD8/_old 2015-12-24 12:17:29.0 +0100
+++ /var/tmp/diff_new_pack.VwvtD8/_new 2015-12-24 12:17:29.0 +0100
@@ -19,7 +19,7 @@
%definepkgname kf5-kcm-fcitx
Name: kcm5-fcitx
-Version:0.5.2
+Version:0.5.3
Release:0
Summary:KF5 control module for Fcitx
License:GPL-2.0+
@@ -29,8 +29,6 @@
Source1:input-keyboard.svg
#PATCH-FIX-OPENSUSE rename po to kcm5_fcitx to avoid conflict w/ kcm_fcitx
Patch: %{name}-po.patch
-# PATCH-FIX-UPSTREAM
0001-kcm-revert-to-QTreeView-implementation-KCategorizedV.patch boo#951609
-Patch1: 0001-kcm-revert-to-QTreeView-implementation-KCategorizedV.patch
BuildRequires: fcitx-devel
BuildRequires: fcitx-qt5-devel
BuildRequires: libqt5-qtbase-devel
@@ -97,7 +95,6 @@
%prep
%setup -q -n kcm-fcitx-%{version}
%patch -p1
-%patch1 -p1
%build
%cmake_kf5 -d build
++ kcm-fcitx-0.5.2.tar.xz -> kcm-fcitx-0.5.3.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcm-fcitx-0.5.2/CMakeLists.txt
new/kcm-fcitx-0.5.3/CMakeLists.txt
--- old/kcm-fcitx-0.5.2/CMakeLists.txt 2015-09-28 19:49:49.0 +0200
+++ new/kcm-fcitx-0.5.3/CMakeLists.txt 2015-12-17 22:47:03.0 +0100
@@ -26,8 +26,8 @@
find_package(FcitxQt5WidgetsAddons REQUIRED)
set(MAJOR_VERSION "0")
-set(MINOR_VERSION "4")
-set(PATCH_VERSION "0")
+set(MINOR_VERSION "5")
+set(PATCH_VERSION "3")
set(SUFFIX_VERSION "")
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcm-fcitx-0.5.2/src/CMakeLists.txt
new/kcm-fcitx-0.5.3/src/CMakeLists.txt
--- old/kcm-fcitx-0.5.2/src/CMakeLists.txt 2015-09-28 19:49:49.0
+0200
+++ new/kcm-fcitx-0.5.3/src/CMakeLists.txt 2015-12-17 22:47:03.0
+0100
@@ -32,6 +32,7 @@
add_library(kcm_fcitx MODULE ${kcm_SRCS})
target_link_libraries(kcm_fcitx
+ Qt5::Widgets
KF5::CoreAddons
KF5::WidgetsAddons
KF5::KCMUtils
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcm-fcitx-0.5.2/src/impage.cpp
new/kcm-fcitx-0.5.3/src/impage.cpp
--- old/kcm-fcitx-0.5.2/src/impage.cpp 2015-09-28 19:49:49.0 +0200
+++ new/kcm-fcitx-0.5.3/src/impage.cpp 2015-12-17 22:47:03.0 +0100
@@ -25,7 +25,7 @@
// KDE
#include
-#include
+#include
#include
@@ -44,41 +44,206 @@
namespace Fcitx
{
-static bool languageIsUnknown(const QString& langCode)
+static QString languageName(const QString& langCode)
{
if (langCode.isEmpty()) {
-return true;
+return i18n("Unknown");
}
else if (langCode == "*")
-return false;
+return i18n("Multilingual");
else {
-const QString result = QLocale(langCode).nativeLanguageName();
-if (result.isEmpty()) {
-return true;
+QLocale locale(langCode);
+if (locale.language() == QLocale::C) {
+// return lang code seems to be a better solution other than
indistinguishable "unknown"
+return langCode;
+}
+const bool hasCountry = langCode.indexOf("_") != -1 &&
locale.country() != QLocale::AnyCountry;
+QString languageName;
+if (hasCountry) {
+languageName = locale.nativeLanguageName();
+}
+if (languageName.isEmpty()) {
+languageName = i18nd("iso_639",
QLocale::languageToString(locale.language()).toUtf8());
+}
+if (languageName.isEmpty()) {
+languageName =
commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2015-12-21 12:04:58
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new (New)
Package is "kcm5-fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2015-10-26
12:48:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new/kcm5-fcitx.changes
2015-12-21 12:05:03.0 +0100
@@ -1,0 +2,10 @@
+Fri Dec 18 07:17:46 CET 2015 - ti...@suse.de
+
+- Upstream fix for converting to QTreeView instead of broken
+ KCategorizedView; this fixes the still-existing crash at clicking
+ "Only Show Currnet Language" checkbox:
+0001-kcm-revert-to-QTreeView-implementation-KCategorizedV.patch
+ obsoleting the old patch
+kcm-fcitx-workaround-for-invalid-langcode.patch
+
+---
Old:
kcm-fcitx-workaround-for-invalid-langcode.patch
New:
0001-kcm-revert-to-QTreeView-implementation-KCategorizedV.patch
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.ebvkMZ/_old 2015-12-21 12:05:04.0 +0100
+++ /var/tmp/diff_new_pack.ebvkMZ/_new 2015-12-21 12:05:04.0 +0100
@@ -29,8 +29,8 @@
Source1:input-keyboard.svg
#PATCH-FIX-OPENSUSE rename po to kcm5_fcitx to avoid conflict w/ kcm_fcitx
Patch: %{name}-po.patch
-# PATCH-FIX-OPENSUSE kcm-fcitx-workaround-for-invalid-langcode.patch boo#95160
-Patch1: kcm-fcitx-workaround-for-invalid-langcode.patch
+# PATCH-FIX-UPSTREAM
0001-kcm-revert-to-QTreeView-implementation-KCategorizedV.patch boo#951609
+Patch1: 0001-kcm-revert-to-QTreeView-implementation-KCategorizedV.patch
BuildRequires: fcitx-devel
BuildRequires: fcitx-qt5-devel
BuildRequires: libqt5-qtbase-devel
++ 0001-kcm-revert-to-QTreeView-implementation-KCategorizedV.patch ++
797 lines (skipped)
commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2015-10-26 12:48:50
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new (New)
Package is "kcm5-fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2015-10-20
00:07:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new/kcm5-fcitx.changes
2015-10-26 12:48:56.0 +0100
@@ -1,0 +2,7 @@
+Thu Oct 22 18:28:11 CEST 2015 - ti...@suse.de
+
+- Work around a crash at clicking "Only Show Current Language"
+ (boo#951609):
+ kcm-fcitx-workaround-for-invalid-langcode.patch
+
+---
New:
kcm-fcitx-workaround-for-invalid-langcode.patch
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.1tO8S5/_old 2015-10-26 12:48:57.0 +0100
+++ /var/tmp/diff_new_pack.1tO8S5/_new 2015-10-26 12:48:57.0 +0100
@@ -29,6 +29,8 @@
Source1:input-keyboard.svg
#PATCH-FIX-OPENSUSE rename po to kcm5_fcitx to avoid conflict w/ kcm_fcitx
Patch: %{name}-po.patch
+# PATCH-FIX-OPENSUSE kcm-fcitx-workaround-for-invalid-langcode.patch boo#95160
+Patch1: kcm-fcitx-workaround-for-invalid-langcode.patch
BuildRequires: fcitx-devel
BuildRequires: fcitx-qt5-devel
BuildRequires: libqt5-qtbase-devel
@@ -95,6 +97,7 @@
%prep
%setup -q -n kcm-fcitx-%{version}
%patch -p1
+%patch1 -p1
%build
%cmake_kf5 -d build
++ kcm-fcitx-workaround-for-invalid-langcode.patch ++
---
src/impage.cpp |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/src/impage.cpp
+++ b/src/impage.cpp
@@ -100,6 +100,7 @@ QVariant IMPage::Private::IMModel::data(
}
const FcitxQtInputMethodItem& imEntry =
filteredIMEntryList.at(index.row());
+QString lc;
switch (role) {
@@ -113,7 +114,10 @@ QVariant IMPage::Private::IMModel::data(
return imEntry.langCode();
case KCategorizedSortFilterProxyModel::CategoryDisplayRole:
-return QLocale(imEntry.langCode()).nativeLanguageName();
+ lc = imEntry.langCode();
+ if (lc.length() == 3)
+ lc.clear();
+return QLocale(lc).nativeLanguageName();
default:
return QVariant();
commit kcm5-fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package kcm5-fcitx for openSUSE:Factory
checked in at 2015-10-19 22:53:09
Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old)
and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new (New)
Package is "kcm5-fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes2015-06-11
08:23:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new/kcm5-fcitx.changes
2015-10-20 00:07:07.0 +0200
@@ -1,0 +2,11 @@
+Sun Oct 18 10:40:06 UTC 2015 - i...@marguerite.su
+
+- update version 0.5.2
+ * A small bugfix relaese.
+ * Fixes some wrong dialog layout when porting to Qt5/KF5.
+- changes in 0.5.1
+ * Fix some dialog handling
+ * Make kcm layout uniform w/ other kcms in system settings
+- rename fcitx-config-kde5 to kf5-kcm-fcitx
+
+---
Old:
kcm-fcitx-0.5.0.tar.xz
New:
kcm-fcitx-0.5.2.tar.xz
Other differences:
--
++ kcm5-fcitx.spec ++
--- /var/tmp/diff_new_pack.niXdVW/_old 2015-10-20 00:07:08.0 +0200
+++ /var/tmp/diff_new_pack.niXdVW/_new 2015-10-20 00:07:08.0 +0200
@@ -16,10 +16,10 @@
#
-%definepkgname fcitx-config-kde5
+%definepkgname kf5-kcm-fcitx
Name: kcm5-fcitx
-Version:0.5.0
+Version:0.5.2
Release:0
Summary:KF5 control module for Fcitx
License:GPL-2.0+
@@ -67,6 +67,10 @@
Requires: plasma5-workspace
Provides: locale(plasma5-workspace:ko;zh_CN;zh_SG)
Supplements:packageand(fcitx:plasma5-workspace)
+# for better user experience
+Provides: fcitx-config-kde5 = %{version}
+Provides: fcitx-config-kf5 = %{version}
+Obsoletes: fcitx-config-kde5 < %{version}
%fcitx_requires
%description -n %{pkgname}
@@ -78,6 +82,8 @@
Summary: Keyboard icons for %{pkgname}
Group: System/I18n/Chinese
Requires: %{pkgname} = %{version}
+Provides: fcitx-config-kde5-icons = %{version}
+Obsoletes: fcitx-config-kde5-icons < %{version}
Provides: fcitx-kcm-icons = %{version}
Conflicts: otherproviders(fcitx-kcm-icons)
Supplements: packageand(%{pkgname}:plasma5-workspace-branding-openSUSE)
++ kcm-fcitx-0.5.0.tar.xz -> kcm-fcitx-0.5.2.tar.xz ++
2771 lines of diff (skipped)
