Update to version 4.3.2.24472

3 files changed, 15 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index afa93a51b7d6..c56c010d4e34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Fri Oct 25 02:52:07 UTC 2019
+# Fri Nov  8 03:51:19 UTC 2019
 pkgbase = bcompare
-	pkgver = 4.3.1.24438
+	pkgver = 4.3.2.24472
 	pkgrel = 1
 	url = http://www.scootersoftware.com
 	arch = i686
@@ -17,10 +17,10 @@ pkgbase = bcompare
 	depends = libxrandr
 	depends = zlib
 	options = !strip
-	source_i686 = http://www.scootersoftware.com/bcompare-4.3.1.24438.i386.tar.gz
-	sha256sums_i686 = a439cf59ead29b944426621c432cb0cfab4380fce4c1f922ed2d23cf26a560f1
-	source_x86_64 = http://www.scootersoftware.com/bcompare-4.3.1.24438.x86_64.tar.gz
-	sha256sums_x86_64 = f8e61d42afa098e10908004f383bfed5ff5fd5a7fbdde246cac0724b03a3e1e6
+	source_i686 = http://www.scootersoftware.com/bcompare-4.3.2.24472.i386.tar.gz
+	sha256sums_i686 = db0d68128cfc4db7e253256340bc682584e45d5c127cbed2f3f9344e388c99f2
+	source_x86_64 = http://www.scootersoftware.com/bcompare-4.3.2.24472.x86_64.tar.gz
+	sha256sums_x86_64 = 648f4cc6195d0ddb0dd135913adfcb11333f5bd3dc81beaa11a533dd455ea0f6
 
 pkgname = bcompare
 	pkgdesc = Beyond Compare 4: Compare, sync, and merge files and folders
diff --git a/PKGBUILD b/PKGBUILD
index 26b1a1582a0f..58485d890896 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgbase=bcompare
 pkgname=('bcompare' 'bcompare-kde5' 'bcompare-kde4' 'bcompare-nautilus' 'bcompare-thunar' 'bcompare-cinnamon' 'bcompare-mate')
-pkgver=4.3.1.24438
+pkgver=4.3.2.24472
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.scootersoftware.com'
@@ -22,8 +22,8 @@ depends=('fontconfig' 'libsm' 'libxcursor' 'libxft' 'libxinerama'  'libxrandr' '
 makedepends=('sed')
 source_x86_64=("http://www.scootersoftware.com/${pkgbase}-${pkgver}.x86_64.tar.gz")
 source_i686=("http://www.scootersoftware.com/${pkgbase}-${pkgver}.i386.tar.gz")
-sha256sums_i686=('a439cf59ead29b944426621c432cb0cfab4380fce4c1f922ed2d23cf26a560f1')
-sha256sums_x86_64=('f8e61d42afa098e10908004f383bfed5ff5fd5a7fbdde246cac0724b03a3e1e6')
+sha256sums_i686=('db0d68128cfc4db7e253256340bc682584e45d5c127cbed2f3f9344e388c99f2')
+sha256sums_x86_64=('648f4cc6195d0ddb0dd135913adfcb11333f5bd3dc81beaa11a533dd455ea0f6')
 options=('!strip') # Do not strip binaries because it breaks them down
 
  prepare() {
@@ -54,6 +54,9 @@ options=('!strip') # Do not strip binaries because it breaks them down
   sed -i 's|/usr/|${PREFIX}/usr/|g' install.sh
   sed -i 's|${PREFIX}/usr/bin|/usr/bin|g' install.sh
   sed -i '/-h \/lib64/{N;N;d;}' install.sh
+  sed -i 's|/ext/ld.so.conf.d|/etc/ld.so.conf.d|g' install.sh
+  sed -i 's|/etc/ld.so.conf.d|${PREFIX}/etc/ld.so.conf.d|g' install.sh
+  sed -i "/ldconfig$/d" install.sh
  }
 
 package_bcompare() {
@@ -74,6 +77,7 @@ package_bcompare() {
 
   # Prepare the directory skeleton needed for install.sh
   cp -r "${_install_dir}/bin"  "${pkgdir}/"
+  cp -r "${_install_dir}/etc"  "${pkgdir}/"
   cp -r "${_install_dir}/lib"  "${pkgdir}/"
   cp -r "${_install_dir}/usr"  "${pkgdir}/"
 
@@ -85,6 +89,7 @@ package_bcompare() {
   mv bin lib usr/
 
   # Fix wrong paths
+  sed -i "s|"${_install_dir}"|/usr|g" etc/ld.so.conf.d/bcompare.conf
   sed -i "s|"${_install_dir}"|/usr|g" usr/bin/bcompare
 
   # Remove KDE, Gnome and Xfce files
diff --git a/bcompare.install b/bcompare.install
index 41a09e5ca5e3..efc442eb4749 100644
--- a/bcompare.install
+++ b/bcompare.install
@@ -1,6 +1,7 @@
 post_install() {
   update-mime-database /usr/share/mime 1> /dev/null
   update-desktop-database -q
+  ldconfig
 }
 
 post_upgrade() {