freefilesync-8.5-0: updating version

3 files changed, 61 insertions, 45 deletions

diff --git a/pcr/freefilesync/FreeFileSync.desktop b/pcr/freefilesync/FreeFileSync.desktop
index 216d0c156..9acfb0c16 100755
--- a/pcr/freefilesync/FreeFileSync.desktop
+++ b/pcr/freefilesync/FreeFileSync.desktop
@@ -1,15 +1,14 @@
 [Desktop Entry]
-Comment=
-Exec=FreeFileSync
-GenericName=Folder Comparison and Synchronization
-Icon=/usr/share/pixmaps/ffsicon.png
 Name=FreeFileSync
+GenericName=File synchronization
+Comment=Backup software to synchronize files and folders
+Exec=FreeFileSync
 NoDisplay=false
-StartupNotify=true
-Categories=GTK;Application;Utility;
 Terminal=0
 TerminalOptions=
 Type=Application
+Icon=/usr/share/pixmaps/ffsicon.png
+Categories=GTK;Application;Utility;
+StartupNotify=true
 X-KDE-SubstituteUID=false
 X-KDE-Username=
-
diff --git a/pcr/freefilesync/PKGBUILD b/pcr/freefilesync/PKGBUILD
index 4b9b9de4d..d50cba16e 100644..100755
--- a/pcr/freefilesync/PKGBUILD
+++ b/pcr/freefilesync/PKGBUILD
@@ -1,48 +1,64 @@
 # Contributor (Arch): chenxing <cxcxcxcx AT gmail DOT com>
 # Contributor (Arch): Michael Burkhard <Michael DOT Burkhard AT web DOT de>
 # Maintainer (Arch): alexmo82 <25396682 AT live DOT it>
-# Maintainer: freaj <freaj@riseup.net>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=freefilesync
-pkgver=6.15
+pkgver=8.5
 pkgrel=0
-pkgdesc="Visual folder comparison and synchronization"
-arch=('any')
-url="http://sourceforge.net/projects/freefilesync/"
+pkgdesc="Backup software to synchronize files and folders"
+arch=('i686' 'x86_64' 'armv7h')
+url="http://www.freefilesync.org/"
 license=('GPLv3')
-depends=(wxgtk webkitgtk2 boost)
-conflicts=(freefilesync-ubuntu)
-source=("http://downloads.sourceforge.net/project/zenxml/zenXml_2.2.zip"
-	"http://downloads.sourceforge.net/project/freefilesync/FreeFileSync/$pkgver/FreeFileSync_${pkgver}_Source.zip" 
-	FreeFileSync.desktop 
-	ffsicon.png 
-	RealtimeSync.desktop 
-	rtsicon.png)
-md5sums=('4c1f953b789d6dcbcb7eccab3d33e8ac'
-	 '53dc5f7249877b0e3a2a76408f6526ee'
-	 'a7be7841f47f29d8e6210c8ab592a1e3'
-	 '1f452dff6f970d95839411008d86250b'
-	 '90152f1021f2d6fb6ab4fa511dc60fa9'
-	 'ee5587fa0a8d906ad416564e4daf5a06')
+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.desktop
+	ffsicon.png
+	RealTimeSync.desktop
+	rtsicon.png
+	)
+md5sums=(
+	'58baf96cb8e1136d10e1ada7419921c5'	#zen source
+	'3d95dd10e7b3395f73173eb6eabc4c9e'	#ffs source
+	'eab0ccfc6a88e229a0f07507b93cfcff'	#FreeFileSync.desktop
+	'1f452dff6f970d95839411008d86250b'	#ffsicon.png
+	'ab266177f69d16ad9f4099ae4edd77a2'	#RealTimeSync.desktop
+	'ee5587fa0a8d906ad416564e4daf5a06'	#rtsicon.png
+	)
+
+prepare() {
+    cd ${srcdir}/zen
+    sed -i 's/__GNUC__ < 5/__GNUC__ < 7/' scope_guard.h
+}
 
 build() {
-  cd ${srcdir}/FreeFileSync/Source
-  make launchpad
+### just in case of compile errors
+    VER=`g++ --version`
+    VER=`echo $VER | cut -d " " -f 1-4`
+    echo "compiled with $VER"
+
+### FFS
+    cd ${srcdir}/FreeFileSync/Source
+    make launchpad
 
-  cd RealtimeSync
-  make launchpad
+### RTS
+    cd RealTimeSync
+    make launchpad
 }
 
 package() {
-  cd ${srcdir}/FreeFileSync/Source
-  make DESTDIR=${pkgdir} install
+    cd ${srcdir}/FreeFileSync/Source
+    make DESTDIR=${pkgdir} install
 
-  cd RealtimeSync
-  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
+    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
 }
diff --git a/pcr/freefilesync/RealtimeSync.desktop b/pcr/freefilesync/RealTimeSync.desktop
index b42759530..ae02f6ad9 100755..100644
--- a/pcr/freefilesync/RealtimeSync.desktop
+++ b/pcr/freefilesync/RealTimeSync.desktop
@@ -1,15 +1,16 @@
 [Desktop Entry]
-Comment=
-Exec=RealtimeSync
-GenericName=Automated Synchronization
-Icon=/usr/share/pixmaps/rtsicon.png
 Name=RealtimeSync
+GenericName=Automated Synchronization
+Comment=Real time synchronization
+Exec=RealTimeSync
 NoDisplay=false
-StartupNotify=true
-Categories=GTK;Application;Utility;
 Terminal=0
 TerminalOptions=
+Icon=/usr/share/pixmaps/rtsicon.png
+Categories=GTK;Application;Utility;
+StartupNotify=true
 Type=Application
 X-KDE-SubstituteUID=false
 X-KDE-Username=
 
+Name[it_IT.utf8]=RealTimeSync