From nobody Thu Jun 23 15:42:37 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 6951885A428; Thu, 23 Jun 2022 15:42:37 +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 4LTPdn2XYDz4sd5; Thu, 23 Jun 2022 15:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655998957; 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=kB6UCa8qvSiUZlQXlN3HL3IDN6j7TGPOK+tSXLn2CEw=; b=HqB7JsQNhIx0lzbAUYymNO8Nn4buPBQjWJTsU9Ie71tpbQ426RudhQuM4gunrk+DptD6ex h3X1bZ2xvVFL0ILQKhHCQXDloy/ofPb5V+6fvSESCibqC5zbtG6x/gR+P6THyOG1EdakGx jjqJgd7sbjoe0q3AhbLkE8oZ6+/UoYZYrO/HMWKd3dJpnk+0p+Lq/6swBMyUe6yezTaj99 +D/+qFSLOuYepzYF4X2jtrsEV9OEpeyqf94yPhpFo6w+ixScoEyjtTEzkA63JZTWwnHEYy D+o5k7tCoVEVvEzY+cbERp+WOG428lvZ4uJeqRQwaO9NX93ErXYsh3nEU0cw9A== 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 36F231D9DF; Thu, 23 Jun 2022 15:42:37 +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 25NFgbI3007721; Thu, 23 Jun 2022 15:42:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NFgbx9007720; Thu, 23 Jun 2022 15:42:37 GMT (envelope-from git) Date: Thu, 23 Jun 2022 15:42:37 GMT Message-Id: <202206231542.25NFgbx9007720@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: f8c049d638e6 - main - science/gramps: Optional dependency on py-bsddb3 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8c049d638e6a9b00ad054f5afaf9083fa1c6581 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655998957; 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=kB6UCa8qvSiUZlQXlN3HL3IDN6j7TGPOK+tSXLn2CEw=; b=B3aaazjnTUwmiH38VJJg1T+g+bwxLyQ3GC08spsjco5kTWS7tvQY6EbA9SgbBHWebUsSvy PzsqVs0JUycCsRG2+B5Y/TrAJlcy5XKLsLdgAFRb2nF3PhlPC3eHfITZPYJZWGkQZppMf7 1xV38PNzLid7NaPncqp+SW5KUhHsCQzn28AjASMXCbEg3pZQ4zVJjNgfYRiGY2OCnA+OTQ Pslg7IxEeFX5CExaKQPGMKu7yd1e+7spIJVFRKOzbdveUtVoZf3D9ee5RA7Vivee30O3bz jafsM1JHITw2mValCVysd/UBQmb8F9DU3UW3Z04ZLCHeFltM/qpqfigsiFVQOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655998957; a=rsa-sha256; cv=none; b=G3Im4S5HJAlPPgiogfyvnCx5kfWPn1YjeKDiDGjsHumIRg+C8RaLhWF3Git0DccEoRAJQ3 Y+9UA/5emX6RQaM+keJar1+W13rxBNabuUJRXdJprh/J1gQJixRIsPRsJV5CMRAMHOSkNk WdaSifj3Ft8K7/Lzomjd4af9GzWTH2V+A2NDOorQMSfg39ws0ZNX2LkHeZ+4vbbNrmrKAD /R8Bmw+1S2hl8bQt8EGH1BBc+56Q11fMjiobPyg27RxVfqApZ7hL6XbZfCjaGCdMuYTD+P aqCC5ebxQiMZvGgaRHrc2EzUo1O9zI3H7ywyo913rgHGS9ZWYnmzvSM5QWqVqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8c049d638e6a9b00ad054f5afaf9083fa1c6581 commit f8c049d638e6a9b00ad054f5afaf9083fa1c6581 Author: Benjamin Takacs AuthorDate: 2022-06-23 06:03:51 +0000 Commit: Fernando Apesteguía CommitDate: 2022-06-23 15:39:59 +0000 science/gramps: Optional dependency on py-bsddb3 databases/py-bsddb3 is deprecated. Make science/gramps use py-bsddb3 as an option to facilitate the migration and remove the DEPRECATE note since it does not apply anymore. Add UPDATING note with instructions for the migration. While here pet linters. PR: 264529 Reported by: nimaje+fbz@bureaucracy.de --- UPDATING | 10 ++++++++++ science/gramps/Makefile | 14 ++++++-------- .../files/patch-gramps_gen_utils_grampslocale.py | 20 ++++++++++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/UPDATING b/UPDATING index 3684a2974f4b..c876ee6f0527 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20220623: +AFFECTS: users of science/gramps + AUTHOR: fernape@FreeBSD.org + + databases/py-bsddb3 is deprecated and will be removed in the future. With that + gramps will lose the ability to load family trees using Berkeley DB. + It is suggested to migrate all family trees using Berkeley DB by exporting + them to gramps xml and import that gramps xml into a family tree using sqlite + as database. + 20220620: AFFECTS: users of www/selenium AUTHOR: fernape@FreeBSD.org diff --git a/science/gramps/Makefile b/science/gramps/Makefile index 80ed881973ec..58bc4677b7e3 100644 --- a/science/gramps/Makefile +++ b/science/gramps/Makefile @@ -2,8 +2,8 @@ PORTNAME= gramps PORTVERSION= 5.1.5 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= science gnome python MAINTAINER= ports@FreeBSD.org @@ -12,14 +12,10 @@ COMMENT= GTK3-based genealogy program LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Requires py-bsddb3 which requires upstream EOLd db5 -EXPIRATION_DATE= 2022-06-30 - LIB_DEPENDS= libgeocode-glib.so:net/geocode-glib \ libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=0:graphics/py-pygraphviz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyicu>=1.8:devel/py-pyicu@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygraphviz>=0:graphics/py-pygraphviz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ xdg-open:devel/xdg-utils @@ -33,14 +29,16 @@ CONFIGURE_ARGS= --disable-mime-install NO_ARCH= yes -OPTIONS_DEFINE= GEXIV GTKSPELL PIL RCS TTFFREEFONT -OPTIONS_DEFAULT= GEXIV GTKSPELL +OPTIONS_DEFINE= BDB GEXIV GTKSPELL PIL RCS TTFFREEFONT +OPTIONS_DEFAULT= BDB GEXIV GTKSPELL +BDB_DESC= Install py-bsddb3 to support family trees using Berkeley DB (DEPRECATED) GEXIV_DESC= Manage Exif metadata embedded in media GTKSPELL_DESC= Spell checking support via gtkspell PIL_DESC= Crop/convert images with Python Imaging Library (Pillow) RCS_DESC= Manage revisions of family trees with with GNU RCS TTFFREEFONT_DESC= More font support in reports +BDB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3@${PY_FLAVOR} GEXIV_LIB_DEPENDS= libgexiv2.so:graphics/gexiv2 GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 PIL_RUN_DEPENDS= ${PY_PILLOW} diff --git a/science/gramps/files/patch-gramps_gen_utils_grampslocale.py b/science/gramps/files/patch-gramps_gen_utils_grampslocale.py new file mode 100644 index 000000000000..eaad4287fa38 --- /dev/null +++ b/science/gramps/files/patch-gramps_gen_utils_grampslocale.py @@ -0,0 +1,20 @@ +--- gramps/gen/utils/grampslocale.py.orig 2022-06-08 13:02:30.116272000 +0200 ++++ gramps/gen/utils/grampslocale.py 2022-06-08 12:40:34.253581000 +0200 +@@ -527,9 +527,14 @@ + # with locale instead of gettext. Win32 doesn't support bindtextdomain. + if self.localedir: + if not sys.platform == 'win32': +- # bug12278, _build_popup_ui() under linux and macOS +- locale.textdomain(self.localedomain) +- locale.bindtextdomain(self.localedomain, self.localedir) ++ if hasattr(locale, 'textdomain'): ++ # bug12278, _build_popup_ui() under linux and macOS ++ locale.textdomain(self.localedomain) ++ locale.bindtextdomain(self.localedomain, self.localedir) ++ else: ++ import gettext ++ gettext.textdomain(self.localedomain) ++ gettext.bindtextdomain(self.localedomain, self.localedir) + else: + self._win_bindtextdomain(self.localedomain.encode('utf-8'), + self.localedir.encode('utf-8'))