[arch-commits] Commit in qtox/trunk (PKGBUILD autoaccept.patch)

[Jiachen Yang]

    Date: Tuesday, October 31, 2017 @ 09:37:11
  Author: farseerfc
Revision: 264875

upgpkg: qtox 1.12.1-2

qtox 1.12.1 fix autoaccept dialog bug #4777

Added:
  qtox/trunk/autoaccept.patch
Modified:
  qtox/trunk/PKGBUILD

------------------+
 PKGBUILD         |    9 ++++++---
 autoaccept.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-31 09:37:09 UTC (rev 264874)
+++ PKGBUILD	2017-10-31 09:37:11 UTC (rev 264875)
@@ -6,7 +6,7 @@
 pkgname=qtox
 _pkgname=qTox
 pkgver=1.12.1
-pkgrel=1
+pkgrel=2
 _gitver='b73603b45a32e63a649294537a62a9f11176c73d'
 pkgdesc='Powerful Tox client written in C++/Qt that follows the Tox design guidelines'
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@
          'qrencode'
          'qt5-svg'
          'sqlcipher'
-	 'libexif'
+	     'libexif'
          'toxcore')
 makedepends=('qt5-tools' 'git' 'check' 'cmake')
 
@@ -31,10 +31,12 @@
         "https://github.com/$_pkgname/$_pkgname/releases/download/v$pkgver/v$pkgver.tar.lz.asc"
 	#"gcc7fix.patch::https://github.com/qTox/qTox/commit/246e23abf3aa64c494c6abf42c83944eb78f1b16.patch"
 	"werror.patch::https://raw.githubusercontent.com/anthonybilinski/tox.pkg/de77c8c4537feeeee583925e114d7b6f5c09fc15/qtox-alpha/debian/patches/0001-backout-werror.patch"
+    "autoaccept.patch"
         )
 sha512sums=('4cbdfae09f4150dfd336a495d72f41be2dd713b64f1a8af4fc8b5c49aea61b35ae61c7984f0573ada7696f6ea20aabf39aada1720bec6c1a3d6c47163773b69b'
             'SKIP'
-            'd31815b976c20ee80f6095cf8166450742bb28dc36ceca48a666be6b159f002e81610abe9754dbeb5b4f0ac6a6395bbebe2669c01a38d9f94a6f6e05249edfb9')
+            'd31815b976c20ee80f6095cf8166450742bb28dc36ceca48a666be6b159f002e81610abe9754dbeb5b4f0ac6a6395bbebe2669c01a38d9f94a6f6e05249edfb9'
+            '85631b2bb0d24117c871f6366aac200dd0554d45b6d88b3abd05c694ce9d43dde1a6fabea14974dd1b7a4c4821539e3c5c9ea6a481d43573a652c3a5771c1fd3')
 
 ## GPG key fingerprints taken from https://github.com/qTox/qTox/blob/$_gitver/README.md
 validpgpkeys=('DA262CC93C0E1E525AD21C8596775D454B8EBF44'  # sudden6 <sudden6 at gmx.at>
@@ -46,6 +48,7 @@
              )
 prepare() {
 	patch -p1 <werror.patch
+	patch -p1 <autoaccept.patch
 }
 
 check() {

Added: autoaccept.patch
===================================================================
--- autoaccept.patch	                        (rev 0)
+++ autoaccept.patch	2017-10-31 09:37:11 UTC (rev 264875)
@@ -0,0 +1,13 @@
+diff --git a/src/widget/friendwidget.cpp b/src/widget/friendwidget.cpp
+index 752c2f81..a0d76c58 100644
+--- a/src/widget/friendwidget.cpp
++++ b/src/widget/friendwidget.cpp
+@@ -222,7 +222,7 @@ void FriendWidget::onContextMenuCalled(QContextMenuEvent* event)
+             Settings::getInstance().setAutoAcceptDir(id, "");
+         } else if (autoAccept->isChecked()) {
+             const QString dir = QFileDialog::getExistingDirectory(
+-                        Q_NULLPTR, tr("Choose an auto accept directory", "popup title"), dir);
++                        Q_NULLPTR, tr("Choose an auto accept directory", "popup title"), Settings::getInstance().getAutoAcceptDir(id));
+ 
+             autoAccept->setChecked(true);
+             qDebug() << "Setting auto accept dir for" << friendId << "to" << dir;