upgpkg: lemon-lime-git 10.2.3rc3.r15.c6b8c30-1

using desktop from upstream

3 files changed, 13 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7591093dcc49..7ff098bff1eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lemon-lime-git
 	pkgdesc = 为了 OI 比赛而生的基于 Lemon 的轻量评测系统 | A tiny judging environment for OI contest based on Project_LemonPlus
-	pkgver = 0.2.3rc3.r0.2049f82
+	pkgver = 0.2.3rc3.r15.c6b8c30
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/iotang/Project_LemonLime
@@ -20,9 +20,7 @@ pkgbase = lemon-lime-git
 	provides = lemon-lime
 	conflicts = lemon-lime
 	source = Project_LemonLime::git+https://github.com/iotang/Project_LemonLime.git
-	source = lemon-lime.desktop
 	md5sums = SKIP
-	md5sums = 707ae7795aab12effd83e92e394bccf4
 
 pkgname = lemon-lime-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 42ac21f2e4d2..06c5ae60785c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=lemon-lime-git
 _pkgname=lemon-lime
-pkgver=0.2.3rc3.r0.2049f82
+pkgver=0.2.3rc3.r15.c6b8c30
 pkgrel=1
 epoch=1
 pkgdesc="为了 OI 比赛而生的基于 Lemon 的轻量评测系统 | A tiny judging environment for OI contest based on Project_LemonPlus"
@@ -26,11 +26,9 @@ options=()
 install=
 changelog=
 source=('Project_LemonLime::git+https://github.com/iotang/Project_LemonLime.git'
-		"lemon-lime.desktop"
 		)
 noextract=()
-md5sums=('SKIP'
-         '707ae7795aab12effd83e92e394bccf4')
+md5sums=('SKIP')
 validpgpkeys=()
 
 pkgver() {
@@ -58,22 +56,25 @@ build() {
 	g++ watcher_unix.cpp -o watcher_unix -O2
 	#qmake lemon.pro
 	#make
-	cmake -DCMAKE_BUILD_TYPE=Release -GNinja .
+	cmake . \
+		-DCMAKE_BUILD_TYPE=Release \
+		-GNinja \
+		-DCMAKE_INSTALL_PREFIX=${pkgdir}/usr
 	ninja
 
 }
 
 package() {
-	#cd "$srcdir/Project_LemonLime"
-	#ninja install
+	cd "$srcdir/Project_LemonLime"
+	ninja install
 	#cd "$pkgdir/bin"
 	#mv lemon lemon-lime
-	cd "$srcdir/Project_LemonLime"
-	install -D -m755 lemon "$pkgdir/usr/bin/$_pkgname"
+	#cd "$srcdir/Project_LemonLime"
+	#install -D -m755 lemon "$pkgdir/usr/bin/$_pkgname"
 
 	#install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-	install -D -m644 assets/lemon-lime.png "$pkgdir/usr/share/icons/hicolor/256x256/lemon-lime.png"
-	install -D -m755 assets/$_pkgname.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
+	#install -D -m644 assets/lemon-lime.png "$pkgdir/usr/share/icons/hicolor/256x256/lemon-lime.png"
+	#install -D -m755 assets/$_pkgname.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
 	install -D -m644 README.md "$pkgdir/usr/share/doc/$_pkgname/README.md"
 	#install -D -m644 Changelog.md "$pkgdir/usr/share/doc/$pkgname/Changelog.md"
 }
diff --git a/lemon-lime.desktop b/lemon-lime.desktop
deleted file mode 100755
index b294fb2775ed..000000000000
--- a/lemon-lime.desktop
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Version=1.0
-Name=LemonLime
-Type=Application
-GenericName=A tiny judging environment for OI contest
-GenericName[zh_CN]=为了 OI 比赛而生的轻量评测系统
-GenericName[zh_TW]=為了 OI 比賽而生的輕量評測系統
-GenericName[ja]=OI競争のための軽量評価システム
-Comment=A tiny judging environment for OI contest based on Project_LemonPlus
-Comment[zh_CN]=为了 OI 比赛而生的基于 Lemon + LemonPlus 的轻量评测系统
-Comment[zh_TW]=為了 OI 比賽而生的基於 Lemon + LemonPlus 的輕量評測系統
-GenericName[ja]=Lemon + LemonPlusに基づくOI競争用の軽量評価システム
-Keywords=OI;Qt;Judge;
-Keywords[zh_CN]=OI;Qt;评测;
-Keywords[ja]=OI;Qt;評価;
-Categories=Tools;
-Terminal=false
-Path=/usr/bin
-Exec=lemon-lime
-Icon=lemon-lime