From 2d06b9960c60f1fc886ae04c595bd9a921cff316 Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zetok@openmailbox.org>
Date: Tue, 5 Jul 2016 03:37:26 +0100
Subject: [PATCH] fix(qtox.pro): don't depend on GTK in order to build on Linux

---
 .travis/build-ubuntu_14_04.sh | 4 ++++
 qtox.pro                      | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis/build-ubuntu_14_04.sh b/.travis/build-ubuntu_14_04.sh
index 76833f203..606297ebc 100755
--- a/.travis/build-ubuntu_14_04.sh
+++ b/.travis/build-ubuntu_14_04.sh
@@ -117,6 +117,10 @@ cd ..
 
 $CC --version
 $CXX --version
+
+# needed, otherwise ffmpeg doesn't get detected
+export PKG_CONFIG_PATH="$PWD/libs/lib/pkgconfig"
+
 # first build qTox without support for optional dependencies
 echo '*** BUILDING "MINIMAL" VERSION ***'
 qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX" ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO DISABLE_PLATFORM_EXT=YES
diff --git a/qtox.pro b/qtox.pro
index bfd20454d..057c9d1c3 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -173,8 +173,6 @@ unix:!macx {
 
         PKGCONFIG += glib-2.0 gtk+-2.0 atk
         PKGCONFIG += cairo gdk-pixbuf-2.0 pango
-        PKGCONFIG += libavformat libavdevice libavcodec
-        PKGCONFIG += libavutil libswscale
         PKGCONFIG += appindicator-0.1 dbusmenu-glib-0.4
     }
 
@@ -184,8 +182,6 @@ unix:!macx {
 
         PKGCONFIG += glib-2.0 gtk+-2.0 atk
         PKGCONFIG += cairo gdk-pixbuf-2.0 pango
-        PKGCONFIG += libavformat libavdevice libavcodec
-        PKGCONFIG += libavutil libswscale
 
         SOURCES +=     src/platform/statusnotifier/closures.c \
         src/platform/statusnotifier/enums.c \
@@ -204,6 +200,10 @@ unix:!macx {
         PKGCONFIG += glib-2.0 gtk+-2.0 atk
         PKGCONFIG += gdk-pixbuf-2.0 cairo pango
     }
+
+    # ffmpeg
+    PKGCONFIG += libavformat libavdevice libavcodec
+    PKGCONFIG += libavutil libswscale
 }
 
 win32 {