summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamLukeYes2020-12-24 21:44:23 +0800
committerSamLukeYes2020-12-24 21:44:23 +0800
commit8f9f3f4d11fed81d9ee16e9f51d2d401043c748a (patch)
tree7ee0c82ce23194df567c212ffb8478538fdf1803
parentbbb88ae1c0842f3a84fe9e83f120df51901c9bea (diff)
downloadaur-8f9f3f4d11fed81d9ee16e9f51d2d401043c748a.tar.gz
remove fcitx5.desktop as already provided
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--enable-fcitx5.sh8
-rw-r--r--fcitx5.desktop5
4 files changed, 8 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 30ff0ffa7020..fc77c5a0ad67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = manjaro-asian-input-support
pkgdesc = Asian input support from Manjaro
pkgver = 2020.12
- pkgrel = 1
+ pkgrel = 2
url = https://gitlab.manjaro.org/packages/community/manjaro-asian-input-support
install = input-support.install
arch = any
@@ -12,13 +12,11 @@ pkgbase = manjaro-asian-input-support
source = enable-fcitx.sh
source = enable-ibus.sh
source = enable-fcitx5.sh
- source = fcitx5.desktop
source = fcitx5.profile
source = ibus.desktop
md5sums = 42db8df96db00e8fcc023b7bc9135b21
md5sums = 1a68e770b9f426301b6a08fe8edb47f1
- md5sums = 76683bfe0294238b08cd7c67b0806fd9
- md5sums = 97a5be2b8ff8c0fc895d9ef21531e698
+ md5sums = e493893ea6af38dd10d0a36e54e33a82
md5sums = 3578677a7102c9f8be3b9f7ea7d3d06f
md5sums = f1a9f3406f8268383149889f4816cd52
diff --git a/PKGBUILD b/PKGBUILD
index 9018b809f83c..eaa7e259cfee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgbase=manjaro-asian-input-support
pkgname=('ibus-input-support' 'fcitx-input-support' 'fcitx5-input-support')
pkgver=2020.12
-pkgrel=1
+pkgrel=2
arch=('any')
url="https://gitlab.manjaro.org/packages/community/manjaro-asian-input-support"
license=('GPL')
@@ -14,14 +14,12 @@ source=(
'enable-fcitx.sh'
'enable-ibus.sh'
'enable-fcitx5.sh'
- 'fcitx5.desktop'
'fcitx5.profile'
'ibus.desktop'
)
md5sums=('42db8df96db00e8fcc023b7bc9135b21'
'1a68e770b9f426301b6a08fe8edb47f1'
- '76683bfe0294238b08cd7c67b0806fd9'
- '97a5be2b8ff8c0fc895d9ef21531e698'
+ 'e493893ea6af38dd10d0a36e54e33a82'
'3578677a7102c9f8be3b9f7ea7d3d06f'
'f1a9f3406f8268383149889f4816cd52')
install=input-support.install
@@ -83,6 +81,5 @@ package_fcitx5-input-support() {
)
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/etc/xdg/fcitx5/profile"
}
diff --git a/enable-fcitx5.sh b/enable-fcitx5.sh
index a18dc8aa52c4..55074ce80296 100644
--- a/enable-fcitx5.sh
+++ b/enable-fcitx5.sh
@@ -1,5 +1,5 @@
# https://wiki.archlinux.org/index.php/Fcitx5
-export INPUT_METHOD=fcitx5
-export GTK_IM_MODULE=fcitx5
-export QT_IM_MODULE=fcitx5
-export XMODIFIERS=@im=fcitx5
+export SDL_IM_MODULE=fcitx
+export GTK_IM_MODULE=fcitx
+export QT_IM_MODULE=fcitx
+export XMODIFIERS=@im=fcitx
diff --git a/fcitx5.desktop b/fcitx5.desktop
deleted file mode 100644
index fcaebd6c5ddd..000000000000
--- a/fcitx5.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=Fcitx5
-Type=Application
-Exec=fcitx5
-Terminal=false