From: Stuart Cardall <developer@it-offshore.co.uk>
To: alpine-aports@lists.alpinelinux.org
Subject: [alpine-aports] [PATCH v2] testing/xpra: update to 0.16.3
Date: Sat, 23 Apr 2016 01:04:53 +0000
Message-Id: <1461373493-304-1-git-send-email-developer@it-offshore.co.uk>
Precedence: list

---
Changes v1 -> v2:
 - fix depends
 - fix gdk / xorg linking

 testing/xpra/APKBUILD | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/testing/xpra/APKBUILD b/testing/xpra/APKBUILD
index 6db4795..da16e5a 100644
--- a/testing/xpra/APKBUILD
+++ b/testing/xpra/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=xpra
-pkgver=0.15.6
+pkgver=0.16.3
 pkgrel=0
 pkgdesc="Xpra is 'screen for X' & allows you to run X programs, usually on a remote host over SSH or encrypted tcp."
 url="http://xpra.org"
 arch="all"
 license="GPLv2+"
-depends="py-gobject py-gtk py-imaging xf86-video-dummy xvfb setxkbmap"
+depends="py-gobject py-gtk py-imaging xf86-video-dummy xvfb setxkbmap xorg-server"
 depends_dev="python-dev cython-dev libx11-dev libxtst-dev libxcomposite-dev libxdamage-dev libxrandr-dev
-		py-gobject-dev py-gtk-dev libxkbfile-dev gtk+2.0-dev x264-dev libvpx-dev ffmpeg-dev libwebp-dev"
+		py-gobject-dev py-gtk-dev libxkbfile-dev gtk+2.0-dev x264-dev x265-dev libvpx-dev ffmpeg-dev libwebp-dev"
 makedepends="$depends_dev cython"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://xpra.org/src/$pkgname-$pkgver.tar.xz"
@@ -26,7 +26,14 @@ prepare() {
 }
 
 build() {
-        cd "$_builddir"
+        cd "$_builddir" # https://www.xpra.org/trac/ticket/1080
+	CFLAGS="$CFLAGS -fno-strict-aliasing"
+	# fixes lazy loading by xorg under musl http://xpra.org/trac/ticket/820
+	sed -i setup.py \
+                -e '/GDK_BINDINGS_PACKAGES = PYGTK_PACKAGES/s/"xfixes"/"x11", "xext", "xfixes"/' \
+                -e 's/pkgconfig("xtst", "xfixes", "xcomposite", "xdamage", "xext")\
+			/pkgconfig("x11", "xtst", "xfixes", "xcomposite", "xdamage", "xext")/' \
+                -e 's/pkgconfig("xcomposite", "xdamage", "xext")/pkgconfig("x11", "xcomposite", "xdamage", "xext")/'
 	python setup.py build || return 1
 }
 
@@ -35,6 +42,6 @@ package() {
         python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="0e115be1df40fe2ce2fe63ff2460488a  xpra-0.15.6.tar.xz"
-sha256sums="cebd8d22d4173610258c835f175ad3781cf49bf91b3d6d3c36c35a825228fa32  xpra-0.15.6.tar.xz"
-sha512sums="750b24d06b6af93757e54651c0e5e55192280715c4439e56881824da90dcea25460631c993bf239c6f9023e74dce5063e32688e31c616d036da16fa3da8c304a  xpra-0.15.6.tar.xz"
+md5sums="9f81ac22991083ee49e01f62ae113a56  xpra-0.16.3.tar.xz"
+sha256sums="1516ab10eb348092077ffb698bce234d06a234a5748e422fdf92f34922fb39ea  xpra-0.16.3.tar.xz"
+sha512sums="1a6bbd01837e702e98ffcaffe12a2e5320108ef50f0fcc64a80735fb53a2b41e4cdda0e0a2d1a3b5f2159a81da4a7c2cac458ab4c2eed4de17adb4e963218590  xpra-0.16.3.tar.xz"
-- 
2.8.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---