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

[David Runge]

    Date: Sunday, November 8, 2020 @ 10:40:33
  Author: dvzrv
Revision: 746463

upgpkg: hyperkitty 1.3.3-4: Rebuild to devendor gstatic fonts (droid is included).

Move python-whoosh to default dependencies, because it is the default search engine.

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-08 09:33:12 UTC (rev 746462)
+++ PKGBUILD	2020-11-08 10:40:33 UTC (rev 746463)
@@ -3,7 +3,7 @@
 _name=HyperKitty
 pkgname=hyperkitty
 pkgver=1.3.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A web interface to access GNU Mailman v3 archives"
 arch=('any')
 url="https://gitlab.com/mailman/hyperkitty"
@@ -12,12 +12,11 @@
 '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' 'sassc')
+'python-robot-detection' 'python-whoosh' 'sassc')
 makedepends=('python-isort' 'python-setuptools')
 checkdepends=('python-beautifulsoup4' 'python-elasticsearch' 'python-mock'
 'python-pytest' 'python-whoosh')
 optdepends=('python-elasticsearch: for using elasticsearch as search backend'
-            'python-whoosh: for using whoosh as search backend'
             'python-xapian-haystack: for using xapian as search backend'
             'uwsgi-plugin-python: for running inside uwsgi'
             'ruby-sassc: alternative to sassc')
@@ -27,6 +26,7 @@
 )
 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}-1.3.3-migration.patch"
         "${pkgname}-qcluster.service"
@@ -35,6 +35,7 @@
         "${pkgname}.uwsgi")
 sha512sums=('4be4630bc0344c3e1633772978880fea996fbf2bb49b728c1d05ae13ab1df8c63b6b7b9b735df32eb2ae31798e76be537748e42c830a63aa01eeff0680f1dc76'
             'SKIP'
+            '27efcd1f30ab51ae61f4802bd8b06d59df09ef0807f7e92423f18390df04e0bd6f47687e191deb67e96beed8e4d5886164760b0f79d6fcb030b5624b6d7f2c6f'
             '452da2c049f0c35d27e15c16af1a6a526de79a6672b6fdaf9a4bcbdfd2110ebf608e8c5a1f5dfc3bb2febc39ecc6e69e2a657c3b2c6e1d2dc2eca2de81125380'
             'e8a90eaef5f98c0025af2dd98589e5059fd0073416c10fe17f810e8c7965a2fc724994dd2e56b034d948de032a98d41a4a3520721516dc2e573e324f4a74dff3'
             'a41c938082ceee555143ddb21c3a95835f9832b9aff423142d78d3e52f12500561f80e0ce43c67a4f190065c9d045945741ac71ab3307db1419c4dc0686db09a'
@@ -46,6 +47,8 @@
 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"
   # fix migrations for python-django >= 3.1:

Added: hyperkitty-1.3.2-fonts.patch
===================================================================
--- hyperkitty-1.3.2-fonts.patch	                        (rev 0)
+++ hyperkitty-1.3.2-fonts.patch	2020-11-08 10:40:33 UTC (rev 746463)
@@ -0,0 +1,18 @@
+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');
+ }