[arch-commits] Commit in moneymanagerex/trunk (PKGBUILD)

[Jaroslav Lichtblau via arch-commits]

    Date: Saturday, December 26, 2020 @ 12:35:05
  Author: jlichtblau
Revision: 793011

upgpkg: moneymanagerex 1.3.6-1 - new upstream release

Modified:
  moneymanagerex/trunk/PKGBUILD

----------+
 PKGBUILD |   41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-12-26 11:36:35 UTC (rev 793010)
+++ PKGBUILD    2020-12-26 12:35:05 UTC (rev 793011)
@@ -1,40 +1,49 @@
 # Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org>
 # Contributor: TDY <t...@gmx.com>
+# Contributor: Martin Dünkelmann <nc-duenkekl3 at netcologne.de>
 
 pkgname=moneymanagerex
-pkgver=1.3.3
-pkgrel=4
+pkgver=1.3.6
+_commit=e91a566976bb549663c147f6f8e3c5e9bf71b818
+pkgrel=1
 pkgdesc="An easy-to-use personal finance suite"
 arch=('x86_64')
-url="https://www.moneymanagerex.org/";
+url="https://github.com/moneymanagerex/moneymanagerex";
 license=('GPL')
 depends=('wxgtk3' 'webkit2gtk')
-makedepends=('git' 'boost')
-_commit=('2a90484293b5020556d835054285fd77a3ee1150')
-source=(git+https://github.com/moneymanagerex/moneymanagerex.git#commit=${_commit})
+makedepends=('boost' 'cmake' 'lsb-release' 'ccache' 'lua' 'git')
+source=($pkgname::git+https://github.com/$pkgname/$pkgname#commit=$_commit)
 sha256sums=('SKIP')
 
+pkgver() {
+  cd $pkgname
+  git describe --abbrev=0 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 prepare() {
-  cd "${srcdir}"/$pkgname
+  cd $pkgname
 
+## clone all submodules
   git submodule update --init
 
-  # Fix build with wxgtk 3.1
-  git cherry-pick -n 47acc00d5355aacb1f15654c4c4ebb7080a6710f
-  git cherry-pick -n f23f4b027f839f3b8a9a3cd21034d2e4d9c6b7d9
+  mkdir -p build
+
+# TODO Workaround: https://github.com/moneymanagerex/moneymanagerex/issues/2685
+  sed -i "s/luaL_checkint(/luaL_checkinteger(/g" 
./3rd/LuaGlue/include/LuaGlue/LuaGlueApplyTuple.h
 }
 
 build() {
-  cd "${srcdir}"/$pkgname
+  cd $pkgname/build
 
-  export LDFLAGS+=" -lwx_gtk3u_webview-3.1" # Fix build with wxgtk 3.1
-  ./configure --prefix=/usr --disable-shared --enable-unicode 
--with-wx-config=/usr/bin/wx-config-gtk3
-  make
-  make po
+  cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+
+  cmake --build . --target package
 }
 
 package() {
-  cd "${srcdir}"/$pkgname
+  cd $pkgname/build
 
   make DESTDIR="${pkgdir}" install
 }