Attachment 248788 Details for Bug 277348 – port upgrade

[patch] port upgrade

0001-Point-to-github-version.patch (text/plain), 4.60 KB, created by Alexey Vyskubov on 2024-02-27 10:47:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Vyskubov

Created: 2024-02-27 10:47:25 UTC

Size: 4.60 KB

patch

obsolete

>From 16d2b67ef7b3dc565e403e7c6f858518848e71ce Mon Sep 17 00:00:00 2001
>From: Alexey Vyskubov <alexey@hotmail.fi>
>Date: Tue, 27 Feb 2024 12:08:53 +0200
>Subject: [PATCH] Point to github version
>
>- Point to my own github fork instead of non-existant now page
>- Upgrade to version 1.09 which includes some fixes
>- Remove non-needed now FreeBSD patches
>- Take maintainership
>---
> x11/wmctrl/Makefile           | 15 ++++++---
> x11/wmctrl/distinfo           |  5 +--
> x11/wmctrl/files/patch-main.c | 61 -----------------------------------
> 3 files changed, 13 insertions(+), 68 deletions(-)
> delete mode 100644 x11/wmctrl/files/patch-main.c
>
>diff --git a/x11/wmctrl/Makefile b/x11/wmctrl/Makefile
>index c4595c94b23b..9f33a4ba9f23 100644
>--- a/x11/wmctrl/Makefile
>+++ b/x11/wmctrl/Makefile
>@@ -1,19 +1,24 @@
> PORTNAME=	wmctrl
>-PORTVERSION=	1.07
>-PORTREVISION=	8
>+DISTVERSION=	1.09
> CATEGORIES=	x11
>-MASTER_SITES=	http://sweb.cz/tripie/utils/wmctrl/dist/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	alexey@pentode.fi
> COMMENT=	Command line tool to interact with an EWMH/NetWM compatible X managers
>-WWW=		http://sweb.cz/tripie/utils/wmctrl/
>+WWW=		https://github.com/avysk/wmctrl
> 
> LICENSE=	GPLv2
> 
> USES=		gnome pkgconfig xorg
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	avysk
>+GH_PROJECT=	wmctrl
>+
> GNU_CONFIGURE=	yes
> GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
> USE_XORG=	x11 xmu xext xt
>+USE_XORG+=	ice
>+USE_XORG+=	sm
> USE_GNOME=	glib20
> 
> PLIST_FILES=	bin/wmctrl share/man/man1/${PORTNAME}.1.gz
>diff --git a/x11/wmctrl/distinfo b/x11/wmctrl/distinfo
>index a0228bba333f..fc373dd96c69 100644
>--- a/x11/wmctrl/distinfo
>+++ b/x11/wmctrl/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (wmctrl-1.07.tar.gz) = d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9
>-SIZE (wmctrl-1.07.tar.gz) = 87820
>+TIMESTAMP = 1709028182
>+SHA256 (avysk-wmctrl-1.09_GH0.tar.gz) = d974cd3c258a5b07ca6d63242c1f35231bbc6a947c1de270f8dac91a1e11f7fb
>+SIZE (avysk-wmctrl-1.09_GH0.tar.gz) = 119251
>diff --git a/x11/wmctrl/files/patch-main.c b/x11/wmctrl/files/patch-main.c
>deleted file mode 100644
>index 235048562111..000000000000
>--- a/x11/wmctrl/files/patch-main.c
>+++ /dev/null
>@@ -1,61 +0,0 @@
>---- main.c	2005-01-29 03:31:33.000000000 +0000
>-+++ main.c	2016-07-01 20:14:55.443662000 +0000
>-@@ -210,14 +210,14 @@
>- static int close_window (Display *disp, Window win);
>- static int longest_str (gchar **strv);
>- static int window_to_desktop (Display *disp, Window win, int desktop);
>--static void window_set_title (Display *disp, Window win, char *str, char mode);
>-+static void window_set_title (Display *disp, Window win, const char *str, char mode);
>- static gchar *get_window_title (Display *disp, Window win);
>- static gchar *get_window_class (Display *disp, Window win);
>- static gchar *get_property (Display *disp, Window win, 
>-         Atom xa_prop_type, gchar *prop_name, unsigned long *size);
>- static void init_charset(void);
>--static int window_move_resize (Display *disp, Window win, char *arg);
>--static int window_state (Display *disp, Window win, char *arg);
>-+static int window_move_resize (Display *disp, Window win, const char *arg);
>-+static int window_state (Display *disp, Window win, const char *arg);
>- static Window Select_Window(Display *dpy);
>- static Window get_active_window(Display *dpy);
>- 
>-@@ -629,9 +629,9 @@
>- }/*}}}*/
>- 
>- static void window_set_title (Display *disp, Window win, /* {{{ */
>--        char *title, char mode) {
>--    gchar *title_utf8;
>--    gchar *title_local;
>-+        const char *title, char mode) {
>-+    void *title_utf8;
>-+    void *title_local;
>- 
>-     if (envir_utf8) {
>-         title_utf8 = g_strdup(title);
>-@@ -734,7 +734,7 @@
>-             0, 0, 0, 0, 0);
>- }/*}}}*/
>- 
>--static int window_state (Display *disp, Window win, char *arg) {/*{{{*/
>-+static int window_state (Display *disp, Window win, const char *arg) {/*{{{*/
>-     unsigned long action;
>-     Atom prop1 = 0;
>-     Atom prop2 = 0;
>-@@ -827,7 +827,7 @@
>-     return FALSE;
>- }/*}}}*/
>- 
>--static int window_move_resize (Display *disp, Window win, char *arg) {/*{{{*/
>-+static int window_move_resize (Display *disp, Window win, const char *arg) {/*{{{*/
>-     signed long grav, x, y, w, h;
>-     unsigned long grflags;
>-     const char *argerr = "The -e option expects a list of comma separated integers: \"gravity,X,Y,width,height\"\n";
>-@@ -1441,6 +1441,9 @@
>- 
>-     /* 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';
>-- 
>2.43.2
>

Actions: View | Diff

Attachments on bug 277348: 248787 | 248788 | 250790