MSVSphere Packaging Team
3 months ago
commit
50457a77c3
GPG Key ID:
B2B0B9F29E528FE8
@ -0,0 +1 @@
|
|||||||
|
SOURCES/ibus-anthy-1.5.16.tar.gz
|
||||||
@ -0,0 +1 @@
|
|||||||
|
2dc9f65f613d211d552e504c1511f02d81a3c355 SOURCES/ibus-anthy-1.5.16.tar.gz
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
From e4ef13166118fe991f7590b093671f9361e9c1cc Mon Sep 17 00:00:00 2001
|
||||||
|
From: fujiwarat <takao.fujiwara1@gmail.com>
|
||||||
|
Date: Tue, 16 Mar 2021 22:13:01 +0900
|
||||||
|
Subject: [PATCH] data: Change default input mode to Hiragana (rhbz#1938129)
|
||||||
|
|
||||||
|
GNOME desktop sets unnecessary JP keymap by default and a few newcomers
|
||||||
|
wish to use Hiragana mode directly.
|
||||||
|
This internal patch will be deleted if the default desktop would be changed.
|
||||||
|
---
|
||||||
|
data/org.freedesktop.ibus.engine.anthy.gschema.xml.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in b/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in
|
||||||
|
index 773be09..cd5a13b 100644
|
||||||
|
--- a/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in
|
||||||
|
+++ b/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
<schema path="/org/freedesktop/ibus/engine/anthy/common/"
|
||||||
|
id="org.freedesktop.ibus.engine.anthy.common">
|
||||||
|
<key name="input-mode" type="i">
|
||||||
|
- <default>3</default>
|
||||||
|
+ <default>0</default>
|
||||||
|
<summary>Input Mode</summary>
|
||||||
|
<description></description>
|
||||||
|
</key>
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
@ -0,0 +1,101 @@
|
|||||||
|
From 9ae92d7b8085e869d37a068a1a94815c78de6110 Mon Sep 17 00:00:00 2001
|
||||||
|
From: fujiwarat <takao.fujiwara1@gmail.com>
|
||||||
|
Date: Tue, 12 Mar 2024 18:25:39 +0900
|
||||||
|
Subject: [PATCH] engine: Ignore Super modifier key
|
||||||
|
|
||||||
|
Super-l is a shortcut key to launch a lock screen in GNOME desktop
|
||||||
|
session and now it can be sent to the engine prior to the window
|
||||||
|
manager.
|
||||||
|
---
|
||||||
|
engine/python2/engine.py | 6 ++++--
|
||||||
|
engine/python3/engine.py | 6 ++++--
|
||||||
|
2 files changed, 8 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/engine/python2/engine.py b/engine/python2/engine.py
|
||||||
|
index 42d4dc1..c7ccd3f 100644
|
||||||
|
--- a/engine/python2/engine.py
|
||||||
|
+++ b/engine/python2/engine.py
|
||||||
|
@@ -4,7 +4,7 @@
|
||||||
|
# ibus-anthy - The Anthy engine for IBus
|
||||||
|
#
|
||||||
|
# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
|
||||||
|
-# Copyright (c) 2010-2023 Takao Fujiwara <takao.fujiwara1@gmail.com>
|
||||||
|
+# Copyright (c) 2010-2024 Takao Fujiwara <takao.fujiwara1@gmail.com>
|
||||||
|
# Copyright (c) 2007-2018 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
@@ -1976,7 +1976,9 @@ class Engine(IBus.EngineSimple):
|
||||||
|
state & hex_mod_mask == hex_mod_mask:
|
||||||
|
return True
|
||||||
|
|
||||||
|
- if state & (IBus.ModifierType.CONTROL_MASK | IBus.ModifierType.MOD1_MASK):
|
||||||
|
+ if state & (IBus.ModifierType.CONTROL_MASK | \
|
||||||
|
+ IBus.ModifierType.MOD1_MASK | \
|
||||||
|
+ IBus.ModifierType.MOD4_MASK):
|
||||||
|
return False
|
||||||
|
|
||||||
|
if (IBus.KEY_exclam <= keyval <= IBus.KEY_asciitilde or
|
||||||
|
diff --git a/engine/python3/engine.py b/engine/python3/engine.py
|
||||||
|
index 4b50a01..0858614 100644
|
||||||
|
--- a/engine/python3/engine.py
|
||||||
|
+++ b/engine/python3/engine.py
|
||||||
|
@@ -4,7 +4,7 @@
|
||||||
|
# ibus-anthy - The Anthy engine for IBus
|
||||||
|
#
|
||||||
|
# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
|
||||||
|
-# Copyright (c) 2010-2023 Takao Fujiwara <takao.fujiwara1@gmail.com>
|
||||||
|
+# Copyright (c) 2010-2024 Takao Fujiwara <takao.fujiwara1@gmail.com>
|
||||||
|
# Copyright (c) 2007-2018 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
@@ -1971,7 +1971,9 @@ class Engine(IBus.EngineSimple):
|
||||||
|
state & hex_mod_mask == hex_mod_mask:
|
||||||
|
return True
|
||||||
|
|
||||||
|
- if state & (IBus.ModifierType.CONTROL_MASK | IBus.ModifierType.MOD1_MASK):
|
||||||
|
+ if state & (IBus.ModifierType.CONTROL_MASK | \
|
||||||
|
+ IBus.ModifierType.MOD1_MASK | \
|
||||||
|
+ IBus.ModifierType.MOD4_MASK):
|
||||||
|
return False
|
||||||
|
|
||||||
|
if (IBus.KEY_exclam <= keyval <= IBus.KEY_asciitilde or
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
|
From c89a60350b2a949306bf75d64e06a0cde3a7846c Mon Sep 17 00:00:00 2001
|
||||||
|
From: fujiwarat <takao.fujiwara1@gmail.com>
|
||||||
|
Date: Sun, 12 May 2024 13:01:50 +0900
|
||||||
|
Subject: [PATCH] tests: Fix CI freeze
|
||||||
|
|
||||||
|
Seems infinit calling g_resources_register_unlocked() happens
|
||||||
|
in register_lazy_static_resources_unlocked() from
|
||||||
|
g_resources_lookup_data() when ibus_init() is called after
|
||||||
|
gtk_init() or gdk_display_open() is called.
|
||||||
|
It's good to delete ibus_init() here since IBus GTK IM module already
|
||||||
|
calls it.
|
||||||
|
---
|
||||||
|
tests/anthytest.py | 8 +++++++-
|
||||||
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/anthytest.py b/tests/anthytest.py
|
||||||
|
index 1d18d19..cf2d6bc 100755
|
||||||
|
--- a/tests/anthytest.py
|
||||||
|
+++ b/tests/anthytest.py
|
||||||
|
@@ -77,7 +77,13 @@ class AnthyTest(unittest.TestCase):
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def setUpClass(cls):
|
||||||
|
- IBus.init()
|
||||||
|
+ # Already called in ibus/client/gtk3/ibusim.c:im_module_init().
|
||||||
|
+ # Otherwise infinit g_resources_register_unlocked() happens in
|
||||||
|
+ # register_lazy_static_resources_unlocked()
|
||||||
|
+ # from g_resources_lookup_data()
|
||||||
|
+ # or IBus.init() could be called before Gdk.Display.open('') is called.
|
||||||
|
+ #IBus.init()
|
||||||
|
+ pass
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self.__id = 0
|
||||||
|
--
|
||||||
|
2.45.0
|
||||||
|
|
||||||
@ -0,0 +1,184 @@
|
|||||||
|
## START: Set by rpmautospec
|
||||||
|
## (rpmautospec version 0.6.5)
|
||||||
|
## RPMAUTOSPEC: autorelease, autochangelog
|
||||||
|
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
||||||
|
release_number = 11;
|
||||||
|
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
|
||||||
|
print(release_number + base_release_number - 1);
|
||||||
|
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
|
||||||
|
## END: Set by rpmautospec
|
||||||
|
|
||||||
|
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_3
|
||||||
|
%global sub_version 1.0
|
||||||
|
%global require_ibus_version 1.5.3
|
||||||
|
%global have_default_layout 1
|
||||||
|
%global have_bridge_hotkey 1
|
||||||
|
%global with_python3 1
|
||||||
|
|
||||||
|
%if (0%{?fedora} > 33 || 0%{?rhel} > 8)
|
||||||
|
%bcond_without kasumi_unicode
|
||||||
|
%else
|
||||||
|
%bcond_with kasumi_unicode
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %with_python3
|
||||||
|
# for bytecompile in %%{_datadir}/ibus-anthy
|
||||||
|
%global __python %{__python3}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
Name: ibus-anthy
|
||||||
|
Version: 1.5.16
|
||||||
|
Release: %autorelease
|
||||||
|
Summary: The Anthy engine for IBus input platform
|
||||||
|
License: GPL-2.0-or-later
|
||||||
|
URL: https://github.com/ibus/ibus/wiki
|
||||||
|
Source0: https://github.com/ibus/ibus-anthy/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
# Upstreamed patches.
|
||||||
|
# Patch0: %%{name}-HEAD.patch
|
||||||
|
Patch0: %{name}-HEAD.patch
|
||||||
|
Patch1: %{name}-1938129-default-hiragana.patch
|
||||||
|
|
||||||
|
BuildRequires: anthy-unicode-devel
|
||||||
|
BuildRequires: desktop-file-utils
|
||||||
|
BuildRequires: gettext-devel
|
||||||
|
BuildRequires: git
|
||||||
|
BuildRequires: glib2-devel
|
||||||
|
BuildRequires: gobject-introspection-devel
|
||||||
|
BuildRequires: ibus
|
||||||
|
BuildRequires: libtool
|
||||||
|
BuildRequires: pkgconfig
|
||||||
|
BuildRequires: python3-devel
|
||||||
|
BuildRequires: python3-gobject
|
||||||
|
BuildRequires: /usr/bin/appstream-util
|
||||||
|
|
||||||
|
Requires: ibus >= %{require_ibus_version}
|
||||||
|
%if %{with kasumi_unicode}
|
||||||
|
Requires: kasumi-unicode
|
||||||
|
%else
|
||||||
|
Requires: kasumi
|
||||||
|
%endif
|
||||||
|
Requires: anthy-unicode
|
||||||
|
Requires: %{name}-python = %{version}-%{release}
|
||||||
|
|
||||||
|
%description
|
||||||
|
The Anthy engine for IBus platform. It provides Japanese input method from
|
||||||
|
a library of the Anthy.
|
||||||
|
|
||||||
|
%package python
|
||||||
|
Summary: Anthy Python files for IBus
|
||||||
|
BuildArch: noarch
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Requires: gtk3
|
||||||
|
Requires: python3-cairo
|
||||||
|
Requires: python3-gobject
|
||||||
|
|
||||||
|
%description python
|
||||||
|
This package contains the Anthy Python files for IBus
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development tools for IBus
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
Requires: glib2-devel
|
||||||
|
Requires: anthy-unicode-devel
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
The ibus-anthy-devel package contains .so file and .gir files
|
||||||
|
for developers.
|
||||||
|
|
||||||
|
%package tests
|
||||||
|
Summary: Tests for the %{name} package
|
||||||
|
BuildRequires: python3-pycotap
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
Requires: python3-pycotap
|
||||||
|
|
||||||
|
%description tests
|
||||||
|
The %{name}-tests package contains tests that can be used to verify
|
||||||
|
the functionality of the installed %{name} package.
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -S git
|
||||||
|
|
||||||
|
%build
|
||||||
|
#autoreconf -f -i -v
|
||||||
|
%configure \
|
||||||
|
%if %have_default_layout
|
||||||
|
--with-layout='default' \
|
||||||
|
%endif
|
||||||
|
%if %have_bridge_hotkey
|
||||||
|
--with-hotkeys \
|
||||||
|
%endif
|
||||||
|
%if %{with kasumi_unicode}
|
||||||
|
--with-kasumi-exec=/usr/bin/kasumi-unicode \
|
||||||
|
%endif
|
||||||
|
--with-on-off-keys="'Zenkaku_Hankaku', 'Ctrl+space', 'Ctrl+J'" \
|
||||||
|
--with-python=python3 \
|
||||||
|
--enable-installed-tests \
|
||||||
|
--disable-static
|
||||||
|
# make -C po update-gmo
|
||||||
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
%install
|
||||||
|
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_libdir}/libanthygobject-%{sub_version}.la
|
||||||
|
|
||||||
|
|
||||||
|
%find_lang %{name}
|
||||||
|
|
||||||
|
%check
|
||||||
|
desktop-file-validate \
|
||||||
|
$RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-anthy.desktop
|
||||||
|
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.xml
|
||||||
|
export LANG=C.UTF-8
|
||||||
|
locale
|
||||||
|
make -C data check
|
||||||
|
|
||||||
|
%ldconfig_scriptlets libs
|
||||||
|
|
||||||
|
|
||||||
|
%files -f %{name}.lang
|
||||||
|
%doc AUTHORS COPYING README
|
||||||
|
# dir {python2_sitearch}/ibus
|
||||||
|
%{_libdir}/libanthygobject-%{sub_version}.so.*
|
||||||
|
%{_libdir}/girepository-1.0/Anthy*.typelib
|
||||||
|
%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.anthy.gschema.xml
|
||||||
|
%dir %{_datadir}/ibus-anthy
|
||||||
|
%{_datadir}/applications/ibus-setup-anthy.desktop
|
||||||
|
%{_datadir}/ibus-anthy/dicts
|
||||||
|
%{_datadir}/icons/hicolor/scalable/apps/ibus-anthy.svg
|
||||||
|
|
||||||
|
%files python
|
||||||
|
%{_libexecdir}/ibus-*-anthy
|
||||||
|
%{_datadir}/ibus-anthy/engine
|
||||||
|
%{_datadir}/ibus-anthy/setup
|
||||||
|
%{_datadir}/ibus/component/*
|
||||||
|
%{_metainfodir}/*.xml
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%{_datadir}/gir-1.0/Anthy*.gir
|
||||||
|
%{_includedir}/ibus-anthy-%{sub_version}
|
||||||
|
%{_libdir}/libanthygobject-%{sub_version}.so
|
||||||
|
|
||||||
|
%files tests
|
||||||
|
%dir %{_libexecdir}/installed-tests
|
||||||
|
%{_libexecdir}/installed-tests/%{name}
|
||||||
|
%dir %{_datadir}/installed-tests
|
||||||
|
%{_datadir}/installed-tests/%{name}
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.5.16-11
|
||||||
|
- Rebuilt for MSVSphere 10
|
||||||
|
|
||||||
|
## START: Generated by rpmautospec
|
||||||
|
* Sat Jul 13 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.16-11
|
||||||
|
- Update required packages in CI
|
||||||
|
- adobe-source-code-pro-fonts is no longer available in RHEL10
|
||||||
|
- dnf and git do not work after systemd-oomd-defaults is installed
|
||||||
|
|
||||||
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.16-10
|
||||||
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
* Thu May 16 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.16-9
|
||||||
|
- RPMAUTOSPEC: unresolvable merge
|
||||||
|
## END: Generated by rpmautospec
|
||||||
Loading…
Reference in new issue