Update to 8.8

2 files changed, 18 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f276d815b31..dcae64cc2232 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Nov  2 21:39:04 UTC 2016
+# Sun Jan 15 18:40:14 UTC 2017
 pkgbase = freefilesync
 	pkgdesc = Backup software to synchronize files and folders
-	pkgver = 8.5
-	pkgrel = 1
+	pkgver = 8.8
+	pkgrel = 0
 	url = http://www.freefilesync.org/
 	arch = i686
 	arch = x86_64
@@ -13,13 +13,13 @@ pkgbase = freefilesync
 	depends = webkitgtk2
 	depends = boost-libs
 	source = http://downloads.sourceforge.net/project/zenxml/zenXml_2.3.zip
-	source = FreeFileSync_8.5_Source.zip::https://dl.dropboxusercontent.com/u/74545385/FreeFileSync_8.5_Source.zip
+	source = FreeFileSync_8.8_Source.zip::https://dl.dropboxusercontent.com/u/74545385/FreeFileSync_8.8_Source.zip
 	source = FreeFileSync.desktop
 	source = ffsicon.png
 	source = RealTimeSync.desktop
 	source = rtsicon.png
 	md5sums = 58baf96cb8e1136d10e1ada7419921c5
-	md5sums = 3d95dd10e7b3395f73173eb6eabc4c9e
+	md5sums = bb28b309893d24464f301a6f989b2b96
 	md5sums = eab0ccfc6a88e229a0f07507b93cfcff
 	md5sums = 1f452dff6f970d95839411008d86250b
 	md5sums = ab266177f69d16ad9f4099ae4edd77a2
diff --git a/PKGBUILD b/PKGBUILD
index ef9311f9c64b..c64043f05ee3 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer: alexmo82 <25396682 AT live DOT it>
 
 pkgname=freefilesync
-pkgver=8.5
-pkgrel=1
+pkgver=8.8
+pkgrel=0
 pkgdesc="Backup software to synchronize files and folders"
 arch=('i686' 'x86_64')
 url="http://www.freefilesync.org/"
@@ -13,7 +13,7 @@ depends=(wxgtk webkitgtk2 boost-libs)
 makedepends=(boost)
 source=(
 	"http://downloads.sourceforge.net/project/zenxml/zenXml_2.3.zip"	#zen
-	"FreeFileSync_${pkgver}_Source.zip::https://dl.dropboxusercontent.com/u/74545385/FreeFileSync_8.5_Source.zip"		#ffs
+	"FreeFileSync_${pkgver}_Source.zip::https://dl.dropboxusercontent.com/u/74545385/FreeFileSync_8.8_Source.zip"		#ffs
 	FreeFileSync.desktop
 	ffsicon.png
 	RealTimeSync.desktop
@@ -21,7 +21,7 @@ source=(
 	)
 md5sums=(
 	'58baf96cb8e1136d10e1ada7419921c5'	#zen source
-	'3d95dd10e7b3395f73173eb6eabc4c9e'	#ffs source
+	'bb28b309893d24464f301a6f989b2b96'	#ffs source
 	'eab0ccfc6a88e229a0f07507b93cfcff'	#FreeFileSync.desktop
 	'1f452dff6f970d95839411008d86250b'	#ffsicon.png
 	'ab266177f69d16ad9f4099ae4edd77a2'	#RealTimeSync.desktop
@@ -29,15 +29,19 @@ md5sums=(
 	)
 
 prepare() {
-    cd ${srcdir}/zen
-    sed -i 's/__GNUC__ < 5/__GNUC__ < 7/' scope_guard.h
+    sed -i 's/m_listBoxHistory->GetTopItem()/0/g'		FreeFileSync/Source/ui/main_dlg.cpp
+    sed -i 's!static_assert!//static_assert!'			zen/scope_guard.h
+    sed -i 's!-O3 -DN!-D"warn_static(arg)= " -O3 -DN!'		FreeFileSync/Source/Makefile
+    sed -i 's!-O3 -DN!-D"warn_static(arg)= " -O3 -DN!'		FreeFileSync/Source/RealTimeSync/Makefile
+    sed -i 's/time_t getVersionCheckInactiveId()/inline time_t getVersionCheckInactiveId()/' FreeFileSync/Source/ui/version_check_impl.h
+    sed -i 's/bool shouldRunPeriodicUpdateCheck(time_t lastUpdateCheck)/inline bool shouldRunPeriodicUpdateCheck(time_t lastUpdateCheck)/' FreeFileSync/Source/ui/version_check_impl.h
 }
 
 build() {
 ### just in case of compile errors
-    VER=`g++ --version`
-    VER=`echo $VER | cut -d " " -f 1-4`
-    echo "compiled with $VER"
+    VER=`g++ -dumpversion`
+    MAC=`g++ -dumpmachine`
+    echo "compiler g++ $VER $MAC"
 
 ### FFS
     cd ${srcdir}/FreeFileSync/Source