aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD71
-rwxr-xr-xsogou-autostart15
3 files changed, 49 insertions, 57 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 59814d26f529..2fc5b502956f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,19 @@
pkgbase = fcitx-sogoupinyin
pkgdesc = Sogou Pinyin for Linux
- pkgver = 2.2.0.0108
- pkgrel = 5
- url = https://pinyin.sogou.com/linux/
+ pkgver = 4.2.1.145
+ pkgrel = 1
+ url = https://shurufa.sogou.com/linux
arch = x86_64
- arch = i686
license = custom
depends = fcitx
depends = opencc
depends = libidn11
depends = lsb-release
depends = xorg-xprop
- depends = qtwebkit
- source = sogou-autostart
- md5sums = ff599d805084f49b95ba99fe640bc170
- source_x86_64 = http://cdn2.ime.sogou.com/dl/index/1524572264/sogoupinyin_2.2.0.0108_amd64.deb
- md5sums_x86_64 = 3fc65450b4a8c2f00561d9c8a4a07b5a
- source_i686 = http://cdn2.ime.sogou.com/dl/index/1524572032/sogoupinyin_2.2.0.0108_i386.deb
- md5sums_i686 = 475d07b3a99c2e23daca68c7d900388f
+ depends = qt5-declarative
+ depends = qt5-svg
+ depends = fcitx-qt5
+ depends = libxss
+ depends = gsettings-qt
pkgname = fcitx-sogoupinyin
-
diff --git a/PKGBUILD b/PKGBUILD
index a34c0da46d2f..98e01270367f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,55 @@
-# Maintainer: Bian Jiaping <ssbianjp [AT] gmail.com>
+# Maintainer: Hao Zhang <hao [AT] hao-zhang.com>
+# Contributor: Bian Jiaping <ssbianjp [AT] gmail.com>
# Contributor: Jove Yu <yushijun110 [AT] gmail.com>
# Contributor: csslayer <wengxt [AT] gmail.com>
# Contributor: Felix Yan <felixonmars [AT] gmail.com>
pkgname=fcitx-sogoupinyin
-pkgver=2.2.0.0108
-pkgrel=5
+pkgver=4.2.1.145
+filename=${pkgname:6}_${pkgver}_amd64.deb
+pkgrel=1
pkgdesc="Sogou Pinyin for Linux"
-arch=('x86_64' 'i686')
-url="https://pinyin.sogou.com/linux/"
-license=('custom')
-depends=('fcitx' 'opencc' 'libidn11' 'lsb-release' 'xorg-xprop' 'qtwebkit')
-
-_i686_time=1524572032
-_x86_64_time=1524572264
-source=('sogou-autostart')
-source_i686=("http://cdn2.ime.sogou.com/dl/index/${_i686_time}/sogoupinyin_${pkgver}_i386.deb")
-source_x86_64=("http://cdn2.ime.sogou.com/dl/index/${_x86_64_time}/sogoupinyin_${pkgver}_amd64.deb")
-
-md5sums=('ff599d805084f49b95ba99fe640bc170')
-md5sums_x86_64=('3fc65450b4a8c2f00561d9c8a4a07b5a')
-md5sums_i686=('475d07b3a99c2e23daca68c7d900388f')
+arch=("x86_64")
+url="https://shurufa.sogou.com/linux"
+license=("custom")
+depends=("fcitx" "opencc" "libidn11" "lsb-release" "xorg-xprop" "qt5-declarative"
+ "qt5-svg" "fcitx-qt5" "libxss" "gsettings-qt")
+sha256sum="3111af17a6abddd80b856aa9c1f579a137d69f3d735ead936ddb6e5f08b59f3b"
+
+prepare(){
+ msg "Retrieving sources..."
+ if [[ -f $startdir/$filename ]]; then
+ msg2 "$(gettext "Found %s")" "$filename"
+ else
+ msg2 "$(gettext "Downloading %s...")" "$filename"
+ curl -s $url | grep -o "https://[0-9a-z:\/\._-]*/$filename" | xargs curl -o $startdir/$filename
+ fi
+ ln -s $startdir/$filename
+ msg "Validating source files with sha256sums..."
+ printf ' %s ... ' "$filename" >&2
+ if [[ $sha256sum = $(sha256sum $filename | cut -d' ' -f1) ]]; then
+ printf '%s\n' "$(gettext "Passed")" >&2
+ else
+ printf '%s\n' "$(gettext "FAILED")" >&2
+ error "$(gettext "One or more files did not pass the validity check!")"
+ exit 1
+ fi
+ msg "Extracting sources..."
+ msg2 "Extracting $filename with bsdtar"
+ bsdtar -xf $filename
+}
package(){
- cd ${srcdir}
+ cd $srcdir
- tar -xJvf data.tar.xz -C "${pkgdir}"
+ tar -xJvf data.tar.xz -C "$pkgdir"
mv "$pkgdir"/usr/lib/*-linux-gnu/fcitx "$pkgdir"/usr/lib/
rmdir "$pkgdir"/usr/lib/*-linux-gnu
- # Avoid warning "No such key 'Gtk/IMModule' in schema 'org.gnome.settings-daemon.plugins.xsettings'"
- sed -i "s#Gtk/IMModule=fcitx#overrides={'Gtk/IMModule':<'fcitx'>}#" "$pkgdir"/usr/share/glib-2.0/schemas/50_sogoupinyin.gschema.override
-
- rm -r "$pkgdir"/usr/share/keyrings
- rm -r "$pkgdir"/etc/X11
-
- # install -m755 sogou-autostart "$pkgdir"/usr/bin
-
- # Do not modify $pkgdir/etc/xdg/autostart/fcitx-ui-sogou-qimpanel.desktop, as it is
- # a symlink to absolute path "/usr/share/applications/fcitx-ui-sogou-qimpanel.desktop"
- # sed -i 's/sogou-qimpanel\ %U/sogou-autostart/g' "$pkgdir"/usr/share/applications/fcitx-ui-sogou-qimpanel.desktop
+ find $pkgdir/opt/sogoupinyin/files/{.license,share} -type d -exec chmod 755 {} \;
+ find $pkgdir/opt/sogoupinyin/files/{.license,share} -type f -exec chmod 644 {} \;
+
+ rm -rf $pkgdir/opt/sogoupinyin/files/lib/qt5
+ rm $pkgdir/opt/sogoupinyin/files/bin/qt.conf
}
diff --git a/sogou-autostart b/sogou-autostart
deleted file mode 100755
index a658f8d8d14f..000000000000
--- a/sogou-autostart
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Wait for fcitx to startup
-for i in $(seq 30); do
- if fcitx-remote &> /dev/null; then
- sogou-qimpanel $@
- echo 'sogou-qimpanel started'
- exit
- else
- sleep 1
- fi
-done
-
-echo 'sogou-qimpanel failed to start: fcitx not running'
-exit 1