Unify PKGBUILDs

2 files changed, 31 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d164978fa44..c32bdb761fb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
 pkgbase = openboard-git
-	pkgdesc = Interactive whiteboard software for schools and universities
+	pkgdesc = Interactive whiteboard software for schools and universities (development version current master)
 	pkgver = 1.6.1rc.0309.r10.gf3f07f99
 	pkgrel = 1
 	url = http://openboard.ch/index.en.html
 	arch = x86_64
+	arch = i686
 	license = GPL3
 	makedepends = git
 	depends = qt5-base
@@ -21,15 +22,17 @@ pkgbase = openboard-git
 	depends = ffmpeg
 	depends = quazip
 	depends = poppler
+	provides = openboard=1.6.1
+	conflicts = openboard
 	source = git://github.com/OpenBoard-org/OpenBoard.git#branch=master
-	source = qchar.patch
 	source = openboard.desktop
+	source = qchar.patch
 	source = quazip.patch
 	source = drop_ThirdParty_repo.patch
 	source = 30fps.patch
 	sha256sums = SKIP
-	sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549
 	sha256sums = 00688af02006bddeab797f624e5cbae66a5c02f4e14315d87d3f198f74797c17
+	sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549
 	sha256sums = 8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7
 	sha256sums = a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14
 	sha256sums = 205062adbbd48d6622341e316e14a5496f73696385a3ed5cda7a89d3e7d2861d
diff --git a/PKGBUILD b/PKGBUILD
index 38876352acea..3c7b0cac022f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,30 @@
-# Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
-# shellcheck disable=SC2034,SC2164,SC2154
+#!/hint/bash
+# Maintainer: bartus <arch-user-repoᘓbartus.33mail.com>
+
 
 pkgname=openboard-git
 _fragment="#branch=master"
 pkgver=1.6.1rc.0309.r10.gf3f07f99
 pkgrel=1
-pkgdesc="Interactive whiteboard software for schools and universities"
-arch=('x86_64')
+pkgdesc="Interactive whiteboard software for schools and universities (development version current master)"
+arch=('x86_64' 'i686')
 url="http://openboard.ch/index.en.html"
 license=('GPL3')
+provides=("${pkgname%-git}=${pkgver%%rc*}")
+conflicts=("${pkgname%-git}")
 depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'qt5-tools' 'qt5-xmlpatterns' 'libpaper' 'bzip2' 'openssl' 'libfdk-aac' 'sdl' 'ffmpeg')
 depends+=(quazip)  #drop internal quazip and use system one.
-depends+=(poppler) #replace xpdf lib with poppler, simplify the package and remove internal dep.
+depends+=(poppler) #replace internal xpdf with poppler and drop freetype/xpdf from deps
 makedepends=(git)
 source=("git://github.com/OpenBoard-org/OpenBoard.git${_fragment}"
-        qchar.patch
         openboard.desktop)
+source+=(qchar.patch)
 source+=(quazip.patch)
 source+=(drop_ThirdParty_repo.patch)
 source+=(30fps.patch)
 sha256sums=('SKIP'
-            'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549'
             '00688af02006bddeab797f624e5cbae66a5c02f4e14315d87d3f198f74797c17'
+            'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549'
             '8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7'
             'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14'
             '205062adbbd48d6622341e316e14a5496f73696385a3ed5cda7a89d3e7d2861d')
@@ -32,14 +35,17 @@ pkgver() {
 }
 
 prepare() {
-  cd "$srcdir/OpenBoard"
-  patch -p1 < $srcdir/drop_ThirdParty_repo.patch
-  patch -p1 < $srcdir/qchar.patch
-  patch -p1 < $srcdir/quazip.patch
+  cd "$srcdir"/OpenBoard
+  msg2 "drop_ThirdParty_repo"
+  patch -p1 < "$srcdir"/drop_ThirdParty_repo.patch
+  msg2 "qchar"
+  patch -p1 < "$srcdir"/qchar.patch
+  msg2 "quazip"
+  patch -p1 < "$srcdir"/quazip.patch
 }
 
 build() {
-  cd "$srcdir/OpenBoard"
+  cd "$srcdir"/OpenBoard
 # convert translations to binary form
   lrelease OpenBoard.pro
   qmake OpenBoard.pro -spec linux-g++
@@ -47,18 +53,12 @@ build() {
 }
 
 package() {
-  cd "$srcdir/OpenBoard"
-
-  mkdir -p "$pkgdir/opt/openboard"
-
-  for i in customizations etc i18n library; do
-    cp -rp "$srcdir/OpenBoard/resources/$i" "$pkgdir/opt/openboard"
-  done 
-
-  cp -rp "$srcdir/OpenBoard/resources/images/OpenBoard.png" "$pkgdir/opt/openboard/"
-  cp -rp "build/linux/release/product/OpenBoard" "$pkgdir/opt/openboard/"
+  cd "$srcdir"/OpenBoard
 
-  install -D -m 644 "$srcdir/openboard.desktop" "$pkgdir/usr/share/applications/openboard.desktop"
-  install -d -m 755 "$pkgdir/usr/bin"
-  ln -s /opt/openboard/OpenBoard "$pkgdir/usr/bin/openboard"
+  install -Dm755 build/linux/release/product/OpenBoard -t "$pkgdir"/opt/openboard/
+  cp -rp "$srcdir"/OpenBoard/resources/{customizations,etc,i18n,library} -t "$pkgdir"/opt/openboard/
+  install -Dm644 "$srcdir"/OpenBoard/resources/images/OpenBoard.png -t "$pkgdir"/usr/share/icons/hicolor/64x64/apps/
+  install -Dm644 "$srcdir"/openboard.desktop -t "$pkgdir"/usr/share/applications/
+  install -dm755 "$pkgdir"/usr/bin/
+  ln -s /opt/openboard/OpenBoard "$pkgdir"/usr/bin/openboard
 }