From c38979b038107deec09dd9f9e6ef360c58975d83 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 5 Feb 2024 17:35:42 -0800 Subject: [PATCH] ibus-anthy: update to 1.5.15. --- .../0001-read-utf-8-encoded-zipfile.patch | 25 ------------ .../patches/data-Update-era.t-with-2022.patch | 36 ------------------ ...imum-candidate-window-page-size-to-1.patch | 37 ------------------ .../ibus-anthy/patches/update-era-2024.patch | 38 +++++++++++++++++++ srcpkgs/ibus-anthy/template | 5 ++- 5 files changed, 41 insertions(+), 100 deletions(-) delete mode 100644 srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch delete mode 100644 srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch delete mode 100644 srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch create mode 100644 srcpkgs/ibus-anthy/patches/update-era-2024.patch diff --git a/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch b/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch deleted file mode 100644 index e8d5315cbf67f..0000000000000 --- a/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: NOKUBI Takatsugu -Date: Thu, 2 Nov 2017 15:11:52 +0900 -Subject: read utf-8 encoded zipfile - ---- - anthy form Debian converted those zipfile to utf-8 - data/zipcode-textdic.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/zipcode-textdic.py b/data/zipcode-textdic.py -index 6fa50d6..cb28a1f 100755 ---- a/data/zipcode-textdic.py -+++ b/data/zipcode-textdic.py -@@ -21,9 +21,9 @@ if len(sys.argv) < 2: - anthy_zipfile = sys.argv[1] - - try: -- contents = codecs.open(anthy_zipfile, 'r', 'euc_jp').read() -+ contents = codecs.open(anthy_zipfile, 'r', 'utf-8').read() - except UnicodeDecodeError as e: -- print('Your file is not eucJP? %s' % anthy_zipfile, file=sys.stderr) -+ print('Your file is not of UTF-8? %s' % anthy_zipfile, file=sys.stderr) - contents = open(anthy_zipfile).read() - - output_zipfile = codecs.open('zipcode.t', 'w', 'utf-8') diff --git a/srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch b/srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch deleted file mode 100644 index c1f66ee5cebeb..0000000000000 --- a/srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ed993538c711d817e5365630b65f372e0dfd01a7 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Thu, 27 Jan 2022 15:15:13 +0900 -Subject: [PATCH] data: Update era.t with 2022 - ---- - data/era.t | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/data/era.t b/data/era.t -index a6d297e..686271f 100644 ---- a/data/era.t -+++ b/data/era.t -@@ -2,7 +2,7 @@ - # - # ibus-anthy - The Anthy engine for IBus - # --# Copyright (c) 2010-2021 Takao Fujiwara -+# Copyright (c) 2010-2022 Takao Fujiwara - # Copyright (c) 2010-2013 Red Hat, Inc. - # - # This program is free software; you can redistribute it and/or modify -@@ -338,6 +338,8 @@ - れいわ２ #T35*500 2020 - れいわ３ #T35*500 令和3 - れいわ３ #T35*500 2021 -+れいわ４ #T35*500 令和4 -+れいわ４ #T35*500 2022 - １８６８ #T35*500 明治1 - １８６９ #T35*500 明治2 - １８７０ #T35*500 明治3 -@@ -496,3 +498,4 @@ - ２０１９ #T35*500 平成31 - ２０２０ #T35*500 令和2 - ２０２１ #T35*500 令和3 -+２０２２ #T35*500 令和4 diff --git a/srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch b/srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch deleted file mode 100644 index f21b70be968b6..0000000000000 --- a/srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4ef5ac95e84056ebd5a446e5e21b5f2a99377363 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Thu, 14 Apr 2022 15:23:26 +0900 -Subject: [PATCH] setup: Minimum candidate window page size to 1 - -IBusLookupTable assert with page_size > 0 (rhbz#2064261) ---- - setup/python2/setup.ui | 2 +- - setup/python3/setup.ui | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup/python2/setup.ui b/setup/python2/setup.ui -index 88b19b8..3e82f2e 100644 ---- a/setup/python2/setup.ui -+++ b/setup/python2/setup.ui -@@ -2,7 +2,7 @@ - - - 10 -- 0 -+ 1 - 0 - 1 - 0 -diff --git a/setup/python3/setup.ui b/setup/python3/setup.ui -index 88b19b8..3e82f2e 100644 ---- a/setup/python3/setup.ui -+++ b/setup/python3/setup.ui -@@ -2,7 +2,7 @@ - - - 10 -- 0 -+ 1 - 0 - 1 - 0 diff --git a/srcpkgs/ibus-anthy/patches/update-era-2024.patch b/srcpkgs/ibus-anthy/patches/update-era-2024.patch new file mode 100644 index 0000000000000..50b331e639f1c --- /dev/null +++ b/srcpkgs/ibus-anthy/patches/update-era-2024.patch @@ -0,0 +1,38 @@ +From 0cb7776994fadb4a4edf3259133bb40e7db31936 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 30 Jan 2024 11:47:51 +0900 +Subject: [PATCH] data: Update era.t with 2024 + +--- + data/era.t | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/data/era.t b/data/era.t +index 7f7bd1b..8750bc5 100644 +--- a/data/era.t ++++ b/data/era.t +@@ -2,7 +2,7 @@ + # + # ibus-anthy - The Anthy engine for IBus + # +-# Copyright (c) 2010-2023 Takao Fujiwara ++# Copyright (c) 2010-2024 Takao Fujiwara + # Copyright (c) 2010-2013 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -342,6 +342,8 @@ + れいわ４ #T35*500 2022 + れいわ５ #T35*500 令和5 + れいわ５ #T35*500 2023 ++れいわ６ #T35*500 令和6 ++れいわ６ #T35*500 2024 + １８６８ #T35*500 明治1 + １８６９ #T35*500 明治2 + １８７０ #T35*500 明治3 +@@ -502,3 +504,4 @@ + ２０２１ #T35*500 令和3 + ２０２２ #T35*500 令和4 + ２０２３ #T35*500 令和5 ++２０２４ #T35*500 令和6 +-- +2.43.0 diff --git a/srcpkgs/ibus-anthy/template b/srcpkgs/ibus-anthy/template index 83be78194d22a..006990c147cd6 100644 --- a/srcpkgs/ibus-anthy/template +++ b/srcpkgs/ibus-anthy/template @@ -1,6 +1,6 @@ # Template file for 'ibus-anthy' pkgname=ibus-anthy -version=1.5.14 +version=1.5.15 revision=1 build_style=gnu-configure build_helper=gir @@ -14,4 +14,5 @@ maintainer="7185 <7185@free.fr>" license="LGPL-2.1-or-later" homepage="https://github.com/fujiwarat/ibus-anthy/wiki" distfiles="https://github.com/ibus/ibus-anthy/releases/download/${version}/ibus-anthy-${version}.tar.gz" -checksum=c8694da18d0b891a48f4d75a0dece37ecbca6d1b1acb64101a7a84cad1046d9b +checksum=58c4e6d5836a4ac9e33aa9e84e58c4deb67ada98f3b544b2440c5783237ed98b +make_check=no # Requires desktop environment and freezes with xvfb-run