Corrected some issues with submodules & style

Changed how submodules are handled to follow Arch standard.
Fixed some inconsistant style errors (inconsistant quoting, bracing)
Removed unnecessary sed invocations

1 files changed, 27 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1d71ac610c23..32a36ca7e3ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,47 +13,56 @@
 # Maintainer: WSDMatty <wsdmatty (at) gmail (dot) com>
 
 pkgname=mudlet-git
-pkgver=3.22.1.r153.gadb14133
+_pkgname=Mudlet
+pkgver=3.22.1.r158.g3c8f12b6
 pkgrel=1
 pkgdesc="A modern MUD client with a graphical interface and Lua scripting (upstream dev branch)"
 _branch="development"
 arch=('i686' 'x86_64')
 url="https://github.com/Mudlet/Mudlet"
 license=('GPL2')
-depends=('hunspell' 'libzip' 'glu' 'lua51' \
-         'lua51-filesystem' 'luazip5.1' 'lua51-sql-sqlite' 'lrexlib-pcre5.1'  \
+depends=('hunspell' 'libzip' 'glu' 'lua51'
+         'lua51-filesystem' 'luazip5.1' 'lua51-sql-sqlite' 'lrexlib-pcre5.1'
          'qt5-gamepad' 'lua51-utf8' 'lua51-lcf' 'ttf-font' 'pugixml' 'lua-yajl')
 makedepends=('git' 'boost' 'qt5-tools')
 provides=('mudlet')
 conflicts=('mudlet' 'mudlet-dev' 'mudlet-deb')
-source=("$pkgname::git+$url.git#branch=$_branch")
-sha1sums=('SKIP')
+source=("git+$url.git#branch=$_branch"
+        "git+https://github.com/Mudlet/edbee-lib.git"
+        "git+https://github.com/martin-eden/lua_code_formatter.git"
+        "git+https://bitbucket.org/pentacent/dblsqd-sdk-qt.git"
+        "git+https://github.com/Mudlet/mixing-cocoa-and-qt.git")
+sha1sums=('SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP')
 
 pkgver() {
-    cd "$srcdir/$pkgname/src"
+    cd "${_pkgname}/src"
     git describe --long --tags | sed 's/^Mudlet-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-    cd "$srcdir/$pkgname/src"
+    cd "${_pkgname}/src"
     # Initialize required submodules for build
-    git submodule update --init --recursive
-    sed -i 's;"mudlet.app/Contents/Resources/mudlet-lua/lua/";"mudlet.app/Contents/Resources/mudlet-lua/lua/", "/usr/share/mudlet/lua/";' mudlet-lua/lua/LuaGlobal.lua
-
-##Fix building with Qt 5.5+
-    sed -i '/#include <QString>/ a #include <QDataStream>' ActionUnit.h
-    sed -i '/#include <QTime>/ a #include <QDataStream>' ctelnet.h
+    git submodule init
+    git config submodule."3rdparty/edbee-lib".url "${srcdir}/edbee-lib/.git"
+    git config submodule."3rdparty/lua_code_formatter".url "${srcdir}/lua_code_formatter/.git"
+    git config submodule."3rdparty/dblsqd".url "${srcdir}/dblsqd-sdk-qt/.git"
+    git config submodule."3rdparty/sparkle-glue".url "${srcdir}/mixing-cocoa-and-qt/.git"
+    git submodule update
 }
 
 build() {
-    cd "$srcdir/$pkgname/src"
+    cd "${_pkgname}/src"
     WITH_FONTS=NO WITH_UPDATER=NO qmake-qt5 PREFIX=/usr
     make
 }
 
 package() {
-    cd "$srcdir/$pkgname/src"
-    make INSTALL_ROOT="$pkgdir" install
-    install -Dm 644 $srcdir/$pkgname/mudlet.desktop ${pkgdir}/usr/share/applications/mudlet.desktop
-    install -Dm 644 $srcdir/$pkgname/mudlet.png ${pkgdir}/usr/share/pixmaps/mudlet.png
+    cd "${_pkgname}/src"
+    make INSTALL_ROOT="${pkgdir}" install
+    install -Dm 644 "${srcdir}/${_pkgname}/mudlet.desktop" "${pkgdir}/usr/share/applications/mudlet.desktop"
+    install -Dm 644 "${srcdir}/${_pkgname}/mudlet.png" "${pkgdir}/usr/share/pixmaps/mudlet.png"
 }