update 1.5.0, add google api

2 files changed, 23 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f8ecc142c80..b0da973ca55f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ldr-translate-gtk
 	pkgdesc = 一个翻译软件，更适合gnome桌面，专注文献翻译，可以截图翻译、复制翻译等，顺带显示网速等系统信息
-	pkgver = 1.4.0
+	pkgver = 1.5.0
 	pkgrel = 1
 	url = https://github.com/yuhldr/ldr-translate
 	arch = x86_64
@@ -8,11 +8,12 @@ pkgbase = ldr-translate-gtk
 	license = GPL
 	depends = make
 	depends = python
-	depends = python-pip
 	depends = libappindicator-gtk3
+	depends = python-psutil
+	depends = python-requests
 	optdepends = gnome-shell-extension-appindicator
 	conflicts = ldr-translate-qt
-	source = https://github.com/yuhldr/ldr-translate/archive/refs/tags/v1.4.0.tar.gz
-	md5sums = 457eb424ba171da1a9addd698ddc7263
+	source = https://github.com/yuhldr/ldr-translate/archive/refs/tags/v1.5.0.tar.gz
+	md5sums = c4c894d9da1f87cd4344d61d9d11c1c9
 
 pkgname = ldr-translate-gtk
diff --git a/PKGBUILD b/PKGBUILD
index d6cc95110719..2797d48db97e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,20 @@
 # Maintainer=yuh <yuhldr@qq.com>
 
-pkgname=ldr-translate-gtk
 pkgdata=ldr-translate
-pkgver=1.4.0
+pkgname=$pkgdata-gtk
+pkgver=1.5.0
 pkgrel=1
 epoch=
 pkgdesc="一个翻译软件，更适合gnome桌面，专注文献翻译，可以截图翻译、复制翻译等，顺带显示网速等系统信息"
 arch=('x86_64')
-url="https://github.com/yuhldr/ldr-translate"
+url="https://github.com/yuhldr/$pkgdata"
 license=('GPL')
 groups=(ldr)
-depends=(make python python-pip libappindicator-gtk3)
-makedepends=()
+depends=(make python libappindicator-gtk3 python-psutil python-requests)
 checkdepends=()
 optdepends=(gnome-shell-extension-appindicator)
 provides=()
-conflicts=(ldr-translate-qt)
+conflicts=($pkgdata-qt)
 replaces=()
 backup=()
 options=()
@@ -23,7 +22,7 @@ install=
 changelog=
 source=("https://github.com/yuhldr/$pkgdata/archive/refs/tags/v$pkgver.tar.gz")
 noextract=()
-md5sums=(457eb424ba171da1a9addd698ddc7263)
+md5sums=(c4c894d9da1f87cd4344d61d9d11c1c9)
 validpgpkeys=()
 
 prepare() {
@@ -31,23 +30,19 @@ prepare() {
 	echo "ldr"
 }
 
-build() {
+package() {
 	cd "$pkgdata-$pkgver"
-	make gtk
-}
 
-check() {
-	cd "$pkgdata-$pkgver"
-	make check-gtk
-}
+	sudo mkdir -p /usr/bin
+	sudo mkdir -p /usr/share/applications
+	sudo mkdir -p /usr/share/icons
+	sudo mkdir -p /opt/ldr-translate
 
-package() {
-	cd "$pkgdata-$pkgver"
-	make install
-	echo
-	echo "*** 右上角指示器 ***"
-	echo "gnome41可选安装：gnome-shell-extension-appindicator"
-	echo "gnome42请网页安装：https://extensions.gnome.org/extension/615/appindicator-support"
-	echo "******"
-	echo
+	sudo cp data/ldr /usr/bin/
+
+	sudo cp data/icon/icon.png /usr/share/icons/ldr-translate.png
+	sudo cp data/ldr-translate.desktop /usr/share/applications/
+
+	sudo cp -r api data/icon data/config.json data/config_locale.json /opt/ldr-translate/
+	sudo cp gui/gtk/* /opt/ldr-translate/
 }