git: 401356c68dd0 - main - x11/slop: unbreak with libglvnd >= 1.3.4

Jan Beich jbeich at FreeBSD.org
Fri Sep 10 04:33:26 UTC 2021


The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=401356c68dd0b526acfd0e75b83da32001628c06

commit 401356c68dd0b526acfd0e75b83da32001628c06
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-09-10 02:18:27 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
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 at 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


More information about the dev-commits-ports-main mailing list