[arch-commits] Commit in kdenetwork-krfb/repos (6 files)
Andrea Scarpino
andrea at archlinux.org
Sat Sep 13 08:26:36 UTC 2014
Date: Saturday, September 13, 2014 @ 10:26:36
Author: andrea
Revision: 221535
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdenetwork-krfb/repos/extra-i686/PKGBUILD
(from rev 221534, kdenetwork-krfb/trunk/PKGBUILD)
kdenetwork-krfb/repos/extra-i686/fix-crash-without-kwallet.patch
(from rev 221534, kdenetwork-krfb/trunk/fix-crash-without-kwallet.patch)
kdenetwork-krfb/repos/extra-x86_64/PKGBUILD
(from rev 221534, kdenetwork-krfb/trunk/PKGBUILD)
kdenetwork-krfb/repos/extra-x86_64/fix-crash-without-kwallet.patch
(from rev 221534, kdenetwork-krfb/trunk/fix-crash-without-kwallet.patch)
Deleted:
kdenetwork-krfb/repos/extra-i686/PKGBUILD
kdenetwork-krfb/repos/extra-x86_64/PKGBUILD
----------------------------------------------+
/PKGBUILD | 82 +++++++++++++++++++++++++
extra-i686/PKGBUILD | 36 ----------
extra-i686/fix-crash-without-kwallet.patch | 42 ++++++++++++
extra-x86_64/PKGBUILD | 36 ----------
extra-x86_64/fix-crash-without-kwallet.patch | 42 ++++++++++++
5 files changed, 166 insertions(+), 72 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-09-13 08:26:28 UTC (rev 221534)
+++ extra-i686/PKGBUILD 2014-09-13 08:26:36 UTC (rev 221535)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdenetwork-krfb
-pkgver=4.14.0
-pkgrel=2
-pkgdesc='Desktop Sharing'
-url='http://www.kde.org/applications/system/krfb'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# 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')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../krfb-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR=$pkgdir install
-}
Copied: kdenetwork-krfb/repos/extra-i686/PKGBUILD (from rev 221534, kdenetwork-krfb/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-09-13 08:26:36 UTC (rev 221535)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdenetwork-krfb
+pkgver=4.14.0
+pkgrel=3
+pkgdesc='Desktop Sharing'
+url='http://www.kde.org/applications/system/krfb'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdenetwork')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# 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=('64e7670d30c8fa7f3a18fe9e6fb5e4254aa19faa'
+ 'fe11f0d256de2e6520f93d5167d191800873cd61')
+
+prepare() {
+ mkdir build
+
+ cd krfb-${pkgver}
+ patch -p1 -i "${srcdir}"/fix-crash-without-kwallet.patch
+}
+
+build() {
+ cd build
+ cmake ../krfb-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR=$pkgdir install
+}
Copied: kdenetwork-krfb/repos/extra-i686/fix-crash-without-kwallet.patch (from rev 221534, kdenetwork-krfb/trunk/fix-crash-without-kwallet.patch)
===================================================================
--- extra-i686/fix-crash-without-kwallet.patch (rev 0)
+++ extra-i686/fix-crash-without-kwallet.patch 2014-09-13 08:26:36 UTC (rev 221535)
@@ -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") ) {
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-09-13 08:26:28 UTC (rev 221534)
+++ extra-x86_64/PKGBUILD 2014-09-13 08:26:36 UTC (rev 221535)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdenetwork-krfb
-pkgver=4.14.0
-pkgrel=2
-pkgdesc='Desktop Sharing'
-url='http://www.kde.org/applications/system/krfb'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# 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')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../krfb-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR=$pkgdir install
-}
Copied: kdenetwork-krfb/repos/extra-x86_64/PKGBUILD (from rev 221534, kdenetwork-krfb/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-09-13 08:26:36 UTC (rev 221535)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdenetwork-krfb
+pkgver=4.14.0
+pkgrel=3
+pkgdesc='Desktop Sharing'
+url='http://www.kde.org/applications/system/krfb'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdenetwork')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# 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=('64e7670d30c8fa7f3a18fe9e6fb5e4254aa19faa'
+ 'fe11f0d256de2e6520f93d5167d191800873cd61')
+
+prepare() {
+ mkdir build
+
+ cd krfb-${pkgver}
+ patch -p1 -i "${srcdir}"/fix-crash-without-kwallet.patch
+}
+
+build() {
+ cd build
+ cmake ../krfb-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR=$pkgdir install
+}
Copied: kdenetwork-krfb/repos/extra-x86_64/fix-crash-without-kwallet.patch (from rev 221534, kdenetwork-krfb/trunk/fix-crash-without-kwallet.patch)
===================================================================
--- extra-x86_64/fix-crash-without-kwallet.patch (rev 0)
+++ extra-x86_64/fix-crash-without-kwallet.patch 2014-09-13 08:26:36 UTC (rev 221535)
@@ -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