[arch-commits] Commit in qtox/repos (6 files)
Jiachen Yang
farseerfc at archlinux.org
Tue Oct 31 09:38:27 UTC 2017
Date: Tuesday, October 31, 2017 @ 09:38:26
Author: farseerfc
Revision: 264879
archrelease: copy trunk to community-i686, community-x86_64
Added:
qtox/repos/community-i686/PKGBUILD
(from rev 264877, qtox/trunk/PKGBUILD)
qtox/repos/community-i686/autoaccept.patch
(from rev 264877, qtox/trunk/autoaccept.patch)
qtox/repos/community-x86_64/PKGBUILD
(from rev 264878, qtox/trunk/PKGBUILD)
qtox/repos/community-x86_64/autoaccept.patch
(from rev 264878, qtox/trunk/autoaccept.patch)
Deleted:
qtox/repos/community-i686/PKGBUILD
qtox/repos/community-x86_64/PKGBUILD
-----------------------------------+
/PKGBUILD | 148 ++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 71 -----------------
community-i686/autoaccept.patch | 13 +++
community-x86_64/PKGBUILD | 71 -----------------
community-x86_64/autoaccept.patch | 13 +++
5 files changed, 174 insertions(+), 142 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-10-31 09:37:59 UTC (rev 264878)
+++ community-i686/PKGBUILD 2017-10-31 09:38:26 UTC (rev 264879)
@@ -1,71 +0,0 @@
-# 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.12.1
-pkgrel=1
-_gitver='b73603b45a32e63a649294537a62a9f11176c73d'
-pkgdesc='Powerful Tox client written in C++/Qt that follows the Tox design guidelines'
-arch=('i686' '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"
- )
-sha512sums=('4cbdfae09f4150dfd336a495d72f41be2dd713b64f1a8af4fc8b5c49aea61b35ae61c7984f0573ada7696f6ea20aabf39aada1720bec6c1a3d6c47163773b69b'
- 'SKIP'
- 'd31815b976c20ee80f6095cf8166450742bb28dc36ceca48a666be6b159f002e81610abe9754dbeb5b4f0ac6a6395bbebe2669c01a38d9f94a6f6e05249edfb9')
-
-## 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
- )
-prepare() {
- patch -p1 <werror.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-i686/PKGBUILD (from rev 264877, qtox/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-10-31 09:38:26 UTC (rev 264879)
@@ -0,0 +1,74 @@
+# 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.12.1
+pkgrel=2
+_gitver='b73603b45a32e63a649294537a62a9f11176c73d'
+pkgdesc='Powerful Tox client written in C++/Qt that follows the Tox design guidelines'
+arch=('i686' '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=('4cbdfae09f4150dfd336a495d72f41be2dd713b64f1a8af4fc8b5c49aea61b35ae61c7984f0573ada7696f6ea20aabf39aada1720bec6c1a3d6c47163773b69b'
+ 'SKIP'
+ 'd31815b976c20ee80f6095cf8166450742bb28dc36ceca48a666be6b159f002e81610abe9754dbeb5b4f0ac6a6395bbebe2669c01a38d9f94a6f6e05249edfb9'
+ '85631b2bb0d24117c871f6366aac200dd0554d45b6d88b3abd05c694ce9d43dde1a6fabea14974dd1b7a4c4821539e3c5c9ea6a481d43573a652c3a5771c1fd3')
+
+## 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
+ )
+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-i686/autoaccept.patch (from rev 264877, qtox/trunk/autoaccept.patch)
===================================================================
--- community-i686/autoaccept.patch (rev 0)
+++ community-i686/autoaccept.patch 2017-10-31 09:38:26 UTC (rev 264879)
@@ -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;
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-10-31 09:37:59 UTC (rev 264878)
+++ community-x86_64/PKGBUILD 2017-10-31 09:38:26 UTC (rev 264879)
@@ -1,71 +0,0 @@
-# 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.12.1
-pkgrel=1
-_gitver='b73603b45a32e63a649294537a62a9f11176c73d'
-pkgdesc='Powerful Tox client written in C++/Qt that follows the Tox design guidelines'
-arch=('i686' '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"
- )
-sha512sums=('4cbdfae09f4150dfd336a495d72f41be2dd713b64f1a8af4fc8b5c49aea61b35ae61c7984f0573ada7696f6ea20aabf39aada1720bec6c1a3d6c47163773b69b'
- 'SKIP'
- 'd31815b976c20ee80f6095cf8166450742bb28dc36ceca48a666be6b159f002e81610abe9754dbeb5b4f0ac6a6395bbebe2669c01a38d9f94a6f6e05249edfb9')
-
-## 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
- )
-prepare() {
- patch -p1 <werror.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-x86_64/PKGBUILD (from rev 264878, qtox/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-10-31 09:38:26 UTC (rev 264879)
@@ -0,0 +1,74 @@
+# 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.12.1
+pkgrel=2
+_gitver='b73603b45a32e63a649294537a62a9f11176c73d'
+pkgdesc='Powerful Tox client written in C++/Qt that follows the Tox design guidelines'
+arch=('i686' '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=('4cbdfae09f4150dfd336a495d72f41be2dd713b64f1a8af4fc8b5c49aea61b35ae61c7984f0573ada7696f6ea20aabf39aada1720bec6c1a3d6c47163773b69b'
+ 'SKIP'
+ 'd31815b976c20ee80f6095cf8166450742bb28dc36ceca48a666be6b159f002e81610abe9754dbeb5b4f0ac6a6395bbebe2669c01a38d9f94a6f6e05249edfb9'
+ '85631b2bb0d24117c871f6366aac200dd0554d45b6d88b3abd05c694ce9d43dde1a6fabea14974dd1b7a4c4821539e3c5c9ea6a481d43573a652c3a5771c1fd3')
+
+## 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
+ )
+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-x86_64/autoaccept.patch (from rev 264878, qtox/trunk/autoaccept.patch)
===================================================================
--- community-x86_64/autoaccept.patch (rev 0)
+++ community-x86_64/autoaccept.patch 2017-10-31 09:38:26 UTC (rev 264879)
@@ -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;
More information about the arch-commits
mailing list