summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD56
-rw-r--r--dingtalk.sh5
3 files changed, 46 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 730648108d22..1e8d363f2b7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,33 @@
pkgbase = dingtalk-bin
pkgdesc = 钉钉
- pkgver = 1.2.0.141
- pkgrel = 1
- url = https://gov.dingtalk.com
+ pkgver = 7.5.0.40221
+ pkgrel = 2
+ url = https://www.dingtalk.com/
arch = x86_64
+ arch = aarch64
license = custom
depends = glu
+ depends = gtk2
+ depends = libxcrypt-compat
+ optdepends = zenity: fix crashes when downloading files, not required on kde.
+ optdepends = libxss: fix tray icon functionality in gnome.
+ optdepends = qt5-wayland: needed in wayland
provides = com.alibabainc.dingtalk
provides = dingtalk
conflicts = com.alibabainc.dingtalk
replaces = com.alibabainc.dingtalk
- source = dingtalk_1.2.0.141-x86_64.deb::https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/com.alibabainc.dingtalk_1.2.0.141_amd64.deb
+ options = !strip
source = service-terms-zh
source = com.alibabainc.dingtalk.desktop
source = dingtalk.sh
source = com.alibabainc.dingtalk.svg
- sha512sums = e22d03dec6320888183aebe679e34e26611322b2ec651d7f56083b5af38c836194cadb3f9f72f8a54e4af7312a60efe795c0d517427393d40d1b969f3d49f0d1
sha512sums = b83d493ed68be0f5a6b851fd93d819bb3a6e62feeb71a5bef10bad24b5ea8f3cf09deea4f31ed727449888a6eae1be99fa9cf263bc921cb8bb2958e2f37a7d64
sha512sums = c8570ec4cd978e26ac622a83db053a0555324752f5000dc5b3cd680d782138e8ef856f09ec9b7850e04e1faa1e39de94dabeb16fbfbe0fd44af43247b30e8b2f
- sha512sums = 50437762c47843fa9040bfb5a723da246d1496e4dc0937028c0f2cb92e0286dc47b7c2a5a0485a4b667cfb30d7c4d23664a2ccb08c5bd3059aad265532c1140e
+ sha512sums = 32dcc5cb725a5ef84e8525a31600d66dc0ea6d56e08c6cdeb4b8c7ad5cd063bdbaff549d6ebfe02361b8e3d1466fa5c2816085861b496bbcc5bb69e55d23bc55
sha512sums = 5f05f90704526fbd16371f6f9deaa171a3cac25a103b21daba72a3028ab7cdf9b566a3ac7842c6ce88d30cc29fe0c8b989c77aa36daab73793a827a1a0d6c775
+ source_x86_64 = dingtalk_7.5.0.40221-x86_64.deb::https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/com.alibabainc.dingtalk_7.5.0.40221_amd64.deb
+ sha512sums_x86_64 = fe8c9a06b92643561b7dc1d4a2cdb88fb0bd84db2afb696a885bfa5ba48062cfc8c15de5151d4537a27123f886e8442d3a63a579dd87260e7747a20aedef1bff
+ source_aarch64 = dingtalk_7.5.0.40221-aarch64.deb::https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/com.alibabainc.dingtalk_7.5.0.40221_arm64.deb
+ sha512sums_aarch64 = 8a17ef294b2c16fbd24fd1a300cdaa482c01e74fd4b36b8379990e6991b09ced4c1082043b10020d8667e7b3afb1056bf555348614d6ea012e41919863d296b3
pkgname = dingtalk-bin
diff --git a/PKGBUILD b/PKGBUILD
index 5557f00fabc4..4821af914787 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,32 +5,40 @@
pkgname=dingtalk-bin
_pkgname=dingtalk
_pkgname2=com.alibabainc.dingtalk
-pkgver=1.2.0.141
-pkgrel=1
+pkgver=7.5.0.40221
+pkgrel=2
pkgdesc="钉钉"
-arch=("x86_64")
-url="https://gov.dingtalk.com"
+arch=("x86_64" 'aarch64')
+url="https://www.dingtalk.com/"
license=("custom")
-depends=("glu")
+options=('!strip')
+depends=("glu" 'gtk2' 'libxcrypt-compat')
#makedepends=("icoutils")
+optdepends=('zenity: fix crashes when downloading files, not required on kde.'
+'libxss: fix tray icon functionality in gnome.'
+'qt5-wayland: needed in wayland'
+)
provides=('com.alibabainc.dingtalk' 'dingtalk')
conflicts=('com.alibabainc.dingtalk')
replaces=('com.alibabainc.dingtalk')
# https://tms.dingtalk.com/markets/dingtalk/service-terms-zh md5 will change per download
-source=("${_pkgname}_${pkgver}-${arch}.deb::https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/${_pkgname2}_${pkgver}_amd64.deb"
- "service-terms-zh"
+source_x86_64=("${_pkgname}_${pkgver}-x86_64.deb::https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/${_pkgname2}_${pkgver}_amd64.deb")
+source_aarch64=(${_pkgname}_${pkgver}-aarch64.deb::https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/${_pkgname2}_${pkgver}_arm64.deb)
+source=("service-terms-zh"
"${_pkgname2}.desktop"
"dingtalk.sh"
- "${_pkgname2}.svg")
+ "${_pkgname2}.svg"
+)
# DebSource & pkgver can be get here: https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Update/other/linux_dingtalk_update.json
-sha512sums=('e22d03dec6320888183aebe679e34e26611322b2ec651d7f56083b5af38c836194cadb3f9f72f8a54e4af7312a60efe795c0d517427393d40d1b969f3d49f0d1'
- 'b83d493ed68be0f5a6b851fd93d819bb3a6e62feeb71a5bef10bad24b5ea8f3cf09deea4f31ed727449888a6eae1be99fa9cf263bc921cb8bb2958e2f37a7d64'
+sha512sums=('b83d493ed68be0f5a6b851fd93d819bb3a6e62feeb71a5bef10bad24b5ea8f3cf09deea4f31ed727449888a6eae1be99fa9cf263bc921cb8bb2958e2f37a7d64'
'c8570ec4cd978e26ac622a83db053a0555324752f5000dc5b3cd680d782138e8ef856f09ec9b7850e04e1faa1e39de94dabeb16fbfbe0fd44af43247b30e8b2f'
- '50437762c47843fa9040bfb5a723da246d1496e4dc0937028c0f2cb92e0286dc47b7c2a5a0485a4b667cfb30d7c4d23664a2ccb08c5bd3059aad265532c1140e'
+ '32dcc5cb725a5ef84e8525a31600d66dc0ea6d56e08c6cdeb4b8c7ad5cd063bdbaff549d6ebfe02361b8e3d1466fa5c2816085861b496bbcc5bb69e55d23bc55'
'5f05f90704526fbd16371f6f9deaa171a3cac25a103b21daba72a3028ab7cdf9b566a3ac7842c6ce88d30cc29fe0c8b989c77aa36daab73793a827a1a0d6c775')
+sha512sums_x86_64=('fe8c9a06b92643561b7dc1d4a2cdb88fb0bd84db2afb696a885bfa5ba48062cfc8c15de5151d4537a27123f886e8442d3a63a579dd87260e7747a20aedef1bff')
+sha512sums_aarch64=('8a17ef294b2c16fbd24fd1a300cdaa482c01e74fd4b36b8379990e6991b09ced4c1082043b10020d8667e7b3afb1056bf555348614d6ea012e41919863d296b3')
prepare(){
cd ${srcdir}
@@ -51,27 +59,17 @@ package(){
# desktop enrty
install -Dm644 ${_pkgname2}.desktop -t ${pkgdir}/usr/share/applications/
-
- # icons
- #extract single image of size 48x48
- #icotool -x -i 3 opt/apps/${_pkgname2}/files/logo.ico -o .
+
install -Dm644 ${srcdir}/${_pkgname2}.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg
# license
install -Dm644 service-terms-zh ${pkgdir}/usr/share/licenses/${_pkgname}/service-terms-zh.html
-# ## libraries
-#
-# cd ${pkgdir}/opt/${_pkgname}/release
-# mkdir ${pkgdir}/opt/${_pkgname}/tmplib
-# mv {dingtalk*,libcef.so,libgraysdk.so,libahencrypt.so,libpangox-1.0.so.0,libgtkglext-x11-1.0.so.0,libgdkglext-x11-1.0.so.0,libutforpc.so} ${pkgdir}/opt/${_pkgname}/tmplib
-#
-#
-# ## remove unused files
-# rm -rf ${pkgdir}/opt/${_pkgname}/release/{libQt*,libm.so.6,imageformats,platforminputcontexts,platforms}
-# rm -rf ${pkgdir}/opt/${_pkgname}/release/lib*
-# mv ${pkgdir}/opt/${_pkgname}/tmplib/* ${pkgdir}/opt/${_pkgname}/release
-# rmdir ${pkgdir}/opt/${_pkgname}/tmplib
- # dingtalk_updater
- rm -rf ${pkgdir}/opt/${_pkgname}/release/{libm.so.6,Resources/{i18n/tool/*.exe,qss/mac}}
+ # fix chinese input in workbench
+ rm -rf ${pkgdir}/opt/${_pkgname}/release/libgtk-x11-2.0.so.*
+
+ rm -rf ${pkgdir}/opt/${_pkgname}/release/{libm.so.6,Resources/{i18n/tool/*.exe,qss/mac,web_content/NativeWebContent_*.zip},libstdc*}
+
+ # remove unused lib
+ rm -rf ${pkgdir}/opt/${_pkgname}/release/{libcurl.so.4,libz*}
}
diff --git a/dingtalk.sh b/dingtalk.sh
index d6cdf1b18308..d9cd6cba9e38 100644
--- a/dingtalk.sh
+++ b/dingtalk.sh
@@ -1,3 +1,6 @@
#!/bin/bash -e
+# try wayland and fallback to xcb in case that it may support xcb some day.
+export QT_QPA_PLATFORM="wayland;xcb"
+export QT_AUTO_SCREEN_SCALE_FACTOR=1
cd /opt/dingtalk/release
-./com.alibabainc.dingtalk
+LD_PRELOAD=./libcef.so ./com.alibabainc.dingtalk