Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id F41A41A923E for ; Fri, 23 Oct 2020 17:30:37 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6E41C84DB5; Fri, 23 Oct 2020 17:30:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E714584D39 for ; Fri, 23 Oct 2020 17:30:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id zUkEY8fOqWPU for ; Fri, 23 Oct 2020 17:30:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3F17884D02 for ; Fri, 23 Oct 2020 17:30:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3142FFB28; Fri, 23 Oct 2020 17:30:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1603474236213540" MIME-Version: 1.0 Date: Fri, 23 Oct 2020 17:30:36 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2020Q3] pkgsrc/wm/xfce4-wm To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20201023173036.3142FFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1603474236213540 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Fri Oct 23 17:30:36 UTC 2020 Added Files: pkgsrc/wm/xfce4-wm [pkgsrc-2020Q3]: hacks.mk Log Message: Pullup ticket #6350 - requested by nia wm/xfce4-wm: NetBSD 8 build fix Revisions pulled up: - wm/xfce4-wm/hacks.mk 1.1 --- Module Name: pkgsrc Committed By: nia Date: Fri Oct 16 06:21:13 UTC 2020 Added Files: pkgsrc/wm/xfce4-wm: hacks.mk Log Message: xfce4-wm: Add hack to let this build on NetBSD 8. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/wm/xfce4-wm/hacks.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1603474236213540 Content-Disposition: inline Content-Length: 788 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/wm/xfce4-wm/hacks.mk diff -u /dev/null pkgsrc/wm/xfce4-wm/hacks.mk:1.1.2.2 --- /dev/null Fri Oct 23 17:30:36 2020 +++ pkgsrc/wm/xfce4-wm/hacks.mk Fri Oct 23 17:30:36 2020 @@ -0,0 +1,16 @@ +# $NetBSD: hacks.mk,v 1.1.2.2 2020/10/23 17:30:36 bsiegert Exp $ + +.if !defined(XFCE4_WM_HACKS_MK) +XFCE4_WM_HACKS_MK= defined + +# Unfortunately, the check in xfwm's configure script simply determines +# whether XRes is available, not its version. +# It's using XRes 1.2 features, but the base version installed in NetBSD 8.x +# is too old to support that. +.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[5678].*) && \ + ${X11_TYPE} == "native" +PKG_HACKS+= old-netbsd-xres +CONFIGURE_ENV+= ac_cv_lib_XRes_XResQueryClients=no +.endif + +.endif # XFCE4_WM_HACKS_MK --_----------=_1603474236213540--