From nobody Thu Apr 28 10:08:15 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2881D1ABED59; Thu, 28 Apr 2022 10:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kprsr0DsZz3GTX; Thu, 28 Apr 2022 10:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651140496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=crjEgVjNUaUgdqlWYtb8tSefbye7462TJbhjfl6Ji0w=; b=hVBayDoGGCAEJW1egwYuKIfkZDCaPjbyV0bov6ZqHfcGOIDkpxXqV089MWc36MHusSxp0I K+ddz7CLx0FOAn5NIzEod4dQKJ7XYxqk4MX5S8myVsj7mv+4d7L/NVhYXsBH81WsWwW6/t J8NVKdRWiA5akJoUDuaSRXe9HfEThhqrusX0Pv38vBgrqK8F+HAijT3SCL5IBl7kRPG0JC XnlP17aNrdXhUcwQngLD3UuFD/oo9eYNuJ5o7xBbFXhunslw+63XVj4O6Bm7lhZGQrZmRX obhrGZsgn8Ma9KMvnhBHWvfw+f3/itEvhpjpkgvuni5hKg2aOLQFugDtJRAmlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5D7716B09; Thu, 28 Apr 2022 10:08:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23SA8FdA037443; Thu, 28 Apr 2022 10:08:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23SA8FOa037442; Thu, 28 Apr 2022 10:08:15 GMT (envelope-from git) Date: Thu, 28 Apr 2022 10:08:15 GMT Message-Id: <202204281008.23SA8FOa037442@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: b652075bb7b7 - main - deskutils/py-paperless: Switch to using Django 3.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b652075bb7b7f59821a3d29336d2d1cc4be614e6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651140496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=crjEgVjNUaUgdqlWYtb8tSefbye7462TJbhjfl6Ji0w=; b=oWpcx4L9eRPGeEJQMUBAs+PggBaji6I8C2PAzxVrTv6zOhyQkfl2R1VC8WotgBddXZj9MF UewHWJDkzxNFPKlb4a30983gW7pZY8BCCM6+2LDG9W/gxbkBnDa9O89q/CEP7sFnWr+B4Q cFPz0ZgcN6a4rJZAFw+n9mjkPFpsabrmDpDm6GXwzVIyKXd2vJ6FLmMoXl/hDFnh11RLNQ mzWZMv3ECtrWW9lPJ9qm/dzFByMiSXK7I4eXcJNwujang4miHrAgy9b+a4aMJIS2vYmGB8 3h3T4mNszyQToXxcfXALCRBgd0z/xooG2l2iFVCUj+B85h4zu6BrvCQ68KIQ0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651140496; a=rsa-sha256; cv=none; b=m1rpiG9Ta3yaCYurvwwJWcpr1runlQFyNVfHHwv6uHAlVrBWk/qQTfKXbroFgRpVZtm1dV iACSjTmabfQpatdpm3286f0Zv3W+tEwYDP3J+kC/aji60mItMrSzw+l3rRWgWbjevFkWEX VdTVzR/pMAKK9W43KBaVKbi7kRDoJZKHwIhqS/cjcAOz/iNqgDsS6bTA4txLb9Br5FumOo MdBFTbGo2OB/ZhBm2yXyfK1BlqRvBxM55IcsxP5hxm3YPBZdZu49+khJqfHZ/qcQhh0lro tiidGK5Mb5sorwgoxvPrzm6kGPnhgnsY7GOET1fFqKzOAuOOZRPdX9Kx7GMkDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=b652075bb7b7f59821a3d29336d2d1cc4be614e6 commit b652075bb7b7f59821a3d29336d2d1cc4be614e6 Author: Michael Gmelin AuthorDate: 2022-04-25 11:44:53 +0000 Commit: Kai Knoblich 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