Update to v10.9

* Manual implementation of "package" step.
  Upstream removed "install" target from Makefiles.

* Replace some constants with inline values.

* Extract desktop icons from Resources.zip.

6 files changed, 44 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 162120a1769d..355fe5e90a8b 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,26 @@
 pkgbase = freefilesync
 	pkgdesc = Backup software to synchronize files and folders
-	pkgver = 10.8
+	pkgver = 10.9
 	pkgrel = 1
 	url = http://www.freefilesync.org/
 	arch = i686
 	arch = x86_64
 	license = GPLv3
 	makedepends = boost
+	makedepends = unzip
 	depends = wxgtk
 	depends = webkit2gtk
 	depends = boost-libs
-	source = FreeFileSync_10.8_Source.zip::https://www.freefilesync.org/download_redirect.php?file=FreeFileSync_10.8_Source.zip
+	source = FreeFileSync_10.9_Source.zip::https://www.freefilesync.org/download_redirect.php?file=FreeFileSync_10.9_Source.zip
 	source = revert_resources_path.patch
 	source = revert_xdg_config_path.patch
 	source = FreeFileSync.desktop
-	source = ffsicon.png
 	source = RealTimeSync.desktop
-	source = rtsicon.png
-	sha256sums = ac33e69d1e2be65fdea60e056d43eef7db26c34ee4e0491f90db487f33674388
+	sha256sums = 221b905528f8800468f2f1edc33fbaa2ff0f4b6d5a4966fa20eafc18dadac3b0
 	sha256sums = 052ef5bf5eb11730499f4b81cd7e70f990fff3cfcc2f7059b84981e7ededc361
 	sha256sums = fef8aa099a27c277b76f1229651ed2324355528482c8f115e09c39269bbf4bdd
-	sha256sums = b381bb9dbda25c3c08a67f18072a2761abe34339ddf3318e1758eb7c349f1a3b
-	sha256sums = 31df3fa1f1310de14bbd379f891d4f8ed2df5b0d68913eb52c88b3be682933fb
-	sha256sums = 1502efdbf1638856a18ab9916e0431bf6a53471792cb2daa380345bac33f67c4
-	sha256sums = f28042587dbe99cf5d6bef2c1be4b026488e418e4ba8332b3016d246b7053a4e
+	sha256sums = d492d71c722340a1e6ee8dbbbf1ea24e052b473c38ef2d64d7338131bf417adc
+	sha256sums = 1321f3af06f0bc9c37dac369ca5960cba00961af7e2ceb76f18d16ca607ffa73
 
 pkgname = freefilesync
 
diff --git a/FreeFileSync.desktop b/FreeFileSync.desktop
index 9acfb0c16ce6..37680ecb3722 100755
--- a/FreeFileSync.desktop
+++ b/FreeFileSync.desktop
@@ -7,7 +7,7 @@ NoDisplay=false
 Terminal=0
 TerminalOptions=
 Type=Application
-Icon=/usr/share/pixmaps/ffsicon.png
+Icon=/usr/share/pixmaps/FreeFileSync.png
 Categories=GTK;Application;Utility;
 StartupNotify=true
 X-KDE-SubstituteUID=false
diff --git a/PKGBUILD b/PKGBUILD
index d59655d45479..9d8a137687fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,32 +5,28 @@
 # Maintainer: jooch <jooch AT gmx DOT com>
 
 pkgname=freefilesync
-pkgver=10.8
+pkgver=10.9
 pkgrel=1
 pkgdesc="Backup software to synchronize files and folders"
 arch=('i686' 'x86_64')
 url="http://www.freefilesync.org/"
 license=('GPLv3')
 depends=(wxgtk webkit2gtk boost-libs)
-makedepends=(boost)
+makedepends=(boost unzip)
 source=(
 	"FreeFileSync_${pkgver}_Source.zip::https://www.freefilesync.org/download_redirect.php?file=FreeFileSync_${pkgver}_Source.zip"		#ffs
 	revert_resources_path.patch
 	revert_xdg_config_path.patch
 	FreeFileSync.desktop
-	ffsicon.png
 	RealTimeSync.desktop
-	rtsicon.png
 	)
 
-sha256sums=('ac33e69d1e2be65fdea60e056d43eef7db26c34ee4e0491f90db487f33674388'	#ffs source
-            '052ef5bf5eb11730499f4b81cd7e70f990fff3cfcc2f7059b84981e7ededc361'	#revert_resources_path.patch
-            'fef8aa099a27c277b76f1229651ed2324355528482c8f115e09c39269bbf4bdd'	#revert_xdg_config_path.patch
-            'b381bb9dbda25c3c08a67f18072a2761abe34339ddf3318e1758eb7c349f1a3b'	#FreeFileSync.desktop
-            '31df3fa1f1310de14bbd379f891d4f8ed2df5b0d68913eb52c88b3be682933fb'	#ffsicon.png
-            '1502efdbf1638856a18ab9916e0431bf6a53471792cb2daa380345bac33f67c4'	#RealTimeSync.desktop
-            'f28042587dbe99cf5d6bef2c1be4b026488e418e4ba8332b3016d246b7053a4e'	#rtsicon.png
-            )
+sha256sums=('221b905528f8800468f2f1edc33fbaa2ff0f4b6d5a4966fa20eafc18dadac3b0' #ffs source
+            '052ef5bf5eb11730499f4b81cd7e70f990fff3cfcc2f7059b84981e7ededc361' #revert_resources_path.patch
+            'fef8aa099a27c277b76f1229651ed2324355528482c8f115e09c39269bbf4bdd' #revert_xdg_config_path.patch
+            'd492d71c722340a1e6ee8dbbbf1ea24e052b473c38ef2d64d7338131bf417adc' #FreeFileSync.desktop
+            '1321f3af06f0bc9c37dac369ca5960cba00961af7e2ceb76f18d16ca607ffa73' #RealTimeSync.desktop
+)
 	 
 DLAGENTS=('https::/usr/bin/curl -fLC - --retry 5 --retry-delay 3 -A Mozilla -o %o')
 
@@ -50,9 +46,6 @@ prepare() {
     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
 
-# linker error
-    sed -i 's#inline##g' FreeFileSync/Source/ui/version_check_impl.h
-
 # install error
     cp ${srcdir}/Changelog.txt ${srcdir}/FreeFileSync/Build
 
@@ -66,6 +59,10 @@ prepare() {
     
 # file not found error
 	sed -i '/\t"..\/Build\/User Manual.pdf" \\/d' FreeFileSync/Source/Makefile
+
+# inlining of constants not present in libssh2's distributed headers
+    sed -i 's/MAX_SFTP_READ_SIZE/30000/g' FreeFileSync/Source/fs/sftp.cpp
+    sed -i 's/MAX_SFTP_OUTGOING_SIZE/30000/g' FreeFileSync/Source/fs/sftp.cpp
 }
 
 build() {
@@ -79,24 +76,33 @@ build() {
 
 ### FFS
     mkdir -p "${srcdir}/FreeFileSync/Build/Bin"
-    cd ${srcdir}/FreeFileSync/Source
-    make
+    cd "${srcdir}/FreeFileSync/Source"
+    make EXENAME=FreeFileSync TMP_PATH="${srcdir}/FreeFileSync/tmp_ffs"
 
 ### RTS
-    cd RealTimeSync
-    make
+    cd "${srcdir}/FreeFileSync/Source/RealTimeSync"
+    make EXENAME=RealTimeSync TMP_PATH="${srcdir}/FreeFileSync/tmp_rts"
 }
 
 package() {
-    cd ${srcdir}/FreeFileSync/Source
-    make DESTDIR=${pkgdir} install
-
-    cd RealTimeSync
-    make DESTDIR=${pkgdir} install
-
-    cd ${srcdir}
-    install -Dm644 FreeFileSync.desktop $pkgdir/usr/share/applications/FreeFileSync.desktop
-    install -Dm644 ffsicon.png $pkgdir/usr/share/pixmaps/ffsicon.png
-    install -Dm644 RealTimeSync.desktop $pkgdir/usr/share/applications/RealTimeSync.desktop
-    install -Dm644 rtsicon.png $pkgdir/usr/share/pixmaps/rtsicon.png
+    bindir="${pkgdir}/usr/bin"
+    appsharedir="${pkgdir}/usr/share/FreeFileSync"
+    appdocdir="${pkgdir}/usr/share/doc/FreeFileSync"
+
+    cd "${srcdir}/FreeFileSync/Build"
+    install -t "${bindir}" -Dm755 Bin/FreeFileSync Bin/RealTimeSync
+    install -t "${appsharedir}" -Dm644 \
+        ding.wav \
+        gong.wav \
+        harp.wav \
+        Resources.zip \
+        styles.gtk_rc
+    install -t "${appsharedir}/Languages" -Dm644 Languages/*.lng
+
+    cd "${srcdir}"
+    install -d "${appdocdir}"
+    gzip < Changelog.txt > "${appdocdir}/CHANGELOG.gz"
+    unzip -o FreeFileSync/Build/Resources.zip FreeFileSync.png RealTimeSync.png
+    install -Dm644 -t "${pkgdir}/usr/share/pixmaps" FreeFileSync.png RealTimeSync.png
+    install -Dm644 -t "${pkgdir}/usr/share/applications" FreeFileSync.desktop RealTimeSync.desktop
 }
diff --git a/RealTimeSync.desktop b/RealTimeSync.desktop
index ae02f6ad95b1..74e605be5eb5 100644
--- a/RealTimeSync.desktop
+++ b/RealTimeSync.desktop
@@ -6,7 +6,7 @@ Exec=RealTimeSync
 NoDisplay=false
 Terminal=0
 TerminalOptions=
-Icon=/usr/share/pixmaps/rtsicon.png
+Icon=/usr/share/pixmaps/RealTimeSync.png
 Categories=GTK;Application;Utility;
 StartupNotify=true
 Type=Application
diff --git a/ffsicon.png b/ffsicon.png
deleted file mode 100755
index 7fbc97509db5..000000000000
--- a/ffsicon.png
+++ /dev/null
diff --git a/rtsicon.png b/rtsicon.png
deleted file mode 100755
index f76e745033a4..000000000000
--- a/rtsicon.png
+++ /dev/null