diff --git a/.SRCINFO b/.SRCINFO index 02fce4a..c8718d0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Oct 21 18:37:12 UTC 2017 +# Thu Nov 16 17:46:29 UTC 2017 pkgbase = teamviewer pkgdesc = All-In-One Software for Remote Support and Online Meetings pkgver = 12.0.85001 - pkgrel = 6 + pkgrel = 7 url = http://www.teamviewer.com install = teamviewer.install arch = i686 @@ -13,16 +13,19 @@ pkgbase = teamviewer conflicts = teamviewer-beta options = !strip source_i686 = https://download.teamviewer.com/download/version_12x/teamviewer_12.0.85001_i386.deb + source_i686 = https://archive.archlinux.org/packages/f/freetype2/freetype2-2.8-2-i686.pkg.tar.xz depends_i686 = fontconfig depends_i686 = libpng12 depends_i686 = libsm depends_i686 = libxinerama depends_i686 = libxrender depends_i686 = libjpeg6-turbo - depends_i686 = freetype2<2.8.1 + depends_i686 = freetype2 depends_i686 = libxtst sha256sums_i686 = 7a729557ef7618c41c8a94a6d668fa84422ecf9acf2b1889ea52c727849f7f07 + sha256sums_i686 = d33cf8be0c4be1c602d368fb363c9029d87f2bc4fdfcae5063595ac482ca39e8 source_x86_64 = https://download.teamviewer.com/download/version_12x/teamviewer_12.0.85001_amd64.deb + source_x86_64 = https://archive.archlinux.org/packages/l/lib32-freetype2/lib32-freetype2-2.8-2-x86_64.pkg.tar.xz depends_x86_64 = lib32-fontconfig depends_x86_64 = lib32-libpng12 depends_x86_64 = lib32-libsm @@ -30,9 +33,10 @@ pkgbase = teamviewer depends_x86_64 = lib32-libxrender depends_x86_64 = lib32-libjpeg6-turbo depends_x86_64 = lib32-libxtst - depends_x86_64 = lib32-freetype2<2.8.1 + depends_x86_64 = lib32-freetype2 depends_x86_64 = libxtst sha256sums_x86_64 = da586795ae999535a214162cd5f4b1c1175b64d99c4da08944957f8e725ad58a + sha256sums_x86_64 = 4f39c9bd52579ac5d13980d760a5434fdb0f0638df07d2abca9ea44a779185e3 pkgname = teamviewer diff --git a/PKGBUILD b/PKGBUILD index 3404b7a..61d8791 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=teamviewer pkgver=12.0.85001 -pkgrel=6 +pkgrel=7 pkgdesc='All-In-One Software for Remote Support and Online Meetings' arch=('i686' 'x86_64') url='http://www.teamviewer.com' @@ -18,7 +18,7 @@ depends_x86_64=( 'lib32-libxrender' 'lib32-libjpeg6-turbo' 'lib32-libxtst' - 'lib32-freetype2<2.8.1' + 'lib32-freetype2' 'libxtst') depends_i686=( 'fontconfig' @@ -27,23 +27,33 @@ depends_i686=( 'libxinerama' 'libxrender' 'libjpeg6-turbo' - 'freetype2<2.8.1' + 'freetype2' 'libxtst') install=teamviewer.install -source_x86_64=("https://download.teamviewer.com/download/version_${pkgver%%.*}x/teamviewer_${pkgver}_amd64.deb") -source_i686=("https://download.teamviewer.com/download/version_${pkgver%%.*}x/teamviewer_${pkgver}_i386.deb") -sha256sums_i686=('7a729557ef7618c41c8a94a6d668fa84422ecf9acf2b1889ea52c727849f7f07') -sha256sums_x86_64=('da586795ae999535a214162cd5f4b1c1175b64d99c4da08944957f8e725ad58a') +source_x86_64=("https://download.teamviewer.com/download/version_${pkgver%%.*}x/teamviewer_${pkgver}_amd64.deb" + "https://archive.archlinux.org/packages/l/lib32-freetype2/lib32-freetype2-2.8-2-x86_64.pkg.tar.xz") +source_i686=("https://download.teamviewer.com/download/version_${pkgver%%.*}x/teamviewer_${pkgver}_i386.deb" + "https://archive.archlinux.org/packages/f/freetype2/freetype2-2.8-2-i686.pkg.tar.xz") +sha256sums_i686=('7a729557ef7618c41c8a94a6d668fa84422ecf9acf2b1889ea52c727849f7f07' + 'd33cf8be0c4be1c602d368fb363c9029d87f2bc4fdfcae5063595ac482ca39e8') +sha256sums_x86_64=('da586795ae999535a214162cd5f4b1c1175b64d99c4da08944957f8e725ad58a' + '4f39c9bd52579ac5d13980d760a5434fdb0f0638df07d2abca9ea44a779185e3') prepare() { warning "If the install fails, you need to uninstall previous major version of Teamviewer" - tar -xf data.tar.bz2 + mkdir data + cd data + tar -xf ../data.tar.bz2 } package() { # Install warning "If the install fails, you need to uninstall previous major version of Teamviewer" - cp -dr --no-preserve=ownership {etc,opt,usr,var} "${pkgdir}"/ + cp -dr --no-preserve=ownership ./data/{etc,opt,usr,var} "${pkgdir}"/ + + # freetype workaround + [ -e "${srcdir}/usr/lib32/libfreetype.so.6.14.0" ] && install -D -m0755 "${srcdir}/usr/lib32/libfreetype.so.6.14.0" "${pkgdir}/opt/teamviewer/tv_bin/wine/lib/libfreetype.so.6" + [ -e "${srcdir}/usr/lib/libfreetype.so.6.14.0" ] && install -D -m0755 "${srcdir}/usr/lib/libfreetype.so.6.14.0" "${pkgdir}/opt/teamviewer/tv_bin/wine/lib/libfreetype.so.6" # Additional files rm "${pkgdir}"/opt/teamviewer/tv_bin/xdg-utils/xdg-email