finish v1.034.3

2 files changed, 27 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13a6dabf6414..55ccfa11aac1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,31 @@
-# Generated by mksrcinfo v8
-# Wen May  9 14:21:32 UTC 2018
 pkgbase = ygopro-zh
-	pkgdesc = A script engine for \"yu-gi-oh!\" and sample gui
+	pkgdesc = A script engine for “yu-gi-oh!” and sample gui
 	pkgver = 1.034
 	pkgrel = 3
 	url = https://github.com/Fluorohydride/ygopro
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	depends = gcc
-	depends = git
-	depends = make
-	depends = premake
+	makedepends = gcc
+	makedepends = make
+	makedepends = premake
 	depends = freetype2
 	depends = libevent
 	depends = sqlite
 	depends = irrlicht
 	depends = lua
 	options = emptydirs
+	options = !buildflags
+	options = !makeflags
 	backup = opt/ygopro/system.conf
 	source = https://codeload.github.com/Fluorohydride/ygopro/tar.gz/v1.034.3
-	source = https://codeload.github.com/Fluorohydride/ygopro-core/zip/master
-	source = https://codeload.github.com/Fluorohydride/ygopro-scripts/zip/master
-	source = https://gitee.com/ximlel/ygopro_data/repository/archive/v1.034.3.zip
+	source = core.zip::https://codeload.github.com/Fluorohydride/ygopro-core/zip/master
+	source = scripts.zip::https://codeload.github.com/Fluorohydride/ygopro-scripts/zip/master
+	source = data.zip::https://gitee.com/ximlel/ygopro_data/repository/archive/v1.034.3.zip
 	sha256sums = 9a6c6aeea1bad1138d3d8218420b03d4078c0debf5638adce1a48075bdc218b8
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = 6c740184be7657d128ffbb96233e39c0ab932854216c4e23a3852926310283d5
 
 pkgname = ygopro
 
diff --git a/PKGBUILD b/PKGBUILD
index 21c7542f1b52..96ae0fc62f21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,42 +7,40 @@ pkgdesc="A script engine for “yu-gi-oh!” and sample gui"
 arch=('i686' 'x86_64')
 url='https://github.com/Fluorohydride/ygopro'
 license=('GPL2')
-depends=('gcc' 'git' 'make' 'premake' 'freetype2' 'libevent' 'sqlite' 'irrlicht' 'lua')
+depends=('freetype2' 'libevent' 'sqlite' 'irrlicht' 'lua')
+makedepends=('gcc' 'make' 'premake')
 backup=(opt/ygopro/system.conf)
-source=("https://codeload.github.com/Fluorohydride/ygopro/tar.gz/v${pkgver}.${pkgrel}")
-source=("https://codeload.github.com/Fluorohydride/ygopro-core/zip/master")
-source=("https://codeload.github.com/Fluorohydride/ygopro-scripts/zip/master")
-source=("https://gitee.com/ximlel/ygopro_data/repository/archive/v${pkgver}.${pkgrel}.zip")
+source=("https://codeload.github.com/Fluorohydride/ygopro/tar.gz/v${pkgver}.${pkgrel}"
+        "core.zip::https://codeload.github.com/Fluorohydride/ygopro-core/zip/master"
+        "scripts.zip::https://codeload.github.com/Fluorohydride/ygopro-scripts/zip/master"
+        "data.zip::https://gitee.com/ximlel/ygopro_data/repository/archive/v${pkgver}.${pkgrel}.zip")
 sha256sums=('9a6c6aeea1bad1138d3d8218420b03d4078c0debf5638adce1a48075bdc218b8'
             "SKIP"
             "SKIP"
-            "SKIP")
-options=('emptydirs')
+            '6c740184be7657d128ffbb96233e39c0ab932854216c4e23a3852926310283d5')
+options=('emptydirs' '!buildflags' '!makeflags')
 
 package() {
 	cd "${srcdir}"
-	tar -xzvf "ygopro-${pkgver}.${pkgrel}.tar.gz"
-	unzip ygopro-core-master.zip
-	unzip ygopro-scripts-master.zip
-	unzip "v${pkgver}.${pkgrel}.zip"
-	rm -R ygopro-core/.git
-	rm -R ygopro-scripts/.git
-	mv ygopro-core/* "ygopro-${pkgver}.${pkgrel}/ocgcore"
-	mv ygopro-scripts/* "ygopro-${pkgver}.${pkgrel}/script"
-	mv ygopro-data/* "ygopro-${pkgver}.${pkgrel}"
+	mv -v ygopro-core-master/* "ygopro-${pkgver}.${pkgrel}/ocgcore"
+	mv -v ygopro-scripts-master/* "ygopro-${pkgver}.${pkgrel}/script"
 	cd "ygopro-${pkgver}.${pkgrel}"
 	premake4 gmake
 	cd build
 	make all
-	mv ../bin/debug/* ../
+	mv -v ../bin/debug/* ../
 	make clean
 	cd ..
 	rm -R bin build obj gframe ocgcore
 	sed -i "s/c:\/windows\/fonts/./" system.conf
-	mv -v ygopro.png "$pkgdir/usr/share/pixmaps/ygopro.png"
-	mv -v ygopro.desktop "$pkgdir/usr/share/applications/ygopro.desktop"
 	mkdir -pv "$pkgdir/opt/ygopro"
 	cp -dRv * "$pkgdir/opt/ygopro"
+	cd "${srcdir}/ygopro_data"
+	mkdir -pv "$pkgdir/usr/share/pixmaps"	
+	mv -v ygopro.png "$pkgdir/usr/share/pixmaps/ygopro.png"
+	mkdir -pv "$pkgdir/usr/share/applications"
+	mv -v ygopro.desktop "$pkgdir/usr/share/applications/ygopro.desktop"
+	mv -v * "$pkgdir/opt/ygopro"
 	cd "$pkgdir/opt/ygopro"
 	find "$pkgdir/opt/ygopro" -type d -exec chmod 777 {} \;
 	find "$pkgdir/opt/ygopro" -type f -exec chmod 777 {} \;