[arch-commits] Commit in kdenetwork-krfb/trunk (2 files)

Andrea Scarpino andrea at archlinux.org
Sat Sep 13 08:26:28 UTC 2014


    Date: Saturday, September 13, 2014 @ 10:26:28
  Author: andrea
Revision: 221534

upgpkg: kdenetwork-krfb 4.14.0-3

Upstream release; provide lib symlinks

Added:
  kdenetwork-krfb/trunk/fix-crash-without-kwallet.patch
Modified:
  kdenetwork-krfb/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   11 +++++++--
 fix-crash-without-kwallet.patch |   42 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-13 08:11:15 UTC (rev 221533)
+++ PKGBUILD	2014-09-13 08:26:28 UTC (rev 221534)
@@ -3,7 +3,7 @@
 
 pkgname=kdenetwork-krfb
 pkgver=4.14.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Desktop Sharing'
 url='http://www.kde.org/applications/system/krfb'
 arch=('i686' 'x86_64')
@@ -14,11 +14,16 @@
 #   but nvidia providing libgl does not depend on libxdamage
 depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/krfb-${pkgver}.tar.xz")
-sha1sums=('64e7670d30c8fa7f3a18fe9e6fb5e4254aa19faa')
+source=("http://download.kde.org/stable/${pkgver}/src/krfb-${pkgver}.tar.xz"
+        'fix-crash-without-kwallet.patch')
+sha1sums=('64e7670d30c8fa7f3a18fe9e6fb5e4254aa19faa'
+          'fe11f0d256de2e6520f93d5167d191800873cd61')
 
 prepare() {
   mkdir build
+
+  cd krfb-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-crash-without-kwallet.patch
 }
 
 build() {

Added: fix-crash-without-kwallet.patch
===================================================================
--- fix-crash-without-kwallet.patch	                        (rev 0)
+++ fix-crash-without-kwallet.patch	2014-09-13 08:26:28 UTC (rev 221534)
@@ -0,0 +1,42 @@
+commit b6b20c84e8229b226906413b663faeb28b81297d
+Author: Jonathan Liu <net147 at gmail.com>
+Date:   Thu Sep 11 00:47:46 2014 +0200
+
+    Fix crash on quit if KDE wallet subsystem is disabled
+    
+    REVIEW: 120097
+
+diff --git a/krfb/invitationsrfbserver.cpp b/krfb/invitationsrfbserver.cpp
+index f144fb6..386fed5 100644
+--- a/krfb/invitationsrfbserver.cpp
++++ b/krfb/invitationsrfbserver.cpp
+@@ -54,8 +54,10 @@ void InvitationsRfbServer::init()
+ 
+     instance->m_wallet = Wallet::openWallet(
+             Wallet::NetworkWallet(), 0, Wallet::Asynchronous);
+-    connect(instance->m_wallet, SIGNAL(walletOpened(bool)),
+-            instance, SLOT(walletOpened(bool)));
++    if(instance->m_wallet) {
++        connect(instance->m_wallet, SIGNAL(walletOpened(bool)),
++                instance, SLOT(walletOpened(bool)));
++    }
+ }
+ 
+ const QString& InvitationsRfbServer::desktopPassword() const
+@@ -121,7 +123,7 @@ InvitationsRfbServer::~InvitationsRfbServer()
+     KSharedConfigPtr config = KGlobal::config();
+     KConfigGroup krfbConfig(config,"Security");
+     krfbConfig.writeEntry("allowUnattendedAccess",m_allowUnattendedAccess);
+-    if(m_wallet->isOpen()) {
++    if(m_wallet && m_wallet->isOpen()) {
+ 
+          if( (m_wallet->currentFolder()=="krfb") ||
+                  ((m_wallet->hasFolder("krfb") || m_wallet->createFolder("krfb")) &&
+@@ -150,6 +152,7 @@ void InvitationsRfbServer::walletOpened(bool opened)
+ {
+     QString desktopPassword;
+     QString unattendedPassword;
++    Q_ASSERT(m_wallet);
+     if( opened &&
+             ( m_wallet->hasFolder("krfb") || m_wallet->createFolder("krfb") ) &&
+             m_wallet->setFolder("krfb") ) {




More information about the arch-commits mailing list