Release 30

2 files changed, 8 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4b841e59ddb..31e194c9b625 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cevomapgen
 	pkgdesc = External Random Map Generator for C-evo
-	pkgver = 29
+	pkgver = 30
 	pkgrel = 1
 	url = https://sourceforge.net/projects/cevomapgen
 	arch = x86_64
@@ -12,10 +12,10 @@ pkgbase = cevomapgen
 	depends = glibc
 	depends = libx11
 	depends = hicolor-icon-theme
-	source = https://sourceforge.net/projects/cevomapgen/files/Source/cevomapgen_29.orig.tar.xz
-	source = https://sourceforge.net/projects/cevomapgen/files/Source/cevomapgen_29.orig.tar.xz.asc
+	source = https://sourceforge.net/projects/cevomapgen/files/Source/cevomapgen_30.orig.tar.xz
+	source = https://sourceforge.net/projects/cevomapgen/files/Source/cevomapgen_30.orig.tar.xz.asc
 	validpgpkeys = 14638444C9858E2A09B0259C211BCF562939AB8F
-	sha256sums = d9e43faf0ce5ac81bdee4b156f95004002700535a360059b25045871e1ffe04a
+	sha256sums = 46f15f18f210437f7a60cb06c67cb03c83ea0d07bda4a856e030a9d2a38399cb
 	sha256sums = SKIP
 
 pkgname = cevomapgen
diff --git a/PKGBUILD b/PKGBUILD
index d23baad04831..d4945329821d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 #
 
 pkgname=cevomapgen
-pkgver=29
+pkgver=30
 pkgrel=1
 pkgdesc="External Random Map Generator for C-evo"
 arch=('x86_64' 'aarch64')
@@ -12,7 +12,7 @@ depends=('qt5pas' 'glibc' 'libx11' 'hicolor-icon-theme')
 makedepends=('fpc' 'lazarus-qt5')
 source=("$url/files/Source/${pkgname}_${pkgver}.orig.tar.xz"
        "$url/files/Source/${pkgname}_${pkgver}.orig.tar.xz.asc")
-sha256sums=('d9e43faf0ce5ac81bdee4b156f95004002700535a360059b25045871e1ffe04a'
+sha256sums=('46f15f18f210437f7a60cb06c67cb03c83ea0d07bda4a856e030a9d2a38399cb'
             'SKIP')
 validpgpkeys=(14638444C9858E2A09B0259C211BCF562939AB8F)
 
@@ -20,19 +20,6 @@ validpgpkeys=(14638444C9858E2A09B0259C211BCF562939AB8F)
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Set temporary folder for lazarus primary config
-  rm -fr "$srcdir/config"
-  mkdir  "$srcdir/config"
-
-  # Don't need Windows docs on Arch
-  rm -f "Docs/ReadmeWindows.html"
-
-  # Move desktop files
-  rm -fr Desktop
-  mkdir  Desktop
-  mv "Docs/cevomapgen.svg"   Desktop
-  mv "Docs/$pkgname.desktop" Desktop
-
   # currently cannot build with -pie as the RTL is not built with pie
   sed -i '/-k-pie/d' fpc.cfg
 }
@@ -41,12 +28,8 @@ prepare() {
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # clean
-  rm -fr lib
-  rm -f *.res
-
-  lazbuild -v
-  lazbuild --ws=qt5 -B --lazarusdir=/usr/lib/lazarus --pcp="$srcdir/config" CevoMapGen.lpi
+  export LAZDIR="--lazarusdir=/usr/lib/lazarus"
+  make lazarusdir=/usr/lib/lazarus
 }