From nobody Fri Dec 17 19:09:12 2021 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 CCB9C18FCB50; Fri, 17 Dec 2021 19:09:12 +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 4JFz6w45yWz3ClH; Fri, 17 Dec 2021 19:09:12 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6240121455; Fri, 17 Dec 2021 19:09:12 +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 1BHJ9ChE076786; Fri, 17 Dec 2021 19:09:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BHJ9CYQ076785; Fri, 17 Dec 2021 19:09:12 GMT (envelope-from git) Date: Fri, 17 Dec 2021 19:09:12 GMT Message-Id: <202112171909.1BHJ9CYQ076785@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 63d22470146b - main - deskutils/calibre: Update to 5.34.0 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63d22470146b15474ccf4f18e23fe95dae1576d2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639768152; 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=duH7ZXNzPzQHjXB2I8BjxPvpNfp1BvrtS41nVLndey8=; b=v4smwhaa4Lu0H/L9I8A1Vg5hueMAaq3tEH8vVAs5f3OVUg8rrP3+24OjMZE6rWikVADPE+ 79bLVS54d80vURc/UKYtve93DDEg3HnoLN7MOYoNXRyQntRZ96z5zyHlmZQjeI2D46GIfa gyKnjiexQ0LiQQMEsb3PNG0FPAH4GlG/MxY0ZX0i/zh0051hvKfZKDwg2Ew44hg3ziHKsV 3vGmATNd/tlGWmn3XRG2TzHd6JduWun0/is03NN89bqDUf+oZo4w0Ia5Hau2vekO8ww/uG uqDgjCkI65LuVMo6G7mJs4dJdqZy6jkoCOPKqEyMEe+3K3wgStd98G7OYYAqHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639768152; a=rsa-sha256; cv=none; b=dRmXlv6S9PkzahBhTzSMV0MUO8VILQyvrHQBmTai39kofk6N+YTcPYCyukZp39naqu7Jeq x1mEXuCZne6DfnOfo+WG9cRIstpcPKWu+CWHjLMdw+NJQeg3IYmTqhFEdXkcmBNw4XeVx2 xC+0DY5dflHizR/JAj/HOMN2lijNEsBWCIbeLXSZq9Kh1x//ShEb3bA2F7LUqV4HM7BncM ILTzb+It3ZmdG/JouaoaeN1pUUim81ehopa6cu/7ZSYqNNva4P98EgyjjrvIzRUgexHhbL U0sFY78tM7j5wXIVcKCtq3kLSMQ+QMsn37sqc0kn2KZLS1Z15N8gi47aFJUCaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=63d22470146b15474ccf4f18e23fe95dae1576d2 commit 63d22470146b15474ccf4f18e23fe95dae1576d2 Author: Guido Falsi AuthorDate: 2021-12-17 19:06:25 +0000 Commit: Guido Falsi CommitDate: 2021-12-17 19:06:25 +0000 deskutils/calibre: Update to 5.34.0 Import upstream patch to fix installation on FreeBSD. [1] Obtained from: https://github.com/kovidgoyal/calibre/commit/dafa08e9213d3baad41c97e7598592bd0e06894d [1] --- deskutils/calibre/Makefile | 3 +-- deskutils/calibre/distinfo | 6 +++--- deskutils/calibre/files/patch-setup_install.py | 11 +++++++++++ deskutils/calibre/pkg-plist | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 92244231fff9..0643c3606fe6 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -1,8 +1,7 @@ # Created by: stas PORTNAME= calibre -PORTVERSION= 5.33.2 -PORTREVISION= 1 +PORTVERSION= 5.34.0 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index 2a9ae9377853..af07fab9330f 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638635716 -SHA256 (calibre-5.33.2.tar.xz) = c2db77b9c09a16af702e4efd09e0b3db4b4c33a01b2ed6782e7e93c4ec7476f2 -SIZE (calibre-5.33.2.tar.xz) = 37081104 +TIMESTAMP = 1639726652 +SHA256 (calibre-5.34.0.tar.xz) = d4d401eefadc534851df4f3ff247949ffac785dbc993901bd2938c3f2894d7e3 +SIZE (calibre-5.34.0.tar.xz) = 37077184 diff --git a/deskutils/calibre/files/patch-setup_install.py b/deskutils/calibre/files/patch-setup_install.py new file mode 100644 index 000000000000..6ed261733ca7 --- /dev/null +++ b/deskutils/calibre/files/patch-setup_install.py @@ -0,0 +1,11 @@ +--- setup/install.py.orig 2021-12-17 00:40:19 UTC ++++ setup/install.py +@@ -158,7 +158,7 @@ class Develop(Command): + import sysconfig + libdir = os.path.join( + self.opts.staging_root, sysconfig.get_config_var('PLATLIBDIR') or 'lib', +- sysconfig.get_python_version(), 'site-packages') ++ os.path.basename(sysconfig.get_config_var('DESTLIB') or sysconfig.get_config_var('LIBDEST') or f'python{sysconfig.get_python_version()}'), 'site-packages') + try: + if not os.path.exists(libdir): + os.makedirs(libdir) diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist index 224a69df17b7..bb7028ecbf4b 100644 --- a/deskutils/calibre/pkg-plist +++ b/deskutils/calibre/pkg-plist @@ -1465,6 +1465,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/catalog/stylesheet.css %%DATADIR%%/catalog/template.xhtml %%DATADIR%%/changelog.json +%%DATADIR%%/common-english-words.txt %%DATADIR%%/content-server/calibre.png %%DATADIR%%/content-server/empty.html %%DATADIR%%/content-server/index-generated.html