From cd9ad4e75b5090cb7a8049576108ad6e7e8e4058 Mon Sep 17 00:00:00 2001 From: Hiroki Tagato Date: Wed, 27 Jul 2022 20:41:06 +0900 Subject: [PATCH] x11/py-caffeine-ng: update to 4.0.2 While here, update WWW. Changelog: https://codeberg.org/WhyNotHugo/caffeine-ng/src/tag/v4.0.2/CHANGELOG.rst Reported by: portscout --- x11/py-caffeine-ng/Makefile | 10 ++++----- x11/py-caffeine-ng/distinfo | 6 ++--- .../files/patch-caffeine_cli.py | 19 ++++++++++++++++ .../files/patch-caffeine_main.py | 22 ------------------- x11/py-caffeine-ng/pkg-descr | 2 +- 5 files changed, 27 insertions(+), 32 deletions(-) create mode 100644 x11/py-caffeine-ng/files/patch-caffeine_cli.py delete mode 100644 x11/py-caffeine-ng/files/patch-caffeine_main.py diff --git a/x11/py-caffeine-ng/Makefile b/x11/py-caffeine-ng/Makefile index 0ae01e4b21b7..01a73f9698f7 100644 --- a/x11/py-caffeine-ng/Makefile +++ b/x11/py-caffeine-ng/Makefile @@ -1,6 +1,5 @@ PORTNAME= caffeine-ng -DISTVERSION= 3.5.1 -PORTREVISION= 1 +DISTVERSION= 4.0.2 CATEGORIES= x11 python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +15,7 @@ LICENSE_FILE_LGPL3+ = ${WRKSRC}/LGPL BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} LIB_DEPENDS= libappindicator3.so:devel/libappindicator \ libnotify.so:devel/libnotify -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.2:devel/py-docopt@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click7>=7.1:devel/py-click7@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ewmh>=0.1.4:devel/py-ewmh@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle@${PY_FLAVOR} \ @@ -28,7 +27,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flake8-bugbear>0:devel/py-flake8-bugbear@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flake8-import-order>0:devel/py-flake8-import-order@${PY_FLAVOR} -USES= desktop-file-utils gettext-tools gnome python:3.6+ +USES= desktop-file-utils gettext-tools gnome python:3.6-3.9 USE_GNOME= gdkpixbuf2 gtk30 pygobject3 USE_PYTHON= autoplist distutils @@ -46,8 +45,7 @@ SCHEMASDIR= share/glib-2.0/schemas post-patch: ${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g; s|/etc|${LOCALBASE}/etc|g' \ - ${WRKSRC}/setup.py \ - ${WRKSRC}/share/applications/*.desktop + ${WRKSRC}/setup.py post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${SCHEMASDIR} diff --git a/x11/py-caffeine-ng/distinfo b/x11/py-caffeine-ng/distinfo index dc9aafb751ca..54adb79da374 100644 --- a/x11/py-caffeine-ng/distinfo +++ b/x11/py-caffeine-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611918197 -SHA256 (caffeine-ng-3.5.1.tar.gz) = 7549c09b527be98d7313df4801aae308b2231fbcc21b1de47d16dbbe71a37f2a -SIZE (caffeine-ng-3.5.1.tar.gz) = 155382 +TIMESTAMP = 1658886222 +SHA256 (caffeine-ng-4.0.2.tar.gz) = ba62235c9d1eb7a3e2e448e3f7a43e66188a4beca3edbb206f8b905ba626eab5 +SIZE (caffeine-ng-4.0.2.tar.gz) = 163529 diff --git a/x11/py-caffeine-ng/files/patch-caffeine_cli.py b/x11/py-caffeine-ng/files/patch-caffeine_cli.py new file mode 100644 index 000000000000..e6c094fd8474 --- /dev/null +++ b/x11/py-caffeine-ng/files/patch-caffeine_cli.py @@ -0,0 +1,19 @@ +--- caffeine/cli.py.orig 2022-07-27 02:03:53 UTC ++++ caffeine/cli.py +@@ -1,4 +1,4 @@ +-import ctypes ++# import ctypes + import logging + import signal + +@@ -20,8 +20,8 @@ def cli(ctx, verbose): + signal.signal(signal.SIGINT, signal.SIG_DFL) + + # register the process id as 'caffeine' +- libc = ctypes.cdll.LoadLibrary("libc.so.6") +- libc.prctl(15, "caffeine", 0, 0, 0) ++ # libc = ctypes.cdll.LoadLibrary("libc.so.6") ++ # libc.prctl(15, "caffeine", 0, 0, 0) + + if verbose: + logging.basicConfig(level=logging.DEBUG) diff --git a/x11/py-caffeine-ng/files/patch-caffeine_main.py b/x11/py-caffeine-ng/files/patch-caffeine_main.py deleted file mode 100644 index 8c1ec158c7a4..000000000000 --- a/x11/py-caffeine-ng/files/patch-caffeine_main.py +++ /dev/null @@ -1,22 +0,0 @@ ---- caffeine/main.py.orig 2021-01-01 14:03:23 UTC -+++ caffeine/main.py -@@ -30,7 +30,7 @@ Options: - -p --preferences Start with the Preferences dialog open. - """ - # TODO: add a -v --verbosity flag. --import ctypes -+# import ctypes - import logging - import os - import signal -@@ -429,8 +429,8 @@ def main(): - GObject.threads_init() - - # register the process id as 'caffeine' -- libc = ctypes.cdll.LoadLibrary("libc.so.6") -- libc.prctl(15, "caffeine", 0, 0, 0) -+ # libc = ctypes.cdll.LoadLibrary("libc.so.6") -+ # libc.prctl(15, "caffeine", 0, 0, 0) - - arguments = docopt(__doc__, version=__version__) - diff --git a/x11/py-caffeine-ng/pkg-descr b/x11/py-caffeine-ng/pkg-descr index a5eef4fc2eb7..f3b44531a20f 100644 --- a/x11/py-caffeine-ng/pkg-descr +++ b/x11/py-caffeine-ng/pkg-descr @@ -3,4 +3,4 @@ the screensaver from showing up, or the system from going to sleep. It does so when an application is fullscreened (eg: youtube), or when you click on the systray icon (which you can do, when, eg: reading). -WWW: https://github.com/caffeine-ng/caffeine-ng +WWW: https://codeberg.org/WhyNotHugo/caffeine-ng