Date: Thu, 28 Apr 2022 10:08:15 GMT From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b652075bb7b7 - main - deskutils/py-paperless: Switch to using Django 3.2 Message-ID: <202204281008.23SA8FOa037442@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=b652075bb7b7f59821a3d29336d2d1cc4be614e6 commit b652075bb7b7f59821a3d29336d2d1cc4be614e6 Author: Michael Gmelin <grembo@FreeBSD.org> AuthorDate: 2022-04-25 11:44:53 +0000 Commit: Kai Knoblich <kai@FreeBSD.org> CommitDate: 2022-04-28 10:06:19 +0000 deskutils/py-paperless: Switch to using Django 3.2 This required a few smaller changes. Also fixes permission issue that stopped paperless_consumer from starting. --- deskutils/py-paperless/Makefile | 3 ++- .../files/patch-src-paperless-settings.py | 7 +++++++ ...dmin_documents_document_change__list__results.html | 11 +++++++++++ deskutils/py-paperless/pkg-plist | 19 ++++++++++++++----- 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/deskutils/py-paperless/Makefile b/deskutils/py-paperless/Makefile index c74385e579c3..47b9370236d4 100644 --- a/deskutils/py-paperless/Makefile +++ b/deskutils/py-paperless/Makefile @@ -1,6 +1,6 @@ PORTNAME= paperless PORTVERSION= 2.7.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= deskutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -104,6 +104,7 @@ do-install: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.orig' -delete @${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/paperless/manage.py \ ${STAGEDIR}${PREFIX}/bin/paperless + @${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/paperless @${MKDIR} ${STAGEDIR}${WWWDIR} @cd ${WRKSRC} && \ ${COPYTREE_SHARE} static ${STAGEDIR}${WWWDIR} diff --git a/deskutils/py-paperless/files/patch-src-paperless-settings.py b/deskutils/py-paperless/files/patch-src-paperless-settings.py index 9f040ceee26e..28c9ac99cba2 100644 --- a/deskutils/py-paperless/files/patch-src-paperless-settings.py +++ b/deskutils/py-paperless/files/patch-src-paperless-settings.py @@ -35,3 +35,10 @@ # Specify for how many years a correspondent is considered recent. Recent # correspondents will be shown in a separate "Recent correspondents" filter as # well. Set to 0 to disable this filter. +@@ -330,3 +330,6 @@ if _filename_parse_transforms: + # well. Set to 0 to disable this filter. + PAPERLESS_RECENT_CORRESPONDENT_YEARS = int(os.getenv( + "PAPERLESS_RECENT_CORRESPONDENT_YEARS", 0)) ++ ++# As hinted by django 3.2 ++DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' diff --git a/deskutils/py-paperless/files/patch-src_documents_templates_admin_documents_document_change__list__results.html b/deskutils/py-paperless/files/patch-src_documents_templates_admin_documents_document_change__list__results.html new file mode 100644 index 000000000000..e5534c4054f2 --- /dev/null +++ b/deskutils/py-paperless/files/patch-src_documents_templates_admin_documents_document_change__list__results.html @@ -0,0 +1,11 @@ +--- src/documents/templates/admin/documents/document/change_list_results.html.orig 2022-04-25 11:00:26 UTC ++++ src/documents/templates/admin/documents/document/change_list_results.html +@@ -81,7 +81,7 @@ + } + + .grid { +- margin-right: 260px; ++ /*margin-right: 260px;*/ + } + .grid:after { + content: ""; diff --git a/deskutils/py-paperless/pkg-plist b/deskutils/py-paperless/pkg-plist index 75d9d19f158c..109d6547b7e8 100644 --- a/deskutils/py-paperless/pkg-plist +++ b/deskutils/py-paperless/pkg-plist @@ -355,6 +355,7 @@ man/man7/paperless.7.gz %%WWWDIR%%/static/admin/css/fonts.css %%WWWDIR%%/static/admin/css/forms.css %%WWWDIR%%/static/admin/css/login.css +%%WWWDIR%%/static/admin/css/nav_sidebar.css %%WWWDIR%%/static/admin/css/responsive.css %%WWWDIR%%/static/admin/css/responsive_rtl.css %%WWWDIR%%/static/admin/css/rtl.css @@ -392,7 +393,6 @@ man/man7/paperless.7.gz %%WWWDIR%%/static/admin/js/SelectBox.js %%WWWDIR%%/static/admin/js/SelectFilter2.js %%WWWDIR%%/static/admin/js/actions.js -%%WWWDIR%%/static/admin/js/actions.min.js %%WWWDIR%%/static/admin/js/admin/DateTimeShortcuts.js %%WWWDIR%%/static/admin/js/admin/RelatedObjectLookups.js %%WWWDIR%%/static/admin/js/autocomplete.js @@ -400,28 +400,29 @@ man/man7/paperless.7.gz %%WWWDIR%%/static/admin/js/cancel.js %%WWWDIR%%/static/admin/js/change_form.js %%WWWDIR%%/static/admin/js/collapse.js -%%WWWDIR%%/static/admin/js/collapse.min.js %%WWWDIR%%/static/admin/js/core.js %%WWWDIR%%/static/admin/js/inlines.js -%%WWWDIR%%/static/admin/js/inlines.min.js %%WWWDIR%%/static/admin/js/jquery.init.js +%%WWWDIR%%/static/admin/js/nav_sidebar.js %%WWWDIR%%/static/admin/js/popup_response.js %%WWWDIR%%/static/admin/js/prepopulate.js -%%WWWDIR%%/static/admin/js/prepopulate.min.js %%WWWDIR%%/static/admin/js/prepopulate_init.js -%%WWWDIR%%/static/admin/js/timeparse.js %%WWWDIR%%/static/admin/js/urlify.js %%WWWDIR%%/static/admin/js/vendor/jquery/LICENSE.txt %%WWWDIR%%/static/admin/js/vendor/jquery/jquery.js %%WWWDIR%%/static/admin/js/vendor/jquery/jquery.min.js %%WWWDIR%%/static/admin/js/vendor/select2/LICENSE.md +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/af.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/ar.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/az.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/bg.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/bn.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/bs.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/ca.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/cs.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/da.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/de.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/dsb.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/el.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/en.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/es.js @@ -434,11 +435,14 @@ man/man7/paperless.7.gz %%WWWDIR%%/static/admin/js/vendor/select2/i18n/he.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/hi.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/hr.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/hsb.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/hu.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/hy.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/id.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/is.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/it.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/ja.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/ka.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/km.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/ko.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/lt.js @@ -446,17 +450,22 @@ man/man7/paperless.7.gz %%WWWDIR%%/static/admin/js/vendor/select2/i18n/mk.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/ms.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/nb.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/ne.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/nl.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/pl.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/ps.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/pt-BR.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/pt.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/ro.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/ru.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/sk.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/sl.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/sq.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/sr-Cyrl.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/sr.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/sv.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/th.js +%%WWWDIR%%/static/admin/js/vendor/select2/i18n/tk.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/tr.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/uk.js %%WWWDIR%%/static/admin/js/vendor/select2/i18n/vi.js
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204281008.23SA8FOa037442>