qtox: edited as requested by exherbo developers

removed unneded patch
added headers to remaining patch (am i doing it right ? )

3 files changed, 15 insertions, 28 deletions

diff --git a/packages/net-im/qtox/files/cflags.patch b/packages/net-im/qtox/files/cflags.patch
index a972949..a30286d 100644
--- a/packages/net-im/qtox/files/cflags.patch
+++ b/packages/net-im/qtox/files/cflags.patch
@@ -1,3 +1,7 @@
+Source: written by Gluzskiy Alexandr <sss@sss.chaoslab.ru>
+Reason: -Werror causing build failure on some gcc version and clang
+Upstream: not submitted, feel free to do it
+
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 92b128ff..aeaa5ab5 100644
 --- a/CMakeLists.txt
diff --git a/packages/net-im/qtox/files/gcc.patch b/packages/net-im/qtox/files/gcc.patch
deleted file mode 100644
index 14c7289..0000000
--- a/packages/net-im/qtox/files/gcc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/core.h b/src/core/core.h
-index ec7b381e..62346c64 100644
---- a/src/core/core.h
-+++ b/src/core/core.h
-@@ -24,6 +24,8 @@
- #include "corestructs.h"
- #include "toxid.h"
- 
-+#include <functional>
-+
- #include <tox/tox.h>
- 
- #include <QMutex>
diff --git a/packages/net-im/qtox/qtox-scm.exheres-0 b/packages/net-im/qtox/qtox-scm.exheres-0
index 5f749f4..debad9d 100644
--- a/packages/net-im/qtox/qtox-scm.exheres-0
+++ b/packages/net-im/qtox/qtox-scm.exheres-0
@@ -1,8 +1,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
-SCM_REPOSITORY="https://github.com/qTox/qTox.git"
+#SCM_REPOSITORY="https://github.com/qTox/qTox.git"
 
-require scm-git
+require github [ user=qTox project=qTox ]
 require cmake [ api=2 ]
 
 DOWNLOADS=""
@@ -12,7 +12,6 @@ SUMMARY="Most feature-rich GUI for net-libs/tox using Qt5"
 HOMEPAGE="https://github.com/qTox/qTox"
 MYOPTIONS="
         gtk
-        X
         ( providers:
             ffmpeg
             libav
@@ -23,30 +22,27 @@ MYOPTIONS="
 DEPENDENCIES="
     build+run:
         app-crypt/sqlcipher
-        net-libs/tox[av]
         media-libs/qrencode
         media-libs/openal
         media-libs/libexif
-        providers:ffmpeg? ( media/ffmpeg )
-        providers:libav? ( media/libav )
+        net-libs/tox[av]
+        x11-libs/libX11
+        x11-libs/libXScrnSaver
+        x11-libs/qtbase:5[gui][sql]
+        x11-libs/qtsvg
         gtk? (
-           dev-libs/atk 
+            dev-libs/atk 
             dev-libs/glib:2
             x11-libs/gdk-pixbuf[X]
             x11-libs/gtk+:2
             x11-libs/cairo[X]
             x11-libs/pango[X]
         )
-        X? (
-            x11-libs/libX11
-            x11-libs/libXScrnSaver
-        )
-        x11-libs/qtbase:5[gui][sql]
-        x11-libs/qtsvg
-"
+        providers:ffmpeg? ( media/ffmpeg )
+        providers:libav? ( media/libav )
+ "
 
 DEFAULT_SRC_PREPARE_PATCHES=(
-        "${FILES}"/gcc.patch
         "${FILES}"/cflags.patch
 )