diff options
| author | Marian Buschsieweke <marian.buschsieweke@ovgu.de> | 2019-10-23 15:39:41 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-10-24 04:50:29 -0300 |
| commit | 9d975d783d73e090f5a94aae16ca475cf71d4996 (patch) | |
| tree | c5c80fb8db4a4b8ecd9e9a4add5afc1d5e2c402a /testing | |
| parent | 5d12500629fa1be683bd601c43d3205e0512a423 (diff) | |
| download | aports-9d975d783d73e090f5a94aae16ca475cf71d4996.tar.bz2 aports-9d975d783d73e090f5a94aae16ca475cf71d4996.tar.xz | |
testing/gajim: Adapt for new py3-keyring
The pyKeyring package has been renamed to keyring, as is required by gajim
by default. So the patch no longer is needed (and instead breaks the
packages).
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gajim/APKBUILD | 6 | ||||
| -rw-r--r-- | testing/gajim/fix_dependency_spelling.patch | 12 |
2 files changed, 2 insertions, 16 deletions
diff --git a/testing/gajim/APKBUILD b/testing/gajim/APKBUILD index 9f08695e35..fbfc82fb58 100644 --- a/testing/gajim/APKBUILD +++ b/testing/gajim/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=gajim pkgver=1.1.3 -pkgrel=0 +pkgrel=1 pkgdesc="A full featured and easy to use XMPP client" url="https://gajim.org/" arch="noarch" @@ -14,7 +14,6 @@ makedepends="py-setuptools python3-dev gettext-dev" checkdepends="xvfb dbus" source=" https://$pkgname.org/downloads/${pkgver:0:3}/$pkgname-$pkgver.tar.bz2 - fix_dependency_spelling.patch " subpackages="$pkgname-doc $pkgname-lang" @@ -40,5 +39,4 @@ package() { } -sha512sums="18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac gajim-1.1.3.tar.bz2 -08b4f81ad301a639494ceab33566b42194b33c4d0801df2078980053227c22eb16f8f00f43c17d5022db58739b380caade88dd8b69f5c5f1cf6be6a606ff2117 fix_dependency_spelling.patch" +sha512sums="18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac gajim-1.1.3.tar.bz2" diff --git a/testing/gajim/fix_dependency_spelling.patch b/testing/gajim/fix_dependency_spelling.patch deleted file mode 100644 index 7fd61a756b..0000000000 --- a/testing/gajim/fix_dependency_spelling.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 = find: - test_suite = test - install_requires = - cssutils>=1.0.2 -- keyring -+ pyKeyring - nbxmpp>=0.6.9,<0.7.0 - precis-i18n>=1.0.0 - pyOpenSSL>=0.12 |