add patch

3 files changed, 35 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e41045b5a47f..0b30eb033854 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-django-filter1.1
 	pkgdesc = Django-filter is a reusable Django application for allowing users to filter querysets dynamically.
 	pkgver = 1.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/carltongibson/django-filter
 	arch = any
 	license = BSD
@@ -11,7 +11,9 @@ pkgbase = python-django-filter1.1
 	makedepends = python2-setuptools
 	options = !emptydirs
 	source = https://github.com/carltongibson/django-filter/archive/1.1.0.tar.gz
+	source = define-QUERY_TERMS.patch
 	sha256sums = 2894cb3dbea0a7e0117f9f5fe8e64d356113784b51346e2cd23b49b3fb97e71e
+	sha256sums = 85b2e8ebe566569a17d045618e4f87bb21991b70760cfbb0fb34c861c8e4d664
 
 pkgname = python-django-filter1.1
 	depends = python-django>=1.8
diff --git a/PKGBUILD b/PKGBUILD
index 50aa65285701..0ab35174baee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=python-django-filter1.1
 _pkgbase="django-filter"
 pkgname=(python-django-filter1.1 python2-django-filter1.1)
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Django-filter is a reusable Django application for allowing users to filter querysets dynamically.'
 arch=(any)
 url='https://github.com/carltongibson/django-filter'
@@ -20,8 +20,17 @@ makedepends=(
   python2-setuptools
 )
 options=(!emptydirs)
-source=("https://github.com/carltongibson/${_pkgbase}/archive/${pkgver}.tar.gz")
-sha256sums=('2894cb3dbea0a7e0117f9f5fe8e64d356113784b51346e2cd23b49b3fb97e71e')
+source=("https://github.com/carltongibson/${_pkgbase}/archive/${pkgver}.tar.gz"
+        "define-QUERY_TERMS.patch"
+)
+sha256sums=('2894cb3dbea0a7e0117f9f5fe8e64d356113784b51346e2cd23b49b3fb97e71e'
+            '85b2e8ebe566569a17d045618e4f87bb21991b70760cfbb0fb34c861c8e4d664')
+
+prepare() {
+  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  patch -p1 -i "${srcdir}/define-QUERY_TERMS.patch"
+
+}
 
 package_python-django-filter1.1() {
   depends=('python-django>=1.8')
diff --git a/define-QUERY_TERMS.patch b/define-QUERY_TERMS.patch
new file mode 100644
index 000000000000..8fbba661d721
--- /dev/null
+++ b/define-QUERY_TERMS.patch
@@ -0,0 +1,20 @@
+diff -ura package.orig/django_filters/filters.py package.new/django_filters/filters.py
+--- package.orig/django_filters/filters.py	2017-10-19 10:25:54.000000000 +0100
++++ package.new/django_filters/filters.py	2018-10-31 00:00:52.575922176 +0000
+@@ -6,7 +6,15 @@
+ from django import forms
+ from django.db.models import Q
+ from django.db.models.constants import LOOKUP_SEP
+-from django.db.models.sql.constants import QUERY_TERMS
++try:
++    from django.db.models.sql.constants import QUERY_TERMS
++except ImportError:
++    QUERY_TERMS = {
++        'exact', 'iexact', 'contains', 'icontains', 'gt', 'gte', 'lt', 'lte', 'in',
++        'startswith', 'istartswith', 'endswith', 'iendswith', 'range', 'year',
++        'month', 'day', 'week_day', 'hour', 'minute', 'second', 'isnull', 'search',
++        'regex', 'iregex',
++    }
+ from django.utils import six
+ from django.utils.itercompat import is_iterable
+ from django.utils.timezone import now