Follow upstream changes

6 files changed, 158 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3f0103ba465..6ded252d3c6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,43 +1,62 @@
 pkgbase = manjaro-asian-input-support
-	pkgdesc = Manjaro Asian input support
-	pkgver = 2020.06
+	pkgdesc = Asian input support from Manjaro
+	pkgver = 2020.07
 	pkgrel = 1
 	url = https://gitlab.manjaro.org/packages/community/manjaro-asian-input-support
+	install = input-support.install
 	arch = any
 	license = GPL
 	conflicts = manjaro-asian-input-support-gtk
 	conflicts = manjaro-asian-input-support-qt
 	conflicts = manjaro-asian-input-support-ibus
 	conflicts = manjaro-asian-input-support-fcitx
-	source = enable-ibus.sh
+	conflicts = manjaro-asian-input-support-fcitx5
 	source = enable-fcitx.sh
+	source = enable-fcitx5.sh
+	source = enable-ibus.sh
+	source = fcitx5.desktop
+	source = fcitx5.profile
 	source = ibus.desktop
-	md5sums = b974be25b7f91c392009cb8d9f1bd5b4
 	md5sums = fdbfae1bba8012daf984a76d7004ae3e
+	md5sums = a647ba08173b10b0dfaf1fdd693035e9
+	md5sums = b974be25b7f91c392009cb8d9f1bd5b4
+	md5sums = 97a5be2b8ff8c0fc895d9ef21531e698
+	md5sums = 3578677a7102c9f8be3b9f7ea7d3d06f
 	md5sums = f1a9f3406f8268383149889f4816cd52
 
 pkgname = ibus-input-support
-	pkgdesc = Manjaro Asian input support for ibus, with dependencies set to optional.
-	optdepends = ibus-libpinyin: a Chinese IME
-	optdepends = ibus-anthy: a Japanese IME
-	optdepends = ibus-hangul: a Korean IME
-	optdepends = ibus-unikey: a Vietnamese IME
-	optdepends = ibus-m17n: other languages provided by M17n (http://www.nongnu.org/m17n/)
+	pkgdesc = Asian input support for ibus
+	optdepends = ibus-libpinyin: 中文 | Chinese
+	optdepends = ibus-anthy: 日本語 | Japanese
+	optdepends = ibus-hangul: 한국어 | Korean
+	optdepends = ibus-unikey: Tiếng Việt | Vietnamese
+	optdepends = ibus-m17n: other languages provided by M17n(http://www.nongnu.org/m17n/)
 	provides = manjaro-asian-input-support-ibus
 
 pkgname = fcitx-input-support
-	pkgdesc = Manjaro Asian input support for fcitx, with dependencies set to optional.
-	optdepends = fcitx-qt5: QT input module
-	optdepends = fcitx-gtk3: GTK input module
-	optdepends = fcitx-configtool: GUI configuration tool
+	pkgdesc = Asian input support for fcitx
+	depends = fcitx-qt5
+	depends = fcitx-configtool
 	optdepends = fcitx-qt4: required by some closed source Chinese IMEs
-	optdepends = fcitx-googlepinyin: a Chinese IME
-	optdepends = fcitx-cloudpinyin: Internet resources to provide candidate input for Chinese
-	optdepends = fcitx-mozc: a Japanese IME
-	optdepends = fcitx-hangul: a Korean IME
-	optdepends = fcitx-unikey: a Vietnamese IME
-	optdepends = fcitx-sayura: a Sinhalese IME
-	optdepends = fcitx-m17n: other languages provided by M17n (http://www.nongnu.org/m17n/)
 	optdepends = kcm-fcitx: KDE configuration module
+	optdepends = fcitx-googlepinyin: 中文 | Chinese
+	optdepends = fcitx-cloudpinyin: 云拼音 | Use internet resources to provide candidate input for Chinese
+	optdepends = fcitx-mozc: 日本語 | Japanese
+	optdepends = fcitx-hangul: 한국어 | Korean
+	optdepends = fcitx-unikey: Tiếng Việt | Vietnamese
+	optdepends = fcitx-sayura: සිංහල | Sinhalese
+	optdepends = fcitx-m17n: other languages provided by M17n(http://www.nongnu.org/m17n/)
 	provides = manjaro-asian-input-support-fcitx
 
+pkgname = fcitx5-input-support
+	pkgdesc = Asian input support for fcitx5
+	depends = fcitx5-qt
+	depends = fcitx5-gtk
+	optdepends = kcm-fcitx5: KDE configuration module
+	optdepends = fcitx5-chinese-addons: 简体中文 | Simplified Chinese
+	optdepends = fcitx5-rime: 繁體中文 | Traditional Chinese
+	optdepends = fcitx5-anthy: 日本語 | Japanese
+	optdepends = fcitx5-hangul: 한국어 | Korean
+	optdepends = fcitx5-unikey: Tiếng Việt | Vietnamese
+	provides = manjaro-asian-input-support-fcitx5
+
diff --git a/PKGBUILD b/PKGBUILD
index b8067e6cb0d0..859c2cc5906e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,89 @@
 # Maintainer: Sam L. Yes <manjaroyes123@outlook.com>
-# Upstream Maintainer: Stefano Capitani <stefanoatmanjarodororg>
-# Upstream Contributors: star2000 <i@star2000.work>
+# Contributor: Stefano Capitani <stefanoatmanjarodororg>
+# Contributor: star2000 <i@star2000.work>
 
 pkgbase=manjaro-asian-input-support
-pkgname=('ibus-input-support' 'fcitx-input-support')
-pkgver=2020.06
+pkgname=('ibus-input-support' 'fcitx-input-support' 'fcitx5-input-support')
+pkgver=2020.07
 pkgrel=1
-pkgdesc="Manjaro Asian input support"
 arch=('any')
 url="https://gitlab.manjaro.org/packages/community/manjaro-asian-input-support"
 license=('GPL')
-source=('enable-ibus.sh' 'enable-fcitx.sh' 'ibus.desktop')
-md5sums=('b974be25b7f91c392009cb8d9f1bd5b4'
-         'fdbfae1bba8012daf984a76d7004ae3e'
+pkgdesc='Asian input support from Manjaro'
+source=(
+	'enable-fcitx.sh'
+	'enable-fcitx5.sh'
+	'enable-ibus.sh'
+	'fcitx5.desktop'
+	'fcitx5.profile'
+	'ibus.desktop'
+)
+md5sums=('fdbfae1bba8012daf984a76d7004ae3e'
+         'a647ba08173b10b0dfaf1fdd693035e9'
+         'b974be25b7f91c392009cb8d9f1bd5b4'
+         '97a5be2b8ff8c0fc895d9ef21531e698'
+         '3578677a7102c9f8be3b9f7ea7d3d06f'
          'f1a9f3406f8268383149889f4816cd52')
-conflicts=("${pkgbase}-gtk" "${pkgbase}-qt" "${pkgbase}-ibus" "${pkgbase}-fcitx")
+install=input-support.install
+conflicts=(
+			"${pkgbase}-gtk"
+			"${pkgbase}-qt"
+			"${pkgbase}-ibus"
+			"${pkgbase}-fcitx"
+			"${pkgbase}-fcitx5"
+			)
 
 package_ibus-input-support() {
-	pkgdesc='Manjaro Asian input support for ibus, with dependencies set to optional.'
-	#depends=('ibus')
+	pkgdesc='Asian input support for ibus'
 	optdepends=(
-		'ibus-libpinyin: a Chinese IME'
-		'ibus-anthy: a Japanese IME'
-		'ibus-hangul: a Korean IME'
-		'ibus-unikey: a Vietnamese IME'
-		'ibus-m17n: other languages provided by M17n (http://www.nongnu.org/m17n/)'
+		'ibus-libpinyin: 中文 | Chinese'
+		'ibus-anthy: 日本語 | Japanese'
+		'ibus-hangul: 한국어 | Korean'
+		'ibus-unikey: Tiếng Việt | Vietnamese'
+		'ibus-m17n: other languages provided by M17n(http://www.nongnu.org/m17n/)'
 	)
 	provides=("${pkgbase}-ibus")
-
 	install -Dm644 "$srcdir/enable-ibus.sh" "$pkgdir/etc/profile.d/input-support.sh"
 	install -Dm644 "$srcdir/ibus.desktop" "$pkgdir/etc/xdg/autostart/ibus.desktop"
 }
 
 package_fcitx-input-support() {
-	pkgdesc='Manjaro Asian input support for fcitx, with dependencies set to optional.'
+	pkgdesc='Asian input support for fcitx'
+	depends=(
+		'fcitx-qt5'          # QT input module
+		'fcitx-configtool'   # gui configuration tool
+	)
 	optdepends=(
-		'fcitx-qt5: QT input module'
-		'fcitx-gtk3: GTK input module'
-		'fcitx-configtool: GUI configuration tool'
 		'fcitx-qt4: required by some closed source Chinese IMEs'
-		'fcitx-googlepinyin: a Chinese IME'
-		'fcitx-cloudpinyin: Internet resources to provide candidate input for Chinese'
-		'fcitx-mozc: a Japanese IME'
-		'fcitx-hangul: a Korean IME'
-		'fcitx-unikey: a Vietnamese IME'
-		'fcitx-sayura: a Sinhalese IME'
-		'fcitx-m17n: other languages provided by M17n (http://www.nongnu.org/m17n/)'
-		'kcm-fcitx: KDE configuration module')
+		'kcm-fcitx: KDE configuration module'
+		'fcitx-googlepinyin: 中文 | Chinese'
+		'fcitx-cloudpinyin: 云拼音 | Use internet resources to provide candidate input for Chinese'
+		'fcitx-mozc: 日本語 | Japanese'
+		'fcitx-hangul: 한국어 | Korean'
+		'fcitx-unikey: Tiếng Việt | Vietnamese'
+		'fcitx-sayura: සිංහල | Sinhalese'
+		'fcitx-m17n: other languages provided by M17n(http://www.nongnu.org/m17n/)'
+	)
 	provides=("${pkgbase}-fcitx")
-
 	install -Dm644 "$srcdir/enable-fcitx.sh" "$pkgdir/etc/profile.d/input-support.sh"
 }
+
+package_fcitx5-input-support() {
+	pkgdesc='Asian input support for fcitx5'
+	depends=(
+		'fcitx5-qt'             # QT input module
+		'fcitx5-gtk'            # GTK input module
+	)
+	optdepends=(
+		'kcm-fcitx5: KDE configuration module'
+		'fcitx5-chinese-addons: 简体中文 | Simplified Chinese'
+		'fcitx5-rime: 繁體中文 | Traditional Chinese'
+		'fcitx5-anthy: 日本語 | Japanese'
+		'fcitx5-hangul: 한국어 | Korean'
+		'fcitx5-unikey: Tiếng Việt | Vietnamese'
+	)
+	provides=("${pkgbase}-fcitx5")
+	install -Dm644 "$srcdir/enable-fcitx5.sh" "$pkgdir/etc/profile.d/input-support.sh"
+	install -Dm644 "$srcdir/fcitx5.desktop" "$pkgdir/etc/xdg/autostart/fcitx5.desktop"
+	install -Dm644 "$srcdir/fcitx5.profile" "$pkgdir/usr/share/$pkgname/profile"
+}
diff --git a/enable-fcitx5.sh b/enable-fcitx5.sh
new file mode 100644
index 000000000000..bcf4fde6eb14
--- /dev/null
+++ b/enable-fcitx5.sh
@@ -0,0 +1,9 @@
+# https://wiki.archlinux.org/index.php/Fcitx5
+im=fcitx5
+export GTK_IM_MODULE=$im
+export QT_IM_MODULE=$im
+export XMODIFIERS=@im=$im
+
+if [ ! -e ~/.config/fcitx5/profile ]; then
+    install -D /usr/share/manjaro-asian-input-support-fcitx5/profile ~/.config/fcitx5/profile
+fi
diff --git a/fcitx5.desktop b/fcitx5.desktop
new file mode 100644
index 000000000000..fcaebd6c5ddd
--- /dev/null
+++ b/fcitx5.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Fcitx5
+Type=Application
+Exec=fcitx5
+Terminal=false
diff --git a/fcitx5.profile b/fcitx5.profile
new file mode 100644
index 000000000000..c4c4f5ea4182
--- /dev/null
+++ b/fcitx5.profile
@@ -0,0 +1,24 @@
+[Groups/0]
+Name=default
+Default Layout=us
+
+[Groups/0/Items/0]
+Name=keyboard-us
+
+[Groups/0/Items/1]
+Name=pinyin
+
+[Groups/0/Items/2]
+Name=rime
+
+[Groups/0/Items/3]
+Name=anthy
+
+[Groups/0/Items/4]
+Name=hangul
+
+[Groups/0/Items/5]
+Name=unikey
+
+[GroupOrder]
+0=default
diff --git a/input-support.install b/input-support.install
new file mode 100644
index 000000000000..804404334007
--- /dev/null
+++ b/input-support.install
@@ -0,0 +1,14 @@
+post_install() {
+	echo
+	echo 'Re-login or reboot to apply modify'
+	echo
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
+