From nobody Sat Aug 26 17:32:07 2023 X-Original-To: dev-commits-ports-main@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 4RY3m80gHMz4qnCm; Sat, 26 Aug 2023 17:32:08 +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 4RY3m80DP7z3g9G; Sat, 26 Aug 2023 17:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693071128; 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=YnRXXX7yUT/53yur+4aJ5AMD5X6zRrPstueMbsUDgtw=; b=Ir6dY7Jx5PRdpxrixXDJsJstM7FsScAUQPtpBmL+9hGdWHqas8iQkieoDdLgMNb7XhxW3L xjpeQwaw/OFtcbv60GIO3ScIQYircFfNd7OGjFRG2NwTaEM8NIlFQfif8z3piadC/A+Iw9 6X6p2HPf1SQ3jwBf9/vTIanTVF+xGDbFEmDW4+5+sM/acp8Igxq/CJ2HuBF0Daucu7+Dst 4xZR9kYUaFQToNFHK+Y+jMmB9Gl7u1QDJQsROhEhvII7ekDU3eBlX9pCR4lkPsGeJtgSjj tNsoaqZ3/q6TvfawmdqAKNxW5dVQjDghGSTiwpKKgSNESDw/OUZe05JmikdJsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693071128; 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=YnRXXX7yUT/53yur+4aJ5AMD5X6zRrPstueMbsUDgtw=; b=yXeYRmnyMVx9VT/vI2Civ4pAHOioS7I1CRgrpE57ewI0d2QWxWyFvDbbRvqhO2VFZqTCJC 8z4mPp9qh02+8vRuggjcVEbo3y5lEBEQU9bHPY4v9aT7Qfz0U1zyjADgp9kmeOAsUswQ2q Oti2K+baxEEZkm9iGcwyLMlcEDULzP/Rzr5O2BPqEukabPFGMTqaNPrZISpqw7Ct092o0D aZLL2WiQWvw9f0/eJHztQRJo6I8HZjk/NzJc6kxIq9fyGcsWFg/Pa3G92Bm3I+YEIshuny 0M7b82RFtjKK8YDFltWz8kZEFisKHwh3I/NDwiXo9V2vG+ONFA0GTz73hE6lkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693071128; a=rsa-sha256; cv=none; b=qxt+vQlGEDP1NXXBGppIz2JUUmYr8GmeL1OLyEUUm2jgpILEC4Ft5HOtUuRMAairbvvbGA ZTD9IB9aylWrPmWNXf4ljNWDAYynaMBuDf2MTXBCMn3PuxePKkpzvnW2BEFTdKo1MXg29s TOrDLxDK4P+nh/DfkJhmtzZa/k7CszHdyBibpdout1+Ztl+GFJNlWdUGYOz8Iswim6UxJ9 PNjTGMERxNBBv3Yr5NuFcPojYP3Goy1nmRrZ1CuzGOla90bg+fwphjcs2iBSfOYLxRZ14i FaqJPTxvwjn/K/a0v3gUCKXv26MdfZSc4L1WrluMCvsv1SDVzeHkuoPDnQJHZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RY3m76PPCzkSh; Sat, 26 Aug 2023 17:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37QHW74L097262; Sat, 26 Aug 2023 17:32:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37QHW7PX097259; Sat, 26 Aug 2023 17:32:07 GMT (envelope-from git) Date: Sat, 26 Aug 2023 17:32:07 GMT Message-Id: <202308261732.37QHW7PX097259@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Richard Gallamore Subject: git: ffaa8cd925c2 - main - www/seahub: Patch for new version of Pillow List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ultima X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffaa8cd925c26ff03e8d7e358b9fa54e774a9db5 Auto-Submitted: auto-generated The branch main has been updated by ultima: URL: https://cgit.FreeBSD.org/ports/commit/?id=ffaa8cd925c26ff03e8d7e358b9fa54e774a9db5 commit ffaa8cd925c26ff03e8d7e358b9fa54e774a9db5 Author: Richard Gallamore AuthorDate: 2023-08-26 17:24:40 +0000 Commit: Richard Gallamore CommitDate: 2023-08-26 17:24:40 +0000 www/seahub: Patch for new version of Pillow PR: 272942 Reported by: Scott Kitchin (scott@kitchin.com), Boris Tassou (boris.tassou@securmail.fr) Submitted by: sunpoet Obtained from: Seafile --- www/seahub/Makefile | 3 ++- www/seahub/files/patch-pillow | 50 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/www/seahub/Makefile b/www/seahub/Makefile index d4faf16db76a..2ad0d93ce723 100644 --- a/www/seahub/Makefile +++ b/www/seahub/Makefile @@ -2,6 +2,7 @@ PORTNAME= seahub DISTVERSIONPREFIX= v DISTVERSION= ${SEAHUB_VER} DISTVERSIONSUFFIX= -server +PORTREVISION= 1 CATEGORIES= www MAINTAINER= ultima@FreeBSD.org @@ -29,7 +30,7 @@ RUN_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}djangorestframework>=0:www/py-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.12.0:security/py-pycryptodome@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${PY_FLAVOR} \ diff --git a/www/seahub/files/patch-pillow b/www/seahub/files/patch-pillow new file mode 100644 index 000000000000..b4fae5571f32 --- /dev/null +++ b/www/seahub/files/patch-pillow @@ -0,0 +1,50 @@ +Obtained from: https://github.com/haiwen/seahub/commit/cbe0817f2bee0c2b00d3ffd3e047c3141862c6c5 + +--- seahub/avatar/settings.py.orig 2022-11-30 03:34:16 UTC ++++ seahub/avatar/settings.py +@@ -22,7 +22,7 @@ AUTO_GENERATE_GROUP_AVATAR_SIZES = getattr(settings, ' + + ### Common settings ### + AVATAR_FILE_STORAGE = getattr(settings, 'AVATAR_FILE_STORAGE', '') +-AVATAR_RESIZE_METHOD = getattr(settings, 'AVATAR_RESIZE_METHOD', Image.ANTIALIAS) ++AVATAR_RESIZE_METHOD = getattr(settings, 'AVATAR_RESIZE_METHOD', Image.Resampling.LANCZOS) + AVATAR_GRAVATAR_BACKUP = getattr(settings, 'AVATAR_GRAVATAR_BACKUP', True) + AVATAR_GRAVATAR_DEFAULT = getattr(settings, 'AVATAR_GRAVATAR_DEFAULT', None) + AVATAR_MAX_AVATARS_PER_USER = getattr(settings, 'AVATAR_MAX_AVATARS_PER_USER', 42) +--- seahub/thumbnail/utils.py.orig 2022-11-30 03:34:16 UTC ++++ seahub/thumbnail/utils.py +@@ -54,22 +54,22 @@ def get_rotated_image(image): + + if orientation == 2: + # Vertical image +- image = image.transpose(Image.FLIP_LEFT_RIGHT) ++ image = image.transpose(Image.Transpose.FLIP_LEFT_RIGHT) + elif orientation == 3: + # Rotation 180 + image = image.rotate(180) + elif orientation == 4: +- image = image.rotate(180).transpose(Image.FLIP_LEFT_RIGHT) ++ image = image.rotate(180).transpose(Image.Transpose.FLIP_LEFT_RIGHT) + # Horizontal image + elif orientation == 5: + # Horizontal image + Rotation 90 CCW +- image = image.rotate(-90, expand=True).transpose(Image.FLIP_LEFT_RIGHT) ++ image = image.rotate(-90, expand=True).transpose(Image.Transpose.FLIP_LEFT_RIGHT) + elif orientation == 6: + # Rotation 270 + image = image.rotate(-90, expand=True) + elif orientation == 7: + # Horizontal image + Rotation 270 +- image = image.rotate(90, expand=True).transpose(Image.FLIP_LEFT_RIGHT) ++ image = image.rotate(90, expand=True).transpose(Image.Transpose.FLIP_LEFT_RIGHT) + elif orientation == 8: + # Rotation 90 + image = image.rotate(90, expand=True) +@@ -230,7 +230,7 @@ def _create_thumbnail_common(fp, thumbnail_file, size) + image = image.convert("RGB") + + image = get_rotated_image(image) +- image.thumbnail((size, size), Image.ANTIALIAS) ++ image.thumbnail((size, size), Image.Resampling.LANCZOS) + image.save(thumbnail_file, THUMBNAIL_EXTENSION) + return (True, 200)