commit vmware-horizon-client 5.0.0-3

3 files changed, 8 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5efe3ff39e03..e80e5243e0d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = vmware-horizon-client
 	pkgdesc = VMware Horizon Client connect to VMware Horizon virtual desktop
 	pkgver = 5.0.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.vmware.com/go/viewclients
 	arch = x86_64
 	license = custom
 	makedepends = libxslt
+	makedepends = patchelf
 	source = vmware-horizon-client-5.0.0-12557422-x86_64.bundle::https://download3.vmware.com/software/view/viewclients/CART20FQ1/VMware-Horizon-Client-5.0.0-12557422.x64.bundle
 	source = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/vmware-bundle.eclass
-	source = 0001-ld-preload.patch
 	source = vmware-horizon-usb
 	source = vmware-horizon-usb.service
 	source = vmware-horizon-virtual-printing.service
 	sha256sums = e2e4af4f82638f28824ebd01c57a099915b57930d885a16f785234882157aaad
 	sha256sums = d8794c22229afdeb698dae5908b7b2b3880e075b19be38e0b296bb28f4555163
-	sha256sums = 974a6e2f513c114df9923d4366308e31ab53cfaef89d5f794204f1eeb1d98f01
 	sha256sums = 008b60ebf45f7d1e033c8ad8ce1688d5e1c59fc0668493067fb89b563b1dc00f
 	sha256sums = a897c1b9e8928fc222880ebbfc7bb6aff940bff4acf4e4e0cd4002fff81c7226
 	sha256sums = e47e770a1e19ed321de7c2765b2d682f59ac466aef92b2e4ea5e65cacf56de36
diff --git a/0001-ld-preload.patch b/0001-ld-preload.patch
deleted file mode 100644
index 184717a276f7..000000000000
--- a/0001-ld-preload.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/vmware-horizon-client/bin/vmware-view	2019-05-28 10:24:21.000000000 +0200
-+++ b/vmware-horizon-client/bin/vmware-view	2019-05-28 10:51:19.859301412 +0200
-@@ -16,6 +16,12 @@ snapPath="/snap/gnome-system-monitor/cur
- cpu=`cat /proc/cpuinfo | grep ARM | wc -l`
- pid_self=$$
-
-+# Starting vmware-view-crtbora results in symbol lookup error. For any reason
-+# libgiomm and libpangomm are loaded from /usr/lib/, not /usr/lib/vmware/.
-+# Preload these libraries to mitigate the issue.
-+LD_PRELOAD="/usr/lib/vmware/libgiomm-2.4.so.1 /usr/lib/vmware/libpangomm-1.4.so.1"
-+export LD_PRELOAD
-+
- # Set media provider install path base on $VMWARE_HORIZON_MEDIA_PROVIDER_PATH
- if [[ "$VMWARE_HORIZON_MEDIA_PROVIDER_PATH" = "" ]]; then
-     mediaproviderPath="/usr/lib/vmware/mediaprovider"
diff --git a/PKGBUILD b/PKGBUILD
index 7ae7d9dfe70a..c11fef361376 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,30 +16,23 @@ _bundled_with_client=('vmware-horizon-pcoip'
 pkgver=5.0.0
 _build=12557422
 _cart='CART20FQ1'
-pkgrel=2
+pkgrel=3
 pkgdesc='VMware Horizon Client connect to VMware Horizon virtual desktop'
 arch=('x86_64')
 url='https://www.vmware.com/go/viewclients'
 license=('custom')
-makedepends=('libxslt')
+makedepends=('libxslt' 'patchelf')
 source=("${pkgbase}-${pkgver}-${_build}-x86_64.bundle::https://download3.vmware.com/software/view/viewclients/${_cart}/VMware-Horizon-Client-${pkgver}-${_build}.x64.bundle"
         'http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/vmware-bundle.eclass'
-        '0001-ld-preload.patch'
         'vmware-horizon-usb'
         'vmware-horizon-usb.service'
         'vmware-horizon-virtual-printing.service')
 sha256sums=('e2e4af4f82638f28824ebd01c57a099915b57930d885a16f785234882157aaad'
             'd8794c22229afdeb698dae5908b7b2b3880e075b19be38e0b296bb28f4555163'
-            '974a6e2f513c114df9923d4366308e31ab53cfaef89d5f794204f1eeb1d98f01'
             '008b60ebf45f7d1e033c8ad8ce1688d5e1c59fc0668493067fb89b563b1dc00f'
             'a897c1b9e8928fc222880ebbfc7bb6aff940bff4acf4e4e0cd4002fff81c7226'
             'e47e770a1e19ed321de7c2765b2d682f59ac466aef92b2e4ea5e65cacf56de36')
 
-# VMware bundles old versions of openssl. Usually we can use system openssl.
-# If things break because VMware relies on legacy or buggy code you can use
-# bundled openssl.
-_USE_BUNDLED_OPENSSL=1
-
 # We need these functions for the Gentoo eclass...
 ebegin() {
 	echo -n "Begin ${1}: "
@@ -84,36 +77,13 @@ build() {
 
 			# ELF executables and libraries only
 			file --mime "${FILE}" | egrep -q "application/x-(pie-)?(executable|sharedlib)" || continue
-
-			# even openssl 1.0.[12].x has library file names ending in .so.1.0.0
-			if [ ${_USE_BUNDLED_OPENSSL:=0} -eq 0 ]; then
-				sed -i -e 's/libssl.so.1.0.[12]/libssl.so.1.0.0/' \
-					-e 's/libcrypto.so.1.0.[12]/libcrypto.so.1.0.0/' \
-					"${FILE}"
-			else
-				# Some files link against openssl...
-				# Use the bundled version there.
-				sed -i -e 's/libssl.so.1.0.[012]/libssl-vmw.so.0/' \
-					-e 's/libcrypto.so.1.0.[012]/libcrypto-vmw.so.0/' \
-					"${FILE}"
-			fi
 		done
 	done
 
-	# now that we fixed dynamic linking...
-	# ... let's finish the hack
-	if [ ${_USE_BUNDLED_OPENSSL:=0} -eq 0 ]; then
-		rm -f "${srcdir}"/extract/vmware-horizon-pcoip/pcoip/lib/vmware/lib{crypto,ssl}.so.1.0.2
-
-		ln -sf ../libcrypto.so.1.0.0 "${srcdir}"/extract/vmware-horizon-pcoip/pcoip/lib/vmware/libcrypto.so.1.0.0
-		ln -sf ../libssl.so.1.0.0 "${srcdir}"/extract/vmware-horizon-pcoip/pcoip/lib/vmware/libssl.so.1.0.0
-	else
-		rename -- '.so.1.0.2' '-vmw.so.0' \
-			"${srcdir}"/extract/vmware-horizon-pcoip/pcoip/lib/vmware/lib{crypto,ssl}.so.1.0.2
-	fi
-
-	# and some more dynamic linking...
-	patch -Np1 < ../0001-ld-preload.patch
+	# remove rpath to fix dynamic linking...
+	for LIB in ${srcdir}/extract/vmware-horizon-pcoip/pcoip/lib/vmware/lib*.so*; do
+		patchelf --remove-rpath "${LIB}"
+	done
 
 	# remove keymap files, depend on vmware-keymaps instead
 	rm -rf "${srcdir}"/extract/vmware-horizon-pcoip/pcoip/lib/vmware/xkeymap/