summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--flask-babel-3.patch33
3 files changed, 41 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d77bdc946089..db2f1132b9a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = searx
pkgdesc = A privacy-respecting, hackable metasearch engine (python(3) based)
pkgver = 1.1.0
- pkgrel = 1
+ pkgrel = 2
url = https://searx.github.io/searx/
arch = any
license = AGPL
@@ -23,9 +23,11 @@ pkgbase = searx
backup = etc/searx/settings.yml
backup = etc/uwsgi/searx.ini
source = https://github.com/searx/searx/archive/v1.1.0.zip
+ source = flask-babel-3.patch
source = searx.ini
source = searx.sysusers
sha512sums = ed92199913353ed246ff30c516402326e9eac0f439b4519d6500b516f9ef73e73d0b25d894c078fb9b65870f2b10a09777d1ae068d13c8e10c91ec14de450b1e
+ sha512sums = 1db543553aa4989e1cb9fb449a1c4badfd5a1c8e39afc99b5f894557ba74b9293b64d02882919ce9f2e4c108a6cd3b7acb51043e98bc3bab40e69078fbe8813f
sha512sums = 476a4297c51681a9a92c6db3933359cc5a8ec292e45b229d98608ef2906b80c173868a30df06c329204c6f9371736a5bb322239860199526fd559780b37a2d0a
sha512sums = 6856e26451fe053d37c2ce4b9d5f3b35891dd8ec702c5256c02d04415124c57705abc497f12943948a85621bb0238d26c2c1f3a7bf42404a6ff1487c7655909e
diff --git a/PKGBUILD b/PKGBUILD
index 8e4eaf4247b6..e33c72f09992 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=searx
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="A privacy-respecting, hackable metasearch engine (python(3) based)"
arch=('any')
url="https://searx.github.io/searx/"
@@ -25,15 +25,19 @@ conflicts=('searx-git' )
replaces=('searx-py3')
backup=('etc/searx/settings.yml' 'etc/uwsgi/searx.ini')
source=("https://github.com/searx/searx/archive/v$pkgver.zip"
+ 'flask-babel-3.patch'
'searx.ini'
'searx.sysusers')
sha512sums=('ed92199913353ed246ff30c516402326e9eac0f439b4519d6500b516f9ef73e73d0b25d894c078fb9b65870f2b10a09777d1ae068d13c8e10c91ec14de450b1e'
+ '1db543553aa4989e1cb9fb449a1c4badfd5a1c8e39afc99b5f894557ba74b9293b64d02882919ce9f2e4c108a6cd3b7acb51043e98bc3bab40e69078fbe8813f'
'476a4297c51681a9a92c6db3933359cc5a8ec292e45b229d98608ef2906b80c173868a30df06c329204c6f9371736a5bb322239860199526fd559780b37a2d0a'
'6856e26451fe053d37c2ce4b9d5f3b35891dd8ec702c5256c02d04415124c57705abc497f12943948a85621bb0238d26c2c1f3a7bf42404a6ff1487c7655909e')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 < ../flask-babel-3.patch
+
# Allow newer versions of the dependencies
sed -i "s|==|>=|g" requirements.txt
diff --git a/flask-babel-3.patch b/flask-babel-3.patch
new file mode 100644
index 000000000000..a575a0e049a6
--- /dev/null
+++ b/flask-babel-3.patch
@@ -0,0 +1,33 @@
+diff --git a/searx/webapp.py b/searx/webapp.py
+index e37eaf73..96bac1c0 100755
+--- a/searx/webapp.py
++++ b/searx/webapp.py
+@@ -141,7 +141,6 @@ if not werkzeug_reloader\
+ or (werkzeug_reloader and os.environ.get("WERKZEUG_RUN_MAIN") == "true"):
+ search_initialize(enable_checker=True)
+
+-babel = Babel(app)
+
+ rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'fa_IR', 'glk', 'he',
+ 'ku', 'mzn', 'pnb', 'ps', 'sd', 'ug', 'ur', 'yi']
+@@ -188,7 +187,6 @@ def _get_browser_or_settings_language(request, lang_list):
+ return settings['search']['default_lang'] or 'en'
+
+
+-@babel.localeselector
+ def get_locale():
+ if 'locale' in request.form\
+ and request.form['locale'] in settings['locales']:
+@@ -217,6 +215,12 @@ def get_locale():
+
+ return locale
+
++babel = Babel()
++if hasattr(babel, "localeselector"):
++ babel.init_app(app)
++ babel.localeselector(get_locale)
++else:
++ babel.init_app(app, locale_selector=get_locale)
+
+ # code-highlighter
+ @app.template_filter('code_highlighter')