commit vmware-horizon-client 2012-1

2 files changed, 31 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77d6af0ac707..2e59fae85a6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vmware-horizon-client
 	pkgdesc = VMware Horizon Client connect to VMware Horizon virtual desktop
-	pkgver = 2006
+	pkgver = 2012
 	pkgrel = 1
 	url = https://www.vmware.com/go/viewclients
 	arch = x86_64
@@ -8,12 +8,12 @@ pkgbase = vmware-horizon-client
 	makedepends = libxslt
 	makedepends = patchelf
 	makedepends = librsvg
-	source = vmware-horizon-client-2006-8.0.0-16522670-x86_64.bundle::https://download3.vmware.com/software/view/viewclients/CART21FQ2/VMware-Horizon-Client-2006-8.0.0-16522670.x64.bundle
+	source = vmware-horizon-client-2012-8.1.0-17349998-x86_64.bundle::https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-2012-8.1.0-17349998.x64.bundle
 	source = https://sources.gentoo.org/proj/vmware.git/plain/eclass/vmware-bundle.eclass
 	source = vmware-horizon-usb
 	source = vmware-horizon-usb.service
 	source = vmware-horizon.svg
-	sha256sums = 77aa390140316956c21910108d440fac6a261fe5e57110ebce5229c9b9a95ccd
+	sha256sums = b89cb48482cfb5d7c57241cddee397f0ed52ba30d727953dbbedc04d2f14b7da
 	sha256sums = d6863e92b891fc506fc8e81714a47ca3f9f74b7fe68bdf48be058d5e0d433033
 	sha256sums = 008b60ebf45f7d1e033c8ad8ce1688d5e1c59fc0668493067fb89b563b1dc00f
 	sha256sums = a897c1b9e8928fc222880ebbfc7bb6aff940bff4acf4e4e0cd4002fff81c7226
diff --git a/PKGBUILD b/PKGBUILD
index 0515f37bbe85..7321dbc3d502 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,28 @@
 # Maintainer: Christian Hesse <mail@eworm.de>
 
 pkgbase=vmware-horizon-client
-pkgname=('vmware-horizon-client'
-	'vmware-horizon-integrated-printing'
-	'vmware-horizon-mmr'
-	'vmware-horizon-rtav'
-	'vmware-horizon-smartcard'
-	'vmware-horizon-tsdr'
-	'vmware-horizon-usb')
-_bundled_with_client=('vmware-horizon-pcoip'
-	'vmware-horizon-seamless-window')
-  # Currently unused bundled packages:
-  #  vmware-horizon-html5mmr
-  #  vmware-horizon-media-provider
-  #  vmware-horizon-scannerclient
-  #  vmware-horizon-serialportclient
-  #  vmware-horizon-url-redirection
-pkgver=2006
-_build1=8.0.0
-_build2=16522670
-_cart='CART21FQ2'
+pkgname=(
+  'vmware-horizon-client'
+  'vmware-horizon-integrated-printing'
+  'vmware-horizon-mmr'
+  'vmware-horizon-rtav'
+  'vmware-horizon-smartcard'
+  'vmware-horizon-tsdr'
+  'vmware-horizon-usb')
+_bundled_with_client=(
+  'vmware-horizon-hosted-apps'
+  'vmware-horizon-pcoip')
+# Extract anyway so we can find messing components... :-p
+_unused_components=(
+  'vmware-horizon-html5mmr'
+  'vmware-horizon-media-provider'
+  'vmware-horizon-scannerclient'
+  'vmware-horizon-serialportclient'
+  'vmware-horizon-url-redirection')
+pkgver=2012
+_build1=8.1.0
+_build2=17349998
+_cart='CART21FQ4'
 pkgrel=1
 pkgdesc='VMware Horizon Client connect to VMware Horizon virtual desktop'
 arch=('x86_64')
@@ -31,7 +34,7 @@ source=("${pkgbase}-${pkgver}-${_build1}-${_build2}-x86_64.bundle::https://downl
         'vmware-horizon-usb'
         'vmware-horizon-usb.service'
         'vmware-horizon.svg')
-sha256sums=('77aa390140316956c21910108d440fac6a261fe5e57110ebce5229c9b9a95ccd'
+sha256sums=('b89cb48482cfb5d7c57241cddee397f0ed52ba30d727953dbbedc04d2f14b7da'
             'd6863e92b891fc506fc8e81714a47ca3f9f74b7fe68bdf48be058d5e0d433033'
             '008b60ebf45f7d1e033c8ad8ce1688d5e1c59fc0668493067fb89b563b1dc00f'
             'a897c1b9e8928fc222880ebbfc7bb6aff940bff4acf4e4e0cd4002fff81c7226'
@@ -51,7 +54,7 @@ prepare() {
 
 	source "${srcdir}/vmware-bundle.eclass"
 
-	for bundle in "${pkgname[@]}" "${_bundled_with_client[@]}"; do
+	for bundle in "${pkgname[@]}" "${_bundled_with_client[@]}" "${_unused_components[@]}"; do
 	        vmware-bundle_extract-bundle-component "${srcdir}/${pkgbase}-${pkgver}-${_build1}-${_build2}-${CARCH}.bundle" "${bundle}" "${srcdir}/extract/${bundle}"
 	done
 
@@ -62,18 +65,6 @@ prepare() {
 build() {
 	cd "${srcdir}/extract/"
 
-	# This is a dirty hack, but it works.
-	# Change dynamic section in ELF files to fix dynamic linking.
-	# Make sure the length is not changed!
-	#
-	# for system openssl:
-	#	libssl.so.1.0.[12] -> libssl.so.1.0.0
-	#	libcrypto.so.1.0.[12] -> libcrypto.so.1.0.0
-	#
-	# for bundled openssl - we use uncommon name to make sure no other application will care:
-	#	libssl.so.1.0.[12] -> libssl-vmw.so.0
-	#	libcrypto.so.1.0.[12] -> libcrypto-vmw.so.0
-
 	for bundle in "${pkgname[@]}" "${_bundled_with_client[@]}"; do
 		for FILE in $(find "${bundle}" -type f); do
 			# executables and libraries only
@@ -81,19 +72,16 @@ build() {
 
 			# make executable
 			chmod +x "${FILE}"
-
-			# ELF executables and libraries only
-			file --mime "${FILE}" | egrep -q "application/x-(pie-)?(executable|sharedlib)" || continue
 		done
 	done
 
 	# remove rpath to fix dynamic linking...
-	for LIB in ${srcdir}/extract/vmware-horizon-pcoip/pcoip/lib/vmware/lib*.so*; do
+	for LIB in ${srcdir}/extract/vmware-horizon-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/
+	rm -rf "${srcdir}"/extract/vmware-horizon-pcoip/lib/vmware/xkeymap/
 
 	# remove png icon, we install svg and rendered pngs
 	sed -i -e '/Name=/a Comment=Connect to VMware Horizon View virtual machines' -e '/^Icon=/c Icon=vmware-horizon' \
@@ -133,9 +121,9 @@ package_vmware-horizon-client() {
 	cd "${srcdir}/extract/vmware-horizon-pcoip/"
 
 	mkdir -p "${pkgdir}/usr/"
-	cp -a pcoip/lib/ "${pkgdir}/usr/"
+	cp -a lib/ "${pkgdir}/usr/"
 
-	cd "${srcdir}/extract/vmware-horizon-seamless-window/"
+	cd "${srcdir}/extract/vmware-horizon-hosted-apps/"
 
 	mkdir -p "${pkgdir}/usr/"
 	install -D -m0755 vmware-view "${pkgdir}/usr/lib/vmware/view/bin/vmware-view"
@@ -157,7 +145,6 @@ package_vmware-horizon-integrated-printing() {
 	cd "${srcdir}/extract/vmware-horizon-integrated-printing/"
 
 	mkdir -p "${pkgdir}/usr/"
-	cp -a bin/ "${pkgdir}/usr/"
 	cp -a lib/ "${pkgdir}/usr/"
 }