From nobody Sun Nov 20 14:25:25 2022 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 4NFXqV1SRLz4hBt3; Sun, 20 Nov 2022 14:25:26 +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 4NFXqV0lhmz3xk3; Sun, 20 Nov 2022 14:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668954326; 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=gU9dkYFq++Oad/IxwlAZBoLh7DmW9/1eBUXn/r5YA4Y=; b=RTfKwcljo91T35tRJSK8oqEHnxD6yyDSkTx/sJ5NIPXsOPuFpR9A4m8boR1jjHOVVSzShs /SXJDNb6FlJLTzuQWrBrs+JfqxHuLmUu1lllfbEDgZW+anbHPnfrxJd5QhmXNCvyilAmQU jesnbwhaF+3ov9owUUCrYJ0TBSpaPy2hTMjk6tBEEXN6x6CkECE3E93/iE9aQWPHCjz6Nd TUZ8Z186+9NejGg6kfDUFsI+JMqbCmdQZIxD/eEbqHEO80i8Al6Wip2Pfm4LeNXp/Vlgil Z1FXj7lUul3HzcMfgOqDoUpgaNlo9a6ectefV74c4ncvKiyGV5L0R1nThcVB+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668954326; 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=gU9dkYFq++Oad/IxwlAZBoLh7DmW9/1eBUXn/r5YA4Y=; b=nFEtEfLZDkTvRjYCK9QJWN91jmGBGCYOEcUphnnVQrAW1VeY9tz3OdCOzHk68tOaiqwxT6 aZbvztg94Uh1iZ13B/wxQ3xizDwV59TyB1fOmL8Ak9BDv7Vjqofeuzm+05LlxAMsPtdEfq N/jfiA1eL8Bs9DKBPUiQNZ6GF5j5WeK2W+0SvoIvpjM+P3HCUaeBY9QqYb2mPeXxEenHxi KDVtRdTJxqmVc3aIgz4PRUximdfpwTWTZZcJY29qMUxkUGNQrCiwF4/4UBJXBj7FtwMCBV 44f9WSqBGEVP/yxzJsvmNe2hZVtiSY3g/KqUKGcD5bry+asPXz86f2yEH9H0Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668954326; a=rsa-sha256; cv=none; b=tQXBHZd/rE/iuv7GSPz+iOZlTOV0R3cXZVQFZo+DhLN+q5qp4pRHhWv9HlA6ccLQFuIWUg 5PleGC6H2aHQra1Fwe4KKmfGv4yoIdqWTKgNm45nVAR2Yz7gmAaU2pthwNlaKaY/lcF7u/ OdgYNS81ufzjwMg2aP2+HUJxVaBMBUqaZP9rekVO4L/wDj1J0o7Zd4cRtiXDfu4CF21Nyy WAeJBYqauPqHb2Eg7xfWeJXMn/rwG7mBimo4j08/24Ixie7UBWQixvswA0V8EDT8U7pUtE oTTIzapqNUCqO6V8f1/DM9ZsDqlYNf2Rkza/eZVYnOdzTH8uKvUcUnjBy0LyeA== 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 4NFXqT6v9lzSJ8; Sun, 20 Nov 2022 14:25:25 +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 2AKEPPcE083665; Sun, 20 Nov 2022 14:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AKEPP2O083664; Sun, 20 Nov 2022 14:25:25 GMT (envelope-from git) Date: Sun, 20 Nov 2022 14:25:25 GMT Message-Id: <202211201425.2AKEPP2O083664@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: c8332032ae22 - main - devel/py-watchdog: add a patch to enable inotify 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: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8332032ae22e82e5e60bd493ed697f9b8340cb1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8332032ae22e82e5e60bd493ed697f9b8340cb1 commit c8332032ae22e82e5e60bd493ed697f9b8340cb1 Author: Robert Kruus AuthorDate: 2022-11-20 14:20:45 +0000 Commit: Nicola Vitale CommitDate: 2022-11-20 14:24:35 +0000 devel/py-watchdog: add a patch to enable inotify - The port does not currently work with the inotify observer as the inotify functions are no longer in the base system/libc. The patch adds a lib_depend on devel/libinotify and patches the appropriate file in the port. - Bump PORTREVISION PR: 260939 Reported by: Robert Kruss --- devel/py-watchdog/Makefile | 10 ++++++---- .../files/patch-src_watchdog_observers_inotify__c.py | 11 +++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile index 8643ef6384ed..3b6c5f88d013 100644 --- a/devel/py-watchdog/Makefile +++ b/devel/py-watchdog/Makefile @@ -1,5 +1,6 @@ PORTNAME= watchdog DISTVERSION= 2.1.9 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,21 +11,22 @@ WWW= https://github.com/gorakhargosh/watchdog LICENSE= APACHE20 +LIB_DEPENDS= libinotify.so:devel/libinotify RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} NO_ARCH= yes PORTDOCS= * -TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} - OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} diff --git a/devel/py-watchdog/files/patch-src_watchdog_observers_inotify__c.py b/devel/py-watchdog/files/patch-src_watchdog_observers_inotify__c.py new file mode 100644 index 000000000000..1dd1a1a14808 --- /dev/null +++ b/devel/py-watchdog/files/patch-src_watchdog_observers_inotify__c.py @@ -0,0 +1,11 @@ +--- src/watchdog/observers/inotify_c.py.orig 2022-06-10 10:11:14 UTC ++++ src/watchdog/observers/inotify_c.py +@@ -25,7 +25,7 @@ from functools import reduce + from ctypes import c_int, c_char_p, c_uint32 + from watchdog.utils import UnsupportedLibc + +-libc = ctypes.CDLL(None) ++libc = ctypes.CDLL('libinotify.so') + + if not hasattr(libc, 'inotify_init') or \ + not hasattr(libc, 'inotify_add_watch') or \