Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: swayfx
@ 2023-04-07  9:57 tmahlburg
  2023-04-07 10:00 ` [PR PATCH] [Updated] " tmahlburg
                   ` (8 more replies)
  0 siblings, 9 replies; 11+ messages in thread
From: tmahlburg @ 2023-04-07  9:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tmahlburg/void-packages master
https://github.com/void-linux/void-packages/pull/43315

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

#### Testing the changes
- I tested the changes in this PR: **YES**<!--|**briefly**|**NO**-->

#### 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, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
-->

I basically just adapted the existing ```sway``` package to this fork. I've run this for a few days on my machine.

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

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

From 5f333d166afe684225dbb4dc1e6eec0596a2ed61 Mon Sep 17 00:00:00 2001
From: Till Mahlburg <mahlburg@posteo.de>
Date: Fri, 7 Apr 2023 12:45:24 +0200
Subject: [PATCH] added swayfx

---
 srcpkgs/swayfx/INSTALL           |  5 +++++
 srcpkgs/swayfx/patches/7326.diff | 26 ++++++++++++++++++++++++++
 srcpkgs/swayfx/template          | 23 +++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/swayfx/INSTALL
 create mode 100644 srcpkgs/swayfx/patches/7326.diff
 create mode 100644 srcpkgs/swayfx/template

diff --git a/srcpkgs/swayfx/INSTALL b/srcpkgs/swayfx/INSTALL
new file mode 100644
index 000000000000..0120d14908bc
--- /dev/null
+++ b/srcpkgs/swayfx/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap CAP_SYS_NICE=+ep usr/bin/sway
+	;;
+esac
diff --git a/srcpkgs/swayfx/patches/7326.diff b/srcpkgs/swayfx/patches/7326.diff
new file mode 100644
index 000000000000..5c9c63063bc4
--- /dev/null
+++ b/srcpkgs/swayfx/patches/7326.diff
@@ -0,0 +1,26 @@
+diff --git a/sway/config.c b/sway/config.c
+index 1f2bb68604..f5efa98a8e 100644
+--- a/sway/config.c
++++ b/sway/config.c
+@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
+ 
+ static struct xkb_state *keysym_translation_state_create(
+ 		struct xkb_rule_names rules) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
+ 		context,
+ 		&rules,
+diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
+index 3f4a7289b9..45a588ecbf 100644
+--- a/sway/input/keyboard.c
++++ b/sway/input/keyboard.c
+@@ -754,7 +754,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
+ 
+ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
+ 		char **error) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	if (!sway_assert(context, "cannot create XKB context")) {
+ 		return NULL;
+ 	}
diff --git a/srcpkgs/swayfx/template b/srcpkgs/swayfx/template
new file mode 100644
index 000000000000..88e04b546d02
--- /dev/null
+++ b/srcpkgs/swayfx/template
@@ -0,0 +1,23 @@
+# Template file for 'sway'
+pkgname=swayfx
+version=0.2
+revision=1
+build_style=meson
+configure_args="-Dwerror=false -Db_ndebug=false"
+conf_files="/etc/sway/config"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
+ gdk-pixbuf-devel libevdev-devel"
+depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
+conflicts="sway"
+short_desc="Sway, but with eye candy!"
+maintainer="Till Mahlburg <mahlburg [at] posteo [dot] de>"
+license="MIT"
+homepage="https://github.com/WillPower3309/swayfx"
+changelog="https://github.com/WillPower3309/swayfx/releases"
+distfiles="https://github.com/WillPower3309/swayfx/archive/refs/tags/${version}.tar.gz"
+checksum=fe5f6070b9b3fc97fafb1bfe1caddce71458632ef4fb884a9ec28d1a458b4e55
+
+post_install() {
+	vlicense LICENSE
+}

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] New package: swayfx
  2023-04-07  9:57 [PR PATCH] New package: swayfx tmahlburg
@ 2023-04-07 10:00 ` tmahlburg
  2023-04-07 10:01 ` paper42
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 11+ messages in thread
From: tmahlburg @ 2023-04-07 10:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tmahlburg/void-packages master
https://github.com/void-linux/void-packages/pull/43315

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

#### Testing the changes
- I tested the changes in this PR: **YES**<!--|**briefly**|**NO**-->

#### 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, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
-->

I basically just adapted the existing ```sway``` package to this fork. I've run this for a few days on my machine.

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

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

From 5f333d166afe684225dbb4dc1e6eec0596a2ed61 Mon Sep 17 00:00:00 2001
From: Till Mahlburg <mahlburg@posteo.de>
Date: Fri, 7 Apr 2023 12:45:24 +0200
Subject: [PATCH 1/2] added swayfx

---
 srcpkgs/swayfx/INSTALL           |  5 +++++
 srcpkgs/swayfx/patches/7326.diff | 26 ++++++++++++++++++++++++++
 srcpkgs/swayfx/template          | 23 +++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/swayfx/INSTALL
 create mode 100644 srcpkgs/swayfx/patches/7326.diff
 create mode 100644 srcpkgs/swayfx/template

diff --git a/srcpkgs/swayfx/INSTALL b/srcpkgs/swayfx/INSTALL
new file mode 100644
index 000000000000..0120d14908bc
--- /dev/null
+++ b/srcpkgs/swayfx/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap CAP_SYS_NICE=+ep usr/bin/sway
+	;;
+esac
diff --git a/srcpkgs/swayfx/patches/7326.diff b/srcpkgs/swayfx/patches/7326.diff
new file mode 100644
index 000000000000..5c9c63063bc4
--- /dev/null
+++ b/srcpkgs/swayfx/patches/7326.diff
@@ -0,0 +1,26 @@
+diff --git a/sway/config.c b/sway/config.c
+index 1f2bb68604..f5efa98a8e 100644
+--- a/sway/config.c
++++ b/sway/config.c
+@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
+ 
+ static struct xkb_state *keysym_translation_state_create(
+ 		struct xkb_rule_names rules) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
+ 		context,
+ 		&rules,
+diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
+index 3f4a7289b9..45a588ecbf 100644
+--- a/sway/input/keyboard.c
++++ b/sway/input/keyboard.c
+@@ -754,7 +754,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
+ 
+ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
+ 		char **error) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	if (!sway_assert(context, "cannot create XKB context")) {
+ 		return NULL;
+ 	}
diff --git a/srcpkgs/swayfx/template b/srcpkgs/swayfx/template
new file mode 100644
index 000000000000..88e04b546d02
--- /dev/null
+++ b/srcpkgs/swayfx/template
@@ -0,0 +1,23 @@
+# Template file for 'sway'
+pkgname=swayfx
+version=0.2
+revision=1
+build_style=meson
+configure_args="-Dwerror=false -Db_ndebug=false"
+conf_files="/etc/sway/config"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
+ gdk-pixbuf-devel libevdev-devel"
+depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
+conflicts="sway"
+short_desc="Sway, but with eye candy!"
+maintainer="Till Mahlburg <mahlburg [at] posteo [dot] de>"
+license="MIT"
+homepage="https://github.com/WillPower3309/swayfx"
+changelog="https://github.com/WillPower3309/swayfx/releases"
+distfiles="https://github.com/WillPower3309/swayfx/archive/refs/tags/${version}.tar.gz"
+checksum=fe5f6070b9b3fc97fafb1bfe1caddce71458632ef4fb884a9ec28d1a458b4e55
+
+post_install() {
+	vlicense LICENSE
+}

From ef250ee847d0069e44ace826da6d0a7f3015a98d Mon Sep 17 00:00:00 2001
From: Till Mahlburg <mahlburg@posteo.de>
Date: Fri, 7 Apr 2023 12:59:13 +0200
Subject: [PATCH 2/2] fix lint issues

---
 srcpkgs/swayfx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/swayfx/template b/srcpkgs/swayfx/template
index 88e04b546d02..2483ca15cfa2 100644
--- a/srcpkgs/swayfx/template
+++ b/srcpkgs/swayfx/template
@@ -1,4 +1,4 @@
-# Template file for 'sway'
+# Template file for 'swayfx'
 pkgname=swayfx
 version=0.2
 revision=1
@@ -9,14 +9,14 @@ hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel libevdev-devel"
 depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
-conflicts="sway"
 short_desc="Sway, but with eye candy!"
-maintainer="Till Mahlburg <mahlburg [at] posteo [dot] de>"
+maintainer="Till Mahlburg <mahlburg@posteo.de>"
 license="MIT"
 homepage="https://github.com/WillPower3309/swayfx"
 changelog="https://github.com/WillPower3309/swayfx/releases"
 distfiles="https://github.com/WillPower3309/swayfx/archive/refs/tags/${version}.tar.gz"
 checksum=fe5f6070b9b3fc97fafb1bfe1caddce71458632ef4fb884a9ec28d1a458b4e55
+conflicts="sway"
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: New package: swayfx
  2023-04-07  9:57 [PR PATCH] New package: swayfx tmahlburg
  2023-04-07 10:00 ` [PR PATCH] [Updated] " tmahlburg
@ 2023-04-07 10:01 ` paper42
  2023-04-07 10:19 ` [PR PATCH] [Updated] [WIP] " tmahlburg
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2023-04-07 10:01 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/43315#issuecomment-1500140065

Comment:
please follow CONTRIBUTING.md for the commit messages

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: swayfx
  2023-04-07  9:57 [PR PATCH] New package: swayfx tmahlburg
  2023-04-07 10:00 ` [PR PATCH] [Updated] " tmahlburg
  2023-04-07 10:01 ` paper42
@ 2023-04-07 10:19 ` tmahlburg
  2023-04-08  9:31 ` [PR REVIEW] " mhmdanas
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 11+ messages in thread
From: tmahlburg @ 2023-04-07 10:19 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tmahlburg/void-packages master
https://github.com/void-linux/void-packages/pull/43315

[WIP] New package: swayfx
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**<!--|**briefly**|**NO**-->

#### 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, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
-->

I basically just adapted the existing ```sway``` package to this fork. I've run this for a few days on my machine.

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

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

From 44aac31a3bb7462e098a573e6a4408cf51912148 Mon Sep 17 00:00:00 2001
From: Till Mahlburg <mahlburg@posteo.de>
Date: Fri, 7 Apr 2023 13:10:09 +0200
Subject: [PATCH] New package: swayfx-0.2

---
 srcpkgs/swayfx/INSTALL           |  5 +++++
 srcpkgs/swayfx/patches/7326.diff | 26 ++++++++++++++++++++++++++
 srcpkgs/swayfx/template          | 23 +++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/swayfx/INSTALL
 create mode 100644 srcpkgs/swayfx/patches/7326.diff
 create mode 100644 srcpkgs/swayfx/template

diff --git a/srcpkgs/swayfx/INSTALL b/srcpkgs/swayfx/INSTALL
new file mode 100644
index 000000000000..0120d14908bc
--- /dev/null
+++ b/srcpkgs/swayfx/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap CAP_SYS_NICE=+ep usr/bin/sway
+	;;
+esac
diff --git a/srcpkgs/swayfx/patches/7326.diff b/srcpkgs/swayfx/patches/7326.diff
new file mode 100644
index 000000000000..c310f9af4c7c
--- /dev/null
+++ b/srcpkgs/swayfx/patches/7326.diff
@@ -0,0 +1,26 @@
+diff --git a/sway/config.c b/sway/config.c
+index 1f2bb68604..f5efa98a8e 100644
+--- a/sway/config.c
++++ b/sway/config.c
+@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
+
+ static struct xkb_state *keysym_translation_state_create(
+ 		struct xkb_rule_names rules) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
+ 		context,
+ 		&rules,
+diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
+index 3f4a7289b9..45a588ecbf 100644
+--- a/sway/input/keyboard.c
++++ b/sway/input/keyboard.c
+@@ -754,7 +754,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
+
+ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
+ 		char **error) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	if (!sway_assert(context, "cannot create XKB context")) {
+ 		return NULL;
+ 	}
diff --git a/srcpkgs/swayfx/template b/srcpkgs/swayfx/template
new file mode 100644
index 000000000000..2483ca15cfa2
--- /dev/null
+++ b/srcpkgs/swayfx/template
@@ -0,0 +1,23 @@
+# Template file for 'swayfx'
+pkgname=swayfx
+version=0.2
+revision=1
+build_style=meson
+configure_args="-Dwerror=false -Db_ndebug=false"
+conf_files="/etc/sway/config"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
+ gdk-pixbuf-devel libevdev-devel"
+depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
+short_desc="Sway, but with eye candy!"
+maintainer="Till Mahlburg <mahlburg@posteo.de>"
+license="MIT"
+homepage="https://github.com/WillPower3309/swayfx"
+changelog="https://github.com/WillPower3309/swayfx/releases"
+distfiles="https://github.com/WillPower3309/swayfx/archive/refs/tags/${version}.tar.gz"
+checksum=fe5f6070b9b3fc97fafb1bfe1caddce71458632ef4fb884a9ec28d1a458b4e55
+conflicts="sway"
+
+post_install() {
+	vlicense LICENSE
+}

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] New package: swayfx
  2023-04-07  9:57 [PR PATCH] New package: swayfx tmahlburg
                   ` (2 preceding siblings ...)
  2023-04-07 10:19 ` [PR PATCH] [Updated] [WIP] " tmahlburg
@ 2023-04-08  9:31 ` mhmdanas
  2023-04-08 12:41 ` [PR PATCH] [Updated] " tmahlburg
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 11+ messages in thread
From: mhmdanas @ 2023-04-08  9:31 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/43315#discussion_r1161089088

Comment:
Shouldn't be necessary anymore:
```suggestion
depends="libcap-progs swaybg xorg-server-xwayland"
```

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] New package: swayfx
  2023-04-07  9:57 [PR PATCH] New package: swayfx tmahlburg
                   ` (3 preceding siblings ...)
  2023-04-08  9:31 ` [PR REVIEW] " mhmdanas
@ 2023-04-08 12:41 ` tmahlburg
  2023-04-08 12:43 ` [PR REVIEW] " tmahlburg
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 11+ messages in thread
From: tmahlburg @ 2023-04-08 12:41 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tmahlburg/void-packages master
https://github.com/void-linux/void-packages/pull/43315

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

#### Testing the changes
- I tested the changes in this PR: **YES**<!--|**briefly**|**NO**-->

#### 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, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
-->

I basically just adapted the existing ```sway``` package to this fork. I've run this for a few days on my machine.

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

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

From efbf98947ae832370edddef646761dd272b4e9f1 Mon Sep 17 00:00:00 2001
From: Till Mahlburg <mahlburg@posteo.de>
Date: Fri, 7 Apr 2023 13:10:09 +0200
Subject: [PATCH] New package: swayfx-0.2

---
 srcpkgs/swayfx/INSTALL           |  5 +++++
 srcpkgs/swayfx/patches/7326.diff | 26 ++++++++++++++++++++++++++
 srcpkgs/swayfx/template          | 23 +++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/swayfx/INSTALL
 create mode 100644 srcpkgs/swayfx/patches/7326.diff
 create mode 100644 srcpkgs/swayfx/template

diff --git a/srcpkgs/swayfx/INSTALL b/srcpkgs/swayfx/INSTALL
new file mode 100644
index 000000000000..0120d14908bc
--- /dev/null
+++ b/srcpkgs/swayfx/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap CAP_SYS_NICE=+ep usr/bin/sway
+	;;
+esac
diff --git a/srcpkgs/swayfx/patches/7326.diff b/srcpkgs/swayfx/patches/7326.diff
new file mode 100644
index 000000000000..c310f9af4c7c
--- /dev/null
+++ b/srcpkgs/swayfx/patches/7326.diff
@@ -0,0 +1,26 @@
+diff --git a/sway/config.c b/sway/config.c
+index 1f2bb68604..f5efa98a8e 100644
+--- a/sway/config.c
++++ b/sway/config.c
+@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
+
+ static struct xkb_state *keysym_translation_state_create(
+ 		struct xkb_rule_names rules) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
+ 		context,
+ 		&rules,
+diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
+index 3f4a7289b9..45a588ecbf 100644
+--- a/sway/input/keyboard.c
++++ b/sway/input/keyboard.c
+@@ -754,7 +754,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
+
+ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
+ 		char **error) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	if (!sway_assert(context, "cannot create XKB context")) {
+ 		return NULL;
+ 	}
diff --git a/srcpkgs/swayfx/template b/srcpkgs/swayfx/template
new file mode 100644
index 000000000000..2483ca15cfa2
--- /dev/null
+++ b/srcpkgs/swayfx/template
@@ -0,0 +1,23 @@
+# Template file for 'swayfx'
+pkgname=swayfx
+version=0.2
+revision=1
+build_style=meson
+configure_args="-Dwerror=false -Db_ndebug=false"
+conf_files="/etc/sway/config"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
+ gdk-pixbuf-devel libevdev-devel"
+depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
+short_desc="Sway, but with eye candy!"
+maintainer="Till Mahlburg <mahlburg@posteo.de>"
+license="MIT"
+homepage="https://github.com/WillPower3309/swayfx"
+changelog="https://github.com/WillPower3309/swayfx/releases"
+distfiles="https://github.com/WillPower3309/swayfx/archive/refs/tags/${version}.tar.gz"
+checksum=fe5f6070b9b3fc97fafb1bfe1caddce71458632ef4fb884a9ec28d1a458b4e55
+conflicts="sway"
+
+post_install() {
+	vlicense LICENSE
+}

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] New package: swayfx
  2023-04-07  9:57 [PR PATCH] New package: swayfx tmahlburg
                   ` (4 preceding siblings ...)
  2023-04-08 12:41 ` [PR PATCH] [Updated] " tmahlburg
@ 2023-04-08 12:43 ` tmahlburg
  2023-05-26 14:41 ` WillPower3309
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 11+ messages in thread
From: tmahlburg @ 2023-04-08 12:43 UTC (permalink / raw)
  To: ml

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

New review comment by tmahlburg on void-packages repository

https://github.com/void-linux/void-packages/pull/43315#discussion_r1161108175

Comment:
Thanks for the feedback, I applied that change.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: New package: swayfx
  2023-04-07  9:57 [PR PATCH] New package: swayfx tmahlburg
                   ` (5 preceding siblings ...)
  2023-04-08 12:43 ` [PR REVIEW] " tmahlburg
@ 2023-05-26 14:41 ` WillPower3309
  2023-06-03 10:07 ` SpidFightFR
  2023-06-25 18:21 ` [PR PATCH] [Merged]: " Duncaen
  8 siblings, 0 replies; 11+ messages in thread
From: WillPower3309 @ 2023-05-26 14:41 UTC (permalink / raw)
  To: ml

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

New comment by WillPower3309 on void-packages repository

https://github.com/void-linux/void-packages/pull/43315#issuecomment-1564498708

Comment:
SwayFX 0.3 is now out :)

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: New package: swayfx
  2023-04-07  9:57 [PR PATCH] New package: swayfx tmahlburg
                   ` (6 preceding siblings ...)
  2023-05-26 14:41 ` WillPower3309
@ 2023-06-03 10:07 ` SpidFightFR
  2023-06-25 18:21 ` [PR PATCH] [Merged]: " Duncaen
  8 siblings, 0 replies; 11+ messages in thread
From: SpidFightFR @ 2023-06-03 10:07 UTC (permalink / raw)
  To: ml

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/43315#issuecomment-1574831920

Comment:
Would love to try out swayfx on my school laptop! 😄

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Merged]: New package: swayfx
  2023-04-07  9:57 [PR PATCH] New package: swayfx tmahlburg
                   ` (7 preceding siblings ...)
  2023-06-03 10:07 ` SpidFightFR
@ 2023-06-25 18:21 ` Duncaen
  8 siblings, 0 replies; 11+ messages in thread
From: Duncaen @ 2023-06-25 18:21 UTC (permalink / raw)
  To: ml

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

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

New package: swayfx
https://github.com/void-linux/void-packages/pull/43315

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

#### Testing the changes
- I tested the changes in this PR: **YES**<!--|**briefly**|**NO**-->

#### 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, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
-->

I basically just adapted the existing ```sway``` package to this fork. I've run this for a few days on my machine.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PR PATCH] New package: swayfx
@ 2023-06-03 14:39 justinesmithies
  0 siblings, 0 replies; 11+ messages in thread
From: justinesmithies @ 2023-06-03 14:39 UTC (permalink / raw)
  To: ml

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

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

https://github.com/justinesmithies/void-packages master
https://github.com/void-linux/void-packages/pull/44240

New package: swayfx
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

#### 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**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64)


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

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

From e40f9197cd8ee929e18ce063c3eb7b8364a6b00e Mon Sep 17 00:00:00 2001
From: Justine Smithies <justine@smithies.me.uk>
Date: Sat, 3 Jun 2023 15:28:51 +0100
Subject: [PATCH 1/5] Create template

---
 srcpkgs/swayfx/template | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/swayfx/template

diff --git a/srcpkgs/swayfx/template b/srcpkgs/swayfx/template
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/srcpkgs/swayfx/template
@@ -0,0 +1 @@
+

From dd176fa46592451154c0ed452512ae014721f5c5 Mon Sep 17 00:00:00 2001
From: Justine Smithies <justine@smithies.me.uk>
Date: Sat, 3 Jun 2023 15:29:42 +0100
Subject: [PATCH 2/5] Initial commit

---
 srcpkgs/swayfx/INSTALL  |  5 +++++
 srcpkgs/swayfx/template | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/swayfx/INSTALL

diff --git a/srcpkgs/swayfx/INSTALL b/srcpkgs/swayfx/INSTALL
new file mode 100644
index 000000000000..0120d14908bc
--- /dev/null
+++ b/srcpkgs/swayfx/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap CAP_SYS_NICE=+ep usr/bin/sway
+	;;
+esac
diff --git a/srcpkgs/swayfx/template b/srcpkgs/swayfx/template
index 8b137891791f..e69fe9cc45b0 100644
--- a/srcpkgs/swayfx/template
+++ b/srcpkgs/swayfx/template
@@ -1 +1,23 @@
+# Template file for 'swayfx'
+pkgname=swayfx
+version=0.3.1
+revision=1
+build_style=meson
+configure_args="-Dwerror=false -Db_ndebug=false"
+conf_files="/etc/sway/config"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
+ gdk-pixbuf-devel libevdev-devel"
+depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
+short_desc="Sway, but with eye candy!"
+maintainer="Till Mahlburg <mahlburg@posteo.de>"
+license="MIT"
+homepage="https://github.com/WillPower3309/swayfx"
+changelog="https://github.com/WillPower3309/swayfx/releases"
+distfiles="https://github.com/WillPower3309/swayfx/archive/refs/tags/${version}.tar.gz"
+checksum=42738d9d180d3e481575451612cdbab3bb62df9523c9dea864f267a20801006b
+conflicts="sway"
 
+post_install() {
+	vlicense LICENSE
+}

From f87af260791a15045a42d455c4bfb091d15ce986 Mon Sep 17 00:00:00 2001
From: Justine Smithies <justine@smithies.me.uk>
Date: Sat, 3 Jun 2023 15:32:08 +0100
Subject: [PATCH 3/5] Create 7326.diff

---
 srcpkgs/swayfx/patches/7326.diff | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/swayfx/patches/7326.diff

diff --git a/srcpkgs/swayfx/patches/7326.diff b/srcpkgs/swayfx/patches/7326.diff
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/srcpkgs/swayfx/patches/7326.diff
@@ -0,0 +1 @@
+

From fe4c328c49a3c464fc07738a592050a660ea4f5d Mon Sep 17 00:00:00 2001
From: Justine Smithies <justine@smithies.me.uk>
Date: Sat, 3 Jun 2023 15:32:35 +0100
Subject: [PATCH 4/5] Initial commit

---
 srcpkgs/swayfx/patches/7326.diff | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/srcpkgs/swayfx/patches/7326.diff b/srcpkgs/swayfx/patches/7326.diff
index 8b137891791f..c310f9af4c7c 100644
--- a/srcpkgs/swayfx/patches/7326.diff
+++ b/srcpkgs/swayfx/patches/7326.diff
@@ -1 +1,26 @@
+diff --git a/sway/config.c b/sway/config.c
+index 1f2bb68604..f5efa98a8e 100644
+--- a/sway/config.c
++++ b/sway/config.c
+@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
 
+ static struct xkb_state *keysym_translation_state_create(
+ 		struct xkb_rule_names rules) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
+ 		context,
+ 		&rules,
+diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
+index 3f4a7289b9..45a588ecbf 100644
+--- a/sway/input/keyboard.c
++++ b/sway/input/keyboard.c
+@@ -754,7 +754,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
+
+ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
+ 		char **error) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	if (!sway_assert(context, "cannot create XKB context")) {
+ 		return NULL;
+ 	}

From c6dfe7203c740dca59605e5d8797252e80da0733 Mon Sep 17 00:00:00 2001
From: Justine Smithies <justine@smithies.me.uk>
Date: Sat, 3 Jun 2023 15:35:26 +0100
Subject: [PATCH 5/5] Update email in template

---
 srcpkgs/swayfx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/swayfx/template b/srcpkgs/swayfx/template
index e69fe9cc45b0..863a2f88ef01 100644
--- a/srcpkgs/swayfx/template
+++ b/srcpkgs/swayfx/template
@@ -10,7 +10,7 @@ makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel libevdev-devel"
 depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
 short_desc="Sway, but with eye candy!"
-maintainer="Till Mahlburg <mahlburg@posteo.de>"
+maintainer="Justine Smithies <justine"smithies.me.uk>"
 license="MIT"
 homepage="https://github.com/WillPower3309/swayfx"
 changelog="https://github.com/WillPower3309/swayfx/releases"

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2023-06-25 18:21 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-07  9:57 [PR PATCH] New package: swayfx tmahlburg
2023-04-07 10:00 ` [PR PATCH] [Updated] " tmahlburg
2023-04-07 10:01 ` paper42
2023-04-07 10:19 ` [PR PATCH] [Updated] [WIP] " tmahlburg
2023-04-08  9:31 ` [PR REVIEW] " mhmdanas
2023-04-08 12:41 ` [PR PATCH] [Updated] " tmahlburg
2023-04-08 12:43 ` [PR REVIEW] " tmahlburg
2023-05-26 14:41 ` WillPower3309
2023-06-03 10:07 ` SpidFightFR
2023-06-25 18:21 ` [PR PATCH] [Merged]: " Duncaen
2023-06-03 14:39 [PR PATCH] " justinesmithies

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).