rpm/fcitx
SHA256
1
0
Fork 0
forked from pool/fcitx
Code Pull Requests Activity

Accepting request 780501 from M17N

Browse Source 
- 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. (forwarded request 780500 from hillwood)

OBS-URL: https://build.opensuse.org/request/show/780501
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fcitx?expand=0&rev=62
This commit is contained in:
Dominique Leuenberger 2020-03-03 09:14:36 +00:00 committed by Git OBS Bridge
commit dc98cc6f94
5 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fcitx-4.2.9.6_dict.tar.xz
View File

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

3
fcitx-4.2.9.7_dict.tar.xz Normal file
View File

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

BIN
fcitx-4.2.9.7_dict.tar.xz.sig Normal file
View File

Binary file not shown.

15
fcitx.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sat Feb 29 15:14:52 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
- 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 <christophe@krop.fr> Thu Aug 22 13:13:21 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>

40
fcitx.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package fcitx # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
%define libver -4_2_9 %define libver -4_2_9
Name: fcitx Name: fcitx
Version: 4.2.9.6 Version: 4.2.9.7
Release: 0 Release: 0
Summary: Flexible Context-aware Input Tool with eXtension Summary: Flexible Context-aware Input Tool with eXtension
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -31,6 +31,7 @@ Source3: xim.fcitx.suse.template
Source8: openSUSE-themes.tar.gz Source8: openSUSE-themes.tar.gz
Source9: macros.%{name} Source9: macros.%{name}
Source99: baselibs.conf 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 # PATCH-FIX-OPENSUSE fcitx-autostart-check-INPUT_METHOD.patch boo#947576
Patch2: fcitx-autostart-check-INPUT_METHOD.patch Patch2: fcitx-autostart-check-INPUT_METHOD.patch
# PATCH-FIX-OPENSUSE downgrade cmake requirement to 3.1 again # PATCH-FIX-OPENSUSE downgrade cmake requirement to 3.1 again
@ -61,6 +62,7 @@ BuildRequires: pango-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(json-c)
BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0 BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xkbfile)
@ -321,31 +323,29 @@ cd build
# fix dlopen-ed library name # fix dlopen-ed library name
cmake .. \ cmake .. \
-DCMAKE_C_FLAGS="%{optflags}" \ -DCMAKE_C_FLAGS="%{optflags}" \
-DCMAKE_CXX_FLAGS="%{optflags}" \ -DCMAKE_CXX_FLAGS="%{optflags}" \
-DCMAKE_VERBOSE_MAKEFILE=On \ -DCMAKE_VERBOSE_MAKEFILE=On \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DOPENCC_LIBRARY_FILENAME=libopencc.so.2 \ -DOPENCC_LIBRARY_FILENAME=libopencc.so.2 \
-DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \ -DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \
-DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \ -DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \
-DENABLE_GTK3_IM_MODULE=On \ -DENABLE_GTK3_IM_MODULE=On \
%if 0%{?sles_version} || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 %if 0%{?sles_version} || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
-DENABLE_QT=Off \ -DENABLE_QT=Off \
-DENABLE_QT_IM_MODULE=off \ -DENABLE_QT_IM_MODULE=off \
%endif %endif
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir} \ -DLIB_INSTALL_DIR=%{_libdir} \
-DSYSCONFDIR=%{_sysconfdir} \ -DSYSCONFDIR=%{_sysconfdir} \
-DENABLE_LUA=On -DENABLE_LUA=On
# fix gobject-introspection build # fix gobject-introspection build
export SUSE_ASNEEDED=0 export SUSE_ASNEEDED=0
make %{?_smp_mflags} %make_build
%install %install
cd build %cmake_install
%make_install
cd ..
# install openSUSE skins # install openSUSE skins
tar -xzf %{SOURCE8} tar -xzf %{SOURCE8}