[PR PATCH] caffeine-ng: update to 4.2.0, adopt.

[PR PATCH] caffeine-ng: update to 4.2.0, adopt.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/caffeine-ng
https://github.com/void-linux/void-packages/pull/47705

caffeine-ng: update to 4.2.0, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/47705.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/caffeine-ng-47705.patch --]
[-- Type: text/x-diff, Size: 4679 bytes --]

From 38301e093f2eac6dfba51a912e8b26b2a554e4be Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 11 Dec 2023 11:59:55 -0500
Subject: [PATCH] caffeine-ng: update to 4.2.0, adopt.

---
 srcpkgs/caffeine-ng/patches/mandir.patch      | 13 ++++++++
 srcpkgs/caffeine-ng/patches/pulsectl.patch    | 15 ++++++++++
 .../patches/use-ayatana-appindicator.patch    | 16 ----------
 srcpkgs/caffeine-ng/template                  | 30 +++++++++++--------
 4 files changed, 45 insertions(+), 29 deletions(-)
 create mode 100644 srcpkgs/caffeine-ng/patches/mandir.patch
 create mode 100644 srcpkgs/caffeine-ng/patches/pulsectl.patch
 delete mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch

diff --git a/srcpkgs/caffeine-ng/patches/mandir.patch b/srcpkgs/caffeine-ng/patches/mandir.patch
new file mode 100644
index 0000000000000..262d1203b7e87
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/mandir.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 1f84fe8..423aed7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -103,7 +103,7 @@ custom_target(
+ 	feed: true,
+ 	capture: true,
+ 	install: true,
+-	install_dir: join_paths(mandir, 'man1/caffeine')
++	install_dir: join_paths(mandir, 'man1')
+ )
+ 
+ install_subdir('caffeine/assets/glade',
diff --git a/srcpkgs/caffeine-ng/patches/pulsectl.patch b/srcpkgs/caffeine-ng/patches/pulsectl.patch
new file mode 100644
index 0000000000000..8c791482672a1
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/pulsectl.patch
@@ -0,0 +1,15 @@
+Not sure why the Meson Python module can't find the installed pulsectl...
+
+diff --git a/meson.build b/meson.build
+index 1f84fe8..05567a4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -22,7 +22,7 @@ endif
+ 
+ pymod = import('python')
+ python = pymod.find_installation('python3',
+-  modules: ['click', 'ewmh', 'setproctitle', 'pulsectl']
++  modules: ['click', 'ewmh', 'setproctitle']
+ )
+ python.dependency()
+ 
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
deleted file mode 100644
index 925dad3e04102..0000000000000
--- a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/caffeine/main.py b/caffeine/main.py
-index 516a138..f48653b 100644
---- a/caffeine/main.py
-+++ b/caffeine/main.py
-@@ -32,9 +32,9 @@ try:
-     gi.require_version("Notify", "0.7")
- except ValueError:
-     gi.require_version("Notify", "0.8")
--gi.require_version("AppIndicator3", "0.1")
-+gi.require_version("AyatanaAppIndicator3", "0.1")
- 
--from gi.repository import AppIndicator3  # noqa: E402
-+from gi.repository import AyatanaAppIndicator3 as AppIndicator3  # noqa: E402
- from gi.repository import GdkPixbuf  # noqa: E402
- from gi.repository import Gtk  # noqa: E402
- from gi.repository.Notify import Notification  # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 6f18114aaddd9..388064fc8f9f8 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,19 +1,23 @@
 # Template file for 'caffeine-ng'
 pkgname=caffeine-ng
-version=4.0.2
-revision=5
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
-depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
- python3-dbus python3-click python3-ewmh python3-gobject
- python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libayatana-appindicator"
+version=4.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config scdoc"
+_python_dependencies="python3-click python3-dbus python3-ewmh python3-gobject
+ python3-pulsectl python3-setproctitle"
+makedepends="python3-gobject-devel python3-dbus-devel gtk+3-devel
+ libnotify-devel libayatana-appindicator-devel ${_python_dependencies}"
+depends="desktop-file-utils hicolor-icon-theme libnotify
+ libayatana-appindicator gtk+3 ${_python_dependencies}"
 short_desc="Temporarily inhibits the screensaver and sleep mode"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://codeberg.org/WhyNotHugo/caffeine-ng"
 changelog="https://codeberg.org/WhyNotHugo/caffeine-ng/raw/branch/main/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/c/caffeine-ng/caffeine-ng-${version}.tar.gz"
-checksum=ba62235c9d1eb7a3e2e448e3f7a43e66188a4beca3edbb206f8b905ba626eab5
-# only runs lints and syntax checks via flake8
-make_check=no
+distfiles="https://codeberg.org/WhyNotHugo/caffeine-ng/archive/v${version}.tar.gz"
+checksum=938080407714104d1c016513146b150a7dc25882ad9ae957d6c02d340d90fda2
+
+pre_configure() {
+	echo $version > version
+}

Re: [PR PATCH] [Updated] caffeine-ng: update to 4.2.0, adopt.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/caffeine-ng
https://github.com/void-linux/void-packages/pull/47705

caffeine-ng: update to 4.2.0, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/47705.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/caffeine-ng-47705.patch --]
[-- Type: text/x-diff, Size: 4734 bytes --]

From beb0efe5abdc9a8de619db054541601f52f9bcd1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 11 Dec 2023 11:59:55 -0500
Subject: [PATCH] caffeine-ng: update to 4.2.0, adopt.

---
 srcpkgs/caffeine-ng/patches/mandir.patch      | 13 +++++++
 srcpkgs/caffeine-ng/patches/pulsectl.patch    | 15 ++++++++
 .../patches/use-ayatana-appindicator.patch    | 16 ---------
 srcpkgs/caffeine-ng/template                  | 34 ++++++++++++-------
 4 files changed, 49 insertions(+), 29 deletions(-)
 create mode 100644 srcpkgs/caffeine-ng/patches/mandir.patch
 create mode 100644 srcpkgs/caffeine-ng/patches/pulsectl.patch
 delete mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch

diff --git a/srcpkgs/caffeine-ng/patches/mandir.patch b/srcpkgs/caffeine-ng/patches/mandir.patch
new file mode 100644
index 0000000000000..262d1203b7e87
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/mandir.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 1f84fe8..423aed7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -103,7 +103,7 @@ custom_target(
+ 	feed: true,
+ 	capture: true,
+ 	install: true,
+-	install_dir: join_paths(mandir, 'man1/caffeine')
++	install_dir: join_paths(mandir, 'man1')
+ )
+ 
+ install_subdir('caffeine/assets/glade',
diff --git a/srcpkgs/caffeine-ng/patches/pulsectl.patch b/srcpkgs/caffeine-ng/patches/pulsectl.patch
new file mode 100644
index 0000000000000..8c791482672a1
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/pulsectl.patch
@@ -0,0 +1,15 @@
+Not sure why the Meson Python module can't find the installed pulsectl...
+
+diff --git a/meson.build b/meson.build
+index 1f84fe8..05567a4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -22,7 +22,7 @@ endif
+ 
+ pymod = import('python')
+ python = pymod.find_installation('python3',
+-  modules: ['click', 'ewmh', 'setproctitle', 'pulsectl']
++  modules: ['click', 'ewmh', 'setproctitle']
+ )
+ python.dependency()
+ 
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
deleted file mode 100644
index 925dad3e04102..0000000000000
--- a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/caffeine/main.py b/caffeine/main.py
-index 516a138..f48653b 100644
---- a/caffeine/main.py
-+++ b/caffeine/main.py
-@@ -32,9 +32,9 @@ try:
-     gi.require_version("Notify", "0.7")
- except ValueError:
-     gi.require_version("Notify", "0.8")
--gi.require_version("AppIndicator3", "0.1")
-+gi.require_version("AyatanaAppIndicator3", "0.1")
- 
--from gi.repository import AppIndicator3  # noqa: E402
-+from gi.repository import AyatanaAppIndicator3 as AppIndicator3  # noqa: E402
- from gi.repository import GdkPixbuf  # noqa: E402
- from gi.repository import Gtk  # noqa: E402
- from gi.repository.Notify import Notification  # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 6f18114aaddd9..f312c4e224fcf 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,19 +1,27 @@
 # Template file for 'caffeine-ng'
 pkgname=caffeine-ng
-version=4.0.2
-revision=5
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
-depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
- python3-dbus python3-click python3-ewmh python3-gobject
- python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libayatana-appindicator"
+version=4.2.0
+revision=1
+build_style=meson
+_python_dependencies="python3-click python3-dbus python3-ewmh python3-gobject
+ python3-pulsectl python3-setproctitle"
+hostmakedepends="pkg-config scdoc ${_python_dependencies}"
+makedepends="python3-gobject-devel python3-dbus-devel gtk+3-devel
+ libnotify-devel libayatana-appindicator-devel"
+depends="desktop-file-utils hicolor-icon-theme libnotify
+ libayatana-appindicator gtk+3 ${_python_dependencies}"
 short_desc="Temporarily inhibits the screensaver and sleep mode"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://codeberg.org/WhyNotHugo/caffeine-ng"
 changelog="https://codeberg.org/WhyNotHugo/caffeine-ng/raw/branch/main/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/c/caffeine-ng/caffeine-ng-${version}.tar.gz"
-checksum=ba62235c9d1eb7a3e2e448e3f7a43e66188a4beca3edbb206f8b905ba626eab5
-# only runs lints and syntax checks via flake8
-make_check=no
+distfiles="https://codeberg.org/WhyNotHugo/caffeine-ng/archive/v${version}.tar.gz"
+checksum=938080407714104d1c016513146b150a7dc25882ad9ae957d6c02d340d90fda2
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" scdoc"
+fi
+
+pre_configure() {
+	echo $version > version
+}

Re: [PR PATCH] [Closed]: caffeine-ng: update to 4.2.0, adopt.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1074 bytes --]

There's a closed pull request on the void-packages repository

caffeine-ng: update to 4.2.0, adopt.
https://github.com/void-linux/void-packages/pull/47705

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: caffeine-ng: update to 4.2.0, adopt.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/47705#issuecomment-1852198039

Comment:
Just realized KDE has "Power Management -> Manually block sleep and screen locking" so I have no need of this, especially since the fullscreen inhibit doesn't work on Wayland...