From 5793fd92e8a14d4a2a163c1c350cb2d7a50f75cc Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Sun, 4 Aug 2019 01:19:07 -0400
Subject: [PATCH] Update packages again, fix redis-desktop-manager

---
 src/crispy-doom/PKGBUILD            |  4 ++--
 src/pi-hole-standalone/PKGBUILD     |  6 ++----
 src/pi-hole-standalone/dnsmasq.main | 10 ----------
 src/redis-desktop-manager/PKGBUILD  |  4 ++--
 4 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 src/pi-hole-standalone/dnsmasq.main

diff --git a/src/crispy-doom/PKGBUILD b/src/crispy-doom/PKGBUILD
index 720bbdb..0b4164d 100644
--- a/src/crispy-doom/PKGBUILD
+++ b/src/crispy-doom/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=crispy-doom
 pkgdesc="Vanilla-compatible enhanced Doom engine"
-pkgver=5.5.2
+pkgver=5.6
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://fabiangreffrath.github.io/crispy-doom"
@@ -14,7 +14,7 @@ optdepends=('freedm: Free deathmatch game'
             'freedoom2: Free Doom II/Final Doom-compatible game')
 install=crispy-doom.install
 source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz)
-sha512sums=('0d17869a175291fc8998bccf7a58a663a3ab424a0f269ddab21ac3e6d354a89f7a34950bd961d9ca160fb7d2fe37b1bc756b58b84fedf099321dfa0eec994672')
+sha512sums=('8b81f170616597cd284298a1286557138be5e026aca5d7da98a55375265a9fdb14d30daa9a4c7d358dba76f1cc4ec92bba940b434b42dd765f0c588d4a3fd088')
 
 prepare() {
   cd "$pkgname-$pkgname-$pkgver"
diff --git a/src/pi-hole-standalone/PKGBUILD b/src/pi-hole-standalone/PKGBUILD
index f82c863..2436fa4 100644
--- a/src/pi-hole-standalone/PKGBUILD
+++ b/src/pi-hole-standalone/PKGBUILD
@@ -16,7 +16,6 @@ backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt'
 
 source=(https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
 	"https://raw.githubusercontent.com/max72bra/pi-hole-standalone-archlinux-customization/master/arch-server-core-$pkgver.patch"
-    dnsmasq.main
 	dnsmasq.include
 	$_pkgname-gravity.service
 	$_pkgname-gravity.timer
@@ -24,8 +23,7 @@ source=(https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
 	piholeDebug.sh)
 
 md5sums=('3973f2a9d7fcd6ea10265feaa397f108'
-         '9a07ec70243c20ed5127a9b140cdccff'
-         '91a3f21bb0a7d429cce2b8d7551e99da'
+         '3cd7bd0ec53825b609c2ba138a089f6f'
          '50d29442a7b185f0d05bc2ed72f875be'
          '047f13d4ac97877f724f87b002aaee63'
          'd42a864f88299998f8233c0bc0dd093d'
@@ -62,7 +60,7 @@ package() {
   install -Dm644 $_pkgname-$pkgver/adlists.list "$pkgdir"/etc/pihole/adlists.list
   install -Dm644 /dev/null "$pkgdir"/etc/pihole/whitelist.txt
   install -Dm644 /dev/null "$pkgdir"/etc/pihole/blacklist.txt
-  install -Dm644 dnsmasq.main "$pkgdir"/usr/share/pihole/configs/dnsmasq.example.conf
+  install -Dm644 $_pkgname-$pkgver/advanced/dnsmasq.conf.original "$pkgdir"/etc/dnsmasq.conf
   install -Dm644 dnsmasq.include "$pkgdir"/etc/dnsmasq.d/01-pihole.conf
   install -dm755 "$pkgdir"/usr/share/licenses/pihole
   install -Dm644 ${pkgname%-*}-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/pihole/Pi-hole
diff --git a/src/pi-hole-standalone/dnsmasq.main b/src/pi-hole-standalone/dnsmasq.main
deleted file mode 100644
index 43de337..0000000
--- a/src/pi-hole-standalone/dnsmasq.main
+++ /dev/null
@@ -1,10 +0,0 @@
-# If you want dnsmasq to listen for DHCP and DNS requests only on
-# specified interfaces (and the loopback) give the name of the
-# interface (eg eth0) here.
-#interface=eth0
-# Or which to listen on by address (remember to include 127.0.0.1 if
-# you use this.)
-listen-address=127.0.0.1
-
-# Include all files in a directory which end in .conf
-conf-dir=/etc/dnsmasq.d/,*.conf
diff --git a/src/redis-desktop-manager/PKGBUILD b/src/redis-desktop-manager/PKGBUILD
index ec133e5..bbcfb25 100644
--- a/src/redis-desktop-manager/PKGBUILD
+++ b/src/redis-desktop-manager/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Vyacheslav Konovalov <echo dnlhY2hrb25vdmFsb3ZAZ21haWwuY29tCg== | base64 -d>
 
 pkgname=redis-desktop-manager
-pkgver=2019.2
+pkgver=2019.3
 pkgrel=1
 pkgdesc='Open source cross-platform Redis Desktop Manager based on Qt 5'
 arch=('x86_64')
@@ -18,7 +18,7 @@ depends=(
   'qt5-graphicaleffects'
   'qt5-svg'
   'libssh2')
-makedepends=('git' 'gcc' 'python2')
+makedepends=('git' 'gcc' 'python2' 'python')
 conflicts=('redis-desktop-manager-bin')
 source=("rdm::git://github.com/uglide/RedisDesktopManager.git#tag=$pkgver"
         'rdm.sh'