From 906bed46f0bd8449b760a4da025693c3b71c68d6 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 1 Jan 2021 06:58:53 +0800 Subject: [PATCH 1/2] [patch tracking] 20210101065849799340 - https://github.com/ibus/ibus/commit/30a3641e19c541924959a5770dd784b4424288d4 --- ...641e19c541924959a5770dd784b4424288d4.patch | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 30a3641e19c541924959a5770dd784b4424288d4.patch diff --git a/30a3641e19c541924959a5770dd784b4424288d4.patch b/30a3641e19c541924959a5770dd784b4424288d4.patch new file mode 100644 index 0000000..676dba7 --- /dev/null +++ b/30a3641e19c541924959a5770dd784b4424288d4.patch @@ -0,0 +1,76 @@ +diff --git a/.travis.yml b/.travis.yml +new file mode 100644 +index 000000000..e90dc230c +--- /dev/null ++++ b/.travis.yml +@@ -0,0 +1,70 @@ ++language: c ++compiler: gcc ++os: linux ++ ++# Require gettext-0.19.8 ++dist: focal ++ ++branches: ++ only: ++ - master ++ ++# FIXME: Run script in every arch ++arch: ++ - amd64 ++ #- ppc64le ++ #- s390x ++ #- arm64 ++ ++addons: ++ apt: ++ packages: ++ # For autogen.sh ++ - gnome-common ++ - gtk-doc-tools ++ # For make from ++ # https://packages.ubuntu.com/search?searchon=sourcenames&keywords=ibus ++ - desktop-file-utils ++ - gobject-introspection ++ - iso-codes ++ - libdconf-dev ++ - libgirepository1.0-dev ++ - libglib2.0-dev ++ - libgtk-3-bin ++ - libgtk-3-dev ++ - libgtk2.0-dev ++ - libtool ++ - libwayland-dev ++ - python-gi-dev ++ - python3-all ++ - unicode-cldr-core ++ - unicode-data ++ - valac ++ ++jobs: ++ include: ++ - name: Build in Ubuntu ++ before_script: ++ - sudo apt-get -qq update ++ script: ++ - set -e ++ - git pull --depth=200 ++ # configure options from ++ # https://salsa.debian.org/debian/ibus/-/blob/master/debian/rules ++ - > ++ ./autogen.sh ++ --with-ucd-dir='/usr/share/unicode' ++ # Set the cutom DESTDIR because the default DESTDIR ++ # /home/travis/bulid/fujiwarat/$PKG/ibus/ibus-$VERSION/_inst seems to be ++ # too long and failed to set DESTDIR to install bindings/pygobject/IBus.py ++ - > ++ make distcheck ++ DISTCHECK_CONFIGURE_FLAGS=" ++ --enable-gtk-doc ++ --disable-schemas-install ++ --enable-memconf ++ --with-ucd-dir='/usr/share/unicode' ++ " ++ DISABLE_GUI_TESTS="ibus-compose ibus-keypress test-stress" ++ VERBOSE=1 ++ DESTDIR="$HOME/build/$USER/dest" -- Gitee From dea448e2cc8e1c0cb42452e6429c79d7ee3fa109 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 1 Jan 2021 06:58:54 +0800 Subject: [PATCH 2/2] [patch tracking] 20210101065849799340 - update spec file --- ibus.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ibus.spec b/ibus.spec index 6f74cf7..887fe26 100644 --- a/ibus.spec +++ b/ibus.spec @@ -6,7 +6,7 @@ Name: ibus Version: 1.5.22 -Release: 3 +Release: 4 Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ URL: https://github.com/ibus/%name/wiki @@ -19,6 +19,7 @@ Patch1: %{name}-1385349-segv-bus-proxy.patch Patch6000: 02338ce751a1ed5b9b892fba530ec2fe211d314e.patch Patch6001: aa558de80c224921753990806cf553428fbe7057.patch Patch6002: b72efea42d5f72e08e2774ae03027c246d41cab7.patch +Patch6003: 30a3641e19c541924959a5770dd784b4424288d4.patch BuildRequires: gettext-devel libtool glib2-doc gtk2-devel gtk3-devel dbus-glib-devel gtk-doc dconf-devel dbus-x11 python3-devel BuildRequires: dbus-python-devel >= %{dbus_python_version} desktop-file-utils python3-gobject vala vala-devel vala-tools @@ -183,6 +184,9 @@ dconf update || : %{_datadir}/gtk-doc/html/* %changelog +* 20210101065849799340 patch-tracking 1.5.22-4 +- append patch file of upstream repository from <30a3641e19c541924959a5770dd784b4424288d4> to <30a3641e19c541924959a5770dd784b4424288d4> + * 20201121063007667187 patch-tracking 1.5.22-3 - append patch file of upstream repository from <02338ce751a1ed5b9b892fba530ec2fe211d314e> to @@ -211,4 +215,4 @@ dconf update || : - DESC:add COPYING.unicode * Thu Sep 19 2019 openEuler Buildteam - 1.5.19-5 -- Package init +- Package init \ No newline at end of file -- Gitee