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

[Jiachen Yang]

    Date: Tuesday, April 3, 2018 @ 08:21:35
  Author: farseerfc
Revision: 313949

archrelease: copy trunk to community-staging-x86_64

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

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

Copied: qtox/repos/community-staging-x86_64/PKGBUILD (from rev 313948, qtox/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2018-04-03 08:21:35 UTC (rev 313949)
@@ -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.14.1
+pkgrel=1
+_gitver='fe552f28b63c7e7ae8159d2b55cb921dd45d9c1d'
+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')
+makedepends=('qt5-tools' 'git' 'check' 'cmake')
+
+#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"
+	#"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=('840ddbcfa804b926e513592458276274a09a6920f45e41a6eca9c8eb459d021a1613733631ed3f31c5ad29f6f5e1695be14289a3e75ff173759a83465652259c'
+            '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
+          '7EB339FE881747E701B7D472EBE36E66A8429B99'  # - https://github.com/qTox/qTox/issues/5048
+          'CA9221C5389B7C50AA5F779352A50775BE13DF17'  # - noavarice
+          '141C880E8BA25B198D0F850F7C132143C1A3A7D4'  # – tox-user
+             )
+
+# prepare() {
+# 	patch -p1 <werror.patch
+# 	patch -p1 <autoaccept.patch
+# }
+
+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-staging-x86_64/autoaccept.patch (from rev 313948, qtox/trunk/autoaccept.patch)
===================================================================
--- community-staging-x86_64/autoaccept.patch	                        (rev 0)
+++ community-staging-x86_64/autoaccept.patch	2018-04-03 08:21:35 UTC (rev 313949)
@@ -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;