[arch-commits] Commit in qtox/repos (3 files)

[Jiachen Yang]

    Date: Thursday, July 5, 2018 @ 08:28:50
  Author: farseerfc
Revision: 352519

archrelease: copy trunk to community-testing-x86_64

Added:
  qtox/repos/community-testing-x86_64/
  qtox/repos/community-testing-x86_64/PKGBUILD
    (from rev 352518, qtox/trunk/PKGBUILD)
  qtox/repos/community-testing-x86_64/autoaccept.patch
    (from rev 352518, qtox/trunk/autoaccept.patch)

------------------+
 PKGBUILD         |   77 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 autoaccept.patch |   13 ++++++++
 2 files changed, 90 insertions(+)

Copied: qtox/repos/community-testing-x86_64/PKGBUILD (from rev 352518, qtox/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2018-07-05 08:28:50 UTC (rev 352519)
@@ -0,0 +1,77 @@
+# Maintainer: Jiachen Yang <farseerfc at gmail.com>
+# AUR Maintainer: Vlad M. <vlad at archlinux.net>
+# Contributor: Håvard Pettersson <mail at haavard.me>
+# Contributor: Kevin MacMartin <prurigro at gmail dot com>
+
+pkgname=qtox
+_pkgname=qTox
+pkgver=1.16.0
+pkgrel=1
+_gitver='02d6c63acaac0ae95fa8be3a1b9301657e6a4a94'
+pkgdesc='Powerful Tox client written in C++/Qt that follows the Tox design guidelines'
+arch=('x86_64')
+url='https://github.com/tux3/qTox'
+license=('GPL3')
+depends=('desktop-file-utils'
+         'libxss'
+         'openal'
+         'gtk2'
+         'ffmpeg'
+         'qrencode'
+         'qt5-svg'
+         'sqlcipher'
+         'libexif'
+         'toxcore'
+         'libgl')
+makedepends=('qt5-tools' 'git' 'check' 'cmake' 'mesa' 'libglvnd')
+
+#source=("git+https://github.com/qTox/qTox.git#commit=$_gitver")
+source=( 
+# "https://github.com/$_pkgname/$_pkgname/releases/download/v$pkgver/v$pkgver.tar.gz"
+# "$_pkgname-v$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$pkgver/v$pkgver.tar.gz"
+        "https://github.com/$_pkgname/$_pkgname/releases/download/v$pkgver/v$pkgver.tar.lz"
+        "https://github.com/$_pkgname/$_pkgname/releases/download/v$pkgver/v$pkgver.tar.lz.asc"
+        )
+sha512sums=('8ddfe66f1e4404162925063d116c955df882953245da4d7d2009bff762bbbb548fb00ccce70ccd0f6cbd6445126209953fe5e89519f8facb011afbb5b6b52582'
+            'SKIP')
+
+## GPG key fingerprints taken from https://github.com/qTox/qTox/blob/$_gitver/README.md
+validpgpkeys=('DA262CC93C0E1E525AD21C8596775D454B8EBF44'  # sudden6 <sudden6 at gmx.at>
+              'BA7883E22F9D35945BA3376053137C3033F09008'  # Zetok Zalbavar <zetok at openmailbox.org>
+	      '1157616BBD860C539926F8139591A163FF9BE04C'  # - antis81
+	      '31039166FA902CA50D05D6085AF9F2E29107C727'  # - Diadlo
+	      'C7A2552D0B250F983827742C133203A3AC399151'  # - initramfs
+	      '2880C860D95C909D3DA45C687E086DD661263264'  # - tux3
+          '74ADB7A7F8ECC1009916C4E42AA8E0DA1B31FB3C'  # - AnthonyBilinski subkey
+          '7EB339FE881747E701B7D472EBE36E66A8429B99'  # - AnthonyBilinski
+          'CA9221C5389B7C50AA5F779352A50775BE13DF17'  # - noavarice
+          '141C880E8BA25B198D0F850F7C132143C1A3A7D4'  # – tox-user
+             )
+
+prepare() {
+# 	patch -p1 <werror.patch
+# 	patch -p1 <autoaccept.patch
+  sed -e 's|-Werror||' -i CMakeLists.txt
+}
+
+check() {
+  cd build
+  make test
+}
+
+build() {
+  #cd "$srcdir/$_pkgname-$pkgver"
+  mkdir -p build
+  cd build
+  ##qmake-qt5 ENABLE_SYSTRAY_UNITY_BACKEND=NO GIT_VERSION=$_gitver GIT_DESCRIBE=v$pkgver ..
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+	  -DGIT_VERSION=$_gitver \
+	  -DGIT_DESCRIBE=v$pkgver
+  make
+}
+
+package() {
+  #cd "$_pkgname-$pkgver"
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: qtox/repos/community-testing-x86_64/autoaccept.patch (from rev 352518, qtox/trunk/autoaccept.patch)
===================================================================
--- community-testing-x86_64/autoaccept.patch	                        (rev 0)
+++ community-testing-x86_64/autoaccept.patch	2018-07-05 08:28:50 UTC (rev 352519)
@@ -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;