From 92019933fe08cfe3bb4a91d3d734e0304c90b190 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Jul 28 2023 15:30:36 +0000 Subject: Implement Plasma Wayland --- diff --git a/.gitignore b/.gitignore index 43008d8..412db0c 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ ibus-1.3.6.tar.gz /ibus-1.5.26.tar.gz /ibus-1.5.27.tar.gz /ibus-1.5.28.tar.gz +/ibus-1.5.29-beta1.tar.gz diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/ibus-HEAD.patch diff --git a/ibus.spec b/ibus.spec index 571e81e..4cf98d7 100644 --- a/ibus.spec +++ b/ibus.spec @@ -1,3 +1,5 @@ +%global source_version %%(echo "%version" | tr '~' '-') + # https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_3 %if (0%{?fedora} > 29 || 0%{?rhel} > 7) %global with_python2 0 @@ -49,16 +51,15 @@ %global dbus_python_version 0.83.0 Name: ibus -Version: 1.5.28 -Release: 14%{?dist} +Version: 1.5.29~beta1 +Release: 1%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPL-2.0-or-later URL: https://github.com/ibus/%name/wiki -Source0: https://github.com/ibus/%name/releases/download/%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/ibus/%name/releases/download/%{source_version}/%{name}-%{source_version}.tar.gz Source1: %{name}-xinput Source2: %{name}.conf.5 # Patch0: %%{name}-HEAD.patch -Patch0: %{name}-HEAD.patch # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577 Patch1: %{name}-1385349-segv-bus-proxy.patch %if 0%{?fedora:0}%{?rhel:1} @@ -96,6 +97,7 @@ BuildRequires: intltool BuildRequires: git BuildRequires: vala BuildRequires: iso-codes-devel +BuildRequires: libdbusmenu-gtk3-devel BuildRequires: libnotify-devel BuildRequires: wayland-devel BuildRequires: cldr-emoji-annotation @@ -291,12 +293,10 @@ the functionality of the installed %{name} package. %prep -%autosetup -S git +%autosetup -S git -n %{name}-%{source_version} # cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || : # cp client/gtk2/ibusim.c client/gtk3/ibusim.c || : # cp client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c || : -cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || : -cp client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c || : # prep test @@ -345,7 +345,6 @@ autoreconf -f -i -v --enable-install-tests \ %{nil} -make -C ui/gtk3 maintainer-clean-generic %make_build %install @@ -442,6 +441,7 @@ dconf update || : %{_bindir}/ibus-daemon %{_datadir}/applications/org.freedesktop.IBus.Panel.Emojier.desktop %{_datadir}/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop +%{_datadir}/applications/org.freedesktop.IBus.Panel.Wayland.Gtk3.desktop %{_datadir}/bash-completion/completions/ibus.bash %{_datadir}/dbus-1/services/*.service %{_datadir}/GConf/gsettings/* @@ -557,6 +557,9 @@ dconf update || : %{_datadir}/installed-tests/ibus %changelog +* Fri Jul 28 2023 Takao Fujiwara - 1.5.29~beta1-1 +- Implement Plasma Wayland + * Thu Jul 20 2023 Fedora Release Engineering - 1.5.28-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index e8defda..8f98bc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ibus-1.5.28.tar.gz) = 5bfb9158a5810d38af900775ed30406823872c431ef4772b476afa7b58c120ef508a51b961620ea6003549f1f49cf05484992beee8677b138f1162afc73ab247 +SHA512 (ibus-1.5.29-beta1.tar.gz) = 58beb2cb3293a1a1ade9abac351954473c92e14f23a1a81e5bcef5745367cf6a96712f6905d3e0fb6e32cd203845968d41957b67009662a287692f79b0a0137d