From nobody Thu Apr 04 01:03:30 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V93Jz0HWcz5GHPD; Thu, 4 Apr 2024 01:03:31 +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 4V93Jy6fVSz4sl5; Thu, 4 Apr 2024 01:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712192610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKfhFkmdWDHu22ZJvinXoLXrC5UJY6huED1ABEiVYGc=; b=BpaVCfXZ6HqFDe9sls+W/Wk8UTqMZN4mQWF/u6j9UeJPlIK1UzpewJXwz6k4SmYAbcyBXl DdV86drvpXLxmaDRQUMGfwkWnoI9mZlgMu9S5ZNxcQ0ZtDFb2eLIT17Fnl6ECSyYexQnkK 9pqVdCsUj/ddOJRvVQAtnqiWb8fGIuOCyL19uMZjWhmG/a8YCSj+bA5O+lZsxWXWuOD8A+ G/9N7VyREaFGCc4U62zO48SxNDRbOfUDTjoFSOgAnq68wPKTUpaKMalFXndmuGXVbnpKTr I00skuMFheFUo8SIeHWKOw2Rs8yBw/9ZMFmztvy1koEZDTz6oY+11N+Ogqi/Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712192610; a=rsa-sha256; cv=none; b=fDrl+IUy2YEUceuNuGvHTlsWC9oLhjDnKDYhN+2FHH9MF9f2jxyX+1vK4UKGaKTafF2Z5n Uy77pofc5Y0QwRrh5uMfFGb+x8A8ydstJ6xPpj4yQHUZpvacjBekC0ew/+KG8ap+LZs4wn CBUy1WF2z0xIv8EjuN+flc6kEFj53EUOV3yZKIxJobZPdpbC+AHT3IrHp54h10d5FybTPv enh/ctR9ADDEFzr1NCX+gxdex9tguxaVZ2Q4hHWKoFyVeEFXMZEjo21DmrjN85KOkEw8bK EF4Y9oThL1AH+FjnB3lMn4JB0VrHME+JlCOaRXgxpSRwMuNkTd6V5MYVjiimrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712192610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKfhFkmdWDHu22ZJvinXoLXrC5UJY6huED1ABEiVYGc=; b=t7IUccjCUI5mpBCcwXNrwX8oNcjs5fqZZD9Ium6TUPSvS5jG1IBMfo6FpUbGdRU4VyIiXT 1evumvGJg/fBa7/KzeEjmQ0Uvk+PxQkYj+0wclkg5Jn0fMParJJYHzzx7+yvReiiLxgVwB RobPmOe8AWEE8Djn78ONsYQvVBZBaQk5yyVzfV9tmu0Ht+du+M5EuPOGY7iJ5VlNQ7Pznc MiFU4q0zzmUUQu3kKKW5ePsEw9WzpSuDsC56Krr3QOWoJ8Dj9lfbeN0WDo6q0LGFtqHJ7V qvftu285E5g5HuxbAaGwlWKOwe7WPnIFvZH/OkNnAAKHmgRMHshg8MhD3h4Bcg== 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 4V93Jy6CnWzvSY; Thu, 4 Apr 2024 01:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43413Ue3092963; Thu, 4 Apr 2024 01:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43413UgL092960; Thu, 4 Apr 2024 01:03:30 GMT (envelope-from git) Date: Thu, 4 Apr 2024 01:03:30 GMT Message-Id: <202404040103.43413UgL092960@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: f9b86bcabf6c - 2024Q1 - x11-servers/xwayland-devel: temporarily revert backports List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2024Q1 X-Git-Reftype: branch X-Git-Commit: f9b86bcabf6ca076e48cbe9af6d922bc19115c2a Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9b86bcabf6ca076e48cbe9af6d922bc19115c2a commit f9b86bcabf6ca076e48cbe9af6d922bc19115c2a Author: Jan Beich AuthorDate: 2024-04-04 01:02:42 +0000 Commit: Jan Beich 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