9.9-3: Moved wxgtk-common-dev, wxgtk2-dev, and wxgtk3-dev from dependencies to make dependencies to allow removal of wxgtk-dev (3.1.x) and reinstallation of wxgtk (3.0.x). Added shell script to semi-automate reinstallation of wxgtk and extraction of libwx*3.1.so* files from wxgtk-dev packages into /usr/lib/.

4 files changed, 54 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e457b0cb161..4b3dca1f9b7e 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 pkgbase = freefilesync
 	pkgdesc = Backup software to synchronize files and folders
 	pkgver = 9.9
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.freefilesync.org/
+	install = freefilesync.install
 	arch = i686
 	arch = x86_64
 	license = GPLv3
+	makedepends = wxgtk-common-dev
+	makedepends = wxgtk2-dev
+	makedepends = wxgtk3-dev
 	makedepends = boost
-	depends = wxgtk-common-dev
-	depends = wxgtk2-dev
-	depends = wxgtk3-dev
 	depends = webkit2gtk
 	depends = boost-libs
 	source = FreeFileSync_9.9_Source.zip::https://www.freefilesync.org/download_redirect.php?file=FreeFileSync_9.9_Source.zip
@@ -18,12 +19,16 @@ pkgbase = freefilesync
 	source = ffsicon.png
 	source = RealTimeSync.desktop
 	source = rtsicon.png
+	source = freefilesync.install
+	source = wxgtk_fix.sh
 	sha256sums = 43edd3c8546bd5a44c5d353811389a68b148f0655c006c13f4357f3579b9a970
 	sha256sums = 8d51e52a9264d09117cf434b7fcb46a17ee4285a00432554ba47fa86ac4511ce
 	sha256sums = b381bb9dbda25c3c08a67f18072a2761abe34339ddf3318e1758eb7c349f1a3b
 	sha256sums = 31df3fa1f1310de14bbd379f891d4f8ed2df5b0d68913eb52c88b3be682933fb
 	sha256sums = 1502efdbf1638856a18ab9916e0431bf6a53471792cb2daa380345bac33f67c4
 	sha256sums = f28042587dbe99cf5d6bef2c1be4b026488e418e4ba8332b3016d246b7053a4e
+	sha256sums = a071bbb79fd490001713de7eb0165f37d2f0bba067af152424b3cc50133aa1a3
+	sha256sums = 6cc7a2272f063e58d4b3f4519326d4a7b1d14c742eda0e1991c7959f00ffbf75
 
 pkgname = freefilesync
 
diff --git a/PKGBUILD b/PKGBUILD
index f312593e6ad1..0168c0f101b2 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,14 @@
 
 pkgname=freefilesync
 pkgver=9.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Backup software to synchronize files and folders"
 arch=('i686' 'x86_64')
 url="http://www.freefilesync.org/"
 license=('GPLv3')
-depends=(wxgtk-common-dev wxgtk2-dev wxgtk3-dev webkit2gtk boost-libs)
-makedepends=(boost)
+depends=(webkit2gtk boost-libs)
+makedepends=(wxgtk-common-dev wxgtk2-dev wxgtk3-dev boost)
+install=${pkgname}.install
 xbrzver=1.6
 source=(
 	"FreeFileSync_${pkgver}_Source.zip::https://www.freefilesync.org/download_redirect.php?file=FreeFileSync_${pkgver}_Source.zip"		#ffs
@@ -20,6 +21,8 @@ source=(
 	ffsicon.png
 	RealTimeSync.desktop
 	rtsicon.png
+	freefilesync.install
+	wxgtk_fix.sh
 	)
 
 sha256sums=(
@@ -29,6 +32,8 @@ sha256sums=(
 	 '31df3fa1f1310de14bbd379f891d4f8ed2df5b0d68913eb52c88b3be682933fb'	#ffsicon.png
 	 '1502efdbf1638856a18ab9916e0431bf6a53471792cb2daa380345bac33f67c4'	#RealTimeSync.desktop
 	 'f28042587dbe99cf5d6bef2c1be4b026488e418e4ba8332b3016d246b7053a4e'	#rtsicon.png
+	 'a071bbb79fd490001713de7eb0165f37d2f0bba067af152424b3cc50133aa1a3'	#freefilesync.install
+	 '6cc7a2272f063e58d4b3f4519326d4a7b1d14c742eda0e1991c7959f00ffbf75'	#wxgtk_fix.sh
 	 )
 	 
 DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -A Mozilla -o %o %u')
@@ -62,6 +67,9 @@ prepare() {
 # add xbrz.cpp entries in Makefile
     sed -i "/zlib_wrap.cpp/ a CPP_LIST+=../../xBRZ/src/xbrz.cpp" FreeFileSync/Source/Makefile
     sed -i "/popup_dlg_generated.cpp/ a CPP_LIST+=../../../xBRZ/src/xbrz.cpp" FreeFileSync/Source/RealTimeSync/Makefile
+
+# copy shell file to /usr/bin/
+    cp ${srcdir}/wxgtk_fix.sh /usr/bin/
 }
 
 build() {
diff --git a/freefilesync.install b/freefilesync.install
new file mode 100755
index 000000000000..a2b7306a1cc0
--- /dev/null
+++ b/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
diff --git a/wxgtk_fix.sh b/wxgtk_fix.sh
new file mode 100755
index 000000000000..d4bbc448d9ed
--- /dev/null
+++ b/wxgtk_fix.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Is root running this script?
+if [ "`id -u`" -ne 0 ]
+then
+  echo -e "\n\nRun this script as root!\n\n"
+  exit -1
+fi
+
+# reinstall wxgtk and extract libwx*3.1.so* files from wxgtk-dev packages into /usr/lib/
+pacman -S wxgtk-common wxgtk2 wxgtk3
+tar -xf /var/cache/pacman/pkg/wxgtk-common-dev* -C / --wildcards --no-anchored 'libwx*.so*'
+tar -xf /var/cache/pacman/pkg/wxgtk2-dev* -C / --wildcards --no-anchored 'libwx*.so*'
+tar -xf /var/cache/pacman/pkg/wxgtk3-dev* -C / --wildcards --no-anchored 'libwx*.so*'
\ No newline at end of file