From 4f8cd00197bf9fafb088f6cb22d6887d05fde4e1e434cfc4c331c599e9d4420a Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 29 Feb 2020 15:35:13 +0000 Subject: [PATCH] Accepting request 780500 from home:hillwood:branches:M17N - Update version to 4.2.9.7 * Do not link jsonc if XKB is disabled * Update Translation * use /org/freedesktop/portal as dbus path for portal. * use the right color for gtk2 * use a different way to suppress unused warning * Revert "[gtk] clean up unused variable." * iso code root should be 639-3. * use iso-codes json file to parse the iso codes data. * fix fall through warning * clean up unused variable. OBS-URL: https://build.opensuse.org/request/show/780500 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=156 --- fcitx-4.2.9.6_dict.tar.xz | 3 --- fcitx-4.2.9.7_dict.tar.xz | 3 +++ fcitx-4.2.9.7_dict.tar.xz.sig | Bin 0 -> 310 bytes fcitx.changes | 15 +++++++++++++ fcitx.spec | 40 +++++++++++++++++----------------- 5 files changed, 38 insertions(+), 23 deletions(-) delete mode 100644 fcitx-4.2.9.6_dict.tar.xz create mode 100644 fcitx-4.2.9.7_dict.tar.xz create mode 100644 fcitx-4.2.9.7_dict.tar.xz.sig diff --git a/fcitx-4.2.9.6_dict.tar.xz b/fcitx-4.2.9.6_dict.tar.xz deleted file mode 100644 index 3a2f72e..0000000 --- a/fcitx-4.2.9.6_dict.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a59351bbae42d62aad61bd604154b8a49b822b3337ff4d2df5622881f680d943 -size 8738408 diff --git a/fcitx-4.2.9.7_dict.tar.xz b/fcitx-4.2.9.7_dict.tar.xz new file mode 100644 index 0000000..c9ae790 --- /dev/null +++ b/fcitx-4.2.9.7_dict.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf333b2a90be616ffed8b83438dfe3dc0e22ecf034b9f651167203ecbe3f6f8f +size 8734508 diff --git a/fcitx-4.2.9.7_dict.tar.xz.sig b/fcitx-4.2.9.7_dict.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..627568e5f38e36e7e18bff336f88e8e5bad6e57f07a59023dc43ea0077e77df8 GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j*I$e>`F(xiFDTWws9i;0ZCBog@r0$sz{A^-{r5RQw9 zjK3rj`EddV{v&qvcBg51!D9JAQF46I_Qh3JFt$9Ou@Gmwi`S+8yW3)p`rB?Avz!J zW(^JY{Ibs#De+oG5awU}_B%lhhWazTXucn{*RkH2*DcS?A6>47QrIo0V$~b)=$I-R z#n7&TjjEz5RlE`X1=KquK1Y4GSe{<<13SE&@g;7o0i`FObUbQF9+2fUuM^@7%yrlx zcY;&*tz3KY7{~SOal~Pr@o`!Fa;>c^UT#7TprQoVa*ihK@qWNz&9;WQ9q`j{TZl9O I`Wsja^;Qv@7ytkO literal 0 HcmV?d00001 diff --git a/fcitx.changes b/fcitx.changes index 521a57b..4e0a87e 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Feb 29 15:14:52 UTC 2020 - Hillwood Yang + +- Update version to 4.2.9.7 + * Do not link jsonc if XKB is disabled + * Update Translation + * use /org/freedesktop/portal as dbus path for portal. + * use the right color for gtk2 + * use a different way to suppress unused warning + * Revert "[gtk] clean up unused variable." + * iso code root should be 639-3. + * use iso-codes json file to parse the iso codes data. + * fix fall through warning + * clean up unused variable. + ------------------------------------------------------------------- Thu Aug 22 13:13:21 UTC 2019 - Christophe Giboudeaux diff --git a/fcitx.spec b/fcitx.spec index 3614bbe..e0c738f 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -1,7 +1,7 @@ # # spec file for package 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 @@ -18,7 +18,7 @@ %define libver -4_2_9 Name: fcitx -Version: 4.2.9.6 +Version: 4.2.9.7 Release: 0 Summary: Flexible Context-aware Input Tool with eXtension License: GPL-2.0-or-later @@ -31,6 +31,7 @@ Source3: xim.fcitx.suse.template Source8: openSUSE-themes.tar.gz Source9: macros.%{name} Source99: baselibs.conf +Source100: https://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz.sig # PATCH-FIX-OPENSUSE fcitx-autostart-check-INPUT_METHOD.patch boo#947576 Patch2: fcitx-autostart-check-INPUT_METHOD.patch # PATCH-FIX-OPENSUSE downgrade cmake requirement to 3.1 again @@ -61,6 +62,7 @@ BuildRequires: pango-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xz +BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(xkbcommon) >= 0.5.0 BuildRequires: pkgconfig(xkbfile) @@ -321,31 +323,29 @@ cd build # fix dlopen-ed library name cmake .. \ - -DCMAKE_C_FLAGS="%{optflags}" \ - -DCMAKE_CXX_FLAGS="%{optflags}" \ - -DCMAKE_VERBOSE_MAKEFILE=On \ - -DCMAKE_BUILD_TYPE=Release \ - -DOPENCC_LIBRARY_FILENAME=libopencc.so.2 \ - -DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \ - -DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \ - -DENABLE_GTK3_IM_MODULE=On \ + -DCMAKE_C_FLAGS="%{optflags}" \ + -DCMAKE_CXX_FLAGS="%{optflags}" \ + -DCMAKE_VERBOSE_MAKEFILE=On \ + -DCMAKE_BUILD_TYPE=Release \ + -DOPENCC_LIBRARY_FILENAME=libopencc.so.2 \ + -DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \ + -DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \ + -DENABLE_GTK3_IM_MODULE=On \ %if 0%{?sles_version} || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 - -DENABLE_QT=Off \ - -DENABLE_QT_IM_MODULE=off \ + -DENABLE_QT=Off \ + -DENABLE_QT_IM_MODULE=off \ %endif - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DLIB_INSTALL_DIR=%{_libdir} \ - -DSYSCONFDIR=%{_sysconfdir} \ - -DENABLE_LUA=On + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DSYSCONFDIR=%{_sysconfdir} \ + -DENABLE_LUA=On # fix gobject-introspection build export SUSE_ASNEEDED=0 -make %{?_smp_mflags} +%make_build %install -cd build -%make_install -cd .. +%cmake_install # install openSUSE skins tar -xzf %{SOURCE8}