Date: Friday, August 31, 2018 @ 17:35:30 Author: farseerfc Revision: 375889
archrelease: copy trunk to community-x86_64 Added: qtox/repos/community-x86_64/PKGBUILD (from rev 375888, qtox/trunk/PKGBUILD) qtox/repos/community-x86_64/autoaccept.patch (from rev 375888, qtox/trunk/autoaccept.patch) Deleted: qtox/repos/community-x86_64/PKGBUILD qtox/repos/community-x86_64/autoaccept.patch ------------------+ PKGBUILD | 140 ++++++++++++++++++++++++++--------------------------- autoaccept.patch | 26 ++++----- 2 files changed, 83 insertions(+), 83 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-08-31 17:34:44 UTC (rev 375888) +++ PKGBUILD 2018-08-31 17:35:30 UTC (rev 375889) @@ -1,70 +0,0 @@ -# Maintainer: Jiachen Yang <farsee...@gmail.com> -# AUR Maintainer: Vlad M. <v...@archlinux.net> -# Contributor: Håvard Pettersson <m...@haavard.me> -# Contributor: Kevin MacMartin <prurigro at gmail dot com> - -pkgname=qtox -_pkgname=qTox -pkgver=1.16.3 -pkgrel=4 -_gitver='8eed684c37bd711de2ca4bd863f5f0509edcdc2d' -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=( - "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=('97c9becd6a90fc6a09a24fb52c1863dd880d19e9a6807499e875020a4012259f926014d98a4c831fd534028d9bcfcb76c5bb32001a553c22e2174a992a493a65' - 'SKIP') - -## GPG key fingerprints taken from https://github.com/qTox/qTox/blob/$_gitver/README.md -validpgpkeys=('DA262CC93C0E1E525AD21C8596775D454B8EBF44' # sudden6 <sudd...@gmx.at> - 'BA7883E22F9D35945BA3376053137C3033F09008' # Zetok Zalbavar <ze...@openmailbox.org> - '1157616BBD860C539926F8139591A163FF9BE04C' # - antis81 - '31039166FA902CA50D05D6085AF9F2E29107C727' # - Diadlo - 'C7A2552D0B250F983827742C133203A3AC399151' # - initramfs - '2880C860D95C909D3DA45C687E086DD661263264' # - tux3 - '74ADB7A7F8ECC1009916C4E42AA8E0DA1B31FB3C' # - AnthonyBilinski subkey - '7EB339FE881747E701B7D472EBE36E66A8429B99' # - AnthonyBilinski - 'CA9221C5389B7C50AA5F779352A50775BE13DF17' # - noavarice - '141C880E8BA25B198D0F850F7C132143C1A3A7D4' # – tox-user - ) - -prepare() { - # disable -Werror for release packaging - sed -e 's|-Werror||' -i CMakeLists.txt -} - -check() { - cd build - make test -} - -build() { - mkdir -p build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - -DGIT_VERSION=$_gitver \ - -DGIT_DESCRIBE=v$pkgver - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: qtox/repos/community-x86_64/PKGBUILD (from rev 375888, qtox/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-08-31 17:35:30 UTC (rev 375889) @@ -0,0 +1,70 @@ +# Maintainer: Jiachen Yang <farsee...@gmail.com> +# AUR Maintainer: Vlad M. <v...@archlinux.net> +# Contributor: Håvard Pettersson <m...@haavard.me> +# Contributor: Kevin MacMartin <prurigro at gmail dot com> + +pkgname=qtox +_pkgname=qTox +pkgver=1.16.3 +pkgrel=5 +_gitver='8eed684c37bd711de2ca4bd863f5f0509edcdc2d' +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=( + "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=('97c9becd6a90fc6a09a24fb52c1863dd880d19e9a6807499e875020a4012259f926014d98a4c831fd534028d9bcfcb76c5bb32001a553c22e2174a992a493a65' + 'SKIP') + +## GPG key fingerprints taken from https://github.com/qTox/qTox/blob/$_gitver/README.md +validpgpkeys=('DA262CC93C0E1E525AD21C8596775D454B8EBF44' # sudden6 <sudd...@gmx.at> + 'BA7883E22F9D35945BA3376053137C3033F09008' # Zetok Zalbavar <ze...@openmailbox.org> + '1157616BBD860C539926F8139591A163FF9BE04C' # - antis81 + '31039166FA902CA50D05D6085AF9F2E29107C727' # - Diadlo + 'C7A2552D0B250F983827742C133203A3AC399151' # - initramfs + '2880C860D95C909D3DA45C687E086DD661263264' # - tux3 + '74ADB7A7F8ECC1009916C4E42AA8E0DA1B31FB3C' # - AnthonyBilinski subkey + '7EB339FE881747E701B7D472EBE36E66A8429B99' # - AnthonyBilinski + 'CA9221C5389B7C50AA5F779352A50775BE13DF17' # - noavarice + '141C880E8BA25B198D0F850F7C132143C1A3A7D4' # – tox-user + ) + +prepare() { + # disable -Werror for release packaging + sed -e 's|-Werror||' -i CMakeLists.txt +} + +check() { + cd build + make test +} + +build() { + mkdir -p build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ + -DGIT_VERSION=$_gitver \ + -DGIT_DESCRIBE=v$pkgver + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Deleted: autoaccept.patch =================================================================== --- autoaccept.patch 2018-08-31 17:34:44 UTC (rev 375888) +++ autoaccept.patch 2018-08-31 17:35:30 UTC (rev 375889) @@ -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; Copied: qtox/repos/community-x86_64/autoaccept.patch (from rev 375888, qtox/trunk/autoaccept.patch) =================================================================== --- autoaccept.patch (rev 0) +++ autoaccept.patch 2018-08-31 17:35:30 UTC (rev 375889) @@ -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;