Re: [PR PATCH] [Updated] New package: flashfocus-2.0.3

[voidlinux-github@inbox.vuxu.org]

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

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

https://github.com/travankor/void-packages flashfocus
https://github.com/void-linux/void-packages/pull/14426

New package: flashfocus-2.0.3
None

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

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

From a1c5cd9694902ce59fefdb0196c1bc8b91ef1909 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 11 Sep 2019 05:58:50 -0700
Subject: [PATCH 1/4] New package: i3ipc-python-2.1.1

---
 srcpkgs/i3ipc-python/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/i3ipc-python/template

diff --git a/srcpkgs/i3ipc-python/template b/srcpkgs/i3ipc-python/template
new file mode 100644
index 00000000000..9247149b117
--- /dev/null
+++ b/srcpkgs/i3ipc-python/template
@@ -0,0 +1,19 @@
+# Template file for 'i3ipc-python'
+pkgname=i3ipc-python
+version=2.1.1
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="i3ipc"
+hostmakedepends="python3 python3-setuptools"
+depends="python3-xlib"
+short_desc="Python library to control i3wm and sway"
+maintainer="travankor <travankor@tuta.io>"
+license="BSD-3-Clause"
+homepage="https://github.com/altdesktop/i3ipc-python"
+distfiles="https://github.com/altdesktop/i3ipc-python/archive/v${version}.tar.gz"
+checksum=0dcd46519603ce3e52c4ae69e50efe1e7a31c03af15e0b9b639055de40daff15
+
+post-install() {
+	vlicense LICENSE
+}

From 796fca35eec1cba48f86b60773068d7fd673bb7b Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 12 Sep 2019 15:31:51 -0700
Subject: [PATCH 2/4] New package: python3-marshmallow-2.20.3

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

diff --git a/srcpkgs/python3-marshmallow/template b/srcpkgs/python3-marshmallow/template
new file mode 100644
index 00000000000..416f8f7cb8d
--- /dev/null
+++ b/srcpkgs/python3-marshmallow/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-marshmallow'
+pkgname=python3-marshmallow
+version=2.20.3
+revision=1
+archs=noarch
+wrksrc=marshmallow-${version}
+build_style=python3-module
+pycompile_module="marshmallow"
+hostmakedepends="python3 python3-setuptools"
+short_desc="Library for converting complex objects from Python datatypes"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://github.com/marshmallow-code/marshmallow"
+distfiles="https://github.com/marshmallow-code/marshmallow/archive/${version}.tar.gz"
+checksum=094f29d5886208e22574bb0ab9cff31c0aa0a8c58b22a19d75949cbed9fb9657
+
+post-install() {
+	vlicense LICENSE
+}

From fa2f045c07d5adc0b57d9d5d82f3a47799d009b8 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 12 Sep 2019 15:31:56 -0700
Subject: [PATCH 3/4] New package: flashfocus-2.0.3

---
 srcpkgs/flashfocus/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/flashfocus/template

diff --git a/srcpkgs/flashfocus/template b/srcpkgs/flashfocus/template
new file mode 100644
index 00000000000..3827aecacb2
--- /dev/null
+++ b/srcpkgs/flashfocus/template
@@ -0,0 +1,25 @@
+# Template file for 'flashfocus'
+pkgname=flashfocus
+version=2.0.3
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="flashfocus"
+hostmakedepends="python3-setuptools"
+depends="i3ipc-python python3-click python3-marshmallow
+ python3-yaml"
+short_desc="Simple focus animations for i3wm and sway"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://github.com/fennerm/flashfocus"
+distfiles="https://github.com/fennerm/flashfocus/archive/v${version}.tar.gz"
+checksum=231b260c6e18cc3cc6400d22797e5c8441432dc2c08154fdccc77c78934ba5d1
+
+pre_build() {
+	#use i3ipc instead of xcb
+	sed -i '22d;24,25d' setup.py
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 3521131982ce4a173b363497f60f3789cb504c16 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Fri, 13 Sep 2019 02:05:12 -0700
Subject: [PATCH 4/4] fix i3

---
 srcpkgs/flashfocus/patches/fix_i3.patch | 21 +++++++++++++++++++++
 srcpkgs/flashfocus/template             |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 srcpkgs/flashfocus/patches/fix_i3.patch

diff --git a/srcpkgs/flashfocus/patches/fix_i3.patch b/srcpkgs/flashfocus/patches/fix_i3.patch
new file mode 100644
index 00000000000..3dcdf675a9d
--- /dev/null
+++ b/srcpkgs/flashfocus/patches/fix_i3.patch
@@ -0,0 +1,21 @@
+diff --git a/flashfocus/compat.py b/flashfocus/compat.py
+index 3f971b6..1eae16c 100644
+--- a/flashfocus/compat.py
++++ b/flashfocus/compat.py
+@@ -1,6 +1,7 @@
+ """Compatibility module for abstracting across display protocols."""
+ from enum import auto, Enum
+ import os
++import subprocess
+ 
+ 
+ class DisplayProtocol(Enum):
+@@ -11,6 +12,8 @@ class DisplayProtocol(Enum):
+ def get_display_protocol() -> DisplayProtocol:
+     if os.environ.get("WAYLAND_DISPLAY"):
+         protocol = DisplayProtocol.WAYLAND
++    elif subprocess.check_output(["wmctrl", "-m"]).decode("utf-8").split()[1] == "i3":
++        protocol = DisplayProtocol.WAYLAND
+     else:
+         protocol = DisplayProtocol.X11
+     return protocol
diff --git a/srcpkgs/flashfocus/template b/srcpkgs/flashfocus/template
index 3827aecacb2..f0f5cc06120 100644
--- a/srcpkgs/flashfocus/template
+++ b/srcpkgs/flashfocus/template
@@ -12,8 +12,10 @@ short_desc="Simple focus animations for i3wm and sway"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://github.com/fennerm/flashfocus"
+changelog="https://raw.githubusercontent.com/fennerm/flashfocus/master/CHANGELOG.md"
 distfiles="https://github.com/fennerm/flashfocus/archive/v${version}.tar.gz"
 checksum=231b260c6e18cc3cc6400d22797e5c8441432dc2c08154fdccc77c78934ba5d1
+patch_args="-Np1"
 
 pre_build() {
 	#use i3ipc instead of xcb