Re: [PR PATCH] [Updated] New package: weechat-matrix-0.3.0

[meator <meator@users.noreply.github.com>]

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

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

https://github.com/meator/void-packages weechat-matrix
https://github.com/void-linux/void-packages/pull/49818

New package: weechat-matrix-0.3.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

#### TODO
- [ ] Figure out all of `depends`
- [ ] Test it with weechat

The AUR seems to be doing some extra patching and build system modification. I'll have to see if it'll also be necessary here.

<!-- 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/49818.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-weechat-matrix-49818.patch --]
[-- Type: text/x-diff, Size: 7204 bytes --]

From ce18745263c4e4d51f663fb47a225b010e4973d7 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sat, 13 Apr 2024 10:16:11 +0200
Subject: [PATCH 1/2] New package: python3-webcolors-1.13

---
 srcpkgs/python3-webcolors/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-webcolors/template

diff --git a/srcpkgs/python3-webcolors/template b/srcpkgs/python3-webcolors/template
new file mode 100644
index 00000000000000..62ea553b929555
--- /dev/null
+++ b/srcpkgs/python3-webcolors/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-webcolors'
+pkgname=python3-webcolors
+version=1.13
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Library for working with HTML/CSS color formats in Python"
+maintainer="meator <meator.dev@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/ubernostrum/webcolors"
+distfiles="https://github.com/ubernostrum/webcolors/archive/refs/tags/${version}.tar.gz"
+checksum=51b5367692d5de19b8422ff5b07d4a2892fe868652d4e131e80250ecf100713a
+
+post_install() {
+	vlicense LICENSE
+}

From 79f291fffca16242c3d99ca51eeb7f34e529af71 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sat, 13 Apr 2024 09:06:12 +0200
Subject: [PATCH 2/2] UNFINISHED: New package: weechat-matrix-0.3.0

---
 srcpkgs/weechat-matrix/patches/fix-nio.patch  | 121 ++++++++++++++++++
 .../weechat-matrix/patches/fix-poetry.patch   |  14 ++
 srcpkgs/weechat-matrix/template               |  23 ++++
 3 files changed, 158 insertions(+)
 create mode 100644 srcpkgs/weechat-matrix/patches/fix-nio.patch
 create mode 100644 srcpkgs/weechat-matrix/patches/fix-poetry.patch
 create mode 100644 srcpkgs/weechat-matrix/template

diff --git a/srcpkgs/weechat-matrix/patches/fix-nio.patch b/srcpkgs/weechat-matrix/patches/fix-nio.patch
new file mode 100644
index 00000000000000..3771d7c75f0e4f
--- /dev/null
+++ b/srcpkgs/weechat-matrix/patches/fix-nio.patch
@@ -0,0 +1,121 @@
+This is a modified version of the feae9fda26ea9de98da9cd6733980a203115537e
+upstream commit. It fixes a apply error in requirements.txt.
+--- a/matrix/config.py
++++ b/matrix/config.py
+@@ -24,12 +24,11 @@
+ Server specific configuration options are handled in server.py
+ """
+ 
++import logging
+ from builtins import super
+ from collections import namedtuple
+ from enum import IntEnum, Enum, unique
+ 
+-import logbook
+-
+ import nio
+ from matrix.globals import SCRIPT_NAME, SERVERS, W
+ from matrix.utf import utf8_decode
+@@ -57,9 +56,8 @@
+     NEXT = 1
+     NEAR_SERVER = 2
+ 
+-
+-nio.logger_group.level = logbook.ERROR
+-
++nio_logger = logging.getLogger("nio")
++nio_logger.setLevel(logging.ERROR)
+ 
+ class Option(
+     namedtuple(
+@@ -141,18 +139,13 @@
+     Called every time the user changes the log level or log category
+     configuration option."""
+ 
++    if category == "encryption":
++        category = "crypto"
++
+     if category == "all":
+-        nio.logger_group.level = level
+-    elif category == "http":
+-        nio.http.logger.level = level
+-    elif category == "client":
+-        nio.client.logger.level = level
+-    elif category == "events":
+-        nio.events.logger.level = level
+-    elif category == "responses":
+-        nio.responses.logger.level = level
+-    elif category == "encryption":
+-        nio.crypto.logger.level = level
++        nio_logger.setLevel(level)
++    else:
++        nio_logger.getChild(category).setLevel(level)
+ 
+ 
+ @utf8_decode
+@@ -178,7 +171,7 @@
+ @utf8_decode
+ def config_log_category_cb(data, option):
+     """Callback for the network.debug_category option."""
+-    change_log_level(G.CONFIG.debug_category, logbook.ERROR)
++    change_log_level(G.CONFIG.debug_category, logging.ERROR)
+     G.CONFIG.debug_category = G.CONFIG.network.debug_category
+     change_log_level(
+         G.CONFIG.network.debug_category, G.CONFIG.network.debug_level
+@@ -203,20 +196,20 @@
+     return 1
+ 
+ 
+-def level_to_logbook(value):
++def level_to_logging(value):
+     if value == 0:
+-        return logbook.ERROR
++        return logging.ERROR
+     if value == 1:
+-        return logbook.WARNING
++        return logging.WARNING
+     if value == 2:
+-        return logbook.INFO
++        return logging.INFO
+     if value == 3:
+-        return logbook.DEBUG
++        return logging.DEBUG
+ 
+-    return logbook.ERROR
++    return logging.ERROR
+ 
+ 
+-def logbook_category(value):
++def logging_category(value):
+     if value == 0:
+         return "all"
+     if value == 1:
+@@ -647,7 +640,7 @@
+                 0,
+                 "error",
+                 "Enable network protocol debugging.",
+-                level_to_logbook,
++                level_to_logging,
+                 config_log_level_cb,
+             ),
+             Option(
+@@ -658,7 +651,7 @@
+                 0,
+                 "all",
+                 "Debugging category",
+-                logbook_category,
++                logging_category,
+                 config_log_category_cb,
+             ),
+             Option(
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -6,7 +6,7 @@
+ attrs
+ logbook
+ pygments
+-matrix-nio[e2e]>=0.6
++matrix-nio[e2e]>=0.21.0
+ aiohttp ; python_version >= "3.5"
+ python-magic
+ requests
diff --git a/srcpkgs/weechat-matrix/patches/fix-poetry.patch b/srcpkgs/weechat-matrix/patches/fix-poetry.patch
new file mode 100644
index 00000000000000..0c0d3480c80099
--- /dev/null
+++ b/srcpkgs/weechat-matrix/patches/fix-poetry.patch
@@ -0,0 +1,14 @@
+Taken from https://github.com/poljar/weechat-matrix/pull/340
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 709adf1..d3292af 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -31,5 +31,5 @@ matrix_sso_helper = ["aiohttp"]
+ matrix_upload = ["python-magic", "requests"]
+ 
+ [build-system]
+-requires = ["poetry>=0.12"]
+-build-backend = "poetry.masonry.api"
++requires = ["poetry-core>=1.0.0"]
++build-backend = "poetry.core.masonry.api"
diff --git a/srcpkgs/weechat-matrix/template b/srcpkgs/weechat-matrix/template
new file mode 100644
index 00000000000000..e37b3e34893617
--- /dev/null
+++ b/srcpkgs/weechat-matrix/template
@@ -0,0 +1,23 @@
+# Template file for 'weechat-matrix'
+pkgname=weechat-matrix
+version=0.3.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-webcolors python3-openssl python3-atomicwrites python3-attrs
+ python3-logbook python3-Pygments python3-matrix-nio python3-aiohttp
+ python3-magic python3-requests weechat-python"
+short_desc="Weechat Matrix protocol script written in python"
+maintainer="meator <meator.dev@gmail.com>"
+license="ISC"
+homepage="https://github.com/poljar/weechat-matrix"
+distfiles="https://github.com/poljar/weechat-matrix/archive/refs/tags/${version}.tar.gz"
+checksum=4a7942ec976dc6081ebb689cb0dc0f02f8ab9d24121f98c6dcb7f39478251329
+
+post_install() {
+	vlicense LICENSE
+	for _script in matrix_decrypt matrix_sso_helper matrix_upload; do
+		vbin contrib/$_script.py
+	done
+	vinstall main.py 755 usr/share/weechat/python weechat-matrix.py
+}