summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD19
-rw-r--r--fix-windows-pos-type.patch22
3 files changed, 39 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 63ceb0c66324..6cc5905df06b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = youdao-dict
pkgdesc = YouDao Dictionary
pkgver = 6.0.0
- pkgrel = 3
+ pkgrel = 4
url = https://cidian.youdao.com/
arch = i686
arch = x86_64
@@ -23,10 +23,11 @@ pkgbase = youdao-dict
depends = qt5-graphicaleffects
depends = qt5-quickcontrols
depends = qt5-multimedia
+ source = file://fix-windows-pos-type.patch
+ sha256sums = 886f217146232511107c16a8cfed82bc8da74e730f9d563e593543b1f33514a5
source_i686 = http://codown.youdao.com/cidian/linux/youdao-dict_6.0.0_i386.tar.gz
sha256sums_i686 = d1ff404f1e465d6a196b566294ddfea1a1bfe4568226201b65d74236407152fc
source_x86_64 = http://codown.youdao.com/cidian/linux/youdao-dict-6.0.0-amd64.tar.gz
sha256sums_x86_64 = 556e2dadd0a737967b78ffd9ad5430660d190e4489854a309c85f81fdf7f084f
pkgname = youdao-dict
-
diff --git a/PKGBUILD b/PKGBUILD
index 92631b87458e..e2f50fbe372f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: yesuu zhang <yesuu79@qq.com>
-# Contributor: qaz <fkxxyz@163.com>
+# Contributor: fkxxyz <fkxxyz@163.com>
pkgname=youdao-dict
pkgver=6.0.0
-pkgrel=3
+pkgrel=4
pkgdesc='YouDao Dictionary'
arch=('i686' 'x86_64')
url='https://cidian.youdao.com/'
@@ -29,15 +29,24 @@ depends=(
'qt5-quickcontrols'
'qt5-multimedia'
)
-source_i686=('http://codown.youdao.com/cidian/linux/youdao-dict_6.0.0_i386.tar.gz')
-source_x86_64=('http://codown.youdao.com/cidian/linux/youdao-dict-6.0.0-amd64.tar.gz')
+source=("file://fix-windows-pos-type.patch")
+source_i686=("http://codown.youdao.com/cidian/linux/youdao-dict_${pkgver}_i386.tar.gz")
+source_x86_64=("http://codown.youdao.com/cidian/linux/youdao-dict-${pkgver}-amd64.tar.gz")
+sha256sums=('886f217146232511107c16a8cfed82bc8da74e730f9d563e593543b1f33514a5')
sha256sums_i686=('d1ff404f1e465d6a196b566294ddfea1a1bfe4568226201b65d74236407152fc')
sha256sums_x86_64=('556e2dadd0a737967b78ffd9ad5430660d190e4489854a309c85f81fdf7f084f')
+build() {
+ cd "${srcdir}"
+ [ ${CARCH} == x86_64 ] && cd "youdao-dict-${pkgver}-amd64"
+
+ patch -p1 -i "${srcdir}/fix-windows-pos-type.patch"
+}
+
package() {
cd "${srcdir}"
[ ${CARCH} == x86_64 ] && cd "youdao-dict-${pkgver}-amd64"
-
+
sed -i -e "/PREFIX=/cROOT=${pkgdir}\nPREFIX=\$ROOT/usr" -e 's/\/etc/$ROOT\/etc/g' -e 's/ln -sf $PREFIX/ln -sf \/usr/g' install.sh
sh install.sh
}
diff --git a/fix-windows-pos-type.patch b/fix-windows-pos-type.patch
new file mode 100644
index 000000000000..e92e47428281
--- /dev/null
+++ b/fix-windows-pos-type.patch
@@ -0,0 +1,22 @@
+--- a/src/app/plugins/youdao/window.py 2022-01-24 00:21:08.317867190 +0800
++++ b/src/app/plugins/youdao/window.py 2022-01-24 00:22:33.509467326 +0800
+@@ -287,8 +287,8 @@
+ geometry = desktop.screenGeometry(desktop.primaryScreen())
+ x = geometry.x() + (geometry.width() - self.width())/2
+ y = geometry.y() + (geometry.height() - self.height())/2
+- self.setX(x)
+- self.setY(y)
++ self.setX(int(x))
++ self.setY(int(y))
+ self.show()
+
+ @QtCore.pyqtSlot()
+--- a/src/dae/window.py 2022-01-24 00:21:08.301200209 +0800
++++ b/src/dae/window.py 2022-01-24 00:21:44.845222361 +0800
+@@ -641,5 +641,5 @@
+ geometry = screen.availableGeometry()
+ x = geometry.x() + (geometry.width() - self.width())/2
+ y = geometry.y() + (geometry.height() - self.height())/2
+- self.move(x, y)
++ self.move(int(x), int(y))
+ self.show()