Compare commits
4 Commits
042a0540dc
...
8df002a49c
Author | SHA1 | Date | |
---|---|---|---|
8df002a49c | |||
dc84a68b75 | |||
ece221b27b | |||
c3091d1090 |
@ -1,6 +1,6 @@
|
|||||||
pkgbase = ibus-mozc-ut
|
pkgbase = ibus-mozc-ut
|
||||||
pkgdesc = Mozc module for IBus bundled with the UT dictionary
|
pkgdesc = Mozc module for IBus bundled with the UT dictionary
|
||||||
pkgver = 2.26.4486.102.20210907
|
pkgver = 2.26.4577.102.20211205
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://github.com/google/mozc
|
url = https://github.com/google/mozc
|
||||||
arch = i686
|
arch = i686
|
||||||
@ -13,11 +13,11 @@ pkgbase = ibus-mozc-ut
|
|||||||
makedepends = qt5-base
|
makedepends = qt5-base
|
||||||
depends = ibus>=1.4.1
|
depends = ibus>=1.4.1
|
||||||
depends = mozc-ut-common
|
depends = mozc-ut-common
|
||||||
provides = ibus-mozc=2.26.4486.102
|
provides = ibus-mozc=2.26.4577.102
|
||||||
conflicts = ibus-mozc
|
conflicts = ibus-mozc
|
||||||
conflicts = ibus-mozc-ut2
|
conflicts = ibus-mozc-ut2
|
||||||
conflicts = ibus-mozc-ut-united
|
conflicts = ibus-mozc-ut-united
|
||||||
source = ibus-mozc-ut-git::git+https://github.com/google/mozc.git#commit=7e8beed3ddad4f8d1065cbab52f24c16d31f5898
|
source = ibus-mozc-ut-git::git+https://github.com/google/mozc.git#commit=01306d0c67c5faa203994bab281c515b9d1248fa
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
|
|
||||||
pkgname = ibus-mozc-ut
|
pkgname = ibus-mozc-ut
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
[subrepo]
|
[subrepo]
|
||||||
remote = https://aur.archlinux.org/ibus-mozc-ut.git
|
remote = https://aur.archlinux.org/ibus-mozc-ut.git
|
||||||
branch = master
|
branch = master
|
||||||
commit = 07e74047740ea7f49f3b03ae39438cb95e15b4ff
|
commit = 202b2c689fb45096d072697173f2385882f39f2d
|
||||||
parent = 327cf72908326b207fb703540a0b8ea37ee763d0
|
parent = c3091d10906fa845390642338f5a5e5d766aec80
|
||||||
method = merge
|
method = merge
|
||||||
cmdver = 0.4.3
|
cmdver = 0.4.3
|
||||||
|
@ -8,9 +8,9 @@
|
|||||||
|
|
||||||
|
|
||||||
## Helpful internal stuff
|
## Helpful internal stuff
|
||||||
_commit=7e8beed3ddad4f8d1065cbab52f24c16d31f5898
|
_commit=01306d0c67c5faa203994bab281c515b9d1248fa
|
||||||
_mozcver=2.26.4486.102
|
_mozcver=2.26.4577.102
|
||||||
_utdicver=20210907
|
_utdicver=20211205
|
||||||
|
|
||||||
pkgname='ibus-mozc-ut'
|
pkgname='ibus-mozc-ut'
|
||||||
pkgver=${_mozcver}.${_utdicver}
|
pkgver=${_mozcver}.${_utdicver}
|
||||||
|
65
mozc-ut-united/.SRCINFO
Normal file
65
mozc-ut-united/.SRCINFO
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
pkgbase = mozc-ut-united
|
||||||
|
pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)
|
||||||
|
pkgver = 2.26.4610.102_20220112_2018.02.26.r231.g7329757e
|
||||||
|
pkgrel = 2
|
||||||
|
url = https://osdn.net/users/utuhiro/pf/utuhiro/files/
|
||||||
|
arch = i686
|
||||||
|
arch = x86_64
|
||||||
|
license = BSD
|
||||||
|
license = GPL
|
||||||
|
license = custom
|
||||||
|
makedepends = ruby
|
||||||
|
makedepends = git
|
||||||
|
makedepends = ninja
|
||||||
|
makedepends = clang
|
||||||
|
makedepends = zinnia
|
||||||
|
makedepends = bazel
|
||||||
|
depends = qt5-base
|
||||||
|
depends = zinnia
|
||||||
|
source = mozc::git+https://github.com/google/mozc.git
|
||||||
|
source = https://osdn.net/downloads/users/37/37585/mozcdic-ut-20220112.tar.bz2
|
||||||
|
source = config-arch-new.patch
|
||||||
|
source = git+https://chromium.googlesource.com/breakpad/breakpad
|
||||||
|
source = git+https://github.com/google/googletest.git
|
||||||
|
source = git+https://chromium.googlesource.com/external/gyp
|
||||||
|
source = git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git
|
||||||
|
source = git+https://github.com/open-source-parsers/jsoncpp.git
|
||||||
|
source = git+https://github.com/google/protobuf.git
|
||||||
|
source = git+https://github.com/abseil/abseil-cpp.git
|
||||||
|
source = android-fix.patch
|
||||||
|
sha1sums = SKIP
|
||||||
|
sha1sums = SKIP
|
||||||
|
sha1sums = SKIP
|
||||||
|
sha1sums = SKIP
|
||||||
|
sha1sums = SKIP
|
||||||
|
sha1sums = SKIP
|
||||||
|
sha1sums = SKIP
|
||||||
|
sha1sums = SKIP
|
||||||
|
sha1sums = SKIP
|
||||||
|
sha1sums = SKIP
|
||||||
|
sha1sums = SKIP
|
||||||
|
|
||||||
|
pkgname = mozc-ut-united
|
||||||
|
pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)
|
||||||
|
arch = i686
|
||||||
|
arch = x86_64
|
||||||
|
depends = qt5-base
|
||||||
|
depends = zinnia
|
||||||
|
optdepends = tegaki-models-zinnia-japanese: hand-writing recognition support
|
||||||
|
provides = mozc=2.26.4610.102
|
||||||
|
conflicts = mozc
|
||||||
|
conflicts = mozc-ut-unified
|
||||||
|
conflicts = mozc-neologd-ut
|
||||||
|
conflicts = mozc-ut2
|
||||||
|
conflicts = mozc-neologd-ut+ut2
|
||||||
|
conflicts = mozc-server
|
||||||
|
conflicts = mozc-utils-gui
|
||||||
|
|
||||||
|
pkgname = ibus-mozc-ut-united
|
||||||
|
pkgdesc = IBus engine module for Mozc with UT dictionary
|
||||||
|
arch = i686
|
||||||
|
arch = x86_64
|
||||||
|
depends = ibus>=1.4.1
|
||||||
|
provides = ibus-mozc
|
||||||
|
conflicts = ibus-mozc
|
||||||
|
conflicts = ibus-mozc-ut2
|
12
mozc-ut-united/.gitrepo
Normal file
12
mozc-ut-united/.gitrepo
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
; DO NOT EDIT (unless you know what you are doing)
|
||||||
|
;
|
||||||
|
; This subdirectory is a git "subrepo", and this file is maintained by the
|
||||||
|
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
|
||||||
|
;
|
||||||
|
[subrepo]
|
||||||
|
remote = https://aur.archlinux.org/mozc-ut-united.git
|
||||||
|
branch = master
|
||||||
|
commit = cc55e98aed4469e7eb547317200ccf82320e267e
|
||||||
|
parent = ece221b27b2f25638073185294fb59d621217014
|
||||||
|
method = merge
|
||||||
|
cmdver = 0.4.3
|
184
mozc-ut-united/PKGBUILD
Normal file
184
mozc-ut-united/PKGBUILD
Normal file
@ -0,0 +1,184 @@
|
|||||||
|
# Maintainer: silverhikari <kerrickethan at gmail dot com>
|
||||||
|
# Contributor: OrangeJuicelol <tep789 at gmail dot com>
|
||||||
|
# Contributor: Rylie <chiefdoraemon at gmail dot com>
|
||||||
|
# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
|
||||||
|
|
||||||
|
## If you will be using mozc.el on Emacs, uncomment below.
|
||||||
|
#_emacs_mozc="yes"
|
||||||
|
|
||||||
|
## If you will be using ibus, uncomment below.
|
||||||
|
_ibus_mozc="yes"
|
||||||
|
|
||||||
|
## Mozc compile option
|
||||||
|
_bldtype=Release
|
||||||
|
#_bldtype=Debug
|
||||||
|
|
||||||
|
#*************************************************************
|
||||||
|
# Upstreams:
|
||||||
|
#
|
||||||
|
# mozc
|
||||||
|
# https://code.google.com/p/mozc/
|
||||||
|
#
|
||||||
|
# Mozc UT dictionary
|
||||||
|
# https://osdn.net/users/utuhiro/pf/utuhiro/files/
|
||||||
|
#*************************************************************
|
||||||
|
|
||||||
|
#_mozcrev=c914d1dfe8b4193731b22da7ee3f53612a94269d
|
||||||
|
_mozcver=2.26.4610.102
|
||||||
|
_utdicdate=20220112
|
||||||
|
_utdicver=1
|
||||||
|
|
||||||
|
pkgbase=mozc-ut-united
|
||||||
|
pkgname=mozc-ut-united
|
||||||
|
true && pkgname=('mozc-ut-united')
|
||||||
|
pkgver=2.26.4610.102_20220112_2018.02.26.r231.g7329757e
|
||||||
|
pkgrel=2
|
||||||
|
arch=('i686' 'x86_64')
|
||||||
|
url="https://code.google.com/p/mozc/"
|
||||||
|
url="https://osdn.net/users/utuhiro/pf/utuhiro/files/"
|
||||||
|
license=('BSD' 'GPL' 'custom')
|
||||||
|
makedepends=('ruby' 'git' 'ninja' 'clang' 'zinnia' 'bazel')
|
||||||
|
source=("mozc::git+https://github.com/google/mozc.git" "https://osdn.net/downloads/users/37/37585/mozcdic-ut-${_utdicdate}.tar.bz2" "config-arch-new.patch" "git+https://chromium.googlesource.com/breakpad/breakpad" "git+https://github.com/google/googletest.git" "git+https://chromium.googlesource.com/external/gyp" "git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git" "git+https://github.com/open-source-parsers/jsoncpp.git" "git+https://github.com/google/protobuf.git" "git+https://github.com/abseil/abseil-cpp.git" "android-fix.patch")
|
||||||
|
sha1sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
|
||||||
|
|
||||||
|
|
||||||
|
if [[ "$_emacs_mozc" == "yes" ]]; then
|
||||||
|
true && pkgname+=('emacs-mozc-ut-united')
|
||||||
|
makedepends+=('emacs')
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$_ibus_mozc" == "yes" ]]; then
|
||||||
|
true && pkgname+=('ibus-mozc-ut-united')
|
||||||
|
fi
|
||||||
|
|
||||||
|
pkgver() {
|
||||||
|
cd "${srcdir}/mozc/"
|
||||||
|
|
||||||
|
printf "%s_%s_%s" "${_mozcver}" "${_utdicdate}" "$(git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')"
|
||||||
|
}
|
||||||
|
|
||||||
|
prepare() {
|
||||||
|
# Enabling all dictionaries
|
||||||
|
sed -i '/^#.*="true"/ s/^#//' ${srcdir}/mozcdic-ut-${_utdicdate}/src/make-dictionaries.sh
|
||||||
|
|
||||||
|
mkdir -p mozc/src/third_party
|
||||||
|
cd "${srcdir}/mozc/"
|
||||||
|
|
||||||
|
git submodule init
|
||||||
|
git config submodule.breakpad.url "$srcdir/breakpad"
|
||||||
|
git config submodule.gtest.url "$srcdir/googletest"
|
||||||
|
git config submodule.gyp.url "$srcdir/gyp"
|
||||||
|
git config submodule.japanese_usage_dictionary.url "$srcdir/japanese-usage-dictionary"
|
||||||
|
git config submodule.jsoncpp.url "$srcdir/jsoncpp"
|
||||||
|
git config submodule.protobuf.url "$srcdir/protobuf"
|
||||||
|
git config submodule.abseil-cpp.url "$srcdir/abseil-cpp"
|
||||||
|
git submodule update
|
||||||
|
|
||||||
|
# Add UT dictionary
|
||||||
|
cat ${srcdir}/mozcdic-ut-${_utdicdate}/mozcdic*-ut-*.txt >> src/data/dictionary_oss/dictionary00.txt
|
||||||
|
|
||||||
|
#fixes file include locations for ibus, and gtk along with correcting qt location on arch
|
||||||
|
patch -d "${srcdir}/mozc/src" -i "${srcdir}/config-arch-new.patch"
|
||||||
|
patch -d "${srcdir}/mozc/src" -i "${srcdir}/android-fix.patch"
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
build() {
|
||||||
|
echo '====================================================='
|
||||||
|
echo ' *** Build Info ***'
|
||||||
|
echo ' The following package files will be generated:'
|
||||||
|
for _p in ${pkgname[@]}
|
||||||
|
do
|
||||||
|
echo " * ${_p}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}"
|
||||||
|
done
|
||||||
|
echo '====================================================='
|
||||||
|
|
||||||
|
PATH="${srcdir}:${PATH}"
|
||||||
|
|
||||||
|
cd "${srcdir}/mozc/src"
|
||||||
|
|
||||||
|
echo "Starting make..."
|
||||||
|
|
||||||
|
bazel --output_user_root="$srcdir/bazel-cache" build package --config oss_linux -c opt
|
||||||
|
|
||||||
|
if [[ "$_ibus_mozc" == "yes" ]]; then
|
||||||
|
sed -i 's|/usr/libexec/|/usr/lib/ibus-mozc/|g' \
|
||||||
|
"${srcdir}/mozc/src/bazel-out/k8-opt/bin/unix/ibus/mozc.xml"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
package_mozc-ut-united() {
|
||||||
|
pkgdesc="A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
|
||||||
|
arch=('i686' 'x86_64')
|
||||||
|
depends=('qt5-base' 'zinnia')
|
||||||
|
provides=("mozc=${_mozcver}")
|
||||||
|
conflicts=('mozc' 'mozc-ut-unified' 'mozc-neologd-ut' 'mozc-ut2' 'mozc-neologd-ut+ut2' 'mozc-server' 'mozc-utils-gui')
|
||||||
|
optdepends=('tegaki-models-zinnia-japanese: hand-writing recognition support')
|
||||||
|
|
||||||
|
_output="${srcdir}/mozc/src/bazel-out/k8-opt/bin"
|
||||||
|
|
||||||
|
install -D -m 755 "${_output}/server/mozc_server" "${pkgdir}/usr/lib/mozc/mozc_server"
|
||||||
|
install -m 755 "${_output}/gui/tool/mozc_tool" "${pkgdir}/usr/lib/mozc/mozc_tool"
|
||||||
|
|
||||||
|
install -d "${pkgdir}/usr/lib/mozc/documents/"
|
||||||
|
install -m 644 "${srcdir}/mozc/src/data/installer/credits_en.html" "${pkgdir}/usr/lib/mozc/documents/"
|
||||||
|
|
||||||
|
_licpath="${pkgdir}/usr/share/licenses/${pkgbase}"
|
||||||
|
install -D -m 644 "${srcdir}/mozc/LICENSE" "${_licpath}/LICENSE_MOZC"
|
||||||
|
install -m 644 "${srcdir}/mozc/src/data/installer/credits_en.html" "${_licpath}"
|
||||||
|
|
||||||
|
cd "${srcdir}/mozcdic-ut-${_utdicdate}"
|
||||||
|
install -m 644 "README.md" "${_licpath}/README_MOZC-UT.md"
|
||||||
|
|
||||||
|
cd "${srcdir}/mozc"
|
||||||
|
cp -rf "docs/" "${_licpath}/"
|
||||||
|
chmod 644 -R "${_licpath}/docs/"
|
||||||
|
}
|
||||||
|
|
||||||
|
package_ibus-mozc-ut-united() {
|
||||||
|
pkgdesc="IBus engine module for Mozc with UT dictionary"
|
||||||
|
arch=('i686' 'x86_64')
|
||||||
|
depends=('ibus>=1.4.1')
|
||||||
|
provides=('ibus-mozc')
|
||||||
|
conflicts=('ibus-mozc' 'ibus-mozc-ut2')
|
||||||
|
|
||||||
|
cd "${srcdir}/mozc/src"
|
||||||
|
|
||||||
|
_output="${srcdir}/mozc/src/bazel-out/k8-opt/bin"
|
||||||
|
|
||||||
|
install -D -m 644 "${_output}/unix/ibus/mozc.xml" "${pkgdir}/usr/share/ibus/component/mozc.xml"
|
||||||
|
install -D -m 755 "${_output}/unix/ibus/ibus_mozc" "${pkgdir}/usr/lib/ibus-mozc/ibus-engine-mozc"
|
||||||
|
install -D -m 644 "data/images/unix/ime_product_icon_opensource-32.png" "${pkgdir}/usr/share/ibus-mozc/product_icon.png"
|
||||||
|
install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/ibus-mozc/tool.png"
|
||||||
|
install -m 644 data/images/unix/ui-properties.png "${pkgdir}/usr/share/ibus-mozc/properties.png"
|
||||||
|
install -m 644 data/images/unix/ui-dictionary.png "${pkgdir}/usr/share/ibus-mozc/dictionary.png"
|
||||||
|
install -m 644 data/images/unix/ui-direct.png "${pkgdir}/usr/share/ibus-mozc/direct.png"
|
||||||
|
install -m 644 data/images/unix/ui-hiragana.png "${pkgdir}/usr/share/ibus-mozc/hiragana.png"
|
||||||
|
install -m 644 data/images/unix/ui-katakana_half.png "${pkgdir}/usr/share/ibus-mozc/katakana_half.png"
|
||||||
|
install -m 644 data/images/unix/ui-katakana_full.png "${pkgdir}/usr/share/ibus-mozc/katakana_full.png"
|
||||||
|
install -m 644 data/images/unix/ui-alpha_half.png "${pkgdir}/usr/share/ibus-mozc/alpha_half.png"
|
||||||
|
install -m 644 data/images/unix/ui-alpha_full.png "${pkgdir}/usr/share/ibus-mozc/alpha_full.png"
|
||||||
|
|
||||||
|
install -D -m 755 "${_output}/renderer/mozc_renderer" "${pkgdir}/usr/lib/mozc/mozc_renderer"
|
||||||
|
}
|
||||||
|
|
||||||
|
package_emacs-mozc-ut-united() {
|
||||||
|
pkgdesc="Emacs engine module for Mozc with UT dictionary"
|
||||||
|
arch=('i686' 'x86_64')
|
||||||
|
depends=('emacs')
|
||||||
|
provides=('emacs-mozc')
|
||||||
|
conflicts=('emacs-mozc' 'emacs-mozc-bin' 'emacs-mozc-ut2')
|
||||||
|
install=
|
||||||
|
|
||||||
|
cd "${srcdir}/mozc/src"
|
||||||
|
|
||||||
|
_output="${srcdir}/mozc/src/bazel-out/k8-opt/bin"
|
||||||
|
|
||||||
|
install -D -m 755 "${_output}/unix/emacs/mozc_emacs_helper" "${pkgdir}/usr/bin/mozc_emacs_helper"
|
||||||
|
install -d "${pkgdir}/usr/share/emacs/site-lisp/emacs-mozc/"
|
||||||
|
install -m 644 "${srcdir}/mozc/src/unix/emacs/mozc.el" "${pkgdir}/usr/share/emacs/site-lisp/emacs-mozc"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Global pkgdesc and depends are here so that they will be picked up by AUR
|
||||||
|
pkgdesc="A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
|
||||||
|
depends=('qt5-base' 'zinnia')
|
16
mozc-ut-united/android-fix.patch
Normal file
16
mozc-ut-united/android-fix.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
--- WORKSPACE.bazel 2022-01-31 15:44:11.510958782 -0500
|
||||||
|
+++ WORKSPACE-new.bazel 2022-01-31 15:48:42.861958776 -0500
|
||||||
|
@@ -5,11 +5,11 @@
|
||||||
|
load("//:config.bzl", "QT_BASE_PATH")
|
||||||
|
|
||||||
|
# This rule reffers $ANDROID_SDK_HOME
|
||||||
|
-android_sdk_repository(name = "androidsdk")
|
||||||
|
+#android_sdk_repository(name = "androidsdk")
|
||||||
|
|
||||||
|
# Android NDK version should be r11c+ for Abseil.
|
||||||
|
# This rule reffers $ANDROID_NDK_HOME
|
||||||
|
-android_ndk_repository(name = "androidndk")
|
||||||
|
+#android_ndk_repository(name = "androidndk")
|
||||||
|
|
||||||
|
local_repository(
|
||||||
|
name = "com_google_absl",
|
58
mozc-ut-united/config-arch-new.patch
Normal file
58
mozc-ut-united/config-arch-new.patch
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
diff -Naur mozc-old/src/BUILD.gtk2.bazel mozc-new-patch/src/BUILD.gtk2.bazel
|
||||||
|
--- mozc-old/src/BUILD.gtk2.bazel 2022-01-15 15:41:14.496303209 -0500
|
||||||
|
+++ mozc-new-patch/src/BUILD.gtk2.bazel 2022-01-15 15:00:19.359619101 -0500
|
||||||
|
@@ -27,8 +27,8 @@
|
||||||
|
"include/pango-1.0/**",
|
||||||
|
"include/pixman-1/**",
|
||||||
|
"include/uuid/**",
|
||||||
|
- "lib/x86_64-linux-gnu/glib-2.0/include/**",
|
||||||
|
- "lib/x86_64-linux-gnu/gtk-2.0/include/**",
|
||||||
|
+ "lib/glib-2.0/include/**",
|
||||||
|
+ "lib/gtk-2.0/include/**",
|
||||||
|
]),
|
||||||
|
copts = ["-pthread"],
|
||||||
|
includes = [
|
||||||
|
@@ -46,8 +46,8 @@
|
||||||
|
"include/pango-1.0",
|
||||||
|
"include/pixman-1",
|
||||||
|
"include/uuid",
|
||||||
|
- "lib/x86_64-linux-gnu/glib-2.0/include",
|
||||||
|
- "lib/x86_64-linux-gnu/gtk-2.0/include",
|
||||||
|
+ "lib/glib-2.0/include",
|
||||||
|
+ "lib/gtk-2.0/include",
|
||||||
|
],
|
||||||
|
linkopts = [
|
||||||
|
"-latk-1.0",
|
||||||
|
diff -Naur mozc-old/src/BUILD.ibus.bazel mozc-new-patch/src/BUILD.ibus.bazel
|
||||||
|
--- mozc-old/src/BUILD.ibus.bazel 2022-01-15 15:41:14.496303209 -0500
|
||||||
|
+++ mozc-new-patch/src/BUILD.ibus.bazel 2022-01-15 14:54:50.964671878 -0500
|
||||||
|
@@ -17,7 +17,7 @@
|
||||||
|
"include/libmount/**",
|
||||||
|
"include/blkid/**",
|
||||||
|
"include/glib-2.0/**",
|
||||||
|
- "lib/x86_64-linux-gnu/glib-2.0/include/**",
|
||||||
|
+ "lib/glib-2.0/include/**",
|
||||||
|
]),
|
||||||
|
copts = ["-pthread"],
|
||||||
|
includes = [
|
||||||
|
@@ -25,7 +25,7 @@
|
||||||
|
"include/libmount",
|
||||||
|
"include/blkid",
|
||||||
|
"include/glib-2.0",
|
||||||
|
- "lib/x86_64-linux-gnu/glib-2.0/include",
|
||||||
|
+ "lib/glib-2.0/include",
|
||||||
|
],
|
||||||
|
linkopts = [
|
||||||
|
"-libus-1.0",
|
||||||
|
diff -Naur mozc-old/src/config.bzl mozc-new-patch/src/config.bzl
|
||||||
|
--- mozc-old/src/config.bzl 2022-01-15 15:41:14.849644550 -0500
|
||||||
|
+++ mozc-new-patch/src/config.bzl 2022-01-15 15:44:40.410965639 -0500
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
MACOS_MIN_OS_VER = "10.12"
|
||||||
|
|
||||||
|
## Qt paths
|
||||||
|
-QT_BASE_PATH = "/usr/include/x86_64-linux-gnu/qt5" # For Debian
|
||||||
|
+QT_BASE_PATH = "/usr/include/qt" # For Debian
|
||||||
|
QT_BIN_PATH = "/usr/bin/"
|
||||||
|
|
||||||
|
## For macOS
|
@ -1,18 +1,18 @@
|
|||||||
pkgbase = mpdevil
|
pkgbase = mpdevil
|
||||||
pkgdesc = A simple music browser for MPD
|
pkgdesc = A simple music browser for MPD
|
||||||
pkgver = 1.3.0
|
pkgver = 1.5.1
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://github.com/SoongNoonien/mpdevil
|
url = https://github.com/SoongNoonien/mpdevil
|
||||||
arch = any
|
arch = any
|
||||||
license = GPL3
|
license = GPL3
|
||||||
makedepends = python-distutils-extra
|
makedepends = meson
|
||||||
depends = python-mpd2
|
depends = python-mpd2
|
||||||
depends = gtk3
|
depends = gtk3
|
||||||
depends = libnotify
|
depends = libnotify
|
||||||
depends = python-gobject
|
depends = python-gobject
|
||||||
depends = python-requests
|
depends = python-requests
|
||||||
depends = python-beautifulsoup4
|
depends = python-beautifulsoup4
|
||||||
source = mpdevil-1.3.0.tar.gz::https://github.com/SoongNoonien/mpdevil/archive/v1.3.0.tar.gz
|
source = mpdevil-1.5.1.tar.gz::https://github.com/SoongNoonien/mpdevil/archive/v1.5.1.tar.gz
|
||||||
sha256sums = 3f3c878c1c0d006aa491b1bef584a2c5ec97955ed1e77ba69caa7ebd875e5474
|
sha256sums = e7a0d20d7e73f07dfa4c36b38bcf3c74b109fb8f865b86e147435d089870b45a
|
||||||
|
|
||||||
pkgname = mpdevil
|
pkgname = mpdevil
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
[subrepo]
|
[subrepo]
|
||||||
remote = https://aur.archlinux.org/mpdevil.git
|
remote = https://aur.archlinux.org/mpdevil.git
|
||||||
branch = master
|
branch = master
|
||||||
commit = 4f070342c1a89b660261f67321f0107ea6ff5c92
|
commit = 83a0b99938ca683cc0a3a6d06431dbd8f4155c17
|
||||||
parent = 1b77cb73b63893151a989bc951b33c933a8f4030
|
parent = 042a0540dcd10fd15ac94fcd8875c7f0617a3639
|
||||||
method = merge
|
method = merge
|
||||||
cmdver = 0.4.3
|
cmdver = 0.4.3
|
||||||
|
@ -1,24 +1,23 @@
|
|||||||
# Maintainer: Martin Wagner <martin.wagner.dev@gmail.com>
|
# Maintainer: Martin Wagner <martin.wagner.dev@gmail.com>
|
||||||
|
|
||||||
pkgname=mpdevil
|
pkgname=mpdevil
|
||||||
pkgver=1.3.0
|
pkgver=1.5.1
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="A simple music browser for MPD"
|
pkgdesc="A simple music browser for MPD"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
license=('GPL3')
|
license=('GPL3')
|
||||||
url="https://github.com/SoongNoonien/mpdevil"
|
url="https://github.com/SoongNoonien/mpdevil"
|
||||||
depends=('python-mpd2' 'gtk3' 'libnotify' 'python-gobject' 'python-requests' 'python-beautifulsoup4')
|
depends=('python-mpd2' 'gtk3' 'libnotify' 'python-gobject' 'python-requests' 'python-beautifulsoup4')
|
||||||
makedepends=('python-distutils-extra')
|
makedepends=('meson')
|
||||||
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/SoongNoonien/mpdevil/archive/v${pkgver}.tar.gz")
|
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/SoongNoonien/mpdevil/archive/v${pkgver}.tar.gz")
|
||||||
sha256sums=('3f3c878c1c0d006aa491b1bef584a2c5ec97955ed1e77ba69caa7ebd875e5474')
|
sha256sums=('e7a0d20d7e73f07dfa4c36b38bcf3c74b109fb8f865b86e147435d089870b45a')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
arch-meson "${pkgname}-${pkgver}" build
|
||||||
python setup.py build
|
meson compile -C build
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
meson install -C build --destdir "$pkgdir"
|
||||||
python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
12
zinnia/.SRCINFO
Normal file
12
zinnia/.SRCINFO
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
pkgbase = zinnia
|
||||||
|
pkgdesc = Simple, customizable and portable online hand recognition system based on Support Vector Machines
|
||||||
|
pkgver = 0.07
|
||||||
|
pkgrel = 1
|
||||||
|
url = https://github.com/silverhikari/zinnia
|
||||||
|
arch = x86_64
|
||||||
|
license = BSD
|
||||||
|
depends = gcc-libs
|
||||||
|
source = https://github.com/silverhikari/zinnia/releases/download/0.07/zinnia-0.07.tar.gz
|
||||||
|
sha256sums = a1f537b67ac37319740d747a5eb101f0a327b0c483aecf8030c32eb3a133b07f
|
||||||
|
|
||||||
|
pkgname = zinnia
|
12
zinnia/.gitrepo
Normal file
12
zinnia/.gitrepo
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
; DO NOT EDIT (unless you know what you are doing)
|
||||||
|
;
|
||||||
|
; This subdirectory is a git "subrepo", and this file is maintained by the
|
||||||
|
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
|
||||||
|
;
|
||||||
|
[subrepo]
|
||||||
|
remote = https://aur.archlinux.org/zinnia.git
|
||||||
|
branch = master
|
||||||
|
commit = 215fc9b564f15bb4687a8a00fcafa2cfa3161fc5
|
||||||
|
parent = dc84a68b754757fdd56dd7a2225ee1434fa845d4
|
||||||
|
method = merge
|
||||||
|
cmdver = 0.4.3
|
25
zinnia/PKGBUILD
Normal file
25
zinnia/PKGBUILD
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
# Maintainer : silverhikari
|
||||||
|
# Contributor: Felix Yan <felixonmars@archlinux.org>
|
||||||
|
# Contributor: Humbert Julien <julroy67 [AT] gmail.com>
|
||||||
|
|
||||||
|
pkgname=zinnia
|
||||||
|
pkgver=0.07
|
||||||
|
pkgrel=1
|
||||||
|
pkgdesc="Simple, customizable and portable online hand recognition system based on Support Vector Machines"
|
||||||
|
arch=('x86_64')
|
||||||
|
url="https://github.com/silverhikari/zinnia"
|
||||||
|
license=('BSD')
|
||||||
|
depends=('gcc-libs')
|
||||||
|
source=("https://github.com/silverhikari/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz")
|
||||||
|
sha256sums=('a1f537b67ac37319740d747a5eb101f0a327b0c483aecf8030c32eb3a133b07f')
|
||||||
|
build() {
|
||||||
|
cd $pkgname-$pkgver
|
||||||
|
./configure --prefix=/usr
|
||||||
|
make
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd $pkgname-$pkgver
|
||||||
|
make DESTDIR="$pkgdir" install
|
||||||
|
install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||||
|
}
|
21
zinnia/zinnia-gcc6.patch
Normal file
21
zinnia/zinnia-gcc6.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
--- a/trainer.cpp
|
||||||
|
+++ b/trainer.cpp
|
||||||
|
@@ -93,7 +93,7 @@ class TrainerImpl: public Trainer {
|
||||||
|
|
||||||
|
public:
|
||||||
|
bool add(const Character &character) {
|
||||||
|
- const std::string y = character.value();
|
||||||
|
+ std::string y = character.value();
|
||||||
|
CHECK_FALSE(!y.empty()) << "input character is empty";
|
||||||
|
Features features;
|
||||||
|
CHECK_FALSE(features.read(character)) << "cannot read character: " << y;
|
||||||
|
@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer {
|
||||||
|
if (!fn) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
- x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn));
|
||||||
|
+ x_.push_back(std::make_pair(y, fn));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user