Let's get this working.

2 files changed, 41 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac4d5590a45c..e358ef6ec586 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,42 +1,34 @@
 pkgbase = mudlet-git
-	pkgdesc = A modern MUD client with a graphical interface and Lua scripting (upstream dev branch)
-	pkgver = 3.22.1.r158.g3c8f12b6
+	pkgdesc = A modern MUD client with a graphical user inteface and built in Lua scripting (git development branch
+	pkgver = 4137_Mudlet.4.6.1.77.g819757d4a_2020.03.25
 	pkgrel = 1
-	url = https://github.com/Mudlet/Mudlet
+	url = http://www.mudlet.org
 	arch = i686
 	arch = x86_64
-	license = GPL2
+	license = GPL
 	makedepends = git
 	makedepends = boost
 	makedepends = qt5-tools
+	depends = qt5-multimedia
 	depends = hunspell
 	depends = libzip
 	depends = glu
-	depends = lua51
 	depends = lua51-filesystem
 	depends = luazip5.1
 	depends = lua51-sql-sqlite
 	depends = lrexlib-pcre5.1
 	depends = qt5-gamepad
 	depends = lua51-utf8
-	depends = lua51-lcf
 	depends = ttf-font
 	depends = pugixml
 	depends = lua-yajl
-	provides = mudlet
+	optdepends = discord-rpc-api: discord integration
+	optdepends = ttf-bitstream-vera: default font
+	optdepends = ttf-ubuntu-font-family: default font
 	conflicts = mudlet
-	conflicts = mudlet-dev
-	conflicts = mudlet-deb
+	replaces = mudlet
 	source = git+https://github.com/Mudlet/Mudlet.git#branch=development
-	source = git+https://github.com/Mudlet/edbee-lib.git
-	source = git+https://github.com/martin-eden/lua_code_formatter.git
-	source = git+https://bitbucket.org/pentacent/dblsqd-sdk-qt.git
-	source = git+https://github.com/Mudlet/mixing-cocoa-and-qt.git
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
+	sha256sums = SKIP
 
 pkgname = mudlet-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 3c1507193670..a543bab1d820 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,45 @@
-# Previous Maintainers of Mudlet-git
-# Contributor: A. Fluteaux <sigma_g (at) melix (dot) net>
-# Contributor: Elmo Tudurov <tudurov+arch (at) gmail (dot) com>
-# Contributor: strata <strata (at) dropswitch (dot) net>
-
-# Based on mudlet and mudlet-dev by Xabre et al.
-# Contributor: Jaroslav Lichtblau <dragonlord (at) aur.archlinux (dot) org>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-# Contributor: Ryon Sherman <ryon.sherman (at) gmail (dot) com>
-# Contributor: Dardo Marasca <gefarion (at) gmail (dot) com>
-# Contributor: Kevin Kyzer <kev (at) k3v (dot) in>
-# Contributor: Xabre <xabre (at) archlinux (dot) info>
-# Maintainer: WSDMatty <wsdmatty (at) gmail (dot) com>
-
+# Contributor: Xabre <xabre @archlinux.info>
 pkgname=mudlet-git
-_pkgname=Mudlet
-pkgver=3.22.1.r158.g3c8f12b6
+_gitname=Mudlet
+pkgver=4137_Mudlet.4.6.1.77.g819757d4a_2020.03.25
 pkgrel=1
-pkgdesc="A modern MUD client with a graphical interface and Lua scripting (upstream dev branch)"
+pkgdesc="A modern MUD client with a graphical user inteface and built in Lua scripting (git development branch"
 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'
-         'qt5-gamepad' 'lua51-utf8' 'lua51-lcf' 'ttf-font' 'pugixml' 'lua-yajl')
+url="http://www.mudlet.org"
+license=('GPL')
+depends=('qt5-multimedia' 'hunspell' 'libzip' 'glu' 'lua51-filesystem' 'luazip5.1' 'lua51-sql-sqlite' \
+         'lrexlib-pcre5.1' 'qt5-gamepad' 'lua51-utf8'  'ttf-font' 'pugixml' 'lua-yajl')
 makedepends=('git' 'boost' 'qt5-tools')
-provides=('mudlet')
-conflicts=('mudlet' 'mudlet-dev' 'mudlet-deb')
-source=("git+https://github.com/Mudlet/Mudlet.git#branch=development"
-        "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')
+optdepends=('discord-rpc-api: discord integration'
+            'ttf-bitstream-vera: default font'
+            'ttf-ubuntu-font-family: default font')
+conflicts=('mudlet')
+replaces=('mudlet')
+source=("git+https://github.com/Mudlet/Mudlet.git#branch=development")
+sha256sums=('SKIP')
 
 pkgver() {
-    cd "${_pkgname}/src"
-    git describe --long --tags | sed 's/^Mudlet-//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-    cd "${_pkgname}/src"
-    # Initialize required submodules for build
-    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
+    cd ${_gitname}
+    _tag=$(git describe --tags | sed 's:^v::') # tag is mobile, and switches between numbers and letters, can't use it for versioning
+    _commits=$(git rev-list --count HEAD) # total commits is the most sane way of getting incremental pkgver
+    _date=$(git log -1 --date=short --pretty=format:%cd)
+    printf "%s_%s_%s\n" "${_commits}" "${_tag}" "${_date}" | sed 's/-/./g'
 }
 
 build() {
-    cd "${_pkgname}/src"
-    WITH_FONTS=NO WITH_UPDATER=NO qmake-qt5 PREFIX=/usr
+    cd "$srcdir/${_gitname}/src"
+    export XDG_DATA_DIRS=/usr/share
+    export WITH_FONTS=NO 
+    export WITH_UPDATER=NO 
+    qmake-qt5 PREFIX=/usr
     make
 }
 
 package() {
-    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"
+    cd $srcdir/${_gitname}/src
+    make INSTALL_ROOT="$pkgdir" install    
+    mkdir -p ${pkgdir}/usr/share/applications
+    mkdir -p ${pkgdir}/usr/share/pixmaps
+    install -m 644 ../mudlet.desktop ${pkgdir}/usr/share/applications
+    install -m 644 ../mudlet.svg ${pkgdir}/usr/share/pixmaps   
 }