[gentoo-commits] repo/gentoo:master commit in: x11-misc/wmctrl/, x11-misc/wmctrl/files/

[Ionen Wolkens]

commit:     f70ea60e8aeaef480defaab569805b3514b33643
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 10:39:55 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 11:33:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70ea60e

x11-misc/wmctrl: EAPI7->8 with minor adjustments

* drop unnecessary dependency on libXt
* fix RedirectedUrl
* GPL-2 -> GPL-2+
* tidy patch

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-misc/wmctrl/files/amd64-Xlib.patch             | 28 ----------------------
 x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch | 12 ++++++++++
 ...wmctrl-1.07-r2.ebuild => wmctrl-1.07-r3.ebuild} | 17 ++++++-------
 3 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/x11-misc/wmctrl/files/amd64-Xlib.patch b/x11-misc/wmctrl/files/amd64-Xlib.patch
deleted file mode 100644
index a1039a825023..000000000000
--- a/x11-misc/wmctrl/files/amd64-Xlib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- wmctrl-1.07.orig/main.c
-+++ wmctrl-1.07/main.c
-@@ -1425,6 +1425,16 @@
-      *
-      * long_length = Specifies the length in 32-bit multiples of the
-      *               data to be retrieved.
-+     *
-+     * NOTE:  see 
-+     * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
-+     * In particular:
-+     *
-+     * 	When the X window system was ported to 64-bit architectures, a
-+     * rather peculiar design decision was made. 32-bit quantities such
-+     * as Window IDs, atoms, etc, were kept as longs in the client side
-+     * APIs, even when long was changed to 64 bits.
-+     *
-      */
-     if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE_LEN / 4, False,
-             xa_prop_type, &xa_ret_type, &ret_format,     
-@@ -1441,6 +1451,8 @@
- 
-     /* null terminate the result to make string handling easier */
-     tmp_size = (ret_format / 8) * ret_nitems;
-+    /* Correct 64 Architecture implementation of 32 bit data */
-+    if(ret_format==32) tmp_size *= sizeof(long)/4;
-     ret = g_malloc(tmp_size + 1);
-     memcpy(ret, ret_prop, tmp_size);
-     ret[tmp_size] = '\0';

diff --git a/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch b/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch
new file mode 100644
index 000000000000..8888a0320870
--- /dev/null
+++ b/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch
@@ -0,0 +1,12 @@
+http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
+--- a/main.c
++++ b/main.c
+@@ -1441,6 +1451,8 @@
+ 
+     /* null terminate the result to make string handling easier */
+     tmp_size = (ret_format / 8) * ret_nitems;
++    /* Correct 64 Architecture implementation of 32 bit data */
++    if(ret_format==32) tmp_size *= sizeof(long)/4;
+     ret = g_malloc(tmp_size + 1);
+     memcpy(ret, ret_prop, tmp_size);
+     ret[tmp_size] = '\0';

diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
similarity index 58%
rename from x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
rename to x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
index f7701592d694..a7bad8f520bc 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl"
-SRC_URI="http://sweb.cz/tripie/utils/wmctrl/dist/${P}.tar.gz"
+HOMEPAGE="http://tripie.sweb.cz/utils/wmctrl/"
+SRC_URI="http://tripie.sweb.cz/utils/wmctrl/dist/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
 RDEPEND="
 	dev-libs/glib:2
 	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt"
+	x11-libs/libXmu"
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/amd64-Xlib.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-64bit-xlib.patch
+)