🔥 removed unnecessary patch and shell script

4 files changed, 37 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 636628889f55..251697cb3b3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = redis-desktop-manager
 	pkgdesc = Open source cross-platform Redis Desktop Manager based on Qt 5
-	pkgver = 2020.0
-	pkgrel = 3
+	pkgver = 2021.0
+	pkgrel = 1
 	url = https://redisdesktop.com/
 	arch = x86_64
 	license = GPL3
@@ -20,14 +20,10 @@ pkgbase = redis-desktop-manager
 	depends = libssh2
 	depends = python
 	conflicts = redis-desktop-manager-bin
-	source = rdm::git://github.com/uglide/RedisDesktopManager.git#tag=2020.0
-	source = rdm.sh
+	source = rdm::git://github.com/uglide/RedisDesktopManager.git#tag=2021.0
 	source = rdm.desktop
-	source = link-python.patch
 	sha256sums = SKIP
-	sha256sums = f469d9a5adce723904efe0f1b1db5d79807410f90aafb117f18ae108d8b2d391
 	sha256sums = 9ca6cfe0fc1a050552ec2fa009a2d517de3b049ff6f379f0fda849e4dbca3f68
-	sha256sums = 428d2758345059f844dee05bbc6d06eecf82f6cbd3f1a8a308fe4f54cadb43ce
 
 pkgname = redis-desktop-manager
 
diff --git a/PKGBUILD b/PKGBUILD
index d29e873d628c..db7858efebab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,40 +11,36 @@ arch=('x86_64')
 url="https://redisdesktop.com/"
 license=('GPL3')
 depends=(
-  'qt5-base'
-  'qt5-imageformats'
-  'qt5-tools'
-  'qt5-declarative'
-  'qt5-quickcontrols'
-  'qt5-quickcontrols2'
-  'qt5-charts'
-  'qt5-graphicaleffects'
-  'qt5-svg'
-  'libssh2'
-  'python')
+	'qt5-base'
+	'qt5-imageformats'
+	'qt5-tools'
+	'qt5-declarative'
+	'qt5-quickcontrols'
+	'qt5-quickcontrols2'
+	'qt5-charts'
+	'qt5-graphicaleffects'
+	'qt5-svg'
+	'libssh2'
+	'python')
 makedepends=('git' 'gcc' 'make')
 conflicts=('redis-desktop-manager-bin')
 source=("rdm::git://github.com/uglide/RedisDesktopManager.git#tag=$pkgver"
-        'rdm.sh'
-        'rdm.desktop'
-        'link-python.patch')
+	'rdm.desktop')
 sha256sums=('SKIP'
-            'f469d9a5adce723904efe0f1b1db5d79807410f90aafb117f18ae108d8b2d391'
-            '9ca6cfe0fc1a050552ec2fa009a2d517de3b049ff6f379f0fda849e4dbca3f68'
-            '428d2758345059f844dee05bbc6d06eecf82f6cbd3f1a8a308fe4f54cadb43ce')
+            '9ca6cfe0fc1a050552ec2fa009a2d517de3b049ff6f379f0fda849e4dbca3f68')
 
 prepare() {
-  cd rdm/
-  git apply ../link-python.patch
-  git submodule update --init --recursive
-  git submodule add https://chromium.googlesource.com/linux-syscall-support 3rdparty/linux-syscall-support
+	cd rdm/
 
-  python build/utils/set_version.py "$pkgver" > src/version.h
+	git submodule update --init --recursive
+	git submodule add https://chromium.googlesource.com/linux-syscall-support 3rdparty/linux-syscall-support
 
-  _lssdir='3rdparty/gbreakpad/src/third_party/lss/'
-  mkdir -p ${_lssdir}
-  cp 3rdparty/linux-syscall-support/linux_syscall_support.h ${_lssdir}
-  touch 3rdparty/gbreakpad/README
+	python build/utils/set_version.py "$pkgver" >src/version.h
+
+	_lssdir='3rdparty/gbreakpad/src/third_party/lss/'
+	mkdir -p ${_lssdir}
+	cp 3rdparty/linux-syscall-support/linux_syscall_support.h ${_lssdir}
+	touch 3rdparty/gbreakpad/README
 }
 
 build() {
@@ -55,20 +51,19 @@ build() {
 }
 
 package() {
-  _instdir="$srcdir/rdm/bin/linux/release"
-  _bindir="$pkgdir/usr/share/redis-desktop-manager/bin"
+	_instdir="$srcdir/rdm/bin/linux/release"
+	_bindir="$pkgdir/usr/share/$pkgname/bin"
 
-  mkdir -p "${_bindir}"
-  mkdir "$pkgdir/usr/share/licenses"
-  mkdir "$pkgdir/usr/share/pixmaps"
-  mkdir "$pkgdir/usr/share/applications"
+	mkdir -p "${_bindir}"
+	mkdir "$pkgdir/usr/share/licenses"
+	mkdir "$pkgdir/usr/share/pixmaps"
+	mkdir "$pkgdir/usr/share/applications"
 
-  install -Dm644 "$srcdir/rdm/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm755 "${_instdir}/rdm" "${_bindir}/rdm"
-  install -Dm755 "$srcdir/rdm.sh" "${_bindir}/rdm.sh"
-  install -Dm644 "$srcdir/rdm/src/resources/images/rdm.png" "$pkgdir/usr/share/pixmaps/rdm.png"
-  install -Dm644 "$srcdir/rdm.desktop" "$pkgdir/usr/share/applications/rdm.desktop"
+	install -Dm644 "$srcdir/rdm/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -Dm755 "${_instdir}/rdm" "${_bindir}/rdm"
+	install -Dm644 "$srcdir/rdm/src/resources/images/rdm.png" "$pkgdir/usr/share/pixmaps/rdm.png"
+	install -Dm644 "$srcdir/rdm.desktop" "$pkgdir/usr/share/applications/rdm.desktop"
 
-  mkdir "$pkgdir/usr/bin"
-  ln -s '/usr/share/redis-desktop-manager/bin/rdm.sh' "$pkgdir/usr/bin/rdm"
+	mkdir "$pkgdir/usr/bin"
+	ln -s "/usr/share/$pkgname/bin/rdm" "$pkgdir/usr/bin/rdm"
 }
diff --git a/link-python.patch b/link-python.patch
deleted file mode 100644
index ad37c2ee34c0..000000000000
--- a/link-python.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/3rdparty/pyotherside.pri b/3rdparty/pyotherside.pri
-index a98930fa..5cc95bde 100644
---- a/3rdparty/pyotherside.pri
-+++ b/3rdparty/pyotherside.pri
-@@ -23,7 +23,7 @@ win32* {
-     } else {
-       PYTHON_CONFIG = python3-config
- 
--      QMAKE_LIBS += $$system($$PYTHON_CONFIG --ldflags --libs)
-+      QMAKE_LIBS += $$system($$PYTHON_CONFIG --embed --ldflags --libs)
-       QMAKE_CXXFLAGS += $$system($$PYTHON_CONFIG --includes)
-       DEFINES *= HAVE_DLADDR
-     }
diff --git a/rdm.sh b/rdm.sh
deleted file mode 100644
index b09e7bca561e..000000000000
--- a/rdm.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-DIR=$(dirname "$(readlink -f "$0")")
-$DIR/rdm