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

[Andrea Scarpino]

    Date: Wednesday, September 24, 2014 @ 18:49:04
  Author: andrea
Revision: 222942

upgpkg: kdenetwork-krfb 4.14.1-1

Fix build

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

---------------------------------+
 PKGBUILD                        |    9 +-------
 fix-crash-without-kwallet.patch |   42 --------------------------------------
 2 files changed, 2 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-24 16:47:53 UTC (rev 222941)
+++ PKGBUILD	2014-09-24 16:49:04 UTC (rev 222942)
@@ -14,16 +14,11 @@
 #   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"
-        'fix-crash-without-kwallet.patch')
-sha1sums=('0131c93b17e8865d25ac950b173633ea2ae8ae38'
-          'fe11f0d256de2e6520f93d5167d191800873cd61')
+source=("http://download.kde.org/stable/${pkgver}/src/krfb-${pkgver}.tar.xz")
+sha1sums=('0131c93b17e8865d25ac950b173633ea2ae8ae38')
 
 prepare() {
   mkdir build
-
-  cd krfb-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-crash-without-kwallet.patch
 }
 
 build() {

Deleted: fix-crash-without-kwallet.patch
===================================================================
--- fix-crash-without-kwallet.patch	2014-09-24 16:47:53 UTC (rev 222941)
+++ fix-crash-without-kwallet.patch	2014-09-24 16:49:04 UTC (rev 222942)
@@ -1,42 +0,0 @@
-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") ) {