Update to version 4.1.1.20615

2 files changed, 22 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef6499b40724..0352ab503350 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bcompare
 	pkgdesc = Beyond Compare 4: Compare, sync, and merge files and folders
-	pkgver = 4.0.7.19761
-	pkgrel = 2
+	pkgver = 4.1.1.20615
+	pkgrel = 1
 	url = http://www.scootersoftware.com
 	install = bcompare.install
 	arch = i686
@@ -9,11 +9,16 @@ pkgbase = bcompare
 	groups = utility
 	license = custom
 	makedepends = sed
-	depends = gtk2
+	depends = fontconfig
 	depends = libsm
+	depends = libxcursor
+	depends = libxft
+	depends = libxinerama
+	depends = libxrandr
+	depends = zlib
 	options = !strip
-	source = http://www.scootersoftware.com/bcompare-4.0.7.19761.tar.gz
-	sha256sums = 541c265d7a8a0981cdeb47a06a3fe83467ac5f73b4d064fdfa29910e97fb4f3d
+	source = http://www.scootersoftware.com/bcompare-4.1.1.20615..tar.gz
+	sha256sums = 8ba8e7fdaa45f55df4a36a2d41708632cef2fde3166f18a4382f3a9eceaea8bb
 
 pkgname = bcompare
 
diff --git a/PKGBUILD b/PKGBUILD
index 703de4a3f5f6..f1c0d91ff1db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,34 +3,26 @@
 # Contributor: Petrovo https://aur.archlinux.org/account.php?Action=AccountInfo&ID=33361
 # Contributor: Pierre-François Gomez https://aur.archlinux.org/account/pef/
 # Contributor: Shura https://aur.archlinux.org/account/shura/
+# Contributor: Michael Hansen <zrax0111 gmail com>
 # Original PKGBUILD file from:
 # - https://bbs.archlinux.org/viewtopic.php?pid=757428#p757428
 # - http://www.scootersoftware.com/vbulletin/showpost.php?s=3c1f289bc76655230b49f440dbe17b53&p=26449&postcount=7
 
 pkgname=bcompare
-pkgver=4.0.7.19761
-pkgrel=2
+pkgver=4.1.1.20615
+pkgrel=1
 pkgdesc="Beyond Compare 4: Compare, sync, and merge files and folders"
 arch=('i686' 'x86_64')
 url="http://www.scootersoftware.com"
 license=('custom')
 groups=('utility')
+depends=('fontconfig' 'libsm' 'libxcursor' 'libxft' 'libxinerama'  'libxrandr' 'zlib')
 makedepends=('sed')
 install=${pkgname}.install
-source=("http://www.scootersoftware.com/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('541c265d7a8a0981cdeb47a06a3fe83467ac5f73b4d064fdfa29910e97fb4f3d')
+source=("http://www.scootersoftware.com/${pkgname}-${pkgver}.${CARCH}.tar.gz")
+sha256sums=('8ba8e7fdaa45f55df4a36a2d41708632cef2fde3166f18a4382f3a9eceaea8bb')
 options=('!strip') # Do not strip binaries because it breaks them down
 
-#Set up platform-specific variables
-_LIB_DIR='lib'
-_PKG_TYPE=''
-if test "$CARCH" == x86_64; then
-  _LIB_DIR='lib32'
-  _PKG_TYPE='lib32-'
-fi
-
-depends+=(${_PKG_TYPE}gtk2 ${_PKG_TYPE}libsm)
-
 package() {
   # Prepare the directory skeleton needed for install.sh
   mkdir -p "${pkgdir}/usr/share/applications"
@@ -53,20 +45,21 @@ package() {
   # Apply some fixes on install.sh before run it
   cd ${pkgname}-${pkgver}
   sed -i 's|/usr/|${PREFIX}/usr/|g' install.sh
+  sed -i '/-h \/lib64/{N;N;d;}' install.sh
   sh install.sh --prefix="${pkgdir}"
 
   # Move some directories to usr
   cd "${pkgdir}"
-  if [ -d usr/${_LIB_DIR} ]; then
-    mv usr/${_LIB_DIR}/* ${_LIB_DIR}
+  if [ -d usr/lib ]; then
+    mv usr/lib/* lib
   fi 
-  mv bin ${_LIB_DIR} usr/
+  mv bin lib usr/
 
-  # Fix wrong path
+  # Fix wrong paths
   sed -i "s|"${pkgdir}"|/usr|g" usr/bin/bcompare
 
   #Clean unneded files
-  pushd usr/${_LIB_DIR}/beyondcompare/ > /dev/null
+  pushd usr/lib/beyondcompare/ > /dev/null
   rm -f uninstall.sh RPM-GPG-KEY-scootersoftware scootersoftware.repo kde_context_menu
   mv help "${pkgdir}/usr/share/doc/beyondcompare"
   mv README "${pkgdir}/usr/share/doc/beyondcompare/"