merge patch from flops

- Fixes issues with network connection. See aur comments and https://github.com/toggl/toggldesktop/issues/2326

3 files changed, 91 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21c0b07a7329..19e7970a1c51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Nov  6 01:05:24 UTC 2017
+# Mon Jan 22 06:22:02 UTC 2018
 pkgbase = toggldesktop
 	pkgdesc = Toggl time tracking software
-	pkgver = 7.4.76
+	pkgver = 7.4.90
 	pkgrel = 1
 	url = https://github.com/toggl/toggldesktop
 	arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = toggldesktop
 	makedepends = gendesk
 	depends = libxss
 	depends = openssl
+	depends = poco
 	depends = qt5-base
 	depends = qt5-declarative
 	depends = qt5-location
@@ -21,10 +22,12 @@ pkgbase = toggldesktop
 	depends = qt5-x11extras
 	conflicts = toggldesktop-bin
 	conflicts = toggl-bin
-	source = toggldesktop-7.4.76.tar.gz::https://github.com/toggl/toggldesktop/archive/v7.4.76.tar.gz
+	source = toggldesktop-7.4.90.tar.gz::https://github.com/toggl/toggldesktop/archive/v7.4.90.tar.gz
 	source = production.patch
-	sha512sums = a1b8cc5b5c5ccd6d552ec3e2058c805ac1cdeceffc05e8f1407fe7847a265067898a16cec98824807da2e631e3b75d16bc373fefca30ff2d89f72691dcac04fe
+	source = systemlibs.patch
+	sha512sums = be9fa6de6516fc55cbb616a358b8fc636fce38a430e2609cf314439da1625134be1986a2ef19cc3b2ffcea065d8a578fdc321f708f5ddb88524f3d6d9bfcc806
 	sha512sums = 484c6e3ba73e2f2ccbe9737424bee68624bd8d46a06735937b3ca134aa34ad9e335b260f7d22bcd3e351ae9d8b989ef048e78cf7ed52bac363bb651a7d229428
+	sha512sums = e2084ecaf7ba3d3c630597450f5aff6bb65844002f2f7332a01228f0f0f0a2c8dae7b7af5f28063db63c5ce10dcd0b21d92adfb5fd8e25677e94eaa0c578c34d
 
 pkgname = toggldesktop
 
diff --git a/PKGBUILD b/PKGBUILD
index efd95bfc6304..9dfee0f82844 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Samuel Walladge <samuel at swalladge dot id dot au>
 # Contributor: Karel Louwagie <karel@louwagie.net>
+# Contributor: Serge Pavlyuk <flopss at gmail dot com>
 
 pkgname=toggldesktop
-pkgver=7.4.76
+pkgver=7.4.90
 pkgrel=1
 pkgdesc="Toggl time tracking software"
 arch=('x86_64')
@@ -10,6 +11,7 @@ url="https://github.com/toggl/toggldesktop"
 license=('BSD')
 depends=('libxss'
          'openssl'
+         'poco'
          'qt5-base'
          'qt5-declarative'
          'qt5-location'
@@ -21,21 +23,28 @@ depends=('libxss'
 makedepends=('readline' 'gendesk')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/toggl/toggldesktop/archive/v${pkgver}.tar.gz"
         "production.patch"
-        )
+        "systemlibs.patch")
 
-sha512sums=('a1b8cc5b5c5ccd6d552ec3e2058c805ac1cdeceffc05e8f1407fe7847a265067898a16cec98824807da2e631e3b75d16bc373fefca30ff2d89f72691dcac04fe'
-            '484c6e3ba73e2f2ccbe9737424bee68624bd8d46a06735937b3ca134aa34ad9e335b260f7d22bcd3e351ae9d8b989ef048e78cf7ed52bac363bb651a7d229428')
+sha512sums=('be9fa6de6516fc55cbb616a358b8fc636fce38a430e2609cf314439da1625134be1986a2ef19cc3b2ffcea065d8a578fdc321f708f5ddb88524f3d6d9bfcc806'
+            '484c6e3ba73e2f2ccbe9737424bee68624bd8d46a06735937b3ca134aa34ad9e335b260f7d22bcd3e351ae9d8b989ef048e78cf7ed52bac363bb651a7d229428'
+            'e2084ecaf7ba3d3c630597450f5aff6bb65844002f2f7332a01228f0f0f0a2c8dae7b7af5f28063db63c5ce10dcd0b21d92adfb5fd8e25677e94eaa0c578c34d')
 
 conflicts=('toggldesktop-bin' 'toggl-bin')
 
 prepare() {
   cd "${srcdir}"
 
-  # patch to build for production
-  # https://github.com/toggl/toggldesktop/wiki/Building-Toggl-Desktop-from-source-for-usage-with-live-servers
   (
     cd "${pkgname}-${pkgver}"
-    patch -p1 < ../production.patch
+
+    # patch to build for production
+    # https://github.com/toggl/toggldesktop/wiki/Building-Toggl-Desktop-from-source-for-usage-with-live-servers
+    msg2 "production patch"
+    patch -p1  < ../production.patch
+
+    # patch to use sytem openssl and poco libs
+    msg2 "systmlibs patch"
+    patch -p1  < ../systemlibs.patch
   )
 
   # make the run script
@@ -75,11 +84,6 @@ package() {
   # Copy Bugsnag library
   install -Dm644 third_party/bugsnag-qt/build/release/libbugsnag-qt.so.1 ${out}/lib/libbugsnag-qt.so.1
 
-  # Copy Poco libraries
-  for lib in libPocoCrypto.so.31 libPocoData.so.31 libPocoDataSQLite.so.31 libPocoFoundation.so.31 libPocoJSON.so.31 libPocoNet.so.31 libPocoNetSSL.so.31 libPocoUtil.so.31 libPocoXML.so.31; do
-    install -Dm644 third_party/poco/lib/Linux/x86_64/${lib} ${out}/lib/${lib}
-  done
-
   # Copy executable
   install -Dm755 src/ui/linux/TogglDesktop/build/release/TogglDesktop ${out}
 
@@ -101,5 +105,3 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-
-
diff --git a/systemlibs.patch b/systemlibs.patch
new file mode 100644
index 000000000000..8e1d6d5d6134
--- /dev/null
+++ b/systemlibs.patch
@@ -0,0 +1,68 @@
+reverted:
+--- toggldesktop-7.4.76/Makefile	2017-11-04 12:40:34.000000000 +0100
++++ mod/Makefile	2017-12-20 10:36:37.658884088 +0100
+@@ -5,8 +5,8 @@
+ architecture=$(shell uname -m)
+ timestamp=$(shell date "+%Y-%m-%d-%H-%M-%S")
+ 
++#pocodir=third_party/poco
++#openssldir=third_party/openssl
+-pocodir=third_party/poco
+-openssldir=third_party/openssl
+ jsoncppdir=third_party/jsoncpp/dist
+ 
+ GTEST_ROOT=third_party/googletest-read-only
+reverted:
+--- toggldesktop-7.4.76/src/lib/linux/TogglDesktopLibrary/TogglDesktopLibrary.pro	2017-11-04 12:40:34.000000000 +0100
++++ mod/src/lib/linux/TogglDesktopLibrary/TogglDesktopLibrary.pro	2017-12-20 10:38:12.312213226 +0100
+@@ -167,32 +167,32 @@
+ INCLUDEPATH += $$PWD/../../../../third_party/lua/src
+ DEPENDPATH += $$PWD/../../../../third_party/lua/src
+ 
++;INCLUDEPATH += $$PWD/../../../../third_party/poco/Foundation/include
++;DEPENDPATH += $$PWD/../../../../third_party/poco/Foundation/include
+-INCLUDEPATH += $$PWD/../../../../third_party/poco/Foundation/include
+-DEPENDPATH += $$PWD/../../../../third_party/poco/Foundation/include
+ 
++;INCLUDEPATH += $$PWD/../../../../third_party/poco/Util/include
++;DEPENDPATH += $$PWD/../../../../third_party/poco/Util/include
+-INCLUDEPATH += $$PWD/../../../../third_party/poco/Util/include
+-DEPENDPATH += $$PWD/../../../../third_party/poco/Util/include
+ 
++;INCLUDEPATH += $$PWD/../../../../third_party/poco/Data/include
++;DEPENDPATH += $$PWD/../../../../third_party/poco/Data/include
+-INCLUDEPATH += $$PWD/../../../../third_party/poco/Data/include
+-DEPENDPATH += $$PWD/../../../../third_party/poco/Data/include
+ 
++;INCLUDEPATH += $$PWD/../../../../third_party/poco/Data/SQLite/include
++;DEPENDPATH += $$PWD/../../../../third_party/poco/Data/SQLite/include
+-INCLUDEPATH += $$PWD/../../../../third_party/poco/Data/SQLite/include
+-DEPENDPATH += $$PWD/../../../../third_party/poco/Data/SQLite/include
+ 
++;INCLUDEPATH += $$PWD/../../../../third_party/openssl/include
++;DEPENDPATH += $$PWD/../../../../third_party/openssl/include
+-INCLUDEPATH += $$PWD/../../../../third_party/openssl/include
+-DEPENDPATH += $$PWD/../../../../third_party/openssl/include
+ 
++;INCLUDEPATH += $$PWD/../../../../third_party/poco/Crypto/include
++;DEPENDPATH += $$PWD/../../../../third_party/poco/Crypto/include
+-INCLUDEPATH += $$PWD/../../../../third_party/poco/Crypto/include
+-DEPENDPATH += $$PWD/../../../../third_party/poco/Crypto/include
+ 
++;INCLUDEPATH += $$PWD/../../../../third_party/poco/Net/include
++;DEPENDPATH += $$PWD/../../../../third_party/poco/Net/include
+-INCLUDEPATH += $$PWD/../../../../third_party/poco/Net/include
+-DEPENDPATH += $$PWD/../../../../third_party/poco/Net/include
+ 
++;INCLUDEPATH += $$PWD/../../../../third_party/poco/NetSSL_OpenSSL/include
++;DEPENDPATH += $$PWD/../../../../third_party/poco/NetSSL_OpenSSL/include
+-INCLUDEPATH += $$PWD/../../../../third_party/poco/NetSSL_OpenSSL/include
+-DEPENDPATH += $$PWD/../../../../third_party/poco/NetSSL_OpenSSL/include
+ 
++;INCLUDEPATH += $$PWD/../../../../third_party/poco/Data/SQLite/src
++;DEPENDPATH += $$PWD/../../../../third_party/poco/Data/SQLite/src
+-INCLUDEPATH += $$PWD/../../../../third_party/poco/Data/SQLite/src
+-DEPENDPATH += $$PWD/../../../../third_party/poco/Data/SQLite/src
+ 
+ #QMAKE_CXXFLAGS += -fsanitize=thread -fPIE
+ #QMAKE_LFLAGS += -pie -fsanitize=thread