summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD43
-rw-r--r--dingtalk.sh5
-rw-r--r--xdg-open.sh3
4 files changed, 33 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f56d112493b7..1e8d363f2b7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,33 @@
pkgbase = dingtalk-bin
pkgdesc = 钉钉
- pkgver = 1.6.0.230113
- pkgrel = 1
+ 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.6.0.230113-x86_64.deb::https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Release/com.alibabainc.dingtalk_1.6.0.230113_amd64.deb
+ options = !strip
source = service-terms-zh
source = com.alibabainc.dingtalk.desktop
source = dingtalk.sh
source = com.alibabainc.dingtalk.svg
- source = https://archive.archlinux.org/packages/c/cairo/cairo-1.17.4-5-x86_64.pkg.tar.zst
- source = xdg-open.sh
- sha512sums = 6da9577f3c80a2db84408c4786411e77a785adce9e8e71ec3522e703428e29036c45073a4d8dd0f73493ebf3494bf0f4681e3634ecaf8b76bd2615e15e2e50db
sha512sums = b83d493ed68be0f5a6b851fd93d819bb3a6e62feeb71a5bef10bad24b5ea8f3cf09deea4f31ed727449888a6eae1be99fa9cf263bc921cb8bb2958e2f37a7d64
sha512sums = c8570ec4cd978e26ac622a83db053a0555324752f5000dc5b3cd680d782138e8ef856f09ec9b7850e04e1faa1e39de94dabeb16fbfbe0fd44af43247b30e8b2f
- sha512sums = 4dde27376ed3ed5fed5da2a94f45e2556c7bd0fe5086351a9fd204a08b52823d70d60024b91c1f1cc023f5a276442537c0789ffbefa9ef7aa2be2b6e10c99071
+ sha512sums = 32dcc5cb725a5ef84e8525a31600d66dc0ea6d56e08c6cdeb4b8c7ad5cd063bdbaff549d6ebfe02361b8e3d1466fa5c2816085861b496bbcc5bb69e55d23bc55
sha512sums = 5f05f90704526fbd16371f6f9deaa171a3cac25a103b21daba72a3028ab7cdf9b566a3ac7842c6ce88d30cc29fe0c8b989c77aa36daab73793a827a1a0d6c775
- sha512sums = 94a108a3f3f88bc7ede370d5e3f84afaedd78d892f7352926091881c066cbe0da55bebb5fc83978ca83c6420ed0c94fbba1f3454c5ff8d33a38669a0a11a80ac
- sha512sums = 685f7eb38fd0e34aac3f1e1272f4c6f9404765decee82831b9fc4e743e0b0a022f8e49bd5623f524890a719af0b1333b96773fb386b74aeded4307e8b1a626ed
+ 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 2814a9b79305..4821af914787 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,38 +5,40 @@
pkgname=dingtalk-bin
_pkgname=dingtalk
_pkgname2=com.alibabainc.dingtalk
-pkgver=1.6.0.230113
-pkgrel=1
+pkgver=7.5.0.40221
+pkgrel=2
pkgdesc="钉钉"
-arch=("x86_64")
+arch=("x86_64" 'aarch64')
url="https://www.dingtalk.com/"
license=("custom")
-depends=("glu" 'gtk2')
+options=('!strip')
+depends=("glu" 'gtk2' 'libxcrypt-compat')
#makedepends=("icoutils")
-optdepends=('zenity: fix crashes when downloading files, not required on kde.')
+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"
- "https://archive.archlinux.org/packages/c/cairo/cairo-1.17.4-5-x86_64.pkg.tar.zst"
- 'xdg-open.sh'
- )
+)
# 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=('6da9577f3c80a2db84408c4786411e77a785adce9e8e71ec3522e703428e29036c45073a4d8dd0f73493ebf3494bf0f4681e3634ecaf8b76bd2615e15e2e50db'
- 'b83d493ed68be0f5a6b851fd93d819bb3a6e62feeb71a5bef10bad24b5ea8f3cf09deea4f31ed727449888a6eae1be99fa9cf263bc921cb8bb2958e2f37a7d64'
+sha512sums=('b83d493ed68be0f5a6b851fd93d819bb3a6e62feeb71a5bef10bad24b5ea8f3cf09deea4f31ed727449888a6eae1be99fa9cf263bc921cb8bb2958e2f37a7d64'
'c8570ec4cd978e26ac622a83db053a0555324752f5000dc5b3cd680d782138e8ef856f09ec9b7850e04e1faa1e39de94dabeb16fbfbe0fd44af43247b30e8b2f'
- '4dde27376ed3ed5fed5da2a94f45e2556c7bd0fe5086351a9fd204a08b52823d70d60024b91c1f1cc023f5a276442537c0789ffbefa9ef7aa2be2b6e10c99071'
- '5f05f90704526fbd16371f6f9deaa171a3cac25a103b21daba72a3028ab7cdf9b566a3ac7842c6ce88d30cc29fe0c8b989c77aa36daab73793a827a1a0d6c775'
- '94a108a3f3f88bc7ede370d5e3f84afaedd78d892f7352926091881c066cbe0da55bebb5fc83978ca83c6420ed0c94fbba1f3454c5ff8d33a38669a0a11a80ac'
- '685f7eb38fd0e34aac3f1e1272f4c6f9404765decee82831b9fc4e743e0b0a022f8e49bd5623f524890a719af0b1333b96773fb386b74aeded4307e8b1a626ed')
+ '32dcc5cb725a5ef84e8525a31600d66dc0ea6d56e08c6cdeb4b8c7ad5cd063bdbaff549d6ebfe02361b8e3d1466fa5c2816085861b496bbcc5bb69e55d23bc55'
+ '5f05f90704526fbd16371f6f9deaa171a3cac25a103b21daba72a3028ab7cdf9b566a3ac7842c6ce88d30cc29fe0c8b989c77aa36daab73793a827a1a0d6c775')
+sha512sums_x86_64=('fe8c9a06b92643561b7dc1d4a2cdb88fb0bd84db2afb696a885bfa5ba48062cfc8c15de5151d4537a27123f886e8442d3a63a579dd87260e7747a20aedef1bff')
+sha512sums_aarch64=('8a17ef294b2c16fbd24fd1a300cdaa482c01e74fd4b36b8379990e6991b09ced4c1082043b10020d8667e7b3afb1056bf555348614d6ea012e41919863d296b3')
prepare(){
cd ${srcdir}
@@ -66,14 +68,7 @@ package(){
# fix chinese input in workbench
rm -rf ${pkgdir}/opt/${_pkgname}/release/libgtk-x11-2.0.so.*
- # fix cairo
- cd $srcdir/usr/lib
- install -Dm755 libcairo.so.2 -t ${pkgdir}/usr/lib/dingtalk
-
- # fix open url
- install -Dm755 $srcdir/xdg-open.sh ${pkgdir}/opt/dingtalk/release/xdg-open
-
- rm -rf ${pkgdir}/opt/${_pkgname}/release/{libm.so.6,Resources/{i18n/tool/*.exe,qss/mac},libstdc*}
+ 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 3061835963bb..d9cd6cba9e38 100644
--- a/dingtalk.sh
+++ b/dingtalk.sh
@@ -1,7 +1,6 @@
#!/bin/bash -e
-export LD_LIBRARY_PATH=/usr/lib/dingtalk:$LD_LIBRARY_PATH
-export PATH=/opt/dingtalk/release:$PATH
# 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
diff --git a/xdg-open.sh b/xdg-open.sh
deleted file mode 100644
index 1babca94c6f8..000000000000
--- a/xdg-open.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-unset -v LD_LIBRARY_PATH
-/usr/bin/xdg-open $@