diff --git a/srcpkgs/emacs-mozc b/srcpkgs/emacs-mozc deleted file mode 120000 index 6874ca426b5..00000000000 --- a/srcpkgs/emacs-mozc +++ /dev/null @@ -1 +0,0 @@ -mozc \ No newline at end of file diff --git a/srcpkgs/fcitx-mozc b/srcpkgs/fcitx-mozc deleted file mode 120000 index 6874ca426b5..00000000000 --- a/srcpkgs/fcitx-mozc +++ /dev/null @@ -1 +0,0 @@ -mozc \ No newline at end of file diff --git a/srcpkgs/ibus-mozc b/srcpkgs/ibus-mozc deleted file mode 120000 index 6874ca426b5..00000000000 --- a/srcpkgs/ibus-mozc +++ /dev/null @@ -1 +0,0 @@ -mozc \ No newline at end of file diff --git a/srcpkgs/mozc/INSTALL.msg b/srcpkgs/mozc/INSTALL.msg new file mode 100644 index 00000000000..78e218473c7 --- /dev/null +++ b/srcpkgs/mozc/INSTALL.msg @@ -0,0 +1 @@ +mozc is no longer provided by Void Linux, and will be fully removed from the repos on 2019/06/08 diff --git a/srcpkgs/mozc/emacs-mozc.INSTALL.msg b/srcpkgs/mozc/emacs-mozc.INSTALL.msg deleted file mode 100644 index 08e953d39db..00000000000 --- a/srcpkgs/mozc/emacs-mozc.INSTALL.msg +++ /dev/null @@ -1,7 +0,0 @@ -To enable Mozc mode, add this to your ~/.emacs.d/init.el file: - -(set-language-environment "Japanese") -(require 'mozc) ; or (load-file "/path/to/mozc.el") -(setq default-input-method "japanese-mozc") - -C-\ is bound to `toggle-input-method' by default. diff --git a/srcpkgs/mozc/ibus-mozc.INSTALL.msg b/srcpkgs/mozc/ibus-mozc.INSTALL.msg deleted file mode 100644 index 527683859be..00000000000 --- a/srcpkgs/mozc/ibus-mozc.INSTALL.msg +++ /dev/null @@ -1,7 +0,0 @@ -ibus-mozc always starts up in Direct Input mode. If you prefer Hiragana -mode by default, set the IBUS_MOZC_DEFAULT_HIRAGANA environment variable -for ibus-daemon, e.g.: - -IBUS_MOZC_DEFAULT_HIRAGANA= ibus-daemon --xim -d - -This is a Void Linux extension. diff --git a/srcpkgs/mozc/patches/cross.patch b/srcpkgs/mozc/patches/cross.patch deleted file mode 100644 index 17d47a900eb..00000000000 --- a/srcpkgs/mozc/patches/cross.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- mozc/src/gyp/common.gypi -+++ mozc/src/gyp/common.gypi -@@ -444,12 +444,12 @@ - }], - ['target_platform=="Linux"', { - 'make_global_settings': [ -- ['AR', ' -+ - // On Gnome Shell with IBus 1.5, new property named "symbol" is used to - // represent the mode indicator on the system panel. Note that "symbol" does - // not exist in IBus 1.4.x. -@@ -80,7 +82,7 @@ bool GetDisabled(IBusEngine *engine) { - // On IBus 1.4.x, IBus expects that an IME should always be turned on and - // IME on/off keys are handled by IBus itself rather than each IME. - #if IBUS_CHECK_VERSION(1, 5, 0) --const bool kActivatedOnLaunch = false; -+const bool kActivatedOnLaunch = !!::std::getenv("IBUS_MOZC_DEFAULT_HIRAGANA"); - #else - const bool kActivatedOnLaunch = true; - #endif // IBus>=1.5.0 diff --git a/srcpkgs/mozc/patches/no-parallel.patch b/srcpkgs/mozc/patches/no-parallel.patch deleted file mode 100644 index 14b23367f09..00000000000 --- a/srcpkgs/mozc/patches/no-parallel.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mozc/src/build_mozc.py -+++ mozc/src/build_mozc.py -@@ -728,6 +728,7 @@ def GypMain(options, unused_args): - gyp_options.extend(['--generator-output=.']) - short_basename = GetBuildShortBaseName(target_platform) - gyp_options.extend(['-G', 'output_dir=%s' % short_basename]) -+ gyp_options.extend(['--no-parallel']) # Parallel generation requires writable /dev/shm - - # Enable cross-compile - # TODO(yukawa): Enable GYP_CROSSCOMPILE for Windows. diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index 2dd26be1e37..af5f8c4b34b 100644 --- a/srcpkgs/mozc/template +++ b/srcpkgs/mozc/template @@ -1,119 +1,9 @@ # Template file for 'mozc' pkgname=mozc version=2.23.2815.102 -revision=1 -hostmakedepends="ninja pkg-config protobuf-devel python" -makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel - fcitx-devel" -depends="tegaki-zinnia-japanese>=0.3" -maintainer="Matthias von Faber " +revision=2 +noarch=yes +build_style=meta +short_desc="Japanese IME (Open Source version of Google Japanese Input) (removed package)" +license="metapackage" homepage="https://github.com/google/mozc" -license="BSD-3-Clause" -short_desc="Japanese IME (Open Source version of Google Japanese Input)" -build_wrksrc=mozc/src -create_wrksrc=yes -distfiles=" - https://gitlab.com/fcitx/mozc/repository/dad94584ea5012110ad1d204e433964243a1639d/archive.tar.bz2>${pkgname}-${version}.tar.bz2 - https://github.com/bnoordhuis/gyp/archive/4ec6c4e3a94bd04a6da2858163d40b2429b8aad1.tar.gz - https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz -" -checksum=" - e38457e63a7fa8d62d87b4f8b3e89fe5f6939d92e3c4fd287a93358375693892 - 009992eae3393ba7b2d2ba6249dbb3ac44157313f10e8add4d3086aef772c04b - 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1 -" - -CXXFLAGS="-D_GNU_SOURCE" - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-devel" -fi - -post_extract() { - ln -s mozc-* mozc - rm -rf mozc/src/unix/fcitx5 - - # symlink "submodules" into place - for _src_dest in gyp japanese-usage-dictionary:japanese_usage_dictionary; do - _src=${_src_dest%:*} - _dst=mozc/src/third_party/${_src_dest#*:} - rmdir $_dst - ln -sr $_src-* $_dst - done - - if [ "$CROSS_BUILD" ]; then - # find fcitx4-config - sed -i -e "s;fcitx4-config;${XBPS_CROSS_BASE}/usr/bin/fcitx4-config;" mozc/src/unix/fcitx/fcitx.gyp - fi -} - -do_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|g' base/mutex.cc ;; - esac -} - -do_build() { - local targets - targets=" - server/server.gyp:mozc_server - gui/gui.gyp:mozc_tool - unix/emacs/emacs.gyp:mozc_emacs_helper - unix/ibus/ibus.gyp:ibus_mozc - renderer/renderer.gyp:mozc_renderer - unix/fcitx/fcitx.gyp:fcitx-mozc - " - GYP_DEFINES=" - document_dir=/usr/share/licenses/${pkgname} - use_libprotobuf=1 - use_libzinnia=1 - " python2 build_mozc.py gyp --target_platform=Linux - python2 build_mozc.py build -c Release $targets - - sed -i 's|/usr/libexec/|/usr/lib/ibus-mozc/|g' out_linux/Release/gen/unix/ibus/mozc.xml -} - -do_install() { - install -D -m 755 out_linux/Release/mozc_server "${PKGDESTDIR}/usr/lib/mozc/mozc_server" - install -m 755 out_linux/Release/mozc_tool "${PKGDESTDIR}/usr/lib/mozc/mozc_tool" - - head -n 29 server/mozc_server.cc > LICENSE - for i in LICENSE data/installer/*.html; do - vlicense "$i" - done -} - -ibus-mozc_package() { - short_desc="Mozc engine for IBus - Client of the Mozc input method" - depends="${sourcepkg}-${version}_${revision} ibus>=1.5.14" - pkg_install() { - install -D -m 755 out_linux/Release/ibus_mozc "${PKGDESTDIR}/usr/lib/ibus-mozc/ibus-engine-mozc" - install -D -m 644 out_linux/Release/gen/unix/ibus/mozc.xml "${PKGDESTDIR}/usr/share/ibus/component/mozc.xml" - install -D -m 644 data/images/unix/ime_product_icon_opensource-32.png "${PKGDESTDIR}/usr/share/ibus-mozc/product_icon.png" - for i in data/images/unix/ui-*.png; do - install -m 644 "$i" "${PKGDESTDIR}/usr/share/ibus-mozc/${i##*/ui-}" - done - install -D -m 755 out_linux/Release/mozc_renderer "${PKGDESTDIR}/usr/lib/mozc/mozc_renderer" - } -} - -emacs-mozc_package() { - pkgdesc="Mozc for Emacs" - depends="${sourcepkg}-${version}_${revision} emacs" - pkg_install() { - install -D -m 755 out_linux/Release/mozc_emacs_helper "${PKGDESTDIR}/usr/bin/mozc_emacs_helper" - install -D -m 644 unix/emacs/mozc.el "${PKGDESTDIR}/usr/share/emacs/site-lisp/emacs-mozc/mozc.el" - } -} - -fcitx-mozc_package() { - short_desc="Mozc engine for fcitx - Client of the Mozc input method" - depends="${sourcepkg}-${version}_${revision} fcitx>=4.2.9" - homepage="https://fcitx-im.org/" - license="GPL-2" - pkg_install() { - install -D -m 644 out_linux/Release/fcitx-mozc.so "${PKGDESTDIR}/usr/lib/fcitx/fcitx-mozc.so" - install -D -m 644 unix/fcitx/fcitx-mozc.conf "${PKGDESTDIR}/usr/share/fcitx/addon/fcitx-mozc.conf" - install -D -m 644 unix/fcitx/mozc.conf "${PKGDESTDIR}/usr/share/fcitx/inputmethod/mozc.conf" - } -}