From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [RFC] switch anthy 0.4's upstream to debian
Date: Sun, 28 Mar 2021 13:48:21 +0200 [thread overview]
Message-ID: <20210328114821.Up-tXLrpXBvwaniDduG1T08jWiC88gA8RVMjIQWXK_k@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28410@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages anthy-0.4-from-debian
https://github.com/void-linux/void-packages/pull/28410
[RFC] switch anthy 0.4's upstream to debian
- switch to Debian's fork,
- upstream is dead
- utf-8 most of the things, now
- new character (令和)
- dict updated.
A patch file from https://github.com/void-linux/void-packages/pull/28410.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-anthy-0.4-from-debian-28410.patch --]
[-- Type: text/x-diff, Size: 11650 bytes --]
From 7ca7a548c56bb96c902f1cb5c8fbd356e36faa6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 22:30:30 +0700
Subject: [PATCH 1/4] anthy: update to 0.4.
---
common/shlibs | 6 +++---
srcpkgs/anthy/template | 34 ++++++++++++++++++++++------------
srcpkgs/libanthy | 1 +
3 files changed, 26 insertions(+), 15 deletions(-)
create mode 120000 srcpkgs/libanthy
diff --git a/common/shlibs b/common/shlibs
index 7319cc8d20cb..3a9f74b6acb9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2325,9 +2325,9 @@ libIL.so.1 devil-1.7.8_1
libILU.so.1 devil-1.7.8_1
libILUT.so.1 devil-1.7.8_1
liboath.so.0 oath-toolkit-2.6.0_2
-libanthy.so.0 anthy-9100h_1
-libanthydic.so.0 anthy-9100h_1
-libanthyinput.so.0 anthy-9100h_1
+libanthy.so.1 libanthy-0.4_1
+libanthydic.so.1 libanthy-0.4_1
+libanthyinput.so.0 libanthy-0.4_1
libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
libtbbmalloc_proxy.so.2 tbb-4.3_1
diff --git a/srcpkgs/anthy/template b/srcpkgs/anthy/template
index 15ab07d942e1..7f8ec36404db 100644
--- a/srcpkgs/anthy/template
+++ b/srcpkgs/anthy/template
@@ -1,26 +1,36 @@
# Template file for 'anthy'
pkgname=anthy
-version=9100h
-revision=2
-_filecode=37536
-conf_files="/etc/anthy-conf"
+reverts="9100h_1 9100h_2"
+version=0.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static"
short_desc="Hiragana text to Kana Kanji mixed text Japanese input method"
maintainer="7185 <7185@free.fr>"
-license="LGPL-2.1"
-homepage="http://osdn.jp/projects/anthy/"
-distfiles="http://dl.sourceforge.jp/anthy/${_filecode}/${pkgname}-${version}.tar.gz"
-checksum="d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547"
-# Would need to build lt-mkdepgraph for the host
-nocross=yes
+# Most are LGPL-2.1+ but src-worddic/textdic.c is LGPL-3.0+
+license="LGPL-3.0-or-later"
+homepage="https://wiki.debian.org/Teams/DebianAnthy"
+distfiles="$DEBIAN_SITE/main/a/anthy/anthy_${version}.orig.tar.gz"
+checksum=fdf590beea7093f3327b1eee76013e4936e4c6659e7cc01dd1fdd6e6f2e9c9f7
+nocross="need to run lt-mkdepgraph"
+
+libanthy_package() {
+ short_desc+=" - libraries"
+ conf_files="/etc/anthy-conf"
+ conflicts="anthy-9100h_1 anthy-9100h_2"
+ pkg_install() {
+ vmove etc/anthy-conf
+ vmove "usr/lib/*.so.*"
+ vmove usr/share
+ }
+}
anthy-devel_package() {
short_desc+=" - development files"
- depends="${sourcepkg}-${version}_${revision}"
+ depends="libanthy-${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/libanthy b/srcpkgs/libanthy
new file mode 120000
index 000000000000..b38e2adfa2dc
--- /dev/null
+++ b/srcpkgs/libanthy
@@ -0,0 +1 @@
+anthy
\ No newline at end of file
From 3eb61c5dba169d07e97f21f1693542ec293aa1a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 22:32:37 +0700
Subject: [PATCH 2/4] fcitx-anthy: rebuild for anthy 0.4
---
srcpkgs/fcitx-anthy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx-anthy/template b/srcpkgs/fcitx-anthy/template
index cb0c8f2b364a..d03499e83c3e 100644
--- a/srcpkgs/fcitx-anthy/template
+++ b/srcpkgs/fcitx-anthy/template
@@ -1,13 +1,13 @@
# Template file for 'fcitx-anthy'
pkgname=fcitx-anthy
version=0.2.3
-revision=1
+revision=2
build_style=cmake
makedepends="anthy-devel fcitx-devel"
depends="fcitx>=4.2.9"
short_desc="Fcitx wrapper for Anthy IM engine"
maintainer="Matthias von Faber <mvf@gmx.eu>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/"
distfiles="https://github.com/fcitx/fcitx-anthy/archive/${version}.tar.gz"
checksum=31826a49a7ff743f830e1279527301abce9e669bc176934c76775999299421a8
From a063cc7d284cab197f45ff0c25553545eaede4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 22:32:37 +0700
Subject: [PATCH 3/4] ibus-anthy: rebuild for anthy 0.4
- Build with python3-gobject-devel
- Remove gir build option since it can't be built without.
Upstream don't provide option to disable
---
.../0001-read-utf-8-encoded-zipfile.patch | 25 +++++++++++++++++++
srcpkgs/ibus-anthy/template | 20 +++++++--------
2 files changed, 34 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.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
new file mode 100644
index 000000000000..f84de4770232
--- /dev/null
+++ b/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch
@@ -0,0 +1,25 @@
+From: NOKUBI Takatsugu <knok@daionet.gr.jp>
+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
+--- data/zipcode-textdic.py
++++ 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/template b/srcpkgs/ibus-anthy/template
index d9d0f92e56a8..9b96fa820633 100644
--- a/srcpkgs/ibus-anthy/template
+++ b/srcpkgs/ibus-anthy/template
@@ -1,11 +1,12 @@
# Template file for 'ibus-anthy'
pkgname=ibus-anthy
version=1.5.11
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--libexec=/usr/lib/ibus $(vopt_enable gir introspection)"
-hostmakedepends="automake gettext $(vopt_if gir gobject-introspection) libtool pkg-config swig"
-makedepends="anthy-devel gettext-devel ibus-devel python-gobject-devel"
+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"
depends="ibus"
short_desc="Japanese input method Anthy IMEngine for IBus Framework"
maintainer="7185 <7185@free.fr>"
@@ -13,14 +14,11 @@ license="LGPL-2.1-or-later"
homepage="https://github.com/ibus/ibus/wiki"
distfiles="https://github.com/ibus/${pkgname}/archive/${version}.tar.gz"
checksum=57d42a302be72409708274aa680c6d7515077766853a2b9193b9974c9c6eeaf6
+make_check=extended
-# Package build options
-build_options="gir"
-
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="gir"
-fi
+post_patch() {
+ 2to3 -w gir/test.py
+}
pre_configure() {
autoreconf -fi
From 09fb412726de3a9b8344ba83fab2a6a36a47accd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 22:32:37 +0700
Subject: [PATCH 4/4] uim: rebuild for anthy 0.4
Close: #28410
---
srcpkgs/uim/patches/anthy-0.4.patch | 13 +++++++
.../replace_obsolete_since_emacs22.1.patch | 38 +++++++++++++++++++
srcpkgs/uim/template | 15 ++++++--
3 files changed, 62 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/uim/patches/anthy-0.4.patch
create mode 100644 srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch
diff --git a/srcpkgs/uim/patches/anthy-0.4.patch b/srcpkgs/uim/patches/anthy-0.4.patch
new file mode 100644
index 000000000000..082bbd764a1b
--- /dev/null
+++ b/srcpkgs/uim/patches/anthy-0.4.patch
@@ -0,0 +1,13 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -124,7 +124,7 @@ AC_ARG_WITH(anthy-utf8,
+ [with_anthy_utf8=no])
+
+ if test "x$with_anthy_utf8" != xno; then
+- PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622,
++ PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 0.4,
+ [with_anthy_utf8=yes
+ AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
+ [libanthy can handle UTF-8])],
diff --git a/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch b/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch
new file mode 100644
index 000000000000..61b28da72088
--- /dev/null
+++ b/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch
@@ -0,0 +1,38 @@
+From 164e2eb050b5fec25033124834cf49ea1a7d8cbb Mon Sep 17 00:00:00 2001
+From: multiSnow <infinity.blick.winkel@gmail.com>
+Date: Thu, 7 Feb 2019 01:03:47 +0800
+Subject: [PATCH] replace process-kill-without-query with
+ set-process-query-on-exit-flag
+
+see https://www.gnu.org/software/emacs/news/NEWS.22.1 and https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=f1c48b0ec521744826ed43ae27eed0e152c472bf
+---
+ emacs/uim-helper.el | 2 +-
+ emacs/uim.el | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git emacs/uim-helper.el emacs/uim-helper.el
+index e86e32d06..19ecd4538 100644
+--- emacs/uim-helper.el
++++ emacs/uim-helper.el
+@@ -106,7 +106,7 @@
+ (if (not proc)
+ (error "uim.el: Couldn't invoke uim-el-helper-agent."))
+
+- (process-kill-without-query proc)
++ (set-process-query-on-exit-flag proc nil)
+
+ ;; wait "OK"
+ (let ((patience uim-startup-timeout) (ok nil))
+diff --git emacs/uim.el emacs/uim.el
+index 9110c3cb6..7e1fadbba 100644
+--- emacs/uim.el
++++ emacs/uim.el
+@@ -488,7 +488,7 @@
+ (error "uim.el: Couldn't invoke uim-el-agent."))
+
+ ;; don't ask kill
+- (process-kill-without-query proc)
++ (set-process-query-on-exit-flag proc nil)
+
+ ;; wait "OK"
+ (let ((patience uim-startup-timeout) (ok nil))
diff --git a/srcpkgs/uim/template b/srcpkgs/uim/template
index 2aec8fe96059..aeb9aff5e913 100644
--- a/srcpkgs/uim/template
+++ b/srcpkgs/uim/template
@@ -1,13 +1,15 @@
# Template file for 'uim'
pkgname=uim
version=1.8.8
-revision=2
+revision=3
build_style=gnu-configure
+build_helper=qmake
configure_args="--enable-pref --enable-fep --with-gtk2 --with-gtk3
--with-qt5 --with-qt5-immodule --with-x --with-anthy-utf8 --with-skk"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool qt5-host-tools qt5-qmake automake
+ libtool gettext-devel"
makedepends="gtk+-devel gtk+3-devel qt5-devel ncurses-devel anthy-devel
- qt5-x11extras-devel"
+ libgcroots-devel qt5-x11extras-devel"
short_desc="Multilingual input method library and environment"
maintainer="Kazuho Sakoda <hyonhyoro.kazuho@gmail.com>"
license="BSD-3-Clause"
@@ -17,6 +19,10 @@ checksum=34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc
CFLAGS="-fcommon"
+pre_configure() {
+ ./autogen.sh
+}
+
post_install() {
vlicense COPYING
}
@@ -24,10 +30,12 @@ post_install() {
uim-gtk2_package() {
short_desc+=" - GTK2 IM module"
pkg_install() {
+ vmove usr/bin/uim-input-pad-ja
vmove "usr/bin/uim-*-gtk"
vmove usr/bin/uim-toolbar-gtk-systray
vmove "usr/libexec/uim-*-gtk"
vmove usr/lib/gtk-2.0
+ vmove usr/share/applications
}
}
@@ -74,7 +82,6 @@ uim-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
next prev parent reply other threads:[~2021-03-28 11:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-02 15:54 [PR PATCH] anthy 0.4 from debian sgn
2021-02-04 16:30 ` [RFC] switch anthy 0.4's upstream to debian sgn
2021-02-05 8:21 ` [PR PATCH] [Updated] " sgn
2021-02-05 8:42 ` sgn
2021-02-21 1:05 ` [PR PATCH] [Updated] " sgn
2021-02-21 1:27 ` sgn
2021-02-21 1:28 ` sgn
2021-03-28 11:48 ` sgn [this message]
2021-03-28 11:58 ` [PR PATCH] [Updated] " sgn
2021-03-28 11:59 ` sgn
2021-03-28 12:00 ` [PR PATCH] [Updated] " sgn
2021-03-28 12:05 ` 7185
2021-03-28 12:53 ` mvf
2021-03-29 14:23 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210328114821.Up-tXLrpXBvwaniDduG1T08jWiC88gA8RVMjIQWXK_k@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).