* [PR PATCH] ibus-anthy: update to 1.5.14.
@ 2022-07-24 22:26 oreo639
2022-07-25 7:31 ` [PR PATCH] [Updated] " oreo639
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: oreo639 @ 2022-07-24 22:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1892 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages ianthy
https://github.com/void-linux/void-packages/pull/38256
ibus-anthy: update to 1.5.14.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This enables tests, although I can disable it again if you want.
swig is only needed when building with pygtk.
intltool is not needed by ibus-anthy.
This removes `--libexec=/usr/lib/ibus` doesn't appear to be needed anymore and it fixes the preferences popup for me.
This uses `--with-layout=default` which is used by debian and fedora to tell ibus-anthy to use the default keyboard layout (otherwise it will always use JP).
This also moves ibus-anthy from Debian Anthy to anthy-unicode, this is what is also used by fcitx5-anthy.
In the basic testing I did, I didn't notice any issues, but please let me know if I missed something.
cc: @7185
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38256.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ianthy-38256.patch --]
[-- Type: text/x-diff, Size: 6379 bytes --]
From b27084035721b7964b775605a2a3208d0338d751 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 14:52:14 -0700
Subject: [PATCH 1/2] New package: python3-pycotap-1.2.2
---
srcpkgs/python3-pycotap/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/python3-pycotap/template
diff --git a/srcpkgs/python3-pycotap/template b/srcpkgs/python3-pycotap/template
new file mode 100644
index 000000000000..ae4ca676d6bc
--- /dev/null
+++ b/srcpkgs/python3-pycotap/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-pycotap'
+pkgname=python3-pycotap
+version=1.2.2
+revision=1
+wrksrc="pycotap-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Tiny test runner that outputs TAP results to standard output"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://el-tramo.be/pycotap/"
+distfiles="${PYPI_SITE}/p/pycotap/pycotap-${version}.tar.gz"
+checksum=f938ecd4931ccd19d9598fb633d5eabb7938f08b84717315e52526aa6277c9ec
From 60663838b2034e97a395e0937e9198ce1c7b44e0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 14:52:45 -0700
Subject: [PATCH 2/2] ibus-anthy: update to 1.5.14.
---
.../patches/data-Update-era.t-with-2022.patch | 36 ++++++++++++++++++
...imum-candidate-window-page-size-to-1.patch | 37 +++++++++++++++++++
srcpkgs/ibus-anthy/template | 24 ++++--------
3 files changed, 81 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch
create mode 100644 srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch
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
new file mode 100644
index 000000000000..c1f66ee5cebe
--- /dev/null
+++ b/srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch
@@ -0,0 +1,36 @@
+From ed993538c711d817e5365630b65f372e0dfd01a7 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+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 <takao.fujiwara1@gmail.com>
++# Copyright (c) 2010-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ # 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
new file mode 100644
index 000000000000..f21b70be968b
--- /dev/null
+++ b/srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch
@@ -0,0 +1,37 @@
+From 4ef5ac95e84056ebd5a446e5e21b5f2a99377363 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+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 @@
+ <interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">10</property>
+- <property name="lower">0</property>
++ <property name="lower">1</property>
+ <property name="page_increment">0</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+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 @@
+ <interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">10</property>
+- <property name="lower">0</property>
++ <property name="lower">1</property>
+ <property name="page_increment">0</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
diff --git a/srcpkgs/ibus-anthy/template b/srcpkgs/ibus-anthy/template
index 70c28c0a55c9..a3d8b6f34797 100644
--- a/srcpkgs/ibus-anthy/template
+++ b/srcpkgs/ibus-anthy/template
@@ -1,25 +1,17 @@
# Template file for 'ibus-anthy'
pkgname=ibus-anthy
-version=1.5.12
+version=1.5.14
revision=1
build_style=gnu-configure
build_helper=gir
-configure_args="--libexec=/usr/lib/ibus"
-hostmakedepends="automake libtool pkg-config swig intltool gettext-devel"
-makedepends="anthy-devel ibus-devel python3-gobject-devel"
+configure_args="--with-python=python3 --with-layout=default"
+hostmakedepends="automake libtool pkg-config gettext"
+makedepends="anthy-unicode-devel ibus-devel python3-gobject-devel"
depends="ibus"
+checkdepends="procps-ng python3-pycotap"
short_desc="Japanese input method Anthy IMEngine for IBus Framework"
maintainer="7185 <7185@free.fr>"
license="LGPL-2.1-or-later"
-homepage="https://github.com/ibus/ibus/wiki"
-distfiles="https://github.com/ibus/${pkgname}/archive/${version}.tar.gz"
-checksum=7756216666264b25083adb3a3e53f6a0ff744efc3331fe7ac7becbf4ed17d2ca
-make_check=extended
-
-post_patch() {
- 2to3 -w gir/test.py
-}
-
-pre_configure() {
- autoreconf -fi
-}
+homepage="https://github.com/fujiwarat/anthy-unicode/wiki"
+distfiles="https://github.com/ibus/ibus-anthy/releases/download/${version}/ibus-anthy-${version}.tar.gz"
+checksum=c8694da18d0b891a48f4d75a0dece37ecbca6d1b1acb64101a7a84cad1046d9b
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] ibus-anthy: update to 1.5.14.
2022-07-24 22:26 [PR PATCH] ibus-anthy: update to 1.5.14 oreo639
@ 2022-07-25 7:31 ` oreo639
2022-07-25 7:47 ` oreo639
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2022-07-25 7:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1973 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages ianthy
https://github.com/void-linux/void-packages/pull/38256
ibus-anthy: update to 1.5.14.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
+ This enables tests, although I can disable it again if you want.
+ swig is only needed when building with pygtk.
+ intltool is not needed by ibus-anthy.
+ This removes `--libexec=/usr/lib/ibus`. I'm not sure what it was needed for but most distros used to use it and have since removed it and the preferences popup doesn't work with it.
+ This uses `--with-layout=default` which is used by debian and fedora to tell ibus-anthy to use the default keyboard layout (otherwise it will always use JP).
+ This also moves ibus-anthy from Debian Anthy to anthy-unicode, this is what is also used by fcitx5-anthy.
In the basic testing I did, I didn't notice any issues, but please let me know if I missed something.
cc: @7185
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38256.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ianthy-38256.patch --]
[-- Type: text/x-diff, Size: 6376 bytes --]
From b27084035721b7964b775605a2a3208d0338d751 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 14:52:14 -0700
Subject: [PATCH 1/2] New package: python3-pycotap-1.2.2
---
srcpkgs/python3-pycotap/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/python3-pycotap/template
diff --git a/srcpkgs/python3-pycotap/template b/srcpkgs/python3-pycotap/template
new file mode 100644
index 000000000000..ae4ca676d6bc
--- /dev/null
+++ b/srcpkgs/python3-pycotap/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-pycotap'
+pkgname=python3-pycotap
+version=1.2.2
+revision=1
+wrksrc="pycotap-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Tiny test runner that outputs TAP results to standard output"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://el-tramo.be/pycotap/"
+distfiles="${PYPI_SITE}/p/pycotap/pycotap-${version}.tar.gz"
+checksum=f938ecd4931ccd19d9598fb633d5eabb7938f08b84717315e52526aa6277c9ec
From 00b74fcc638bb30f9238c507738e5d07995745a1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 14:52:45 -0700
Subject: [PATCH 2/2] ibus-anthy: update to 1.5.14.
---
.../patches/data-Update-era.t-with-2022.patch | 36 ++++++++++++++++++
...imum-candidate-window-page-size-to-1.patch | 37 +++++++++++++++++++
srcpkgs/ibus-anthy/template | 24 ++++--------
3 files changed, 81 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch
create mode 100644 srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch
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
new file mode 100644
index 000000000000..c1f66ee5cebe
--- /dev/null
+++ b/srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch
@@ -0,0 +1,36 @@
+From ed993538c711d817e5365630b65f372e0dfd01a7 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+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 <takao.fujiwara1@gmail.com>
++# Copyright (c) 2010-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ # 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
new file mode 100644
index 000000000000..f21b70be968b
--- /dev/null
+++ b/srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch
@@ -0,0 +1,37 @@
+From 4ef5ac95e84056ebd5a446e5e21b5f2a99377363 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+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 @@
+ <interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">10</property>
+- <property name="lower">0</property>
++ <property name="lower">1</property>
+ <property name="page_increment">0</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+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 @@
+ <interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">10</property>
+- <property name="lower">0</property>
++ <property name="lower">1</property>
+ <property name="page_increment">0</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
diff --git a/srcpkgs/ibus-anthy/template b/srcpkgs/ibus-anthy/template
index 70c28c0a55c9..83be78194d22 100644
--- a/srcpkgs/ibus-anthy/template
+++ b/srcpkgs/ibus-anthy/template
@@ -1,25 +1,17 @@
# Template file for 'ibus-anthy'
pkgname=ibus-anthy
-version=1.5.12
+version=1.5.14
revision=1
build_style=gnu-configure
build_helper=gir
-configure_args="--libexec=/usr/lib/ibus"
-hostmakedepends="automake libtool pkg-config swig intltool gettext-devel"
-makedepends="anthy-devel ibus-devel python3-gobject-devel"
+configure_args="--with-python=python3 --with-layout=default"
+hostmakedepends="automake libtool pkg-config gettext"
+makedepends="anthy-unicode-devel ibus-devel python3-gobject-devel"
depends="ibus"
+checkdepends="procps-ng python3-pycotap"
short_desc="Japanese input method Anthy IMEngine for IBus Framework"
maintainer="7185 <7185@free.fr>"
license="LGPL-2.1-or-later"
-homepage="https://github.com/ibus/ibus/wiki"
-distfiles="https://github.com/ibus/${pkgname}/archive/${version}.tar.gz"
-checksum=7756216666264b25083adb3a3e53f6a0ff744efc3331fe7ac7becbf4ed17d2ca
-make_check=extended
-
-post_patch() {
- 2to3 -w gir/test.py
-}
-
-pre_configure() {
- autoreconf -fi
-}
+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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] ibus-anthy: update to 1.5.14.
2022-07-24 22:26 [PR PATCH] ibus-anthy: update to 1.5.14 oreo639
2022-07-25 7:31 ` [PR PATCH] [Updated] " oreo639
@ 2022-07-25 7:47 ` oreo639
2022-07-26 16:05 ` [PR REVIEW] " sgn
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2022-07-25 7:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1973 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages ianthy
https://github.com/void-linux/void-packages/pull/38256
ibus-anthy: update to 1.5.14.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
+ This enables tests, although I can disable it again if you want.
+ swig is only needed when building with pygtk.
+ intltool is not needed by ibus-anthy.
+ This removes `--libexec=/usr/lib/ibus`. I'm not sure what it was needed for but most distros used to use it and have since removed it and the preferences popup doesn't work with it.
+ This uses `--with-layout=default` which is used by debian and fedora to tell ibus-anthy to use the default keyboard layout (otherwise it will always use JP).
+ This also moves ibus-anthy from Debian Anthy to anthy-unicode, this is what is also used by fcitx5-anthy.
In the basic testing I did, I didn't notice any issues, but please let me know if I missed something.
cc: @7185
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38256.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ianthy-38256.patch --]
[-- Type: text/x-diff, Size: 6376 bytes --]
From b27084035721b7964b775605a2a3208d0338d751 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 14:52:14 -0700
Subject: [PATCH 1/2] New package: python3-pycotap-1.2.2
---
srcpkgs/python3-pycotap/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/python3-pycotap/template
diff --git a/srcpkgs/python3-pycotap/template b/srcpkgs/python3-pycotap/template
new file mode 100644
index 000000000000..ae4ca676d6bc
--- /dev/null
+++ b/srcpkgs/python3-pycotap/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-pycotap'
+pkgname=python3-pycotap
+version=1.2.2
+revision=1
+wrksrc="pycotap-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Tiny test runner that outputs TAP results to standard output"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://el-tramo.be/pycotap/"
+distfiles="${PYPI_SITE}/p/pycotap/pycotap-${version}.tar.gz"
+checksum=f938ecd4931ccd19d9598fb633d5eabb7938f08b84717315e52526aa6277c9ec
From 36a922603baf88cda3729123d0e977e963844468 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 14:52:45 -0700
Subject: [PATCH 2/2] ibus-anthy: update to 1.5.14.
---
.../patches/data-Update-era.t-with-2022.patch | 36 ++++++++++++++++++
...imum-candidate-window-page-size-to-1.patch | 37 +++++++++++++++++++
srcpkgs/ibus-anthy/template | 24 ++++--------
3 files changed, 81 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch
create mode 100644 srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch
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
new file mode 100644
index 000000000000..c1f66ee5cebe
--- /dev/null
+++ b/srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch
@@ -0,0 +1,36 @@
+From ed993538c711d817e5365630b65f372e0dfd01a7 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+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 <takao.fujiwara1@gmail.com>
++# Copyright (c) 2010-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ # 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
new file mode 100644
index 000000000000..f21b70be968b
--- /dev/null
+++ b/srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch
@@ -0,0 +1,37 @@
+From 4ef5ac95e84056ebd5a446e5e21b5f2a99377363 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+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 @@
+ <interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">10</property>
+- <property name="lower">0</property>
++ <property name="lower">1</property>
+ <property name="page_increment">0</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+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 @@
+ <interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">10</property>
+- <property name="lower">0</property>
++ <property name="lower">1</property>
+ <property name="page_increment">0</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
diff --git a/srcpkgs/ibus-anthy/template b/srcpkgs/ibus-anthy/template
index 70c28c0a55c9..83be78194d22 100644
--- a/srcpkgs/ibus-anthy/template
+++ b/srcpkgs/ibus-anthy/template
@@ -1,25 +1,17 @@
# Template file for 'ibus-anthy'
pkgname=ibus-anthy
-version=1.5.12
+version=1.5.14
revision=1
build_style=gnu-configure
build_helper=gir
-configure_args="--libexec=/usr/lib/ibus"
-hostmakedepends="automake libtool pkg-config swig intltool gettext-devel"
-makedepends="anthy-devel ibus-devel python3-gobject-devel"
+configure_args="--with-python=python3 --with-layout=default"
+hostmakedepends="automake libtool pkg-config gettext"
+makedepends="anthy-unicode-devel ibus-devel python3-gobject-devel"
depends="ibus"
+checkdepends="procps-ng python3-pycotap"
short_desc="Japanese input method Anthy IMEngine for IBus Framework"
maintainer="7185 <7185@free.fr>"
license="LGPL-2.1-or-later"
-homepage="https://github.com/ibus/ibus/wiki"
-distfiles="https://github.com/ibus/${pkgname}/archive/${version}.tar.gz"
-checksum=7756216666264b25083adb3a3e53f6a0ff744efc3331fe7ac7becbf4ed17d2ca
-make_check=extended
-
-post_patch() {
- 2to3 -w gir/test.py
-}
-
-pre_configure() {
- autoreconf -fi
-}
+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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] ibus-anthy: update to 1.5.14.
2022-07-24 22:26 [PR PATCH] ibus-anthy: update to 1.5.14 oreo639
2022-07-25 7:31 ` [PR PATCH] [Updated] " oreo639
2022-07-25 7:47 ` oreo639
@ 2022-07-26 16:05 ` sgn
2022-07-26 19:27 ` [PR PATCH] [Updated] " oreo639
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2022-07-26 16:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/38256#discussion_r929757510
Comment:
Please remove `usr/COPYING`
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] ibus-anthy: update to 1.5.14.
2022-07-24 22:26 [PR PATCH] ibus-anthy: update to 1.5.14 oreo639
` (2 preceding siblings ...)
2022-07-26 16:05 ` [PR REVIEW] " sgn
@ 2022-07-26 19:27 ` oreo639
2022-07-26 19:28 ` [PR REVIEW] " oreo639
2022-07-27 9:53 ` [PR PATCH] [Merged]: " sgn
5 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2022-07-26 19:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1973 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages ianthy
https://github.com/void-linux/void-packages/pull/38256
ibus-anthy: update to 1.5.14.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
+ This enables tests, although I can disable it again if you want.
+ swig is only needed when building with pygtk.
+ intltool is not needed by ibus-anthy.
+ This removes `--libexec=/usr/lib/ibus`. I'm not sure what it was needed for but most distros used to use it and have since removed it and the preferences popup doesn't work with it.
+ This uses `--with-layout=default` which is used by debian and fedora to tell ibus-anthy to use the default keyboard layout (otherwise it will always use JP).
+ This also moves ibus-anthy from Debian Anthy to anthy-unicode, this is what is also used by fcitx5-anthy.
In the basic testing I did, I didn't notice any issues, but please let me know if I missed something.
cc: @7185
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38256.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ianthy-38256.patch --]
[-- Type: text/x-diff, Size: 6434 bytes --]
From 13ca7397e34cd3c7d6ab8eb3753fb3a68560b886 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 14:52:14 -0700
Subject: [PATCH 1/2] New package: python3-pycotap-1.2.2
---
srcpkgs/python3-pycotap/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-pycotap/template
diff --git a/srcpkgs/python3-pycotap/template b/srcpkgs/python3-pycotap/template
new file mode 100644
index 000000000000..8f998fd8e1bb
--- /dev/null
+++ b/srcpkgs/python3-pycotap/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pycotap'
+pkgname=python3-pycotap
+version=1.2.2
+revision=1
+wrksrc="pycotap-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Tiny test runner that outputs TAP results to standard output"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://el-tramo.be/pycotap/"
+distfiles="${PYPI_SITE}/p/pycotap/pycotap-${version}.tar.gz"
+checksum=f938ecd4931ccd19d9598fb633d5eabb7938f08b84717315e52526aa6277c9ec
+
+post_install() {
+ rm -f ${DESTDIR}/usr/COPYING
+}
From c899f4c8c0c53ac9621e987847e46337b413c76a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 14:52:45 -0700
Subject: [PATCH 2/2] ibus-anthy: update to 1.5.14.
---
.../patches/data-Update-era.t-with-2022.patch | 36 ++++++++++++++++++
...imum-candidate-window-page-size-to-1.patch | 37 +++++++++++++++++++
srcpkgs/ibus-anthy/template | 24 ++++--------
3 files changed, 81 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch
create mode 100644 srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch
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
new file mode 100644
index 000000000000..c1f66ee5cebe
--- /dev/null
+++ b/srcpkgs/ibus-anthy/patches/data-Update-era.t-with-2022.patch
@@ -0,0 +1,36 @@
+From ed993538c711d817e5365630b65f372e0dfd01a7 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+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 <takao.fujiwara1@gmail.com>
++# Copyright (c) 2010-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ # 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
new file mode 100644
index 000000000000..f21b70be968b
--- /dev/null
+++ b/srcpkgs/ibus-anthy/patches/setup-Minimum-candidate-window-page-size-to-1.patch
@@ -0,0 +1,37 @@
+From 4ef5ac95e84056ebd5a446e5e21b5f2a99377363 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+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 @@
+ <interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">10</property>
+- <property name="lower">0</property>
++ <property name="lower">1</property>
+ <property name="page_increment">0</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+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 @@
+ <interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">10</property>
+- <property name="lower">0</property>
++ <property name="lower">1</property>
+ <property name="page_increment">0</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
diff --git a/srcpkgs/ibus-anthy/template b/srcpkgs/ibus-anthy/template
index 70c28c0a55c9..83be78194d22 100644
--- a/srcpkgs/ibus-anthy/template
+++ b/srcpkgs/ibus-anthy/template
@@ -1,25 +1,17 @@
# Template file for 'ibus-anthy'
pkgname=ibus-anthy
-version=1.5.12
+version=1.5.14
revision=1
build_style=gnu-configure
build_helper=gir
-configure_args="--libexec=/usr/lib/ibus"
-hostmakedepends="automake libtool pkg-config swig intltool gettext-devel"
-makedepends="anthy-devel ibus-devel python3-gobject-devel"
+configure_args="--with-python=python3 --with-layout=default"
+hostmakedepends="automake libtool pkg-config gettext"
+makedepends="anthy-unicode-devel ibus-devel python3-gobject-devel"
depends="ibus"
+checkdepends="procps-ng python3-pycotap"
short_desc="Japanese input method Anthy IMEngine for IBus Framework"
maintainer="7185 <7185@free.fr>"
license="LGPL-2.1-or-later"
-homepage="https://github.com/ibus/ibus/wiki"
-distfiles="https://github.com/ibus/${pkgname}/archive/${version}.tar.gz"
-checksum=7756216666264b25083adb3a3e53f6a0ff744efc3331fe7ac7becbf4ed17d2ca
-make_check=extended
-
-post_patch() {
- 2to3 -w gir/test.py
-}
-
-pre_configure() {
- autoreconf -fi
-}
+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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] ibus-anthy: update to 1.5.14.
2022-07-24 22:26 [PR PATCH] ibus-anthy: update to 1.5.14 oreo639
` (3 preceding siblings ...)
2022-07-26 19:27 ` [PR PATCH] [Updated] " oreo639
@ 2022-07-26 19:28 ` oreo639
2022-07-27 9:53 ` [PR PATCH] [Merged]: " sgn
5 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2022-07-26 19:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/38256#discussion_r930337876
Comment:
Thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: ibus-anthy: update to 1.5.14.
2022-07-24 22:26 [PR PATCH] ibus-anthy: update to 1.5.14 oreo639
` (4 preceding siblings ...)
2022-07-26 19:28 ` [PR REVIEW] " oreo639
@ 2022-07-27 9:53 ` sgn
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2022-07-27 9:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1818 bytes --]
There's a merged pull request on the void-packages repository
ibus-anthy: update to 1.5.14.
https://github.com/void-linux/void-packages/pull/38256
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
+ This enables tests, although I can disable it again if you want.
+ swig is only needed when building with pygtk.
+ intltool is not needed by ibus-anthy.
+ This removes `--libexec=/usr/lib/ibus`. I'm not sure what it was needed for but most distros used to use it and have since removed it and the preferences popup doesn't work with it.
+ This uses `--with-layout=default` which is used by debian and fedora to tell ibus-anthy to use the default keyboard layout (otherwise it will always use JP).
+ This also moves ibus-anthy from Debian Anthy to anthy-unicode, this is what is also used by fcitx5-anthy.
In the basic testing I did, I didn't notice any issues, but please let me know if I missed something.
cc: @7185
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-07-27 9:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-24 22:26 [PR PATCH] ibus-anthy: update to 1.5.14 oreo639
2022-07-25 7:31 ` [PR PATCH] [Updated] " oreo639
2022-07-25 7:47 ` oreo639
2022-07-26 16:05 ` [PR REVIEW] " sgn
2022-07-26 19:27 ` [PR PATCH] [Updated] " oreo639
2022-07-26 19:28 ` [PR REVIEW] " oreo639
2022-07-27 9:53 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).