Date: Thu, 4 Apr 2024 01:03:30 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: f9b86bcabf6c - 2024Q1 - x11-servers/xwayland-devel: temporarily revert backports Message-ID: <202404040103.43413UgL092960@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9b86bcabf6ca076e48cbe9af6d922bc19115c2a commit f9b86bcabf6ca076e48cbe9af6d922bc19115c2a Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-04-04 01:02:42 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-04-04 01:03:15 +0000 x11-servers/xwayland-devel: temporarily revert backports ===> Applying distribution patches for xwayland-devel-21.0.99.1.671_1 No file to patch. Skipping... 1 out of 1 hunks ignored--saving rejects to render/glyphstr_priv.h.rej ===> FAILED Applying distribution patch bdca6c3d1f50.patch with -p1 *** Error code 1 This reverts commit 655bcbcfb9e0caff8e8e2705a78f5a5a3db3d83a. --- x11-servers/xwayland-devel/Makefile | 5 ----- x11-servers/xwayland-devel/distinfo | 8 -------- 2 files changed, 13 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index ac786c9d01ab..010672cbfeac 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -2,7 +2,6 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 21.0.99.1-671 DISTVERSIONSUFFIX= -gf0a187f55 -PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel @@ -11,10 +10,6 @@ PATCHFILES+= cd6c9c1246af.patch:-p1:github # https://gitlab.freedesktop.org/xorg PATCHFILES+= 91b97b031290.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCHFILES+= 3b0d1a3a2296.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ -PATCHFILES+= 96798fc19674.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 -PATCHFILES+= 3e77295f888c.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 -PATCHFILES+= 6c684d035c06.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 -PATCHFILES+= bdca6c3d1f50.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot) diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 54936c280248..356dcaddd63d 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -7,11 +7,3 @@ SHA256 (91b97b031290.patch) = 8e44f24c34d598cc152173d2d59cc6eb7d3ac3427819c732f0 SIZE (91b97b031290.patch) = 18382 SHA256 (3b0d1a3a2296.patch) = 4e2c4165e9e287ed42cbb9a30eedf1a10f0fcbae0db6a222feb1783f9bb2ed29 SIZE (3b0d1a3a2296.patch) = 2513 -SHA256 (96798fc19674.patch) = 8b59b74f09476bb44d7b425dc2453b54766db4b7d30e20e1b1f1bef4ad0db7c1 -SIZE (96798fc19674.patch) = 1467 -SHA256 (3e77295f888c.patch) = 33686bbf6ecec42d064b4066b13f79f9e32f86d4ceef819ebdb7567f326fbd7d -SIZE (3e77295f888c.patch) = 1358 -SHA256 (6c684d035c06.patch) = 01ad0be2af7c0a00fd3efd218eee64fb5bd8acbf0978186947f0b6b4b1b9febd -SIZE (6c684d035c06.patch) = 1569 -SHA256 (bdca6c3d1f50.patch) = fcec0b3e508ee12824e7b2e48ede67766104105605ff996ad0df9cb1d9ad389d -SIZE (bdca6c3d1f50.patch) = 3830
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404040103.43413UgL092960>