Bug fixes

2 files changed, 66 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 663f5d338116..de5864a1a1b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,21 @@
 pkgbase = fcitx-baidupinyin
-	pkgdesc = A wrapper of Baidu Pinyin IM engine for Fcitx.
+	pkgdesc = Fcitx wrapper for Baidu Pinyin IM engine
 	pkgver = 1.0.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://srfsh.baidu.com/site/guanwang_linux/index.html
 	arch = x86_64
 	license = custom
-	depends = fcitx
-	depends = qt5-quickcontrols
-	source = https://imeres.baidu.com/imeres/ime-res/guanwang/img/Ubuntu_Deepin-fcitx-baidupinyin-64.zip
-	source = https://srf.baidu.com/site/linux/service/index.html
-	sha256sums = e053946b404b8a74900db5844e27dc5d5c122a442c8676aba54e3d3e3fa64e13
-	sha256sums = SKIP
+	depends = glibc>=2.4
+	depends = fcitx>=4.2.0
+	depends = fcitx-qt5
+	depends = glib2>=2.12.0
+	depends = qt5-base>=5.7.1
+	depends = qt5-quickcontrols>=5.5.1
+	provides = fcitx-baidupinyin
+	source = fcitx-baidupinyin.zip::https://imeres.baidu.com/imeres/ime-res/guanwang/img/Ubuntu_Deepin-fcitx-baidupinyin-64.zip
+	source = index.html::https://srf.baidu.com/site/linux/service/index.html
+	sha512sums = 08058b612dc325beeaa9a53d7cd1386e30ed7a460c5c363a34cfb8bae0835f2cdae3450f9ded9534f624b9b10472fc0c1aff5698d6fd2898a7d89c39e8dd408c
+	sha512sums = 94a68ff85d15515daa979f3b221a8e180030e561aa7ade3ef05aaaa2559ff951382e4deeca76d0cf63693704f65d20b411371618c0875e6e0374fcaf2015db5d
 
 pkgname = fcitx-baidupinyin
 
diff --git a/PKGBUILD b/PKGBUILD
index 19d7cdbab3b9..fed682b9a7a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,62 @@
-# Maintainer: fkxxyz <fkxxyz@163.com>
-
+# Maintainer: Sukanka <su975853527 [AT] gmail.com>
+# Contributor: fkxxyz <fkxxyz@163.com>
 pkgname=fcitx-baidupinyin
 pkgver=1.0.1.0
-pkgrel=1
-pkgdesc="A wrapper of Baidu Pinyin IM engine for Fcitx."
+pkgrel=2
+pkgdesc="Fcitx wrapper for Baidu Pinyin IM engine"
 arch=("x86_64")
 url="https://srfsh.baidu.com/site/guanwang_linux/index.html"
 license=("custom")
-depends=("fcitx" "qt5-quickcontrols")
-#optdepends=("fcitx-qimpanel: Configure panel and skin.")
-
+depends=('glibc>=2.4' 'fcitx>=4.2.0' 'fcitx-qt5' 'glib2>=2.12.0' 'qt5-base>=5.7.1' 'qt5-quickcontrols>=5.5.1')
+#Depends: libc6 (>= 2.4), fcitx-bin, fcitx-data (>= 1:4.2.0), fcitx-modules,  libglib2.0-0 (>= 2.12.0), libqt5core5a (>= 5.7.1), qml-module-qtquick-controls (>= 5.5.1)
+#optdepends=('fcitx-qimpanel: input method frontend used in baidupinyin')  # use BDIMSettings instead.
+provides=("fcitx-baidupinyin")
 source=(
-  "https://imeres.baidu.com/imeres/ime-res/guanwang/img/Ubuntu_Deepin-fcitx-baidupinyin-64.zip"
-  "https://srf.baidu.com/site/linux/service/index.html")
-sha256sums=("e053946b404b8a74900db5844e27dc5d5c122a442c8676aba54e3d3e3fa64e13"
-			"SKIP")
-
-prepare(){
-  cd ${srcdir}
-  bsdtar -xf fcitx-baidupinyin.deb
-  bsdtar -xf data.tar.xz
-}
+    'fcitx-baidupinyin.zip::https://imeres.baidu.com/imeres/ime-res/guanwang/img/Ubuntu_Deepin-fcitx-baidupinyin-64.zip'
+    'index.html::https://srf.baidu.com/site/linux/service/index.html'
+) 
+sha512sums=(
+    '08058b612dc325beeaa9a53d7cd1386e30ed7a460c5c363a34cfb8bae0835f2cdae3450f9ded9534f624b9b10472fc0c1aff5698d6fd2898a7d89c39e8dd408c'
+    '94a68ff85d15515daa979f3b221a8e180030e561aa7ade3ef05aaaa2559ff951382e4deeca76d0cf63693704f65d20b411371618c0875e6e0374fcaf2015db5d'
+)
 
 package(){
-  cd "${pkgdir}"
-  
-  # Copy all files.
-  cp -r "${srcdir}/"{usr,opt} .
-  
-  # Fix the location of the library.
-  mv "usr/lib/x86_64-linux-gnu/"* "usr/lib"
-  rm -r "usr/lib/x86_64-linux-gnu"
-  
-  # Fix the location of entries.
-  edir="opt/apps/com.baidu.fcitx-baidupinyin/entries"
-  rm -r "${edir}/autostart"
-  install -d "etc/xdg/autostart"
-  ln -sf "/usr/share/applications/fcitx-ui-baidu-qimpanel.desktop" \
-      "etc/xdg/autostart/fcitx-ui-baidu-qimpanel-ln.desktop"
-  mv "${edir}/"* "usr/share"
-  rm -r "${edir}"
-  
-  # Install license.
-  install -Dm644 "${srcdir}/index.html" \
-      "usr/share/licenses/fcitx-baidupinyin/license.html"
+    ar -vx fcitx-baidupinyin.deb --output="${srcdir}"  
+    cd ${srcdir}
+    tar -xJvf data.tar.xz -C "${pkgdir}"
+    
+    mkdir -p "$pkgdir"/etc/xdg/autostart/
+    mv "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/entries/applications/fcitx-ui-baidu-qimpanel.desktop "$pkgdir"/etc/xdg/autostart/fcitx-baidupinyin.desktop
+    sed -i  's|/opt/apps/com.baidu.fcitx-baidupinyin/files/bin/bd-qimpanel.watchdog.sh|/usr/bin/bd-qimpanel.watchdog.sh|g' "$pkgdir"/etc/xdg/autostart/fcitx-baidupinyin.desktop
+    sed -i 's|Icon=baidu|Icon=fcitx-baidupinyin|g' "$pkgdir"/etc/xdg/autostart/fcitx-baidupinyin.desktop
+    cp -r  "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/entries/icons "$pkgdir"/usr/share/
+    
+    # I don't know where to put fcitx-baidupinyin.mo for fuzzy pinyin, just delete. location : "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/entries/locale/zh_CN/LC_MESSAGES/fcitx-baidupinyin.mo
+    rm -r "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/entries 
+    
+    mkdir -p "$pkgdir"/usr/lib/fcitx/
+    mv "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/files/lib/fcitx*  "$pkgdir"/usr/lib/fcitx/
+    cp -r "$pkgdir"/opt/apps/com.baidu.fcitx-baidupinyin/files/* "$pkgdir"/usr/
+    sed -i  's|/opt/apps/com.baidu.fcitx-baidupinyin/files/bin/baidu-qimpanel|/usr/bin/baidu-qimpanel|g' "$pkgdir"/usr/bin/bd-qimpanel.watchdog.sh
+    
+    # use BDIMSettings as its configtool, if you want to use fcitx-qimpanel, comment this line
+    if [ ! -f /usr/bin/fcitx-qimpanel-configtool ]; then
+        mv "$pkgdir"/usr/bin/BDIMSettings "${pkgdir}"/usr/bin/fcitx-qimpanel-configtool
+    fi
+    
+    # data should be moved to ~/.config/BaiduPY.user manually
+    mkdir -p "$pkgdir"/tmp/
+    mv "$pkgdir"/usr/share/data "$pkgdir"/tmp
+    
+    # install license
+    install -Dm644 "${srcdir}/index.html"  "${pkgdir}/usr/share/licenses/fcitx-baidupinyin/license.html"
+    # clean up unused files
+    rm -rf "$pkgdir"/opt/apps
+    rm -rf "$pkgdir"/usr/lib/*-linux-gnu
+    rm -r "$pkgdir"/fcitx-baidupinyin.deb
+    rm  "$pkgdir"/usr/bin/BDIMWizard
+    
+    msg 'Plase manually copy data files to your user home by: '
+    msg 'mkdir -p ~/.config/BaiduPY.user/data'
+    msg 'cp -r /tmp/data ~/.config/BaiduPY.user'
 }
-