From 513e423c8bd3c800c700056cef582c65e7470f7f734913accab3cea614917170 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Thu, 10 Dec 2020 00:38:11 +0000 Subject: [PATCH] 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 | 14 ++++++++++++++ appdata.loc | 9 +++++++++ fcitx5-5.0.1.tar.xz | 3 --- fcitx5-5.0.3.tar.xz | 3 +++ fcitx5-lambda.patch | 35 +++++++++++++++++++++++++++++++++++ fcitx5.changes | 5 +++++ fcitx5.spec | 28 +++++++++++++++++++++------- 7 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 appdata.its create mode 100644 appdata.loc delete mode 100644 fcitx5-5.0.1.tar.xz create mode 100644 fcitx5-5.0.3.tar.xz create mode 100644 fcitx5-lambda.patch diff --git a/appdata.its b/appdata.its new file mode 100644 index 0000000..faf9e7b --- /dev/null +++ b/appdata.its @@ -0,0 +1,14 @@ + + + + + diff --git a/appdata.loc b/appdata.loc new file mode 100644 index 0000000..5d7e6fa --- /dev/null +++ b/appdata.loc @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/fcitx5-5.0.1.tar.xz b/fcitx5-5.0.1.tar.xz deleted file mode 100644 index dd0241e..0000000 --- a/fcitx5-5.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3933b3c3bec5079bf2cd829c82dce2d3f0504784811068fb4b404c16fb4f24a -size 1266516 diff --git a/fcitx5-5.0.3.tar.xz b/fcitx5-5.0.3.tar.xz new file mode 100644 index 0000000..258232d --- /dev/null +++ b/fcitx5-5.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06400e643bea6409f840182d47f229d04adf055e43cb53973c5fff92732890e6 +size 1281544 diff --git a/fcitx5-lambda.patch b/fcitx5-lambda.patch new file mode 100644 index 0000000..0eb5428 --- /dev/null +++ b/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 { + return {0, 0}; + }), +- ([this](dbus::DBusStruct type) { ++ ([&](dbus::DBusStruct type) { + setContentType(std::get<0>(type), std::get<1>(type)); + }), + dbus::PropertyOption::Hidden); + FCITX_OBJECT_VTABLE_WRITABLE_PROPERTY( + clientCommitPreedit, "ClientCommitPreedit", "(b)", +- ([this]() -> dbus::DBusStruct { return {clientCommitPreedit_}; }), +- ([this](dbus::DBusStruct value) { ++ ([&]() -> dbus::DBusStruct { return {clientCommitPreedit_}; }), ++ ([&](dbus::DBusStruct value) { + clientCommitPreedit_ = std::get<0>(value); + }), + dbus::PropertyOption::Hidden); diff --git a/fcitx5.changes b/fcitx5.changes index 38c5a37..3b2c5f3 100644 --- a/fcitx5.changes +++ b/fcitx5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 6 05:08:33 UTC 2020 - Marguerite Su + +- update version 5.0.3 + ------------------------------------------------------------------- Sat Nov 28 05:12:34 UTC 2020 - Marguerite Su diff --git a/fcitx5.spec b/fcitx5.spec index 31a0c12..c53b853 100644 --- a/fcitx5.spec +++ b/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-std-runtime_error.patch +Patch1: fcitx5-lambda.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