From 672cc3e20840f7cc8d60f5ee9c0f7b24b6fe6c7d Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sun, 5 Aug 2018 19:54:28 -0500
Subject: freefilesync-10.2-1: updating version

---
 pcr/freefilesync/PKGBUILD             | 16 ++++++++++++----
 pcr/freefilesync/freefilesync.install | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 pcr/freefilesync/freefilesync.install

(limited to 'pcr/freefilesync')

diff --git a/pcr/freefilesync/PKGBUILD b/pcr/freefilesync/PKGBUILD
index 456d6f407..d32ee9be9 100644
--- a/pcr/freefilesync/PKGBUILD
+++ b/pcr/freefilesync/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=freefilesync
-pkgver=9.8
+pkgver=10.2
 pkgrel=1
 pkgdesc="Backup software to synchronize files and folders"
 arch=('i686' 'x86_64' 'armv7h')
@@ -22,7 +22,7 @@ source=(
 	)
 
 sha256sums=(
-	 '77a59586284a518d6df6c0cc934c3efa434f247acce70452ab9fe37e7747b96d'	#ffs source
+	 'b7b072f6239529d0030d845b4b62463edf37910dda3e75cd9dd64f01da81b5b9'	#ffs source
 	 'b381bb9dbda25c3c08a67f18072a2761abe34339ddf3318e1758eb7c349f1a3b'	#FreeFileSync.desktop
 	 '31df3fa1f1310de14bbd379f891d4f8ed2df5b0d68913eb52c88b3be682933fb'	#ffsicon.png
 	 '1502efdbf1638856a18ab9916e0431bf6a53471792cb2daa380345bac33f67c4'	#RealTimeSync.desktop
@@ -47,6 +47,14 @@ prepare() {
 
 # install error
     cp ${srcdir}/Changelog.txt ${srcdir}/FreeFileSync/Build
+
+# edit lines to remove functions that require wxgtk 3.1.x  
+    sed -e 's:m_textCtrlOfflineActivationKey->ForceUpper:// &:g' -i 'FreeFileSync/Source/ui/small_dlgs.cpp'
+    sed -e 's:const double scrollSpeed =:& 6; //:g' -i 'wx+/grid.cpp'
+
+# add '-lz' back into LINKFLAGS
+    sed -i '/pie/ s/-pthread/-lz -pthread/' FreeFileSync/Source/Makefile
+    sed -i '/pie/ s/-pthread/-lz -pthread/' FreeFileSync/Source/RealTimeSync/Makefile
 }
 
 build() {
@@ -60,11 +68,11 @@ build() {
 
 ### FFS
     cd ${srcdir}/FreeFileSync/Source
-    make launchpad
+    make
 
 ### RTS
     cd RealTimeSync
-    make launchpad
+    make
 }
 
 package() {
diff --git a/pcr/freefilesync/freefilesync.install b/pcr/freefilesync/freefilesync.install
new file mode 100644
index 000000000..a2b7306a1
--- /dev/null
+++ b/pcr/freefilesync/freefilesync.install
@@ -0,0 +1,20 @@
+#function to tell user to run shell script to reinstall wxgtk and extract libwx*3.1.so* items from wxgtk-dev packages after installation/upgrade of freefilesync
+reinstall_and_extract_message() {
+	echo -e "\n\n$(tput bold)$(tput setaf 7)$(tput setab 1)Run 'sudo sh /usr/bin/wxgtk_fix.sh' after this finishes"'!'"$(tput sgr 0)\n\n"
+}
+
+# send message after installation of freefilesync
+post_install() {
+	reinstall_and_extract_message
+}
+
+# send message after upgrade of freefilesync
+post_upgrade() {
+	reinstall_and_extract_message
+}
+
+# remove the libwx*3.1.so* files from /usr/lib/ and wxgtk_fix.sh from /usr/bin after removal of freefilesync
+post_remove() {
+	rm /usr/lib/libwx*3.1.so*
+	rm /usr/bin/wxgtk_fix.sh
+}
\ No newline at end of file
-- 
cgit v1.2.2