From 0b37c6c5b4346979f4a80b5360001db0f9314b4d Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Tue, 19 Jun 2018 12:10:51 -0400
Subject: [PATCH] Fix some builds

---
 ppa                                     |  5 +++
 src/lib32-ncurses5-compat-libs/PKGBUILD | 52 -------------------------
 src/mingw-w64-crt/PKGBUILD              | 11 ++----
 src/mingw-w64-headers/PKGBUILD          | 13 ++-----
 src/mingw-w64-winpthreads/PKGBUILD      |  9 ++---
 src/movim-git/PKGBUILD                  | 14 ++++---
 src/movim-git/movim.service             |  2 +-
 7 files changed, 26 insertions(+), 80 deletions(-)
 delete mode 100644 src/lib32-ncurses5-compat-libs/PKGBUILD

diff --git a/ppa b/ppa
index 65e8f33..802eb83 100755
--- a/ppa
+++ b/ppa
@@ -123,6 +123,11 @@ rebuild_db() {
     sign_packages $repo_name.db $repo_name.files
 }
 
+echo_deps() {
+    cd "$src_dir"
+    aurchain "$@"
+}
+
 build_deps() {
     cd "$src_dir"
     if [ "$#" -gt 0 ]; then
diff --git a/src/lib32-ncurses5-compat-libs/PKGBUILD b/src/lib32-ncurses5-compat-libs/PKGBUILD
deleted file mode 100644
index 4404305..0000000
--- a/src/lib32-ncurses5-compat-libs/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Kevin Brodsky <corax26 at gmail dot com>
-
-_pkgbasename=ncurses
-pkgname=lib32-${_pkgbasename}5-compat-libs
-pkgver=6.1
-pkgrel=1
-pkgdesc="System V Release 4.0 curses emulation library (32-bit), ABI 5"
-arch=('x86_64')
-url="http://www.gnu.org/software/ncurses/"
-license=('MIT')
-depends=('lib32-glibc' "lib32-${_pkgbasename}")
-makedepends=("gcc-multilib")
-source=(https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$pkgver.tar.gz{,.sig})
-md5sums=('98c889aaf8d23910d2b92d65be2e737a'
-         'SKIP')
-validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # Thomas Dickey
-
-build() {
-  cd ${_pkgbasename}-${pkgver}
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-     --with-shared --with-normal --without-debug --without-ada \
-     --with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/lib32 \
-     --with-abi-version=5 --without-pkg-config --without-gpm
-   make
-}
-
-package() {
-  cd ${_pkgbasename}-${pkgver}
-  make install.libs
-
-  install -dm755 ${pkgdir}/usr/lib32
-
-  # fool packages looking to link to non-wide-character ncurses libraries
-  for lib in ncurses form panel menu; do
-    ln -s lib${lib}w.so.5 "$pkgdir"/usr/lib32/lib${lib}.so.5
-  done
-  # Also provide a libtinfo symlink
-  ln -s libncurses.so.5 "$pkgdir/usr/lib32/libtinfo.so.5"
-
-  # Remove .so symlinks and static libraries (conflicting with lib32-ncurses)
-  rm -f "${pkgdir}"/usr/{lib32/*.so,lib32/*.a}
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-# vim: set et ts=2 sw=2:
diff --git a/src/mingw-w64-crt/PKGBUILD b/src/mingw-w64-crt/PKGBUILD
index 29f0f97..e37e991 100644
--- a/src/mingw-w64-crt/PKGBUILD
+++ b/src/mingw-w64-crt/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 266000 2017-11-09 13:12:50Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
 
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-crt
-pkgver=5.0.3
+pkgver=5.0.4
 _pkgver=${pkgver/rc/-rc}
 pkgrel=1
 pkgdesc='MinGW-w64 CRT for Windows'
@@ -17,13 +16,11 @@ makedepends=('mingw-w64-gcc-base' 'mingw-w64-binutils' 'mingw-w64-headers')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 validpgpkeys=('CAF5641F74F7DFBA88AE205693BDB53CD4EBC740')
 source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig})
-sha256sums=('2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4'
+sha256sums=('5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803'
             'SKIP')
 
 prepare() {
   cd "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-crt
-  aclocal
-  automake
 }
 
 build() {
diff --git a/src/mingw-w64-headers/PKGBUILD b/src/mingw-w64-headers/PKGBUILD
index ad6059b..c8b5098 100644
--- a/src/mingw-w64-headers/PKGBUILD
+++ b/src/mingw-w64-headers/PKGBUILD
@@ -4,7 +4,7 @@
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname='mingw-w64-headers'
-pkgver=5.0.3
+pkgver=5.0.4
 _pkgver=${pkgver/rc/-rc}
 pkgrel=2
 pkgdesc="MinGW-w64 headers for Windows"
@@ -14,17 +14,12 @@ license=('custom')
 groups=('mingw-w64-toolchain' 'mingw-w64')
 options=('!strip' '!libtool' '!emptydirs')
 validpgpkeys=('CAF5641F74F7DFBA88AE205693BDB53CD4EBC740')
-source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig}
-        0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch)
-sha256sums=('2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4'
-            'SKIP'
-            'be8aabf9c98026db998c97e7e14293d4a9db9a73587ab860e72d7a798b6ad16e')
+source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig})
+sha256sums=('5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803'
+            'SKIP')
 
 prepare() {
   cd "$srcdir"/mingw-w64-v${_pkgver}
-
-  # https://sourceforge.net/p/mingw-w64/mailman/message/36200602/
-  patch -p1 -i "$srcdir"/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch
 }
 
 build() {
diff --git a/src/mingw-w64-winpthreads/PKGBUILD b/src/mingw-w64-winpthreads/PKGBUILD
index d0dee48..8246cd1 100644
--- a/src/mingw-w64-winpthreads/PKGBUILD
+++ b/src/mingw-w64-winpthreads/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 266006 2017-11-09 13:20:35Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
 
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-winpthreads
-pkgver=5.0.3
+pkgver=5.0.4
 _pkgver=${pkgver/rc/-rc}
 pkgrel=1
 pkgdesc='MinGW-w64 winpthreads library'
@@ -20,7 +19,7 @@ replaces=('mingw-w64-headers-bootstrap')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 validpgpkeys=('CAF5641F74F7DFBA88AE205693BDB53CD4EBC740')
 source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig})
-sha256sums=('2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4'
+sha256sums=('5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803'
             'SKIP')
 
 build() {
diff --git a/src/movim-git/PKGBUILD b/src/movim-git/PKGBUILD
index 2aaff68..cd8dd34 100644
--- a/src/movim-git/PKGBUILD
+++ b/src/movim-git/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgbase='movim'
 pkgname=movim-git
-pkgver=r6815.8fba1ad6
+pkgver=r6859.eeb15ce8
 pkgrel=1
 pkgdesc="Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol."
 arch=('any')
@@ -23,9 +23,6 @@ source=("$_pkgbase::git+https://github.com/movim/movim"
         movim.env
         movim.service)
 install=movim.install
-sha256sums=('SKIP'
-            '5dfff91dd4a54f3d3713530e204370a96d37898b670a61123d8cad42f92da306'
-            '793b85ca2080d92d9663af1750d0be9d1cbd20de9c828cb0ce0cc91ad5510f11')
 backup=("etc/webapps/$_pkgbase/db.inc.php"
         "etc/default/movim")
 
@@ -53,9 +50,10 @@ package() {
   # XXX: Symlinks created post_upgrade. Waiting for upstream to fix
   # https://github.com/movim/movim/issues/509.
 
-  cp -r app lib locales src themes vendor "$pkgdir/usr/share/webapps/$_pkgbase"
+  cp -r app database lib locales src themes vendor \
+    "$pkgdir/usr/share/webapps/$_pkgbase"
   install -Dm644 VERSION CHANGELOG.md INSTALL.md README.md index.php \
-    linker.php manifest.webapp "$pkgdir/usr/share/webapps/$_pkgbase"
+    linker.php phinx.php "$pkgdir/usr/share/webapps/$_pkgbase"
   install -Dm755 daemon.php "$pkgdir/usr/share/webapps/$_pkgbase"
 
   # Configuration file
@@ -75,3 +73,7 @@ package() {
   install -g http -Dm640 "$srcdir/movim.env" "$pkgdir/etc/default/$_pkgbase"
   install -Dm644 "$srcdir/movim.service" "$pkgdir/usr/lib/systemd/system/movim.service"
 }
+
+sha256sums=('SKIP'
+            '5dfff91dd4a54f3d3713530e204370a96d37898b670a61123d8cad42f92da306'
+            'b348b86ccfe56b104ada9134672bf77054b148b2a2eb9f704be429905fc3d834')
diff --git a/src/movim-git/movim.service b/src/movim-git/movim.service
index 30a6674..c3c4f5e 100644
--- a/src/movim-git/movim.service
+++ b/src/movim-git/movim.service
@@ -6,7 +6,7 @@ After=network.target
 Group=http
 WorkingDirectory=/usr/share/webapps/movim
 EnvironmentFile=/etc/default/movim
-ExecStartPre=/usr/bin/php mud.php db --set
+ExecStartPre=/usr/bin/php vendor/bin/phinx migrate
 ExecStart=/usr/bin/php daemon.php start --url=${MOVIM_URL} --port=${MOVIM_PORT} --interface=${MOVIM_INTERFACE}
 Restart=always