[arch-commits] Commit in hyperkitty/trunk (PKGBUILD hyperkitty-1.3.2-fonts.patch)

[David Runge]

    Date: Thursday, October 21, 2021 @ 19:51:48
  Author: dvzrv
Revision: 1032057

upgpkg: hyperkitty 1.3.5-1: Upgrade to 1.3.5.

Include python-mistune (v2) as new dependency.
Add python-lxml to checkdepends.
Remove patch to not load fonts from google (the fonts are now included).
Remove modification to allow use of python-django >= 3.2 (now included).

Modified:
  hyperkitty/trunk/PKGBUILD
Deleted:
  hyperkitty/trunk/hyperkitty-1.3.2-fonts.patch

------------------------------+
 PKGBUILD                     |   25 +++++++++----------------
 hyperkitty-1.3.2-fonts.patch |   18 ------------------
 2 files changed, 9 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-21 19:50:31 UTC (rev 1032056)
+++ PKGBUILD	2021-10-21 19:51:48 UTC (rev 1032057)
@@ -2,8 +2,8 @@
 
 _name=HyperKitty
 pkgname=hyperkitty
-pkgver=1.3.4
-pkgrel=2
+pkgver=1.3.5
+pkgrel=1
 pkgdesc="A web interface to access GNU Mailman v3 archives"
 arch=('any')
 url="https://gitlab.com/mailman/hyperkitty"
@@ -11,11 +11,12 @@
 depends=('python-dateutil' 'python-django' 'python-django-compressor'
 'python-django-extensions' 'python-django-gravatar' 'python-django-haystack'
 'python-django-mailman3' 'python-django-q' 'python-django-rest-framework'
-'python-flufl-lock' 'python-mailmanclient' 'python-networkx' 'python-pytz'
-'python-robot-detection' 'python-whoosh' 'sassc')
+'python-flufl-lock' 'python-mailmanclient' 'python-mistune' 'python-networkx'
+'python-pytz' 'python-robot-detection' 'python-whoosh' 'sassc')
 makedepends=('python-isort' 'python-setuptools')
-checkdepends=('python-beautifulsoup4' 'python-elasticsearch' 'python-mock'
-'python-pytest' 'python-whoosh')
+checkdepends=('python-beautifulsoup4' 'python-django-debug-toolbar'
+'python-elasticsearch' 'python-lxml' 'python-mock' 'python-pytest'
+'python-whoosh')
 optdepends=('python-elasticsearch: for using elasticsearch as search backend'
             'python-xapian-haystack: for using xapian as search backend'
             'uwsgi-plugin-python: for running inside uwsgi'
@@ -26,23 +27,20 @@
 )
 install="${pkgname}.install"
 source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"{,.asc}
-        "${pkgname}-1.3.2-fonts.patch"
         "${pkgname}-1.3.2-settings.patch"
         "${pkgname}-qcluster.service"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
         "${pkgname}.uwsgi")
-sha512sums=('8cb0a24aa16b62f697d5d86c19a752b91b18ea228f9c3b3eb66fc4dce9e4fcb8560be7fbaa00000630e70aaff7c521fa7791f704854347e55d27c31dd12e733b'
+sha512sums=('9e794cd522904369dea5a70489e3ab7fe149680ed13f03e5002f0ad84304cf1de7481c71e302cf46cd9fa244cadca5d0c41767ceb4cee82b7153f052bc1b677d'
             'SKIP'
-            '27efcd1f30ab51ae61f4802bd8b06d59df09ef0807f7e92423f18390df04e0bd6f47687e191deb67e96beed8e4d5886164760b0f79d6fcb030b5624b6d7f2c6f'
             '452da2c049f0c35d27e15c16af1a6a526de79a6672b6fdaf9a4bcbdfd2110ebf608e8c5a1f5dfc3bb2febc39ecc6e69e2a657c3b2c6e1d2dc2eca2de81125380'
             'a41c938082ceee555143ddb21c3a95835f9832b9aff423142d78d3e52f12500561f80e0ce43c67a4f190065c9d045945741ac71ab3307db1419c4dc0686db09a'
             '3267427109b08b8c9336b187381ed14357a07370bdcdfc24da94555020ad0424c5bbebc09e131e981e0540c51db443ffe558209e1bca7c2a1b7b1f602ed0805b'
             'c943d82b8640a513728e3f07fa44c0ddb5a3bb8ec84a3a70990e51287ca01977887f895b901688fc4643d8fcb106d524259a86a51bccaafd77c69b241f1b23ba'
             '351f40a6bc1fd1735c883408f9941808e081206927a7c02467e03228243dd156378cac21f851b498702bd4f96fde8e4c80536dbcc6f3c384bf708bed4e988971')
-b2sums=('d405b66115174f118f51abab22037556cd9050200723de75884fa68daf99bf5a8c46abcfe224f2ab138fbaea72d871acc7d040c4d9fcd181521b29de75575bab'
+b2sums=('2ef6917425bdf00a5a03383a8f7ff0eb1243557c1189d9afba33b3c1f09db63b40827b0e7f9602964f251197045594d786df13c6cd288c97980967bdf85eba4c'
         'SKIP'
-        '6a82643eb7628b22c33975af5bac2cc7e6969fe0c423cd92bdd7ca1cb676a1621b0ccc089afe6d2f42aae2a6494a214bed44aa2180ee8dd8c71188e07a32ed7d'
         '1eab6221db4adb1a066bde8d6c84a90d3e414d1d30c5cf55a90a4ac58d131f7c4872c85d65e98d91ee0f4cac6f71c47c829993c736617a86be8fec5d831422c8'
         'e8ae1d123e74b0c6984df3e5fff720e03dcbc3f007123718fe845024b42e5c13b7eac4da6bde04a9e1372d446bfa50ac12479730a9092e8396b73434e59663d3'
         'f4e912e75c5127897837d67626ba94a418ec408f0f3a9bcd1767633347e107600cc43825caa5737a84362273a353bf03097879ff5b9065663150f6db4b96238a'
@@ -53,14 +51,9 @@
 prepare() {
   mv -v "${_name}-${pkgver}" "$pkgname-$pkgver"
   cd "$pkgname-$pkgver"
-  # do not load fonts from gstatic
-  patch -Np1 -i "../${pkgname}-1.3.2-fonts.patch"
   # setting FHS compliant default paths, remove debug options
   patch -Np1 -i "../${pkgname}-1.3.2-settings.patch"
   touch settings_local.py
-  # increase the maximum allowed version of django to 3.2
-  # https://gitlab.com/mailman/hyperkitty/-/merge_requests/357
-  sed -e 's/<3.2/<3.3/g' -i setup.py
 }
 
 build() {

Deleted: hyperkitty-1.3.2-fonts.patch
===================================================================
--- hyperkitty-1.3.2-fonts.patch	2021-10-21 19:50:31 UTC (rev 1032056)
+++ hyperkitty-1.3.2-fonts.patch	2021-10-21 19:51:48 UTC (rev 1032057)
@@ -1,18 +0,0 @@
-diff -ruN a/hyperkitty/static/hyperkitty/libs/fonts/droid/droid.css b/hyperkitty/static/hyperkitty/libs/fonts/droid/droid.css
---- a/hyperkitty/static/hyperkitty/libs/fonts/droid/droid.css	2018-02-19 00:12:08.000000000 +0100
-+++ b/hyperkitty/static/hyperkitty/libs/fonts/droid/droid.css	2020-11-08 00:04:02.141817108 +0100
-@@ -3,7 +3,6 @@
-   font-style: normal;
-   font-weight: 400;
-   src: local('Droid Sans'), local('DroidSans'),
--       url(https://fonts.gstatic.com/s/droidsans/v6/s-BiyweUPV0v-yRb-cjciC3USBnSvpkopQaUR-2r7iU.ttf) format('truetype'),
-        url(DroidSans.ttf) format('truetype');
- }
- @font-face {
-@@ -11,6 +10,5 @@
-   font-style: normal;
-   font-weight: 400;
-   src: local('Droid Sans Mono'), local('DroidSansMono'),
--       url(https://fonts.gstatic.com/s/droidsansmono/v7/ns-m2xQYezAtqh7ai59hJYW_AySPyikQrZReizgrnuw.ttf) format('truetype'),
-        url(DroidSansMono.ttf) format('truetype');
- }