Update to 8.9

2 files changed, 35 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dcae64cc2232..9ee11a13606b 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jan 15 18:40:14 UTC 2017
+# Mon Feb 13 00:58:06 UTC 2017
 pkgbase = freefilesync
 	pkgdesc = Backup software to synchronize files and folders
-	pkgver = 8.8
+	pkgver = 8.9
 	pkgrel = 0
 	url = http://www.freefilesync.org/
 	arch = i686
@@ -12,14 +12,14 @@ pkgbase = freefilesync
 	depends = wxgtk
 	depends = webkitgtk2
 	depends = boost-libs
-	source = http://downloads.sourceforge.net/project/zenxml/zenXml_2.3.zip
-	source = FreeFileSync_8.8_Source.zip::https://dl.dropboxusercontent.com/u/74545385/FreeFileSync_8.8_Source.zip
+	source = http://downloads.sourceforge.net/project/zenxml/zenXml_2.4.zip
+	source = FreeFileSync_8.9_Source.zip::https://dl.dropboxusercontent.com/u/74545385/FreeFileSync_8.9_Source.zip
 	source = FreeFileSync.desktop
 	source = ffsicon.png
 	source = RealTimeSync.desktop
 	source = rtsicon.png
-	md5sums = 58baf96cb8e1136d10e1ada7419921c5
-	md5sums = bb28b309893d24464f301a6f989b2b96
+	md5sums = 55907f1af4eb94a4196d95815b675d78
+	md5sums = 92a29624a517367e348afce669502c73
 	md5sums = eab0ccfc6a88e229a0f07507b93cfcff
 	md5sums = 1f452dff6f970d95839411008d86250b
 	md5sums = ab266177f69d16ad9f4099ae4edd77a2
diff --git a/PKGBUILD b/PKGBUILD
index c64043f05ee3..1f90c368d652 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: alexmo82 <25396682 AT live DOT it>
 
 pkgname=freefilesync
-pkgver=8.8
+pkgver=8.9
 pkgrel=0
 pkgdesc="Backup software to synchronize files and folders"
 arch=('i686' 'x86_64')
@@ -12,44 +12,47 @@ license=('GPLv3')
 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.8_Source.zip"		#ffs
+	"http://downloads.sourceforge.net/project/zenxml/zenXml_2.4.zip"	#zen
+	"FreeFileSync_${pkgver}_Source.zip::https://dl.dropboxusercontent.com/u/74545385/FreeFileSync_8.9_Source.zip"		#ffs
 	FreeFileSync.desktop
 	ffsicon.png
 	RealTimeSync.desktop
 	rtsicon.png
 	)
 md5sums=(
-	'58baf96cb8e1136d10e1ada7419921c5'	#zen source
-	'bb28b309893d24464f301a6f989b2b96'	#ffs source
-	'eab0ccfc6a88e229a0f07507b93cfcff'	#FreeFileSync.desktop
-	'1f452dff6f970d95839411008d86250b'	#ffsicon.png
-	'ab266177f69d16ad9f4099ae4edd77a2'	#RealTimeSync.desktop
-	'ee5587fa0a8d906ad416564e4daf5a06'	#rtsicon.png
-	)
+	 '55907f1af4eb94a4196d95815b675d78'	#zen source
+	 '92a29624a517367e348afce669502c73'	#ffs source
+	 'eab0ccfc6a88e229a0f07507b93cfcff'	#FreeFileSync.desktop
+	 '1f452dff6f970d95839411008d86250b'	#ffsicon.png
+	 'ab266177f69d16ad9f4099ae4edd77a2'	#RealTimeSync.desktop
+	 'ee5587fa0a8d906ad416564e4daf5a06'	#rtsicon.png
+	 )
 
 prepare() {
+# wxgtk < 3.1.0
     sed -i 's/m_listBoxHistory->GetTopItem()/0/g'		FreeFileSync/Source/ui/main_dlg.cpp
+# gcc 6.3.1
     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
+# 8.9 warn_static(string) -DZEN_LINUX
+    sed -i 's!-O3 -DN!-D"warn_static(arg)= " -DZEN_LINUX -O3 -DN!'		FreeFileSync/Source/Makefile
+    sed -i 's!-O3 -DN!-D"warn_static(arg)= " -DZEN_LINUX -O3 -DN!'		FreeFileSync/Source/RealTimeSync/Makefile
+# 8.9 linker error
+    sed -i 's#inline##g' FreeFileSync/Source/ui/version_check_impl.h
+# 8.9 install error
+    cp ${srcdir}/Changelog.txt ${srcdir}/FreeFileSync/Build
 }
 
 build() {
-### just in case of compile errors
-    VER=`g++ -dumpversion`
-    MAC=`g++ -dumpmachine`
-    echo "compiler g++ $VER $MAC"
-
-### FFS
-    cd ${srcdir}/FreeFileSync/Source
-    make launchpad
-
-### RTS
-    cd RealTimeSync
-    make launchpad
+# just in case of compile errors
+  VER=`g++ -dumpversion`
+  MAC=`g++ -dumpmachine`
+  echo "compiler g++ $VER $MAC"
+# FFS
+  cd ${srcdir}/FreeFileSync/Source
+  make launchpad
+# RTS
+  cd RealTimeSync
+  make launchpad
 }
 
 package() {