Update to 1806

3 files changed, 7 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b8765c66f82f..8f66e00a0924 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = golden-cheetah-dev
 	pkgdesc = Cycling Power Analysis Software. Development version.
 	pkgver = 3.5
-	pkgrel = 1804
+	pkgrel = 1806
 	url = http://www.goldencheetah.org/
 	arch = i686
 	arch = x86_64
@@ -35,12 +35,12 @@ pkgbase = golden-cheetah-dev
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://github.com/GoldenCheetah/GoldenCheetah/archive/v3.5-DEV1804.tar.gz
+	source = https://github.com/GoldenCheetah/GoldenCheetah/archive/v3.5-DEV1806.tar.gz
 	source = gcconfig.pri
 	source = GoldenCheetah.desktop
 	source = gc.png
-	md5sums = f8d55de1682e16a5dacac6bd0724374a
-	md5sums = e0ed270ab834613f5bba3be82382c992
+	md5sums = dc89a3eecc73d42b525f2b4c7013216f
+	md5sums = c9046d48dcff232fcdd6b04ab77db6db
 	md5sums = 5a83da03adf4b4ea14ec459061699c0c
 	md5sums = e1fb382b4a7316da1ffd435e45e50c4a
 
diff --git a/PKGBUILD b/PKGBUILD
index 25f6dbc5a28b..d4fb7b55514d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=golden-cheetah-dev
 pkgver=3.5
-pkgrel=1804
+pkgrel=1806
 pkgdesc="Cycling Power Analysis Software. Development version."
 arch=('i686' 'x86_64')
 url="http://www.goldencheetah.org/"
@@ -14,8 +14,8 @@ optdepends=('vlc' 'qwtplot3d-svn' 'srmio' 'libftd2xx' 'libkml' 'libusb' 'libsamp
 options=('!strip' '!buildflags' 'staticlibs')
 source=(https://github.com/GoldenCheetah/GoldenCheetah/archive/v$pkgver-DEV$pkgrel.tar.gz
 gcconfig.pri GoldenCheetah.desktop gc.png)
-md5sums=('f8d55de1682e16a5dacac6bd0724374a'
-         'e0ed270ab834613f5bba3be82382c992'
+md5sums=('dc89a3eecc73d42b525f2b4c7013216f'
+         'c9046d48dcff232fcdd6b04ab77db6db'
          '5a83da03adf4b4ea14ec459061699c0c'
          'e1fb382b4a7316da1ffd435e45e50c4a')
 
@@ -27,10 +27,6 @@ build() {
   qmake-qt5 QMAKE_DEFAULT_INCDIRS=
   make -j8
 
-  cd "../kqoauth/"
-  qmake-qt5 QMAKE_DEFAULT_INCDIRS=
-  make -j8
-
   cd "../src/"
   cp $srcdir/gcconfig.pri gcconfig.pri
   qmake-qt5 QMAKE_LRELEASE=/usr/bin/lrelease-qt5 QMAKE_DEFAULT_INCDIRS=
diff --git a/gcconfig.pri b/gcconfig.pri
index d7c9c92a2f52..c6594fcea261 100644
--- a/gcconfig.pri
+++ b/gcconfig.pri
@@ -61,22 +61,6 @@ exists(/usr/lib/libftd2xx.so) {
     D2XX_LIBS    = /usr/lib/libftd2xx.so
 }
 
-# If you want Twitter support you must install a QT OAUTH library kQoAUTH
-#     http://github.com/kypeli/kQOAuth (Version >= 0.98 - tested with 0.98))
-# Set path to the root of the OAUTH installation
-# If you installed in /usr/local/kqoauth then set
-# KQOAUTH_INSTALL = /usr/local/kqoauth
-# This will automatically set:
-# KQOAUTH_INCLUDE = $${KQOAUTH_INSTALL}/src
-# KQOAUTH_LIBS    = $${KQOAUTH_INSTALL}/lib/libkqoauthd0.a   // if in DEBUG mode
-# KQOAUTH_LIBS    = $${KQOAUTH_INSTALL}/lib/libkqoauth0.a    // if in RELEASE mode
-# You may override the INCLUDE and LIB files if you like.
-# You *must* define KQOAUTH_INSTALL to use this feature.
-
-KQOAUTH_INSTALL = yes
-#KQOAUTH_INCLUDE = kqoauth
-#KQOAUTH_LIBS = kqoauth/libkqoauth.a
-
 # If you want 3D plotting, you need to install qwtplot3d
 #     http://qwtplot3d.sourceforge.net/
 # If you are running Linux and have font problems, download
@@ -96,15 +80,6 @@ exists(/usr/lib/libqwtplot3d.a) {
     QWT3D_LIBS    = /usr/lib/libqwtplot3d.a 
 }
 
-
-# For TrainingPeaks.com upload/download you need to install the Qt Soap add-on
-#     http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Utilities/qtsoap
-# If qtsoap.pri is install in /usr/local/qtsolutions/soap/ then set
-# QTSOAP_INSTALL = /usr/local/qtsolutions/soap
-# By default we use a copy of Qt Soap in the GIT repository.
-# You *must* define QTSOAP_INSTALL to use a different version than this.
-#QTSOAP_INSTALL = 
-
 # If you want support for Google Earth .kml files then you need
 # to install the Google libkml library
 #