Received: from mail.ovgu.de (mail.ovgu.de [141.44.1.66]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 3FC69782B99 for ; Sat, 13 Jul 2019 18:18:18 +0000 (UTC) Received: from mail.ovgu.de (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id 17B82415E7; Sat, 13 Jul 2019 20:18:18 +0200 (CEST) Received: from faultier2go (x590c5feb.dyn.telefonica.de [89.12.95.235]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.ovgu.de (Postfix) with ESMTPSA id CE23C40066; Sat, 13 Jul 2019 20:18:17 +0200 (CEST) Date: Sat, 13 Jul 2019 20:18:16 +0200 From: Marian Buschsieweke To: Leo Cc: Subject: Re: [PATCH 7/8] testing/gajim: Update 1.0.3 --> 1.1.3 Message-ID: <20190713201816.7655f610@faultier2go> In-Reply-To: References: <20190713114246.17619-7-marian.buschsieweke@ovgu.de> Organization: =?UTF-8?B?T3R0by12b24tR3Vlcmlja2UtVW5pdmVyc2l0w6R0?= Magdeburg X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-alpine-linux-musl) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_//cBEEI_Z3cgJO_OCj9WbXfG"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-PMX-Version: 6.4.6.2792898, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2019.7.13.180917, AntiVirus-Engine: 5.63.0, AntiVirus-Data: 2019.7.12.5630001 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, INVALID_MSGID_NO_FQDN 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __ATTACHMENT_SIZE_0_10K 0, __BODY_NO_MAILTO 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __COURIER_PHRASE 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __DQ_NEG_HEUR 0, __DQ_NEG_IP 0, __FORWARDED_MSG 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __HAS_ATTACHMENT 0, __HAS_ATTACHMENT1 0, __HAS_ATTACHMENT2 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_REFERENCES 0, __HAS_X_MAILER 0, __IN_REP_TO 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_TEXT_P2 0, __MIME_VERSION 0, __PHISH_SPEAR_SUBJ_PREDICATE 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_NEGATE 0, __SUBJ_REPLY 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_NO_WWW 0, __URI_NS ' X-Spam-Score: Gauge= X-PMX-consideredAsSpam: no --Sig_//cBEEI_Z3cgJO_OCj9WbXfG Content-Type: multipart/mixed; boundary="MP_/.m3OwA9nxfzvp=1s9aQYRHT" --MP_/.m3OwA9nxfzvp=1s9aQYRHT Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi, the attached patch is fixed according to your comments. Thanks for the quick review. Also, I couldn't resist from making the indent consistently. Kind regards, Marian On Sat, 13 Jul 2019 12:11:52 -0300 Leo wrote: > The commit title is wrong, please fix >=20 > /: upgrade to >=20 > > +depends=3D"py3-cairo py3-gobject3 py3-asn1 py3-nbxmpp py3-openssl py3-= precis-i18n py3-keyring py3-cssutils gtk+3.0" =20 >=20 > Please cut this line at 80 columns --MP_/.m3OwA9nxfzvp=1s9aQYRHT Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0007-testing-gajim-upgrade-to-1.1.3.patch =46rom db753ee2f8bc8ee23b1cbdfea9fff2b5b57bb6f8 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Sat, 13 Jul 2019 13:36:20 +0200 Subject: [PATCH 7/8] testing/gajim: upgrade to 1.1.3 --- testing/gajim/APKBUILD | 28 +++++++++++++-------- testing/gajim/fix_dependency_spelling.patch | 12 +++++++++ 2 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 testing/gajim/fix_dependency_spelling.patch diff --git a/testing/gajim/APKBUILD b/testing/gajim/APKBUILD index 2b1a7fa90f..a1ef7ec93e 100644 --- a/testing/gajim/APKBUILD +++ b/testing/gajim/APKBUILD @@ -1,20 +1,27 @@ # Maintainer: Marian Buschsieweke pkgname=3Dgajim -pkgver=3D1.0.3 -pkgrel=3D1 +pkgver=3D1.1.3 +pkgrel=3D0 pkgdesc=3D"A full featured and easy to use XMPP client" url=3D"https://gajim.org/" arch=3D"noarch" license=3D"GPL-3.0-only" -depends=3D"py3-cairo py3-gobject3 py3-asn1 py3-nbxmpp py3-openssl gtk+3.0" +depends=3D" + py3-cairo py3-gobject3 py3-asn1 py3-nbxmpp py3-openssl + py3-precis-i18n py3-keyring py3-cssutils gtk+3.0 + " makedepends=3D"py-setuptools python3-dev gettext-dev" checkdepends=3D"xvfb dbus" -source=3D"https://$pkgname.org/downloads/1.0/$pkgname-$pkgver.tar.bz2" +source=3D" + https://$pkgname.org/downloads/${pkgver:0:3}/$pkgname-$pkgver.tar.bz2 + fix_dependency_spelling.patch + " builddir=3D"$srcdir"/$pkgname-$pkgver +subpackages=3D"$pkgname-doc $pkgname-lang" =20 build() { - cd "$builddir" - python3 setup.py build + cd "$builddir" + python3 setup.py build } =20 check() { @@ -28,13 +35,14 @@ check() { else kill $xvfb_pid return 1 - fi + fi } =20 package() { - cd "$builddir" - python3 setup.py install --prefix=3D/usr --root=3D"$pkgdir" + cd "$builddir" + python3 setup.py install --prefix=3D/usr --root=3D"$pkgdir" } =20 -sha512sums=3D"a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a8= 2c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8 gajim= -1.0.3.tar.bz2" =20 +sha512sums=3D"18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e08= 2e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac gajim= -1.1.3.tar.bz2 +08b4f81ad301a639494ceab33566b42194b33c4d0801df2078980053227c22eb16f8f00f43= c17d5022db58739b380caade88dd8b69f5c5f1cf6be6a606ff2117 fix_dependency_spel= ling.patch" diff --git a/testing/gajim/fix_dependency_spelling.patch b/testing/gajim/fi= x_dependency_spelling.patch new file mode 100644 index 0000000000..7fd61a756b --- /dev/null +++ b/testing/gajim/fix_dependency_spelling.patch @@ -0,0 +1,12 @@ +diff -rupN gajim-1.1.3-bak/setup.cfg gajim-1.1.3/setup.cfg +--- gajim-1.1.3-bak/setup.cfg 2019-07-13 13:21:47.213443123 +0200 ++++ gajim-1.1.3/setup.cfg 2019-07-13 13:21:59.913397194 +0200 +@@ -21,7 +21,7 @@ packages =3D find: + test_suite =3D test + install_requires =3D=20 + cssutils>=3D1.0.2 +- keyring ++ pyKeyring + nbxmpp>=3D0.6.9,<0.7.0 + precis-i18n>=3D1.0.0 + pyOpenSSL>=3D0.12 --=20 2.22.0 --MP_/.m3OwA9nxfzvp=1s9aQYRHT-- --Sig_//cBEEI_Z3cgJO_OCj9WbXfG Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQTCygBuMypPDEZ59jZh9kxlmbFTnwUCXSogaAAKCRBh9kxlmbFT nwlnAQCHP+qZpMbYh613IVZoXZErVsyAQwlaz+wMTGs3HdvrnwEA4yLtlV36J55J NQv9nZBlG5K7ATsbN8CwvS9Q6e1aWgc= =UQMP -----END PGP SIGNATURE----- --Sig_//cBEEI_Z3cgJO_OCj9WbXfG--