[PR PATCH] sway: restore support for gtk-primary-selection

[PR PATCH] sway: restore support for gtk-primary-selection

[4ricci]

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

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

https://github.com/4ricci/void-packages sway
https://github.com/void-linux/void-packages/pull/30576

sway: restore support for gtk-primary-selection
This reverts https://github.com/swaywm/sway/commit/5ad3990a6c9beae44392e1962223623c0a4e3fa9 and fixes clipboard issues with Firefox ESR 78.

See https://github.com/swaywm/sway/issues/6169, https://github.com/swaywm/sway/pull/5788, https://github.com/swaywm/wlroots/issues/2421.

The issue should only affect GTK versions older than 3.24.24, but apparenty Firefox 78 (and maybe others) is affected even if we have a more recent GTK.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30576.patch is attached

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

From f25e30f520b6a62cf9fa69f73f7c74be8bbabf9e Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 29 Apr 2021 10:19:09 +0200
Subject: [PATCH] sway: restore support for gtk-primary-selection

This reverts https://github.com/swaywm/sway/commit/5ad3990a6c9beae44392e1962223623c0a4e3fa9
and fixes clipboard issues with Firefox ESR 78
---
 srcpkgs/sway/patches/primary_selection.diff | 18 ++++++++++++++++++
 srcpkgs/sway/template                       |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sway/patches/primary_selection.diff

diff --git a/srcpkgs/sway/patches/primary_selection.diff b/srcpkgs/sway/patches/primary_selection.diff
new file mode 100644
index 000000000000..a64e545194c5
--- /dev/null
+++ b/srcpkgs/sway/patches/primary_selection.diff
@@ -0,0 +1,18 @@
+--- sway/server.c
++++ sway/server.c
+@@ -15,6 +15,7 @@
+ #include <wlr/types/wlr_data_control_v1.h>
+ #include <wlr/types/wlr_export_dmabuf_v1.h>
+ #include <wlr/types/wlr_gamma_control_v1.h>
++#include <wlr/types/wlr_gtk_primary_selection.h>
+ #include <wlr/types/wlr_idle.h>
+ #include <wlr/types/wlr_layer_shell_v1.h>
+ #include <wlr/types/wlr_pointer_constraints_v1.h>
+@@ -75,6 +76,7 @@ bool server_init(struct sway_server *server) {
+ 		wlr_data_device_manager_create(server->wl_display);
+ 
+ 	wlr_gamma_control_manager_v1_create(server->wl_display);
++	wlr_gtk_primary_selection_device_manager_create(server->wl_display);
+ 
+ 	server->new_output.notify = handle_new_output;
+ 	wl_signal_add(&server->backend->events.new_output, &server->new_output);
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 3297f668adf4..4a77658518e8 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,7 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
 version=1.6
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"

Re: [PR REVIEW] sway: restore support for gtk-primary-selection

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30576#discussion_r623484267

Comment:
Please explain the patch on the top (linking the PRs would work) and mention that the feature was only removed from wlroots after the 0.13 release, which is why we can still use it in sway.

Re: [PR PATCH] [Updated] sway: restore support for gtk-primary-selection

[4ricci]

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

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

https://github.com/4ricci/void-packages sway
https://github.com/void-linux/void-packages/pull/30576

sway: restore support for gtk-primary-selection
This reverts https://github.com/swaywm/sway/commit/5ad3990a6c9beae44392e1962223623c0a4e3fa9 and fixes clipboard issues with Firefox ESR 78.

See https://github.com/swaywm/sway/issues/6169, https://github.com/swaywm/sway/pull/5788, https://github.com/swaywm/wlroots/issues/2421.

The issue should only affect GTK versions older than 3.24.24, but apparenty Firefox 78 (and maybe others) is affected even if we have a more recent GTK.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30576.patch is attached

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

From 889cd9e0db5c22b02fa1a9a4951c8241f3bbabaf Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 29 Apr 2021 10:19:09 +0200
Subject: [PATCH] sway: restore support for gtk-primary-selection

This reverts https://github.com/swaywm/sway/commit/5ad3990a6c9beae44392e1962223623c0a4e3fa9
and fixes clipboard issues with Firefox ESR 78
---
 srcpkgs/sway/patches/primary_selection.diff | 25 +++++++++++++++++++++
 srcpkgs/sway/template                       |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sway/patches/primary_selection.diff

diff --git a/srcpkgs/sway/patches/primary_selection.diff b/srcpkgs/sway/patches/primary_selection.diff
new file mode 100644
index 000000000000..e1f02fa0ee2c
--- /dev/null
+++ b/srcpkgs/sway/patches/primary_selection.diff
@@ -0,0 +1,25 @@
+Sway 1.6 removed support for gtk-primary-selection, but some
+programs (e.g. Firefox ESR 78) still rely on it.
+Since wlroots will drop it in version 0.14, we can restore
+this feature on sway.
+https://github.com/swaywm/sway/pull/5788
+https://github.com/swaywm/wlroots/issues/2421
+https://github.com/swaywm/wlroots/pull/2460
+--- sway/server.c
++++ sway/server.c
+@@ -15,6 +15,7 @@
+ #include <wlr/types/wlr_data_control_v1.h>
+ #include <wlr/types/wlr_export_dmabuf_v1.h>
+ #include <wlr/types/wlr_gamma_control_v1.h>
++#include <wlr/types/wlr_gtk_primary_selection.h>
+ #include <wlr/types/wlr_idle.h>
+ #include <wlr/types/wlr_layer_shell_v1.h>
+ #include <wlr/types/wlr_pointer_constraints_v1.h>
+@@ -75,6 +76,7 @@ bool server_init(struct sway_server *server) {
+ 		wlr_data_device_manager_create(server->wl_display);
+ 
+ 	wlr_gamma_control_manager_v1_create(server->wl_display);
++	wlr_gtk_primary_selection_device_manager_create(server->wl_display);
+ 
+ 	server->new_output.notify = handle_new_output;
+ 	wl_signal_add(&server->backend->events.new_output, &server->new_output);
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 3297f668adf4..4a77658518e8 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,7 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
 version=1.6
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"

Re: [PR PATCH] [Merged]: sway: restore support for gtk-primary-selection

[ericonr]

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

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

sway: restore support for gtk-primary-selection
https://github.com/void-linux/void-packages/pull/30576

Description:
This reverts https://github.com/swaywm/sway/commit/5ad3990a6c9beae44392e1962223623c0a4e3fa9 and fixes clipboard issues with Firefox ESR 78.

See https://github.com/swaywm/sway/issues/6169, https://github.com/swaywm/sway/pull/5788, https://github.com/swaywm/wlroots/issues/2421.

The issue should only affect GTK versions older than 3.24.24, but apparenty Firefox 78 (and maybe others) is affected even if we have a more recent GTK.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->