From owner-dev-commits-ports-main@freebsd.org Fri Sep 10 04:33:26 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 725FC67E3E1; Fri, 10 Sep 2021 04:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H5NKf2gtwz4bwZ; Fri, 10 Sep 2021 04:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3BD38263B5; Fri, 10 Sep 2021 04:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18A4XQo3064036; Fri, 10 Sep 2021 04:33:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18A4XQR3064035; Fri, 10 Sep 2021 04:33:26 GMT (envelope-from git) Date: Fri, 10 Sep 2021 04:33:26 GMT Message-Id: <202109100433.18A4XQR3064035@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 401356c68dd0 - main - x11/slop: unbreak with libglvnd >= 1.3.4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 401356c68dd0b526acfd0e75b83da32001628c06 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Sep 2021 04:33:26 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=401356c68dd0b526acfd0e75b83da32001628c06 commit 401356c68dd0b526acfd0e75b83da32001628c06 Author: Jan Beich AuthorDate: 2021-09-10 02:18:27 +0000 Commit: Jan Beich CommitDate: 2021-09-10 04:32:45 +0000 x11/slop: unbreak with libglvnd >= 1.3.4 src/framebuffer.cpp:55:9: error: use of undeclared identifier 'XDestroyImage'; did you mean 'XDestroyIC'? XDestroyImage( image ); ^~~~~~~~~~~~~ XDestroyIC /usr/local/include/X11/Xlib.h:3867:13: note: 'XDestroyIC' declared here extern void XDestroyIC( ^ src/framebuffer.cpp:55:24: error: cannot initialize a parameter of type 'XIC' (aka '_XIC *') with an lvalue of type 'XImage *' (aka '_XImage *') XDestroyImage( image ); ^~~~~ /usr/local/include/X11/Xlib.h:3869:1: note: passing argument to parameter here ); ^ PR: 258269 Reported by: antoine (via exp-run) --- x11/slop/Makefile | 3 +++ x11/slop/distinfo | 2 ++ 2 files changed, 5 insertions(+) diff --git a/x11/slop/Makefile b/x11/slop/Makefile index bc25f16469f1..1324e5548a97 100644 --- a/x11/slop/Makefile +++ b/x11/slop/Makefile @@ -4,6 +4,9 @@ DISTVERSIONPREFIX= v PORTREVISION= 5 CATEGORIES= x11 +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 38886dd13ccb.patch:-p1 # https://github.com/naelstrof/slop/pull/150 + MAINTAINER= 0mp@FreeBSD.org COMMENT= Make a screen selection and print the selection coordinates to stdout diff --git a/x11/slop/distinfo b/x11/slop/distinfo index b04ec3e8d99f..c5792226dea2 100644 --- a/x11/slop/distinfo +++ b/x11/slop/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1586688391 SHA256 (naelstrof-slop-v7.5_GH0.tar.gz) = 94d8b6270217cd7f56ce7d4a9a75069025262830a2f91c3239b7fc07da5ea8da SIZE (naelstrof-slop-v7.5_GH0.tar.gz) = 51060 +SHA256 (38886dd13ccb.patch) = 9bf386a35d9dbfdec805665ba729cea0f9b06c2130cd8e923aeb5b435376d00e +SIZE (38886dd13ccb.patch) = 1132