Updated to 1.15.0

2 files changed, 14 insertions, 34 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6cbdfb7..e170c83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@
 
 pkgname=qtox
 _pkgname=qTox
-pkgver=1.13.0
+pkgver=1.15.0
 pkgrel=2
-_gitver='531defd0aa66af1b128f7293bc08718ce2cc064f'
+_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'
+url='https://github.com/qTox/qTox'
 license=('GPL3')
 depends=('desktop-file-utils'
          'libxss'
@@ -24,31 +24,27 @@ depends=('desktop-file-utils'
          '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"
+source=(
         "qtox-$pkgver.tar.lz::https://github.com/$_pkgname/$_pkgname/releases/download/v$pkgver/v$pkgver.tar.lz"
         "qtox-$pkgver.tar.lz.asc::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=('d1cc9f7c3c3c16514f2c3c980f342df017897dfc6527ce47e940ef2828a47b672268f7a62b04db3f69b1565ba7a1906d7242f17d6b22600881f9d0a7abf3eafd'
+sha512sums=('117d903b069369b404d4fe8b80df9520cfa06455ef99a39780875be53d0efad931e209c476b15b27228338cf5dca6cfdd4b782d8025c1299ba64a5c8d69ed054'
             'SKIP')
 
-## GPG key fingerprints taken from https://github.com/qTox/qTox/blob/$_gitver/README.md
 validpgpkeys=('DA262CC93C0E1E525AD21C8596775D454B8EBF44'  # sudden6 <sudden6@gmx.at>
               'BA7883E22F9D35945BA3376053137C3033F09008'  # Zetok Zalbavar <zetok@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
-# }
+prepare() {
+  sed -e 's|-Werror||' -i CMakeLists.txt
+}
 
 check() {
   cd build
@@ -56,19 +52,16 @@ check() {
 }
 
 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 \
-	  -DSMILEYS=DISABLED
+        -DGIT_DESCRIBE=v$pkgver \
+        -DSMILEYS=DISABLED
   make
 }
 
 package() {
-  #cd "$_pkgname-$pkgver"
   cd build
   make DESTDIR="$pkgdir" install
 }
diff --git a/autoaccept.patch b/autoaccept.patch
deleted file mode 100644
index 7c8a781..0000000
--- a/autoaccept.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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;