svn commit: r472802 - in head/x11/xscreensaver: . files

[Niclas Zeising]

Author: zeising
Date: Tue Jun 19 16:24:03 2018
New Revision: 472802
URL: https://svnweb.freebsd.org/changeset/ports/472802

Log:
  Fix build without the XFT option.
  
  PR:		224731
  Reported by:	ml at netfence.it

Added:
  head/x11/xscreensaver/files/patch-utils_xft.c   (contents, props changed)
Modified:
  head/x11/xscreensaver/Makefile

Modified: head/x11/xscreensaver/Makefile
==============================================================================
--- head/x11/xscreensaver/Makefile	Tue Jun 19 15:51:16 2018	(r472801)
+++ head/x11/xscreensaver/Makefile	Tue Jun 19 16:24:03 2018	(r472802)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xscreensaver
 PORTVERSION=	5.39
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 

Added: head/x11/xscreensaver/files/patch-utils_xft.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/xscreensaver/files/patch-utils_xft.c	Tue Jun 19 16:24:03 2018	(r472802)
@@ -0,0 +1,21 @@
+--- utils/xft.c.orig	2018-06-17 08:45:55 UTC
++++ utils/xft.c
+@@ -198,12 +198,12 @@ XftColorAllocValue (Display *dpy,
+       int green_shift, green_len;
+       int blue_shift, blue_len;
+ 
+-      red_shift   = maskbase (visual->rgba_masks[0]);
+-      red_len     = masklen  (visual->rgba_masks[0]);
+-      green_shift = maskbase (visual->rgba_masks[1]);
+-      green_len   = masklen (visual->rgba_masks[1]);
+-      blue_shift  = maskbase (visual->rgba_masks[2]);
+-      blue_len    = masklen (visual->rgba_masks[2]);
++      red_shift   = maskbase (visual->red_mask);
++      red_len     = masklen  (visual->red_mask);
++      green_shift = maskbase (visual->green_mask);
++      green_len   = masklen (visual->green_mask);
++      blue_shift  = maskbase (visual->blue_mask);
++      blue_len    = masklen (visual->blue_mask);
+       result->pixel = (((color->red   >> (16 - red_len))   << red_shift)   |
+                        ((color->green >> (16 - green_len)) << green_shift) |
+                        ((color->blue  >> (16 - blue_len))  << blue_shift));