From 41179e13bfa79794f4a9b72cfbaf1e627a57de94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 2 Feb 2021 22:30:30 +0700 Subject: [PATCH 1/5] anthy: update to 0.4. --- common/shlibs | 6 +++--- srcpkgs/anthy/template | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index ce0e74cc74e..69eba845387 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2281,9 +2281,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 anthy-0.4_1 +libanthydic.so.1 anthy-0.4_1 +libanthyinput.so.0 anthy-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 15ab07d942e..46a60e30927 100644 --- a/srcpkgs/anthy/template +++ b/srcpkgs/anthy/template @@ -1,19 +1,19 @@ # Template file for 'anthy' pkgname=anthy -version=9100h -revision=2 -_filecode=37536 +reverts="9100h_1 9100h_2" +version=0.4 +revision=1 conf_files="/etc/anthy-conf" 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" anthy-devel_package() { short_desc+=" - development files" From 8c0891f8f56d50366125260dba7063cd894a93d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 2 Feb 2021 22:32:37 +0700 Subject: [PATCH 2/5] 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 cb0c8f2b364..d03499e83c3 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 " -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 51f5d3f973269063cc5e72ad9fd4b799a56830c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 2 Feb 2021 22:32:37 +0700 Subject: [PATCH 3/5] 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 00000000000..f84de477023 --- /dev/null +++ b/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch @@ -0,0 +1,25 @@ +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 +--- 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 d9d0f92e56a..9b96fa82063 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 75d2197565cdb40d569dfdea2830a0c4acf61fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 4 Feb 2021 22:54:55 +0700 Subject: [PATCH 4/5] New package: libgcroots-0.3.2 --- common/shlibs | 2 +- srcpkgs/libgcroots-devel | 1 + srcpkgs/libgcroots/template | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/libgcroots-devel create mode 100644 srcpkgs/libgcroots/template diff --git a/common/shlibs b/common/shlibs index 69eba845387..c1a9371a5d9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2875,7 +2875,7 @@ liblxpanel.so.0 lxpanel-0.9.3_1 libuim.so.8 uim-1.8.6_1 libuim-scm.so.0 uim-1.8.6_1 libuim-custom.so.2 uim-1.8.6_1 -libgcroots.so.0 uim-1.8.6_1 +libgcroots.so.0 libgcroots-0.3.2_1 libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 diff --git a/srcpkgs/libgcroots-devel b/srcpkgs/libgcroots-devel new file mode 120000 index 00000000000..3f941c40e0f --- /dev/null +++ b/srcpkgs/libgcroots-devel @@ -0,0 +1 @@ +libgcroots \ No newline at end of file diff --git a/srcpkgs/libgcroots/template b/srcpkgs/libgcroots/template new file mode 100644 index 00000000000..26423de91dc --- /dev/null +++ b/srcpkgs/libgcroots/template @@ -0,0 +1,28 @@ +# Template file for 'libgcroots' +pkgname=libgcroots +version=0.3.2 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +short_desc="GC library for sigscheme Scheme interpreter" +maintainer="Đoàn Trần Công Danh " +license="custom:libgcroots" +homepage="https://github.com/uim/libgcroots" +distfiles="https://github.com/uim/libgcroots/releases/download/$version/libgcroots-$version.tar.bz2" +checksum=b177a1c033bd907ea341db7e46eeee181acb73225bf58ada1966e7b4d50f657f + +post_install() { + rm -f $DESTDIR/usr/lib/*.la + vlicense COPYING +} + +libgcroots-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From c38620842a62ec98e827c08772c8df6e3aa51e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 2 Feb 2021 22:32:37 +0700 Subject: [PATCH 5/5] 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 00000000000..082bbd764a1 --- /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 00000000000..61b28da7208 --- /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 +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 2aec8fe9605..aeb9aff5e91 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 " 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" } }