summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Rawlinson2018-07-29 19:00:29 +1200
committerGeorge Rawlinson2018-07-29 19:00:29 +1200
commite319da2dd97fb24d7a3e24c679a54b78f7aef5e4 (patch)
tree645e38cfaf18f32af7868776f1d218a07b74712c
parentd201d26287a76840a788e3966ec1e40b6c63f96e (diff)
downloadaur-e319da2dd97fb24d7a3e24c679a54b78f7aef5e4.tar.gz
refactor: adopt & cleanup
-rw-r--r--.SRCINFO6
-rw-r--r--.gitignore13
-rw-r--r--PKGBUILD33
3 files changed, 35 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9ff9ed74a4c2..be0da7258d9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = leocad
pkgdesc = A CAD program for creating virtual LEGO models
pkgver = 18.02
- pkgrel = 1
+ pkgrel = 2
url = http://leocad.org
arch = i686
arch = x86_64
@@ -11,8 +11,8 @@ pkgbase = leocad
depends = hicolor-icon-theme
source = leocad-18.02.tar.gz::https://github.com/leozide/leocad/archive/v18.02.tar.gz
source = leocad-18.02-library.zip::https://github.com/leozide/leocad/releases/download/v18.02/Library-Linux-11331.zip
- sha256sums = 496567a9f05930b3366b38053b6de4f2c9d917280079eeb45d08581784903ca1
- sha256sums = 55063566f8c887b04f280e32aa138fee2388c267bfc5e7b0f51d5cdcff54c9b4
+ sha512sums = cf7b878d2a39775d6f0a4d07608a99144d832a06e9813b79dd85e018f7fb16cddb8a1f5cc4640488a0168aeb8549e7ee91811e4a4b9f727d788b598f10f25d97
+ sha512sums = 6e303c6b3aa2b1948a69d6165555ab069d211b71ec26e7b8903c7dbd0d716483765d45265fedca67fbd1df21bc2af92f224638668db15bd849cd60f9fb0598d6
pkgname = leocad
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..bb731aae6160
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+# Directories
+pkg/
+src/
+
+# Archives
+*.tar
+*.tar.*
+*.zip
+*.tgz
+
+# Logs
+*.log
+*.log.*
diff --git a/PKGBUILD b/PKGBUILD
index 52896420055d..187903636b16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer:
+# Maintainer: George Rawlinson <george@rawlinson.net.nz>
# Contributor: Michael Straube <michael.straube@posteo.de>
# Contributor: Seth Schroeder <theking@kingdomofseth.com>
# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
pkgname=leocad
pkgver=18.02
-pkgrel=1
+pkgrel=2
pkgdesc="A CAD program for creating virtual LEGO models"
arch=('i686' 'x86_64')
url="http://leocad.org"
@@ -14,23 +14,28 @@ depends=('qt5-base' 'hicolor-icon-theme')
makedepends=('qt5-tools')
source=("$pkgname-$pkgver.tar.gz::https://github.com/leozide/leocad/archive/v$pkgver.tar.gz"
"$pkgname-$pkgver-library.zip::https://github.com/leozide/leocad/releases/download/v$pkgver/Library-Linux-11331.zip")
-sha256sums=('496567a9f05930b3366b38053b6de4f2c9d917280079eeb45d08581784903ca1'
- '55063566f8c887b04f280e32aa138fee2388c267bfc5e7b0f51d5cdcff54c9b4')
-
-prepare() {
- mkdir -p build
-}
+sha512sums=('cf7b878d2a39775d6f0a4d07608a99144d832a06e9813b79dd85e018f7fb16cddb8a1f5cc4640488a0168aeb8549e7ee91811e4a4b9f727d788b598f10f25d97'
+ '6e303c6b3aa2b1948a69d6165555ab069d211b71ec26e7b8903c7dbd0d716483765d45265fedca67fbd1df21bc2af92f224638668db15bd849cd60f9fb0598d6')
build() {
- cd build
- qmake-qt5 ../$pkgname-$pkgver \
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # create Makefile with QMake
+ qmake-qt5 \
INSTALL_PREFIX=/usr \
- DISABLE_UPDATE_CHECK=1
+ DISABLE_UPDATE_CHECK=1 \
+ "${pkgname}.pro"
+
+ # build package
make
}
package() {
- cd build
- make INSTALL_ROOT="$pkgdir" install
- install -Dm644 ../library.bin "$pkgdir"/usr/share/leocad/library.bin
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # copy install to pkgdir
+ make INSTALL_ROOT="${pkgdir}" install
+
+ # install parts library
+ install -Dm644 "${srcdir}/library.bin" "${pkgdir}/usr/share/leocad/library.bin"
}