Update ibusunicodegen.h with latest unicode-ucd

- Update simple.xml with latest xkeyboard-config - Fix gvfsd-fuse to unbind directory - Update translations
2020-08-27 12:12:20 +09:00 · 2020-08-27 12:12:20 +09:00 · f661c28f2f
commit f661c28f2f
parent 652774a06c
4 changed files with 167 additions and 11 deletions
--- a/.gitignore
+++ b/.gitignore
@ -27,12 +27,7 @@
 /ibus-gjs-3.4.1.20130115.tar.gz
 /ibus-xkb-1.5.0.tar.gz
 /ibus-xkb-1.5.0.20140114.tar.gz
-/ibus-po-1.5.9-20141001.tar.gz
-/ibus-po-1.5.10-20150402.tar.gz
-/ibus-po-1.5.14-20160909.tar.gz
-/ibus-po-1.5.17-20180221.tar.gz
-/ibus-po-1.5.18-20180627.tar.gz
-/ibus-po-1.5.19-20180822.tar.gz
+/ibus-po-1.5.22-20200827.tar.gz
 ibus-1.3.6.tar.gz
 /ibus-1.3.7.tar.gz
 /ibus-1.3.8.tar.gz
@ -61,5 +56,4 @@ ibus-1.3.6.tar.gz
 /ibus-1.5.20.tar.gz
 /ibus-1.5.21.tar.gz
 /ibus-1.5.22.tar.gz
-/ibus-simple-1.5.22.20200821.xml.gz
-/ibus-simple-1.5.22.20200821.2.xml.gz
+/ibus-simple-1.5.22.20200826.xml.gz
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@ -2126,3 +2126,156 @@ index dc4ccf12..18f7dc8c 100755
 -- 
 2.24.1

+From 5959d6f1d40c06f57bd895cd84d2b84deb6b6d8d Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Thu, 27 Aug 2020 10:30:43 +0900
+Subject: [PATCH] data/dconf: Fix rm $TMPDIR in make-dconf-override-db.sh
+
+dbus-launch and gsettings run /usr/lib*/gvfsd-fuse $TMPDIR/cache/gvfs -f
+via systemd since gvfs 1.45.90 in Fedora 33
+---
+ data/dconf/make-dconf-override-db.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
+index 9c650e97..48dd8fac 100755
+--- a/data/dconf/make-dconf-override-db.sh
+++ b/data/dconf/make-dconf-override-db.sh
+@@ -45,6 +45,10 @@ for schema in $schemas; do
+   done
+ done
+ 
+# dbus-launch and gsettings run /usr/lib*/gvfsd-fuse $TMPDIR/cache/gvfs -f
+# via systemd since gvfs 1.45.90 in Fedora 33
+# and rm $TMPDIR could be failed until umount would be called.
+umount $TMPDIR/cache/gvfs
+ rm -rf $TMPDIR
+ 
+ kill $DBUS_SESSION_BUS_PID
+-- 
+2.24.1
+
+From e10fc89c5afa1941801429b3a653b3f83b5d3802 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Thu, 27 Aug 2020 10:31:10 +0900
+Subject: [PATCH] src: Update ibusunicodegen.h with unicode-ucd 13.0.0
+
+---
+ src/ibusunicodegen.h |  32 ++++
+ 2 files changed, 262 insertions(+), 170 deletions(-)
+
+diff --git a/src/ibusunicodegen.h b/src/ibusunicodegen.h
+index 6a60a5a9..c891d0e3 100644
+--- a/src/ibusunicodegen.h
+++ b/src/ibusunicodegen.h
+@@ -847,6 +847,10 @@ const static char *unicode_blocks[] = {
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+     N_("Rumi Numeral Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Yezidi"),
+     /* TRANSLATORS: You might refer the translations from gucharmap with
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+@@ -855,6 +859,10 @@ const static char *unicode_blocks[] = {
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+     N_("Sogdian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Chorasmian"),
+     /* TRANSLATORS: You might refer the translations from gucharmap with
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+@@ -939,6 +947,10 @@ const static char *unicode_blocks[] = {
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+     N_("Warang Citi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Dives Akuru"),
+     /* TRANSLATORS: You might refer the translations from gucharmap with
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+@@ -975,6 +987,10 @@ const static char *unicode_blocks[] = {
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+     N_("Makasar"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Lisu Supplement"),
+     /* TRANSLATORS: You might refer the translations from gucharmap with
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+@@ -1039,6 +1055,14 @@ const static char *unicode_blocks[] = {
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+     N_("Tangut Components"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Khitan Small Script"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tangut Supplement"),
+     /* TRANSLATORS: You might refer the translations from gucharmap with
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+@@ -1187,6 +1211,10 @@ const static char *unicode_blocks[] = {
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+     N_("Symbols and Pictographs Extended-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Symbols for Legacy Computing"),
+     /* TRANSLATORS: You might refer the translations from gucharmap with
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+@@ -1211,6 +1239,10 @@ const static char *unicode_blocks[] = {
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+     N_("CJK Compatibility Ideographs Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Unified Ideographs Extension G"),
+     /* TRANSLATORS: You might refer the translations from gucharmap with
+                     the following command:
+        msgmerge -C gucharmap.po ibus.po ibus.pot */
+-- 
+2.24.1
+
+From 394d9a83962225bff4c39ed3e9ddd5c3019a3936 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Thu, 27 Aug 2020 11:52:16 +0900
+Subject: [PATCH] data/dconf: Fix regression in make-dconf-override-db.sh
+
+---
+ data/dconf/make-dconf-override-db.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
+index 48dd8fac..601c1c3f 100755
+--- a/data/dconf/make-dconf-override-db.sh
+++ b/data/dconf/make-dconf-override-db.sh
+@@ -48,7 +48,9 @@ done
+ # dbus-launch and gsettings run /usr/lib*/gvfsd-fuse $TMPDIR/cache/gvfs -f
+ # via systemd since gvfs 1.45.90 in Fedora 33
+ # and rm $TMPDIR could be failed until umount would be called.
+-umount $TMPDIR/cache/gvfs
+if [ -d $TMPDIR/cache/gvfs ] ; then
+    umount $TMPDIR/cache/gvfs
+fi
+ rm -rf $TMPDIR
+ 
+ kill $DBUS_SESSION_BUS_PID
+-- 
+2.24.1
+
--- a/ibus.spec
+++ b/ibus.spec
@ -26,14 +26,15 @@

 Name:           ibus
 Version:        1.5.22
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
 Source0:        https://github.com/ibus/%name/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}-xinput
 Source2:        %{name}.conf.5
-Source3:        %{name}-simple-1.5.22.20200821.2.xml.gz
+Source3:        https://fujiwara.fedorapeople.org/ibus/po/%{name}-simple-1.5.22.20200826.xml.gz
+Source4:        https://fujiwara.fedorapeople.org/ibus/po/%{name}-po-1.5.22-20200827.tar.gz
 # Patch0:         %%{name}-HEAD.patch
 Patch0:         %{name}-HEAD.patch
 # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
@ -251,6 +252,7 @@ cd engine
 cp %{SOURCE3} simple.xml.gz
 gunzip simple.xml.gz
 cd ..
+zcat %{SOURCE4} | tar xfv -


 # prep test
@ -458,6 +460,12 @@ dconf update || :
 %{_datadir}/installed-tests/ibus

 %changelog
+* Thu Aug 27 2020 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.22-14
+- Update ibusunicodegen.h with latest unicode-ucd
+- Update simple.xml with latest xkeyboard-config
+- Fix gvfsd-fuse to unbind directory
+- Update translations
+
 * Fri Aug 21 2020 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.22-13
 - Update simple.xml with layout_variant

--- a/3
+++ b/3
@ -1,2 +1,3 @@
 SHA512 (ibus-1.5.22.tar.gz) = 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
-SHA512 (ibus-simple-1.5.22.20200821.2.xml.gz) = 7c698e1a06da8e120d13c324d0eecad6ee0094e59cae2d9d5782e027c30de0e0259c6116919481e0438698bf20867cd2dad51ee90fb37a2fe1bde242e03920a5
+SHA512 (ibus-simple-1.5.22.20200826.xml.gz) = 8de160f73f474f6eed838171fdc28a0f9d32def4d7f80f83e125bcde5fddd99807545bfde8ee19a964d40419f029f160356e0b188472a2bd742f9882dd4673df
+SHA512 (ibus-po-1.5.22-20200827.tar.gz) = 87bcade0166744e186af81747d5f3c38e223a85f6bef859f714a8dc9912789def2bc41c67b78a2743455be3c53df31953ca382f0d23ac115a0a42deea7675de3