Subject: [alpine-aports]

From: Stuart Cardall <[email-masked]>
Date: Mon, 22 Aug 2016 05:15:57 +0000

networkmanager will need to stay disabled until modemanager & it's dependent
libraries are added with these patches.

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Stuart Cardall <[email-masked]>
Date: Mon, 22 Aug 2016 05:16:04 +0000

---
 community/firetools/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/community/firetools/APKBUILD b/community/firetools/APKBUILD
index f3e0c71..50bf13a 100644
--- a/community/firetools/APKBUILD
+++ b/community/firetools/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Stuart Cardall <[email-masked]>
 pkgname=firetools
 pkgver=0.9.40.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Firejail sandbox launcher integrated with the system tray"
 url="https://l3net.wordpress.com/projects/firejail/#firetools"
 arch="all !armhf"
-- 
2.9.3

---

---

From: Stuart Cardall <[email-masked]>
Date: Mon, 22 Aug 2016 05:16:01 +0000

---
 community/whois/APKBUILD                | 17 +++++++++++------
 community/whois/undefined-libintl.patch | 11 +++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 community/whois/undefined-libintl.patch

diff --git a/community/whois/APKBUILD b/community/whois/APKBUILD
index 64371ca..831ee21 100644
--- a/community/whois/APKBUILD
+++ b/community/whois/APKBUILD
@@ -2,21 +2,23 @@
 # Maintainer: Stuart Cardall <[email-masked]>
 pkgname=whois
 pkgver=5.2.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Intelligent WHOIS client by Marco d'Itri"
 url="http://www.linux.it/~md/software/"
 arch="all"
 license="GPL2"
 makedepends="$depends_dev perl libidn-dev gettext-dev"
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/rfc1036/$pkgname/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rfc1036/$pkgname/archive/v$pkgver.tar.gz
+	undefined-libintl.patch
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	make CONFIG_FILE="/etc/whois.conf" \
 		HAVE_LIBIDN=1 HAVE_ICONV=1 \
-		CFLAGS="$CFLAGS -lintl $CXXFLAGS" || return 1
+		|| return 1
 }
 
 package() {
@@ -25,6 +27,9 @@ package() {
 	install -D -m644 whois.conf "$pkgdir/etc/whois.conf"
 }
 
-md5sums="c7d86f4cdc97f92722b2500bf12aefd1  whois-5.2.12.tar.gz"
-sha256sums="8485aa02909fd6aaa1cfd8b5e63559310879bf8a62793a83c96a4502164b968a  whois-5.2.12.tar.gz"
-sha512sums="812ae2a344e5b190175213cca1b10cc58821312f8ad8b31995ecb6963e71b1343ccfa6f06ce896856b9c9622be3dfb22e1fba30ed254f25373f08b4d84143552  whois-5.2.12.tar.gz"
+md5sums="c7d86f4cdc97f92722b2500bf12aefd1  whois-5.2.12.tar.gz
+2242ddc5ddd2bb98465e467e324de686  undefined-libintl.patch"
+sha256sums="8485aa02909fd6aaa1cfd8b5e63559310879bf8a62793a83c96a4502164b968a  whois-5.2.12.tar.gz
+27876ce871f1116b6bc5baeab5176787b36c5ca1574dff2267b236f97b2a35d4  undefined-libintl.patch"
+sha512sums="812ae2a344e5b190175213cca1b10cc58821312f8ad8b31995ecb6963e71b1343ccfa6f06ce896856b9c9622be3dfb22e1fba30ed254f25373f08b4d84143552  whois-5.2.12.tar.gz
+83de8846813ee25acda5027a79b71932cdd8d9a13acac6f7d7831c1f84b154fb865abda510d82222e6edb344dead7f480734b1fe83dc3ba8a3ec81b35ba0ab69  undefined-libintl.patch"
diff --git a/community/whois/undefined-libintl.patch b/community/whois/undefined-libintl.patch
new file mode 100644
index 0000000..0150053
--- /dev/null
+++ b/community/whois/undefined-libintl.patch
@@ -0,0 +1,11 @@
+--- whois-5.2.12/Makefile
++++ whois-5.2.12/Makefile.new
+@@ -14,7 +14,7 @@
+ 
+ # FreeBSD
+ #whois_LDADD += -liconv
+-#LIBS += -L/usr/local/lib -lintl
++LIBS += -lintl
+ #INCLUDES += -I/usr/local/include
+ 
+ # OS/2 EMX
-- 
2.9.3

---

---

From: Stuart Cardall <[email-masked]>
Date: Mon, 22 Aug 2016 05:16:03 +0000

---
 community/xpra/APKBUILD              | 15 ++++++++++-----
 community/xpra/build-ffmpeg3.1.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 community/xpra/build-ffmpeg3.1.patch

diff --git a/community/xpra/APKBUILD b/community/xpra/APKBUILD
index 557700b..ae3801d 100644
--- a/community/xpra/APKBUILD
+++ b/community/xpra/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Stuart Cardall <[email-masked]>
 # Maintainer: Stuart Cardall <[email-masked]>
 pkgname=xpra
-pkgver=0.17.1
+pkgver=0.17.4
 pkgrel=1
 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"
@@ -13,7 +13,9 @@ depends_dev="python-dev cython-dev libx11-dev libxtst-dev libxcomposite-dev libx
 		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 linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tests"
-source="http://xpra.org/src/$pkgname-$pkgver.tar.xz"
+source="http://xpra.org/src/$pkgname-$pkgver.tar.xz
+	build-ffmpeg3.1.patch
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -47,6 +49,9 @@ tests() {
 	cp -rf tests "$subpkgdir"/usr/share/xpra/
 }
 
-md5sums="d83910c4e8c3799822f5fe90f6d8e928  xpra-0.17.1.tar.xz"
-sha256sums="041de13937f3f0529dcde9ccc681b52bc85c5074a021060a56a1da2cdfe66315  xpra-0.17.1.tar.xz"
-sha512sums="f1d323b7207b89838045126939d7d68ff72313c00724f2be7d405c12880fedc12900c11c8d36a0780ee6f7ffca1b6f75c69136eeebd73333fbd437cf9a7ffcfa  xpra-0.17.1.tar.xz"
+md5sums="b8d028fe85245500bb3bfa041e04636f  xpra-0.17.4.tar.xz
+c51b684d9652ad65315c7aec3134b3f8  build-ffmpeg3.1.patch"
+sha256sums="92a7854b8ddad6a28efddf226bcbe8e79b051dff859246fcb5f2c7d0828f3d6d  xpra-0.17.4.tar.xz
+323e6a0ee209d4e1f36b476bd04372e2e4e62406cf8ad6383b13743bc4a34872  build-ffmpeg3.1.patch"
+sha512sums="5463d3ca659fe6d1617e69eee0b115f9df2f488c8c390a02e9eb31e04c29d262679a5463fdd13472cdd2328d01c52fde6ad9a87686fe95cb8adcbff97af6e324  xpra-0.17.4.tar.xz
+c32205b716848396c5c0872ad120f06e45841ef880ecbbbe8166fb004d3f1d3fb1575f5a7f3eebfc8764ff4a7e8d30e49b4a599ae791748c36a39b4782ead8f6  build-ffmpeg3.1.patch"
diff --git a/community/xpra/build-ffmpeg3.1.patch b/community/xpra/build-ffmpeg3.1.patch
new file mode 100644
index 0000000..04619ed
--- /dev/null
+++ b/community/xpra/build-ffmpeg3.1.patch
@@ -0,0 +1,26 @@
+Forwarded: not-needed
+Origin: upstream, https://www.xpra.org/trac/changeset/12944/xpra
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=832863
+Bug-Upstream: https://www.xpra.org/trac/ticket/1242
+Author: Antoine Martin <[email-masked]>
+Description: avoid FTBFS with FFmpeg-3.1.
+ ~~~~
+ xpra/codecs/dec_avcodec2/decoder.c: In function '__pyx_pf_4xpra_6codecs_12dec_avcodec2_7decoder_7Decoder_22decompress_image':
+ xpra/codecs/dec_avcodec2/decoder.c:7505:9: error: 'avcodec_decode_video2' is deprecated [-Werror=deprecated-declarations]
+          __pyx_v_len = avcodec_decode_video2(__pyx_v_self->codec_ctx, __pyx_v_self->av_frame, (&__pyx_v_got_picture), (&__pyx_v_avpkt));
+          ^
+ ~~~~
+
+--- a/setup.py
++++ b/setup.py
+@@ -2310,8 +2310,9 @@
+ 
+ toggle_packages(dec_avcodec2_ENABLED, "xpra.codecs.dec_avcodec2")
+ if dec_avcodec2_ENABLED:
+     avcodec2_pkgconfig = pkgconfig("avcodec", "avutil")
++    add_to_keywords(avcodec2_pkgconfig, 'extra_compile_args', "-Wno-error=deprecated-declarations")
+     cython_add(Extension("xpra.codecs.dec_avcodec2.decoder",
+                 ["xpra/codecs/dec_avcodec2/decoder.pyx"]+membuffers_c,
+                 **avcodec2_pkgconfig))
+ 
+
-- 
2.9.3

---

---

From: Stuart Cardall <[email-masked]>
Date: Mon, 22 Aug 2016 05:15:59 +0000

---
 community/libqmi/APKBUILD | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/community/libqmi/APKBUILD b/community/libqmi/APKBUILD
index 110b299..08972e3 100644
--- a/community/libqmi/APKBUILD
+++ b/community/libqmi/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Stuart Cardall <[email-masked]>
 # Maintainer: Stuart Cardall <[email-masked]>
 pkgname=libqmi
-pkgver=1.12.6
+pkgver=1.6.0
 pkgrel=0
 pkgdesc="QMI modem protocol helper library"
 url="http://www.freedesktop.org/wiki/Software/libqmi"
 arch="all"
 license="GPL2"
 depends=""
-depends_dev="glib-dev"
-makedepends="$depends_dev gtk-doc python"
+depends_dev=""
+makedepends="$depends_dev gtk-doc python glib-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
@@ -43,6 +43,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="24c9eb300662ba6cff0152de89bd9ec0  libqmi-1.12.6.tar.xz"
-sha256sums="0857bffece4e8ddfa7f721dd9ca63b4c78de345ac9ae2faebf04062cacba3780  libqmi-1.12.6.tar.xz"
-sha512sums="7001f61dbe2be431867a504dbfc634ed5e7c3f3b1740aef7833fb8163d1a6bdffb57793f09062f49c0b8eeff5a011a2a057a938d618f3547ff5942021b3e8a9d  libqmi-1.12.6.tar.xz"
+md5sums="17d6c2b404ee1eb4d1e60050fef64491  libqmi-1.6.0.tar.xz"
+sha256sums="fa4ff7dacfd1063880c517683fb928b3be5609a45f60d36ec834c1b5711d4582  libqmi-1.6.0.tar.xz"
+sha512sums="8bd69c3ce21cd4e9cc89fa99b88121dceafdfabc30e1d4643b32890ae8ec2671534ec920b457cc837b621263146c2d02ab799b34e00141c23053a16e155f822f  libqmi-1.6.0.tar.xz"
-- 
2.9.3

---

---

From: Stuart Cardall <[email-masked]>
Date: Mon, 22 Aug 2016 05:16:00 +0000

---
 community/modemmanager/APKBUILD | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/community/modemmanager/APKBUILD b/community/modemmanager/APKBUILD
index 94cea74..1f521c2 100644
--- a/community/modemmanager/APKBUILD
+++ b/community/modemmanager/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Stuart Cardall <[email-masked]>
 # Maintainer: Stuart Cardall <[email-masked]>
 pkgname=modemmanager
-pkgver=1.4.14
+pkgver=1.6.0
 pkgrel=0
 pkgdesc="ModemManager library"
 url="http://www.freedesktop.org/wiki/Software/ModemManager"
@@ -12,7 +12,6 @@ makedepends="$depends_dev gobject-introspection-dev gtk-doc intltool vala
 	libgudev-dev polkit-dev libmbim-dev libqmi-dev linux-headers"
 subpackages="$pkgname-dev $pkgname-lang $pkgname-doc libmm-glib:libmm libmm-glib-dev:libmmdev"
 source="http://www.freedesktop.org/software/ModemManager/ModemManager-$pkgver.tar.xz
-	no-XCASE.patch
 	$pkgname.rules
 	"
 
@@ -41,6 +40,8 @@ build() {
 		--with-newest-qmi-commands \
 		--with-dbus-sys-dir=/etc/dbus-1 \
 		--enable-vala=yes \
+		--without-mbim \
+		--without-qmi \
 		|| return 1
 	# https://bugzilla.gnome.org/show_bug.cgi?id=655517
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -82,12 +83,9 @@ To control your modem without the root password: add your user account to the 'p
 EOF
 }
 
-md5sums="cabb72e7c2ddf6af96eca2c9f3d168a3  ModemManager-1.4.14.tar.xz
-63288189ea454e9712dc26d76d75277d  no-XCASE.patch
+md5sums="d9d93d2961ee35b4cd8a75a6a8631cb4  ModemManager-1.6.0.tar.xz
 735e155a785554349906c09dd36d3866  modemmanager.rules"
-sha256sums="abe6cdd515a774bcba3afdcdb1e504569801e79282ccdf26099f33cbb8731ba2  ModemManager-1.4.14.tar.xz
-5e5b87b580faf14e4c56ccc7f9f189522742a64ab365b26751dcc86e68dedb87  no-XCASE.patch
+sha256sums="a94f4657a8fa6835e2734fcc6edf20aa8c8d452f62299d7748541021c3eb2445  ModemManager-1.6.0.tar.xz
 577807e59b1e95757a4d94922c66f7f36487922c5092a6c148e7db6a4dc6afe8  modemmanager.rules"
-sha512sums="2fb5517cd3fbd98cf4048cec326fabf18fb26d88b75e56208d1ed64d70d72d6e826ef30391c86fbcfe4d69661194bcfbb55d545db10ebe8baf8ef16a3c580446  ModemManager-1.4.14.tar.xz
-5c537e4a86212339d0c41ae3e1055513051a0d6e51bdf2547a38054fbe802feeac2ff46c863ab69423a6693ac33ebacec7a771d4b270aeb5fe6e6bb601361f23  no-XCASE.patch
+sha512sums="66f1ff1c872e360a56b5b6c6d4071544b6c6e0423f3c825d3ea8383898e80a177eb9efdf82538ca6fa02ae8db464d3aa8bbe226f195e7065f074b75c115a5182  ModemManager-1.6.0.tar.xz
 3c76ee577334e25c836857f8e7fef6a249cdd9fcd8f889cb64d9c1667bc6a95c087267a153bddd1a13256c59f8cd578ccb448e6b9cb54b73bb74acb8a0ca1e3f  modemmanager.rules"
-- 
2.9.3

---