summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamLukeYes2020-07-16 14:08:10 +0800
committerSamLukeYes2020-07-16 14:08:10 +0800
commiteeb8c671fc3f0f57dc332f03823c26e00b3f97a2 (patch)
treef02494b095236f7cd44d4bcb61fab33e01a13538
parent60e2b2c1f22008436288462aa9ba35f99c9016ca (diff)
downloadaur-eeb8c671fc3f0f57dc332f03823c26e00b3f97a2.tar.gz
adding Wayland solution
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD16
-rw-r--r--enable-fcitx.sh8
-rw-r--r--enable-ibus.sh8
-rw-r--r--input-support.install12
5 files changed, 26 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 588be93fe10e..b4293a62338c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = manjaro-asian-input-support
pkgdesc = Asian input support from Manjaro
pkgver = 2020.07
- pkgrel = 2
+ pkgrel = 3
url = https://gitlab.manjaro.org/packages/community/manjaro-asian-input-support
install = input-support.install
arch = any
@@ -14,8 +14,8 @@ pkgbase = manjaro-asian-input-support
source = fcitx5.desktop
source = fcitx5.profile
source = ibus.desktop
- md5sums = fdbfae1bba8012daf984a76d7004ae3e
- md5sums = b974be25b7f91c392009cb8d9f1bd5b4
+ md5sums = 42db8df96db00e8fcc023b7bc9135b21
+ md5sums = 1a68e770b9f426301b6a08fe8edb47f1
md5sums = 97a5be2b8ff8c0fc895d9ef21531e698
md5sums = 3578677a7102c9f8be3b9f7ea7d3d06f
md5sums = f1a9f3406f8268383149889f4816cd52
diff --git a/PKGBUILD b/PKGBUILD
index bcd65502942a..80f1f562f6b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: Sam L. Yes <manjaroyes123@outlook.com>
-# Upstream Maintainer: Stefano Capitani <stefanoatmanjarodororg>
-# Contributor: star2000 <i@star2000.work>
+# Maintainer: star2000 <i@star2000.work>
+# Contributor: Stefano Capitani <stefanoatmanjarodororg>
pkgbase=manjaro-asian-input-support
pkgname=('ibus-input-support' 'fcitx-input-support' 'fcitx5-input-support')
pkgver=2020.07
-pkgrel=2
+pkgrel=3
arch=('any')
url="https://gitlab.manjaro.org/packages/community/manjaro-asian-input-support"
license=('GPL')
@@ -17,11 +17,11 @@ source=(
'fcitx5.profile'
'ibus.desktop'
)
-md5sums=('fdbfae1bba8012daf984a76d7004ae3e'
- 'b974be25b7f91c392009cb8d9f1bd5b4'
- '97a5be2b8ff8c0fc895d9ef21531e698'
- '3578677a7102c9f8be3b9f7ea7d3d06f'
- 'f1a9f3406f8268383149889f4816cd52')
+md5sums=('42db8df96db00e8fcc023b7bc9135b21'
+ '1a68e770b9f426301b6a08fe8edb47f1'
+ '97a5be2b8ff8c0fc895d9ef21531e698'
+ '3578677a7102c9f8be3b9f7ea7d3d06f'
+ 'f1a9f3406f8268383149889f4816cd52')
install=input-support.install
conflicts=(
"${pkgbase}-ibus"
diff --git a/enable-fcitx.sh b/enable-fcitx.sh
index 9485f98c23d5..c4a077f0470e 100644
--- a/enable-fcitx.sh
+++ b/enable-fcitx.sh
@@ -1,5 +1,5 @@
# https://wiki.archlinux.org/index.php/Fcitx
-im=fcitx
-export GTK_IM_MODULE=$im
-export QT_IM_MODULE=$im
-export XMODIFIERS=@im=$im
+#im=fcitx
+export GTK_IM_MODULE=fcitx
+export QT_IM_MODULE=fcitx
+export XMODIFIERS=@im=fcitx
diff --git a/enable-ibus.sh b/enable-ibus.sh
index b9376d5e290f..f216a6093895 100644
--- a/enable-ibus.sh
+++ b/enable-ibus.sh
@@ -1,5 +1,5 @@
# https://wiki.archlinux.org/index.php/IBus
-im=ibus
-export GTK_IM_MODULE=$im
-export QT_IM_MODULE=$im
-export XMODIFIERS=@im=$im
+#im=ibus
+export GTK_IM_MODULE=ibus
+export QT_IM_MODULE=ibus
+export XMODIFIERS=@im=ibus
diff --git a/input-support.install b/input-support.install
index 804404334007..c516a456d74e 100644
--- a/input-support.install
+++ b/input-support.install
@@ -1,6 +1,9 @@
post_install() {
echo
- echo 'Re-login or reboot to apply modify'
+ echo 'Re-login or reboot to apply modify.'
+ printf "If you're using a Wayland session, you might also need to add the variables defined in "
+ printf "/etc/profile.d/input-support.sh to /etc/environment manually before you re-login or reboot."
+ echo
echo
}
@@ -8,7 +11,6 @@ post_upgrade() {
post_install
}
-post_remove() {
- post_install
-}
-
+# post_remove() {
+# post_install
+# } \ No newline at end of file