[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/wdisplays/files/, gui-apps/wdisplays/

[Matthias Coppens]

commit:     f56995185d43d02dcc33f4cdb8e728c0e61c398b
Author:     Matthias Coppens <coppens.matthias.abc <AT> gmail <DOT> com>
AuthorDate: Mon Jul 27 09:20:26 2020 +0000
Commit:     Matthias Coppens <coppens.matthias.abc <AT> gmail <DOT> com>
CommitDate: Mon Jul 27 09:22:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f5699518

gui-apps/wdisplays: Updated patch

This commit updates the patch for wdisplays-1.0 and updates the revision
number, since the patch solves a runtime issue.
This commit also cleans the ebuilds a bit.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Matthias Coppens <coppens.matthias.abc <AT> gmail.com>

 gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch                | 7 +++----
 .../wdisplays/{wdisplays-1.0-r1.ebuild => wdisplays-1.0-r2.ebuild} | 3 +--
 gui-apps/wdisplays/wdisplays-9999.ebuild                           | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch 
b/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch
index 607c69b..200acd8 100644
--- a/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch
+++ b/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch
@@ -1,4 +1,4 @@
-From 657e2966e556c78f121075c69fe1ba8d2b4dcb73 Mon Sep 17 00:00:00 2001
+From 5198a9c94b40ff157c284df413be5402f1b75118 Mon Sep 17 00:00:00 2001
 From: Simon Ser <cont...@emersion.fr>
 Date: Wed, 8 Jul 2020 11:57:35 +0200
 Subject: [PATCH] Use correct versions when binding globals
@@ -17,7 +17,7 @@ Closes: https://github.com/cyclopsian/wdisplays/issues/18
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/outputs.c b/src/outputs.c
-index 9ebf7e5..40410ec 100644
+index 9ebf7e5..a5007e8 100644
 --- a/src/outputs.c
 +++ b/src/outputs.c
 @@ -534,20 +534,20 @@ static void registry_handle_global(void *data, struct 
wl_registry *registry,
@@ -31,7 +31,7 @@ index 9ebf7e5..40410ec 100644
    } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
      state->xdg_output_manager = wl_registry_bind(registry, name,
 -        &zxdg_output_manager_v1_interface, version);
-+        &zxdg_output_manager_v1_interface, 3);
++        &zxdg_output_manager_v1_interface, 2);
    } else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 
0) {
      state->copy_manager = wl_registry_bind(registry, name,
 -        &zwlr_screencopy_manager_v1_interface, version);
@@ -46,4 +46,3 @@ index 9ebf7e5..40410ec 100644
    }
  }
  
-

diff --git a/gui-apps/wdisplays/wdisplays-1.0-r1.ebuild 
b/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild
similarity index 96%
rename from gui-apps/wdisplays/wdisplays-1.0-r1.ebuild
rename to gui-apps/wdisplays/wdisplays-1.0-r2.ebuild
index 88076f1..f77ab59 100644
--- a/gui-apps/wdisplays/wdisplays-1.0-r1.ebuild
+++ b/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild
@@ -10,6 +10,7 @@ case "${PV}" in
                ;;
        *)
                SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+               KEYWORDS="~amd64"
 esac
 inherit meson xdg
 
@@ -24,6 +25,4 @@ DEPEND="${BDEPEND}"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~amd64"
-
 PATCHES=("${FILESDIR}/${P}-pull20.patch")

diff --git a/gui-apps/wdisplays/wdisplays-9999.ebuild 
b/gui-apps/wdisplays/wdisplays-9999.ebuild
index 88964cf..e277e11 100644
--- a/gui-apps/wdisplays/wdisplays-9999.ebuild
+++ b/gui-apps/wdisplays/wdisplays-9999.ebuild
@@ -10,6 +10,7 @@ case "${PV}" in
                ;;
        *)
                SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+               KEYWORDS="~amd64"
 esac
 inherit meson xdg
 
@@ -23,5 +24,3 @@ DEPEND="${BDEPEND}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-
-KEYWORDS=""