[PR PATCH] python3-xdg-variables: update, rename, fix dependants and conflicts

[PR PATCH] python3-xdg-variables: update, rename, fix dependants and conflicts

[ahesford]

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

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

https://github.com/ahesford/void-packages py-inotify
https://github.com/void-linux/void-packages/pull/46580

python3-xdg-variables: update, rename, fix dependants and conflicts
Updating `python3-xdg-variables` and changing its name to the upstream package allows us to remove a conflict with `python3-xdg` and remove a `python3-inotify` dependency. Likewise, the dependant `remhind` can have its `python3-inotify` removed because it doesn't seem to be used.

This leaves only `cinnamon`, `quodlibet` and `ulauncher` as dependants of the broken `python3-inotify`. Note that `ulauncher` is also broken by virtue of `python3-Levenshtein`.

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

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-py-inotify-46580.patch --]
[-- Type: text/x-diff, Size: 7208 bytes --]

From eac37e305e3a5a9fbeadb0fcc327bb345f0aea1a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 10 Oct 2023 21:56:58 -0400
Subject: [PATCH 1/3] python3-xdg-variables: update to 6.0.1, rename to
 python3-xdg-base-dirs

---
 srcpkgs/python3-xdg-base-dirs/template | 25 +++++++++++++++++++++++++
 srcpkgs/python3-xdg-variables          |  1 +
 srcpkgs/python3-xdg-variables/template | 17 -----------------
 3 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/python3-xdg-base-dirs/template
 create mode 120000 srcpkgs/python3-xdg-variables
 delete mode 100644 srcpkgs/python3-xdg-variables/template

diff --git a/srcpkgs/python3-xdg-base-dirs/template b/srcpkgs/python3-xdg-base-dirs/template
new file mode 100644
index 0000000000000..1b2d1269a8e64
--- /dev/null
+++ b/srcpkgs/python3-xdg-base-dirs/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-xdg-base-dirs'
+pkgname=python3-xdg-base-dirs
+version=6.0.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+short_desc="Python implementation of the XDG Base Directory Specification"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ISC"
+homepage="https://github.com/srstevenson/xdg-base-dirs"
+distfiles="${PYPI_SITE}/x/xdg-base-dirs/xdg_base_dirs-${version}.tar.gz"
+checksum=b4c8f4ba72d1286018b25eea374ec6fbf4fddda3d4137edf50de95de53e195a6
+# Tarball provides no tests
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}
+
+python3-xdg-variables_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/python3-xdg-variables b/srcpkgs/python3-xdg-variables
new file mode 120000
index 0000000000000..3ef875d3618b0
--- /dev/null
+++ b/srcpkgs/python3-xdg-variables
@@ -0,0 +1 @@
+python3-xdg-base-dirs
\ No newline at end of file
diff --git a/srcpkgs/python3-xdg-variables/template b/srcpkgs/python3-xdg-variables/template
deleted file mode 100644
index 00520b1db9ef8..0000000000000
--- a/srcpkgs/python3-xdg-variables/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python3-xdg-variables'
-pkgname=python3-xdg-variables
-version=4.0.1
-revision=5
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-inotify python3-aionotify"
-short_desc="Provide variables defined by the XDG Base Directory Specification"
-maintainer="Stacy Harper <contact@stacyharper.net>"
-license="ISC"
-homepage="https://github.com/srstevenson/xdg"
-distfiles="${PYPI_SITE}/x/xdg/xdg-${version}.tar.gz"
-checksum=c939c99def394cbaf765a3ee55efd6ea7e4c5eaed8d9ebc2d03af84ba35dec57
-
-post_install() {
-	vlicense LICENCE
-}

From 83058190a2c15c3984ad3cb04cc021e0c01b1e67 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 10 Oct 2023 22:02:18 -0400
Subject: [PATCH 2/3] remhind: rebuild with python3-xdg-base-dirs, without
 python3-inotify

---
 srcpkgs/remhind/patches/pyinotify.patch | 12 +++++++++
 srcpkgs/remhind/patches/xdg.patch       | 36 +++++++++++++++++++++++++
 srcpkgs/remhind/template                |  4 +--
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/remhind/patches/pyinotify.patch
 create mode 100644 srcpkgs/remhind/patches/xdg.patch

diff --git a/srcpkgs/remhind/patches/pyinotify.patch b/srcpkgs/remhind/patches/pyinotify.patch
new file mode 100644
index 0000000000000..50a8643ca20f6
--- /dev/null
+++ b/srcpkgs/remhind/patches/pyinotify.patch
@@ -0,0 +1,12 @@
+Despite listing pyinotify as a dependency, it isn't actually referenced anywhere.
+
+--- ./setup.cfg.orig	2023-10-10 22:07:11.502935586 -0400
++++ ./setup.cfg	2023-10-10 22:08:15.522236184 -0400
+@@ -23,7 +23,6 @@
+ 	aionotify
+ 	icalendar
+ 	python-dateutil
+-	pyinotify
+ 	PyGObject
+ 	toml
+ 	tzlocal
diff --git a/srcpkgs/remhind/patches/xdg.patch b/srcpkgs/remhind/patches/xdg.patch
new file mode 100644
index 0000000000000..482ad46453a16
--- /dev/null
+++ b/srcpkgs/remhind/patches/xdg.patch
@@ -0,0 +1,36 @@
+diff -ur remhind-0.1.1.orig/remhind/__main__.py remhind-0.1.1/remhind/__main__.py
+--- remhind-0.1.1.orig/remhind/__main__.py	2023-10-10 21:58:25.792467164 -0400
++++ remhind-0.1.1/remhind/__main__.py	2023-10-10 22:00:58.599184654 -0400
+@@ -5,7 +5,7 @@
+ 
+ import gi
+ import toml
+-from xdg import XDG_CONFIG_HOME, XDG_CACHE_HOME
++from xdg_base_dirs import xdg_config_home, xdg_cache_home
+ 
+ from .monitor import monitor_calendars
+ from .events import check_events, CalendarStore
+@@ -33,9 +33,9 @@
+ def main():
+     parser = argparse.ArgumentParser(description="remind event from vdirs")
+     parser.add_argument('-c', '--config', type=pathlib.Path,
+-        default=XDG_CONFIG_HOME / 'remhind' / 'config')
++        default=xdg_config_home() / 'remhind' / 'config')
+     parser.add_argument('-d', '--database', type=pathlib.Path,
+-        default=XDG_CACHE_HOME / 'remhind.db')
++        default=xdg_cache_home() / 'remhind.db')
+     parser.add_argument('-v', '--verbose', action='count', default=0)
+ 
+     asyncio.run(monitor_file_events(parser.parse_args()))
+diff -ur remhind-0.1.1.orig/setup.cfg remhind-0.1.1/setup.cfg
+--- remhind-0.1.1.orig/setup.cfg	2023-10-10 21:58:25.793467169 -0400
++++ remhind-0.1.1/setup.cfg	2023-10-10 22:01:05.341216310 -0400
+@@ -27,7 +27,7 @@
+ 	PyGObject
+ 	toml
+ 	tzlocal
+-	xdg
++	xdg-base-dirs
+ 
+ [options.entry_points]
+ console-scripts = 
diff --git a/srcpkgs/remhind/template b/srcpkgs/remhind/template
index 8601b363625c4..0b1eef7473e2c 100644
--- a/srcpkgs/remhind/template
+++ b/srcpkgs/remhind/template
@@ -1,11 +1,11 @@
 # Template file for 'remhind'
 pkgname=remhind
 version=0.1.1
-revision=6
+revision=7
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-gobject-devel python3-cairo-devel"
 depends="python3-icalendar python3-dateutil python3-gobject python3-toml
- python3-tzlocal python3-xdg-variables python3-inotify python3-aionotify libnotify"
+ python3-tzlocal python3-xdg-base-dirs python3-aionotify libnotify"
 checkdepends="${depends} python3-freezegun python3-pytest-xdist"
 short_desc="Notification daemon of events stored in directories"
 maintainer="Stacy Harper <contact@stacyharper.net>"

From 3919c70386b573b9f03ac1a5031ed0fdf429c257 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 10 Oct 2023 21:57:41 -0400
Subject: [PATCH 3/3] python3-xdg: remove python3-xdg-variables conflict

---
 srcpkgs/python3-xdg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-xdg/template b/srcpkgs/python3-xdg/template
index 21677dcc789d7..0904db59a7e04 100644
--- a/srcpkgs/python3-xdg/template
+++ b/srcpkgs/python3-xdg/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xdg'
 pkgname=python3-xdg
 version=0.28
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -13,4 +13,4 @@ distfiles="${PYPI_SITE}/p/pyxdg/pyxdg-${version}.tar.gz"
 checksum=3267bb3074e934df202af2ee0868575484108581e6f3cb006af1da35395e88b4
 
 # Both provide Python module xdg.
-conflicts="python3-xdg-variables"
+conflicts="python3-xdg-variables<6.0.1_1"

Re: [PR PATCH] [Merged]: python3-xdg-variables: update, rename, fix dependants and conflicts

[ahesford]

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

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

python3-xdg-variables: update, rename, fix dependants and conflicts
https://github.com/void-linux/void-packages/pull/46580

Description:
Updating `python3-xdg-variables` and changing its name to the upstream package allows us to remove a conflict with `python3-xdg` and remove a `python3-inotify` dependency. Likewise, the dependant `remhind` can have its `python3-inotify` removed because it doesn't seem to be used.

This leaves only `cinnamon`, `quodlibet` and `ulauncher` as dependants of the broken `python3-inotify`. Note that `ulauncher` is also broken by virtue of `python3-Levenshtein`.

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