Accepting request 854379 from home:MargueriteSu:branches:M17N

- update version 5.0.3

OBS-URL: https://build.opensuse.org/request/show/854379
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=11

appdata.its

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
+           version="2.0">
+  <its:translateRule selector="/component" translate="no"/>
+  <its:translateRule selector="/component/name |
+                               /component/summary |
+                               /component/description |
+                               /component/developer_name |
+                               /component/screenshots/screenshot/caption |
+                               /component/releases/release/description |
+                               /component/agreement/agreement_section/name |
+                               /component/agreement/agreement_section/description"
+                     translate="yes"/>
+</its:rules>

appdata.loc

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<locatingRules>
+  <locatingRule name="AppData" pattern="*.appdata.xml">
+    <documentRule localName="component" target="appdata.its"/>
+  </locatingRule>
+  <locatingRule name="AppData" pattern="*.metainfo.xml">
+    <documentRule localName="component" target="appdata.its"/>
+  </locatingRule>
+</locatingRules>

fcitx5-5.0.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3933b3c3bec5079bf2cd829c82dce2d3f0504784811068fb4b404c16fb4f24a
-size 1266516

fcitx5-5.0.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06400e643bea6409f840182d47f229d04adf055e43cb53973c5fff92732890e6
+size 1281544

fcitx5-lambda.patch

@@ -0,0 +1,35 @@
+Index: fcitx5-5.0.3/test/testdbus.cpp
+===================================================================
+--- fcitx5-5.0.3.orig/test/testdbus.cpp
++++ fcitx5-5.0.3/test/testdbus.cpp
+@@ -67,7 +67,7 @@ private:
+                                  []() { return 5; });
+     FCITX_OBJECT_VTABLE_WRITABLE_PROPERTY(
+         testProperty2, "testProperty2", "i", [this]() { return prop2; },
+-        [this](int32_t v) { prop2 = v; });
++        [&](int32_t v) { prop2 = v; });
+ };
+ 
+ #define TEST_SERVICE "org.fcitx.Fcitx.TestDBus"
+Index: fcitx5-5.0.3/src/frontend/ibusfrontend/ibusfrontend.cpp
+===================================================================
+--- fcitx5-5.0.3.orig/src/frontend/ibusfrontend/ibusfrontend.cpp
++++ fcitx5-5.0.3/src/frontend/ibusfrontend/ibusfrontend.cpp
+@@ -594,14 +594,14 @@ private:
+         ([]() -> dbus::DBusStruct<uint32_t, uint32_t> {
+             return {0, 0};
+         }),
+-        ([this](dbus::DBusStruct<uint32_t, uint32_t> type) {
++        ([&](dbus::DBusStruct<uint32_t, uint32_t> type) {
+             setContentType(std::get<0>(type), std::get<1>(type));
+         }),
+         dbus::PropertyOption::Hidden);
+     FCITX_OBJECT_VTABLE_WRITABLE_PROPERTY(
+         clientCommitPreedit, "ClientCommitPreedit", "(b)",
+-        ([this]() -> dbus::DBusStruct<bool> { return {clientCommitPreedit_}; }),
+-        ([this](dbus::DBusStruct<bool> value) {
++        ([&]() -> dbus::DBusStruct<bool> { return {clientCommitPreedit_}; }),
++        ([&](dbus::DBusStruct<bool> value) {
+             clientCommitPreedit_ = std::get<0>(value);
+         }),
+         dbus::PropertyOption::Hidden);

fcitx5.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Dec  6 05:08:33 UTC 2020 - Marguerite Su <i@marguerite.su>
+
+- update version 5.0.3
+
 -------------------------------------------------------------------
 Sat Nov 28 05:12:34 UTC 2020 - Marguerite Su <i@marguerite.su>
 

fcitx5.spec

@@ -20,7 +20,7 @@
 %endif
 
 Name:           fcitx5
-Version:        5.0.1
+Version:        5.0.3
 Release:        0
 Summary:        Next generation of fcitx
 License:        LGPL-2.1-or-later
@@ -31,10 +31,11 @@ Source1:        en_dict-20121020.tar.gz
 Source2:        https://raw.githubusercontent.com/fcitx/fcitx-artwork/master/logo/Fcitx.svg
 Source3:        xim.d-fcitx5
 Source4:        macros.fcitx5
+Source5:        https://raw.githubusercontent.com/hughsie/appstream-glib/master/data/appdata.loc
+Source6:        https://raw.githubusercontent.com/hughsie/appstream-glib/master/data/appdata.its
 Source99:       baselibs.conf
 Patch0:         fcitx5-no-download.patch
-# PATCH-FIX-UPSTREAM marguerite@opensuse.org fcitx5-std-runtime_error.patch - std::runtime_error is in stdexcept.h
+Patch1:         fcitx5-lambda.patch
-Patch1:         fcitx5-std-runtime_error.patch
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  cairo-devel
 BuildRequires:  cldr-emoji-annotation-devel
@@ -123,12 +124,17 @@ This package provides utility libraries for fcitx5.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 cp -r %{SOURCE1} src/modules/spell/dict/
 # fix fcitx5-diagnose env-script-interpreter
 sed -i '1s/env //' data/fcitx5-diagnose.sh
 
 %build
+# fix leap 15.2 msgfmt can not locate its rules
+mkdir -p %{_builddir}/its
+export GETTEXTDATADIR=%{_builddir}
+cp -r %{S:5} %{_builddir}/its
+cp -r %{S:6} %{_builddir}/its
 %cmake -DENABLE_PRESAGE=On -DCMAKE_SKIP_RPATH=OFF -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}
 %make_build
 
@@ -172,6 +178,11 @@ mkdir -p %{buildroot}%{_libdir}/fcitx5/qt5
 # install macros.fcitx5
 install -Dm 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5
 
+# install gettext its rules
+mkdir -p %{buildroot}%{_datadir}/gettext/its
+install -Dm 0755 %{S:5} %{buildroot}%{_datadir}/gettext/its
+install -Dm 0755 %{S:6} %{buildroot}%{_datadir}/gettext/its
+
 %find_lang fcitx5
 %fdupes %{buildroot}
 
@@ -198,6 +209,7 @@ install -Dm 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5
 %{_datadir}/applications/fcitx5-configtool.desktop
 %{_datadir}/fcitx5
 %{_datadir}/icons/hicolor/*/apps/fcitx.*
+%{_datadir}/icons/hicolor/*/apps/org.fcitx.Fcitx5.*
 %{_datadir}/dbus-1/services/org.fcitx.Fcitx5.service
 %{_datadir}/metainfo/org.fcitx.Fcitx5.metainfo.xml
 
@@ -209,17 +221,19 @@ install -Dm 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5
 %{_libdir}/libFcitx5Core.so
 %{_libdir}/libFcitx5Utils.so
 %{_libdir}/pkgconfig/Fcitx5*.pc
+%{_datadir}/gettext/its/appdata.its
+%{_datadir}/gettext/its/appdata.loc
 
 %files -n libFcitx5Config6
 %{_libdir}/libFcitx5Config.so.6
-%{_libdir}/libFcitx5Config.so.5.0
+%{_libdir}/libFcitx5Config.so.5.0.3
 
 %files -n libFcitx5Core7
 %{_libdir}/libFcitx5Core.so.7
-%{_libdir}/libFcitx5Core.so.5.0
+%{_libdir}/libFcitx5Core.so.5.0.3
 
 %files -n libFcitx5Utils2
 %{_libdir}/libFcitx5Utils.so.2
-%{_libdir}/libFcitx5Utils.so.5.0
+%{_libdir}/libFcitx5Utils.so.5.0.3
 
 %changelog