svn commit: r543551 - in head/x11-wm/xfce4-wm: . files

[Guido Falsi]

Author: madpilot
Date: Mon Jul 27 21:57:43 2020
New Revision: 543551
URL: https://svnweb.freebsd.org/changeset/ports/543551

Log:
  - Update xfce4-wm to 4.14.3
  - Import upstream fix for startup crash in this version [1]
  - Add new dependency on xres
  
  Obtained from:	https://gitlab.xfce.org/xfce/xfwm4/-/issues/411 [1]

Added:
  head/x11-wm/xfce4-wm/files/
  head/x11-wm/xfce4-wm/files/patch-gpid-long   (contents, props changed)
Modified:
  head/x11-wm/xfce4-wm/Makefile
  head/x11-wm/xfce4-wm/distinfo
  head/x11-wm/xfce4-wm/pkg-plist

Modified: head/x11-wm/xfce4-wm/Makefile
==============================================================================
--- head/x11-wm/xfce4-wm/Makefile	Mon Jul 27 21:38:53 2020	(r543550)
+++ head/x11-wm/xfce4-wm/Makefile	Mon Jul 27 21:57:43 2020	(r543551)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-wm
-PORTVERSION=	4.14.2
+PORTVERSION=	4.14.3
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DISTNAME=	xfwm4-${DISTVERSIONFULL}
@@ -20,7 +20,7 @@ USES=		compiler:c11 gettext-tools gmake gnome pkgconfi
 USE_GNOME=	cairo gtk30 intltool libwnck3
 USE_XFCE=	libmenu xfconf
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xi xinerama \
-		xorgproto xpresent xrandr xrender
+		xorgproto xpresent xrandr xrender xres
 
 CONFIGURE_ARGS=	--enable-xsync \
 		--enable-render \

Modified: head/x11-wm/xfce4-wm/distinfo
==============================================================================
--- head/x11-wm/xfce4-wm/distinfo	Mon Jul 27 21:38:53 2020	(r543550)
+++ head/x11-wm/xfce4-wm/distinfo	Mon Jul 27 21:57:43 2020	(r543551)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588352802
-SHA256 (xfce4/xfwm4-4.14.2.tar.bz2) = b15b40342596a3b6ab5167a58371262adf5484e165cb25a31fef42f0aa8ffd92
-SIZE (xfce4/xfwm4-4.14.2.tar.bz2) = 1158799
+TIMESTAMP = 1595759392
+SHA256 (xfce4/xfwm4-4.14.3.tar.bz2) = 829bec5a9e35a9f11c54a546c0112f5ad36e0f747be1156856d4abcce37283bf
+SIZE (xfce4/xfwm4-4.14.3.tar.bz2) = 1164653

Added: head/x11-wm/xfce4-wm/files/patch-gpid-long
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/xfce4-wm/files/patch-gpid-long	Mon Jul 27 21:57:43 2020	(r543551)
@@ -0,0 +1,50 @@
+diff --git a/src/client.c b/src/client.c
+index 47f5c7b7..9f19948e 100644
+--- src/client.c
++++ src/client.c
+@@ -1589,7 +1589,6 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
+     gboolean shaped;
+     gchar *wm_name;
+     unsigned long valuemask;
+-    long pid;
+     int i;
+ 
+     g_return_val_if_fail (w != None, NULL);
+diff --git a/src/hints.c b/src/hints.c
+index 9d79869f..4b1ec3a2 100644
+--- src/hints.c
++++ src/hints.c
+@@ -1450,7 +1450,7 @@ getWindowStartupId (DisplayInfo *display_info, Window w, gchar **startup_id)
+ GPid
+ getWindowPID (DisplayInfo *display_info, Window w)
+ {
+-    GPid pid = 0;
++    long pid = 0;
+ #ifdef HAVE_XRES
+     XResClientIdSpec client_specs;
+     XResClientIdValue *client_ids = NULL;
+@@ -1476,7 +1476,7 @@ getWindowPID (DisplayInfo *display_info, Window w)
+                 if (client_ids[i].spec.mask == XRES_CLIENT_ID_PID_MASK)
+                 {
+                     CARD32 *value = client_ids[i].value;
+-                    pid = (GPid) *value;
++                    pid = (long) *value;
+                     break;
+                 }
+             }
+@@ -1485,7 +1485,7 @@ getWindowPID (DisplayInfo *display_info, Window w)
+ 
+             if (pid > 0)
+             {
+-                return pid;
++                return (GPid) pid;
+             }
+         }
+     }
+@@ -1493,5 +1493,5 @@ getWindowPID (DisplayInfo *display_info, Window w)
+ 
+     getHint (display_info, w, NET_WM_PID, (long *) &pid);
+ 
+-    return pid;
++    return (GPid) pid;
+ }

Modified: head/x11-wm/xfce4-wm/pkg-plist
==============================================================================
--- head/x11-wm/xfce4-wm/pkg-plist	Mon Jul 27 21:38:53 2020	(r543550)
+++ head/x11-wm/xfce4-wm/pkg-plist	Mon Jul 27 21:57:43 2020	(r543551)
@@ -59,6 +59,7 @@ share/icons/hicolor/scalable/apps/xfwm4.svg
 %%NLS%%share/locale/hr/LC_MESSAGES/xfwm4.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfwm4.mo
 %%NLS%%share/locale/hy_AM/LC_MESSAGES/xfwm4.mo
+%%NLS%%share/locale/hye/LC_MESSAGES/xfwm4.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfwm4.mo
 %%NLS%%share/locale/ie/LC_MESSAGES/xfwm4.mo
 %%NLS%%share/locale/is/LC_MESSAGES/xfwm4.mo