diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | link-python.patch | 13 |
3 files changed, 32 insertions, 13 deletions
@@ -1,13 +1,12 @@ pkgbase = redis-desktop-manager pkgdesc = Open source cross-platform Redis Desktop Manager based on Qt 5 - pkgver = 2019.4 + pkgver = 2019.5 pkgrel = 1 url = https://redisdesktop.com/ arch = x86_64 - license = GPLv3 + license = GPL3 makedepends = git makedepends = gcc - makedepends = python2 depends = qt5-base depends = qt5-imageformats depends = qt5-tools @@ -18,13 +17,16 @@ pkgbase = redis-desktop-manager depends = qt5-graphicaleffects depends = qt5-svg depends = libssh2 + depends = python conflicts = redis-desktop-manager-bin - source = rdm::git://github.com/uglide/RedisDesktopManager.git#tag=2019.4 + source = rdm::git://github.com/uglide/RedisDesktopManager.git#tag=2019.5 source = rdm.sh source = rdm.desktop + source = link-python.patch sha256sums = SKIP sha256sums = f469d9a5adce723904efe0f1b1db5d79807410f90aafb117f18ae108d8b2d391 sha256sums = 9ca6cfe0fc1a050552ec2fa009a2d517de3b049ff6f379f0fda849e4dbca3f68 + sha256sums = 428d2758345059f844dee05bbc6d06eecf82f6cbd3f1a8a308fe4f54cadb43ce pkgname = redis-desktop-manager @@ -1,13 +1,14 @@ +# Maintainer: Versus Void <chaoskeeper @ mail FULL STOP ru> # Maintainer: Mehmet Ozgur Bayhan <mozgurbayhan@gmail.com> # Contributor: Vyacheslav Konovalov <echo dnlhY2hrb25vdmFsb3ZAZ21haWwuY29tCg== | base64 -d> pkgname=redis-desktop-manager -pkgver=2019.4 +pkgver=2019.5 pkgrel=1 pkgdesc='Open source cross-platform Redis Desktop Manager based on Qt 5' arch=('x86_64') url="https://redisdesktop.com/" -license=('GPLv3') +license=('GPL3') depends=( 'qt5-base' 'qt5-imageformats' @@ -18,28 +19,31 @@ depends=( 'qt5-charts' 'qt5-graphicaleffects' 'qt5-svg' - 'libssh2') -makedepends=('git' 'gcc' 'python2') + 'libssh2' + 'python') +makedepends=('git' 'gcc') conflicts=('redis-desktop-manager-bin') source=("rdm::git://github.com/uglide/RedisDesktopManager.git#tag=$pkgver" 'rdm.sh' - 'rdm.desktop') + 'rdm.desktop' + 'link-python.patch') sha256sums=('SKIP' 'f469d9a5adce723904efe0f1b1db5d79807410f90aafb117f18ae108d8b2d391' - '9ca6cfe0fc1a050552ec2fa009a2d517de3b049ff6f379f0fda849e4dbca3f68') + '9ca6cfe0fc1a050552ec2fa009a2d517de3b049ff6f379f0fda849e4dbca3f68' + '428d2758345059f844dee05bbc6d06eecf82f6cbd3f1a8a308fe4f54cadb43ce') 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 - python2 build/utils/set_version.py "$pkgver" > src/version.h + 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} - cd 3rdparty/gbreakpad - touch README + touch 3rdparty/gbreakpad/README } build() { diff --git a/link-python.patch b/link-python.patch new file mode 100644 index 000000000000..ad37c2ee34c0 --- /dev/null +++ b/link-python.patch @@ -0,0 +1,13 @@ +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 + } |