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

Accepting request 1005086 from home:MargueriteSu:branches:M17N

Browse Source 
- update version 5.0.19
  * classicui: support blur mask on kwin (x11&wayland)
  * xim: fix preedit start callback
- switch source to _dict variant and drop
  * en_dict-20121020.tar.gz
  * fcitx5-no-download.patch
- drop 0001-Remove-unused-xkbcommon-headers.patch,
  upstreamed

OBS-URL: https://build.opensuse.org/request/show/1005086
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=35
This commit is contained in:
Marguerite Su 2022-09-21 07:30:50 +00:00 committed by Git OBS Bridge
parent 9aee0e6ebf
commit ecab59d882
7 changed files with 17 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-Remove-unused-xkbcommon-headers.patch
View File

@ -1,26 +0,0 @@
From 8ab4581ca7142636cb8178cfa1ecf97d5a73afc6 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Tue, 5 Jul 2022 07:52:50 -0700
Subject: [PATCH] Remove unused xkbcommon headers.
Fix #538
---
src/im/keyboard/keyboard.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/im/keyboard/keyboard.h b/src/im/keyboard/keyboard.h
index 9a4d2f3..e16db96 100644
--- a/src/im/keyboard/keyboard.h
+++ b/src/im/keyboard/keyboard.h
@@ -7,8 +7,6 @@
#ifndef _FCITX_IM_KEYBOARD_KEYBOARD_H_
#define _FCITX_IM_KEYBOARD_KEYBOARD_H_
-#include <xkbcommon/xkbcommon-compose.h>
-#include <xkbcommon/xkbcommon.h>
#include "fcitx-config/configuration.h"
#include "fcitx-config/iniparser.h"
#include "fcitx-utils/event.h"
--
2.36.1

3
en_dict-20121020.tar.gz
View File

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

3
fcitx5-5.0.18.tar.xz
View File

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

3
fcitx5-5.0.19_dict.tar.xz Normal file
View File

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

17
fcitx5-no-download.patch
View File

@ -1,17 +0,0 @@
Index: fcitx5-4.99.0+git20180620.9e15086/src/modules/spell/dict/CMakeLists.txt
===================================================================
--- fcitx5-4.99.0+git20180620.9e15086.orig/src/modules/spell/dict/CMakeLists.txt
+++ fcitx5-4.99.0+git20180620.9e15086/src/modules/spell/dict/CMakeLists.txt
@@ -15,9 +15,9 @@ set(SPELL_EN_DICT_TAR "en_dict-${SPELL_E
set(SPELL_EN_DICT_URL
"https://download.fcitx-im.org/data/en_dict-${SPELL_EN_DICT_VER}.tar.gz")
-fcitx5_download(spell-en-download ${SPELL_EN_DICT_URL} ${SPELL_EN_DICT_TAR}
- c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb)
-fcitx5_extract(spell-en-extract "${SPELL_EN_DICT_TAR}" DEPENDS spell-en-download
+#fcitx5_download(spell-en-download ${SPELL_EN_DICT_URL} ${SPELL_EN_DICT_TAR}
+# c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb)
+fcitx5_extract(spell-en-extract "${SPELL_EN_DICT_TAR}"
OUTPUT ${SPELL_EN_DICT_SRC})
add_custom_command(

12
fcitx5.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Sep 20 13:29:06 UTC 2022 - Marguerite Su <i@marguerite.su>
- update version 5.0.19
* classicui: support blur mask on kwin (x11&wayland)
* xim: fix preedit start callback
- switch source to _dict variant and drop
* en_dict-20121020.tar.gz
* fcitx5-no-download.patch
- drop 0001-Remove-unused-xkbcommon-headers.patch,
upstreamed
-------------------------------------------------------------------
Mon Sep 19 07:43:09 UTC 2022 - Michal Suchanek <msuchanek@suse.com>

9
fcitx5.spec
View File

@ -25,23 +25,19 @@
%endif
Name: fcitx5
Version: 5.0.18
Version: 5.0.19
Release: 0
Summary: Next generation of fcitx
License: LGPL-2.1-or-later
Group: System/I18n/Chinese
URL: https://github.com/fcitx/fcitx5
Source: https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.xz
Source1: en_dict-20121020.tar.gz
Source: https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}_dict.tar.xz
Source2: https://raw.githubusercontent.com/fcitx/fcitx-artwork/master/logo/Fcitx.svg
Source3: xim.d-fcitx5
Source4: macros.fcitx5
Source102: fcitx5.service
Patch0: fcitx5-no-download.patch
Patch1: fcitx5-gcc7.patch
Patch2: fcitx5-5.0.13-memfd.patch
# PATCH-FIX-UPSTREAM gh#fcitx/fcitx5#538
Patch3: 0001-Remove-unused-xkbcommon-headers.patch
BuildRequires: cmake
BuildRequires: dbus-1-devel
BuildRequires: extra-cmake-modules
@ -142,7 +138,6 @@ This package provides utility libraries for fcitx5.
%prep
%autosetup -p1
cp -r %{SOURCE1} src/modules/spell/dict/
%build
%if 0%{?suse_version} < 1550