From owner-svn-ports-head@freebsd.org Tue Jun 19 16:24:04 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 875C4102493C; Tue, 19 Jun 2018 16:24:04 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 34375695B3; Tue, 19 Jun 2018 16:24:04 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1573815FAB; Tue, 19 Jun 2018 16:24:04 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5JGO3Hv078721; Tue, 19 Jun 2018 16:24:03 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5JGO3SY078719; Tue, 19 Jun 2018 16:24:03 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201806191624.w5JGO3SY078719@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Tue, 19 Jun 2018 16:24:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472802 - in head/x11/xscreensaver: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/x11/xscreensaver: . files X-SVN-Commit-Revision: 472802 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jun 2018 16:24:04 -0000 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@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));