diff options
author | Dan Hasting | 2022-07-29 11:32:43 -0400 |
---|---|---|
committer | Dan Hasting | 2022-07-29 11:32:43 -0400 |
commit | 535d568d9173a10507dab6284725c12600d0ad21 (patch) | |
tree | 08b14c44892f3f5f2cae62c0ac81dd7f7daeed6e | |
parent | 3d8cecec68d3900e06a20c64fb0418d76d55287e (diff) | |
download | aur-kdocker.tar.gz |
Version 5.4
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | fix-deadlock.patch | 89 |
3 files changed, 8 insertions, 106 deletions
@@ -1,7 +1,7 @@ pkgbase = kdocker pkgdesc = An application to help you dock any application into the system tray - pkgver = 5.3 - pkgrel = 2 + pkgver = 5.4 + pkgrel = 1 url = https://github.com/user-none/KDocker arch = i686 arch = x86_64 @@ -10,9 +10,7 @@ pkgbase = kdocker depends = qt5-x11extras depends = libxpm depends = libxmu - source = https://github.com/user-none/KDocker/archive/5.3.tar.gz - source = fix-deadlock.patch - sha256sums = c49eea33d46a626b2a59c8ddc923ce9a027f0b9bd2125f4f6c264e888997e663 - sha256sums = 731edac829b4231ddf87f3ed6cd043df4c2026bec4dc26dd11c22ad79876bcbd + source = https://github.com/user-none/KDocker/archive/5.4.tar.gz + sha256sums = c3c14b2c930db34d7b18c4d5d96f03d78dc0a21098acb0351ae6fe40e7f1048d pkgname = kdocker @@ -1,20 +1,13 @@ pkgname=kdocker -pkgver=5.3 -pkgrel=2 +pkgver=5.4 +pkgrel=1 pkgdesc="An application to help you dock any application into the system tray" arch=('i686' 'x86_64') url="https://github.com/user-none/KDocker" license=('GPL2') depends=('qt5-base' 'qt5-x11extras' 'libxpm' 'libxmu') -source=(https://github.com/user-none/KDocker/archive/${pkgver}.tar.gz - 'fix-deadlock.patch') -sha256sums=('c49eea33d46a626b2a59c8ddc923ce9a027f0b9bd2125f4f6c264e888997e663' - '731edac829b4231ddf87f3ed6cd043df4c2026bec4dc26dd11c22ad79876bcbd') - -prepare() { - cd "$srcdir/KDocker-$pkgver" - patch --forward --strip=1 --input="${srcdir}/fix-deadlock.patch" -} +source=(https://github.com/user-none/KDocker/archive/${pkgver}.tar.gz) +sha256sums=('c3c14b2c930db34d7b18c4d5d96f03d78dc0a21098acb0351ae6fe40e7f1048d') build() { cd "$srcdir/KDocker-$pkgver" diff --git a/fix-deadlock.patch b/fix-deadlock.patch deleted file mode 100644 index d3018f6ef609..000000000000 --- a/fix-deadlock.patch +++ /dev/null @@ -1,89 +0,0 @@ -Only in KDocker: .git -Only in KDocker: .gitattributes -Only in KDocker: .gitignore -diff --unified --recursive --text KDocker-5.3/src/application.cpp KDocker/src/application.cpp ---- KDocker-5.3/src/application.cpp 2020-03-10 10:04:31.000000000 -0400 -+++ KDocker/src/application.cpp 2022-04-04 17:06:38.897419076 -0400 -@@ -18,19 +18,40 @@ - */ - - #include "application.h" -+#include <sys/socket.h> -+#include <unistd.h> - -+int Application::m_closeSignalFd[2]; - - Application::Application(const QString &appId, int &argc, char **argv) : QtSingleApplication(appId, argc, argv) { - m_kdocker = 0; -+ -+ // Translate UNIX signals to Qt signals (See https://doc.qt.io/qt-5/unix-signals.html) -+ if (::socketpair(AF_UNIX, SOCK_STREAM, 0, m_closeSignalFd)) -+ qFatal("Couldn't create signal handling socketpair"); -+ -+ m_closeSignalSocketNotifier = new QSocketNotifier(m_closeSignalFd[1], QSocketNotifier::Read, this); -+ connect(m_closeSignalSocketNotifier, SIGNAL(activated(QSocketDescriptor)), this, SLOT(handleCloseSignal())); - } - - void Application::setKDockerInstance(KDocker *kdocker) { - m_kdocker = kdocker; - } - --void Application::close() { -+void Application::notifyCloseSignal() { -+ char tmp = 1; -+ ::write(m_closeSignalFd[0], &tmp, sizeof(tmp)); -+} -+ -+void Application::handleCloseSignal() { -+ m_closeSignalSocketNotifier->setEnabled(false); -+ char tmp; -+ ::read(m_closeSignalFd[1], &tmp, sizeof(tmp)); -+ - if (m_kdocker) { - m_kdocker->undockAll(); - } - quit(); -+ -+ m_closeSignalSocketNotifier->setEnabled(true); - } -diff --unified --recursive --text KDocker-5.3/src/application.h KDocker/src/application.h ---- KDocker-5.3/src/application.h 2020-03-10 10:04:31.000000000 -0400 -+++ KDocker/src/application.h 2022-04-04 17:06:38.897419076 -0400 -@@ -21,6 +21,7 @@ - #define _APPLICATION_H - - #include <QtSingleApplication> -+#include <QSocketNotifier> - - #include "kdocker.h" - -@@ -32,10 +33,16 @@ - Application(const QString &appId, int &argc, char **argv); - - void setKDockerInstance(KDocker *kdocker); -- void close(); -+ void notifyCloseSignal(); -+ -+public slots: -+ void handleCloseSignal(); - - private: - KDocker *m_kdocker; -+ -+ static int m_closeSignalFd[2]; -+ QSocketNotifier *m_closeSignalSocketNotifier; - }; - - #endif /* _APPLICATION_H */ -diff --unified --recursive --text KDocker-5.3/src/main.cpp KDocker/src/main.cpp ---- KDocker-5.3/src/main.cpp 2020-03-10 10:04:31.000000000 -0400 -+++ KDocker/src/main.cpp 2022-04-04 17:06:38.897419076 -0400 -@@ -33,7 +33,7 @@ - static void sighandler(int sig) { - Q_UNUSED(sig); - -- dynamic_cast<Application*> (qApp)->close(); -+ dynamic_cast<Application*> (qApp)->notifyCloseSignal(); - } - - int main(int argc, char *argv[]) { |