Update to v5.5.2, FOSS dep of an older pango

4 files changed, 14 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d5dc91ea16d..f6d73515dc65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = anydesk
 	pkgdesc = 'AnyDesk Free' is an All-In-One Software for Remote Support
-	pkgver = 5.5.1
-	pkgrel = 2
+	pkgver = 5.5.2
+	pkgrel = 1
 	url = https://anydesk.de
 	arch = i686
 	arch = x86_64
@@ -25,18 +25,14 @@ pkgbase = anydesk
 	depends = libxfixes
 	depends = libxdamage
 	depends = gcc-libs
+	depends = pango-anydesk
 	optdepends = libpulse
-	conflicts = anydesk-test
 	source = anydesk.sh
-	source = PKGBUILD.pango
-	source = pango-1.43.0-2.tar.gz
 	sha256sums = 2368b0011fc52cbb4cf8013436628d25db3a86b35ae9a04868e221656a0f77a3
-	sha256sums = f73e451632a1297acba18feb33a1871d532f65640ea59c10ca59152a80034d44
-	sha256sums = a5c9b0530ef5ddb571be4236a8ba624a78ab048fa9be34d135b269052b0459cf
-	source_i686 = https://download.anydesk.com/linux/anydesk_5.5.1-1_i386.deb
-	sha256sums_i686 = 0587765e713c8a6a2e59977f0aaed3b2425753a26656df5a5ed69b9e94f6eac1
-	source_x86_64 = https://download.anydesk.com/linux/anydesk_5.5.1-1_amd64.deb
-	sha256sums_x86_64 = 17d1dacde77730a84b5acd2f5dbf588638d7a78655cb8256a689479369330440
+	source_i686 = https://download.anydesk.com/linux/anydesk_5.5.2-1_i386.deb
+	sha256sums_i686 = bf2a0c8f3ad8d2abc88a92472aa9ddc53cb0d7de50637247839d14ec986d3261
+	source_x86_64 = https://download.anydesk.com/linux/anydesk_5.5.2-1_amd64.deb
+	sha256sums_x86_64 = 097dd283d1f722e8d1607e1ca3663a91b6b573b0f0c29e70659345026fad1023
 
 pkgname = anydesk
 
diff --git a/PKGBUILD b/PKGBUILD
index 50a2620a58c7..12a60f0af944 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,22 @@
 # Maintainer: Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=anydesk
-pkgver=5.5.1
-pkgrel=2
+pkgver=5.5.2
+pkgrel=1
 pkgdesc="'AnyDesk Free' is an All-In-One Software for Remote Support"
 arch=('i686' 'x86_64')
 url="https://anydesk.de"
 license=('custom:Freeware')
-depends=('fakeroot' 'python-shiboken2' 'gtkglext' 'libglvnd' 'gtk2' 'libx11' 'glibc' 'glib2' 'gdk-pixbuf2' 'libxcb' 'cairo' 'pango' 'libxi' 'libxrandr' 'libxtst' 'libxext' 'libxfixes' 'libxdamage' 'gcc-libs')
+depends=('fakeroot' 'python-shiboken2' 'gtkglext' 'libglvnd' 'gtk2' 'libx11' 'glibc' 'glib2' 'gdk-pixbuf2' 'libxcb' 'cairo' 'pango' 'libxi' 'libxrandr' 'libxtst' 'libxext' 'libxfixes' 'libxdamage' 'gcc-libs' 'pango-anydesk')
 optdepends=('libpulse')
-conflicts=('anydesk-test')
 
 source_i686=(https://download.anydesk.com/linux/${pkgname}_${pkgver}-1_i386.deb)
 source_x86_64=(https://download.anydesk.com/linux/${pkgname}_${pkgver}-1_amd64.deb)
-source=('anydesk.sh' 'PKGBUILD.pango' 'pango-1.43.0-2.tar.gz')
+source=('anydesk.sh')
 
-sha256sums_i686=('0587765e713c8a6a2e59977f0aaed3b2425753a26656df5a5ed69b9e94f6eac1')
-sha256sums_x86_64=('17d1dacde77730a84b5acd2f5dbf588638d7a78655cb8256a689479369330440')
-sha256sums=('2368b0011fc52cbb4cf8013436628d25db3a86b35ae9a04868e221656a0f77a3' 'f73e451632a1297acba18feb33a1871d532f65640ea59c10ca59152a80034d44' 'a5c9b0530ef5ddb571be4236a8ba624a78ab048fa9be34d135b269052b0459cf')
+sha256sums_i686=('bf2a0c8f3ad8d2abc88a92472aa9ddc53cb0d7de50637247839d14ec986d3261')
+sha256sums_x86_64=('097dd283d1f722e8d1607e1ca3663a91b6b573b0f0c29e70659345026fad1023')
+sha256sums=('2368b0011fc52cbb4cf8013436628d25db3a86b35ae9a04868e221656a0f77a3')
 
 package() {
     cd "${pkgdir}"
@@ -29,7 +28,6 @@ package() {
     # temporary fix for issues with pango>=1.44
     install "${pkgdir}/usr/bin/anydesk" "${pkgdir}/usr/bin/anydesk.bin"
     install "${srcdir}/anydesk.sh" "${pkgdir}/usr/bin/anydesk"
-    cp -r "${srcdir}/pango-1.43.0-2" "${pkgdir}/usr/share/anydesk/files"
     #
     msg2 "\e[1;32mAnyDesk now has a systemd file for unattendant access: anydesk.service \e[0m"
     install -D -m 644 "${pkgdir}/usr/share/anydesk/files/systemd/anydesk.service" "${pkgdir}/usr/lib/systemd/system/anydesk.service"
diff --git a/PKGBUILD.pango b/PKGBUILD.pango
deleted file mode 100644
index aca4ba721935..000000000000
--- a/PKGBUILD.pango
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pango
-pkgver=1.43.0
-pkgrel=2
-epoch=1
-pkgdesc="A library for layout and rendering of text"
-url="https://www.pango.org/"
-arch=(x86_64)
-license=(LGPL)
-depends=(libthai cairo libxft harfbuzz fribidi)
-makedepends=(gobject-introspection help2man gtk-doc git meson)
-checkdepends=(ttf-dejavu cantarell-fonts)
-_commit=26f1135f374f3ad5eb963dcdf016542fbbda361b  # tags/1.43.0^0
-source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd pango
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd pango
-
-  # Fix .pc
-  git cherry-pick -n d0cb6be7431d1a3c711bd45bcf05b34601604037
-}
-
-build() {
-  arch-meson pango build -D enable_docs=true
-  ninja -C build
-}
-
-check() {
-  meson test -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-  rm -r "$pkgdir"/usr/{lib,share}/installed-tests
-}
diff --git a/pango-1.43.0-2.tar.gz b/pango-1.43.0-2.tar.gz
deleted file mode 100644
index d31bf2d28b89..000000000000
--- a/pango-1.43.0-2.tar.gz
+++ /dev/null