From nobody Tue Apr 09 16:41:12 2024 X-Original-To: dev-commits-ports-main@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 4VDWtj65m9z5HHk1; Tue, 9 Apr 2024 16:41:17 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VDWth5mS9z4b5c; Tue, 9 Apr 2024 16:41:16 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712680876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=D7cmtpjil2fEiH9Z11AlOKYgNQqRK4R/15OAPtULUAY=; b=vnrjy3KmiFiOQFuJq7TIUIOfqTEIJd9UQNCLwNzefREC3DQy1D8N29MjUWzY8idca06Aul QSt/B9USVxVgwRiF9WNlGsQEcC22PLMTPPNGuHTGYp4SRYMRBmLD8qQhBJjTDsDSjs+/y+ wZp+ddcBgzHxX1HHNFljmpmKLC2UDm9ksdUuHhyYoyLLLenO3rn3WgeQAw57A7tWccJ95h JYSX4kYLks4MiEJT24dneoei79BQ8o/JjQbRQCppr70ARCPX5RUnzUUgS4aIb46W03mlXj dH+3R0jHFQZuF/unIV2hm1yMS3a0V1P+e/lP6B9U11e53dXfPa4uXBnFptsuvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712680876; a=rsa-sha256; cv=none; b=Ut3D/iy3BADZuP+geHXNWSqHRYCF8lzjmuCMvYI9NO4ePHHRB866hRhMUQ8rMAVJh8Drl3 YTlD6jtwQQpnr+AiVnsxYwo8xjEtiLaHzNWbDeQqRH90zuJtS3qeEfyMKPwiWII4yoiuYX 5VHSuVqiJAm/exQtCnTJLyUM8Xo9bxEsvl8ywaMYt0gG+nM+M6WKWGwXn2cRpKdrMcuIy/ /niPpxdjefL1Zg6UXegOQzbUVKrrq0vFBkEv0sgkw2Wgw9ZgLTnjl2LGMmsjg2Z5fIQkWQ a2EpKUhrGa0UQJUqK99OVBUfqrhB2tiMt2ArM/TfOhs3+FyVOWhR6DK0SqndYw== 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=1712680876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=D7cmtpjil2fEiH9Z11AlOKYgNQqRK4R/15OAPtULUAY=; b=n4OLEqDUwafLnIxkTgan8axXeWwFnsvN1jl4m9prWG+NAuGzNJLBBj1tTYpDeRzFKm4C3X MMEhR2lbeElHbywtNvMjlnyFfctY3pD1KovhtQrel+/5J1Yti0EDS5V9U5nZFVHmbhDB9A oOY/bHWwkPOSbkVIwGBK6sjQYderYQPQCVe+KWG4/HoglEhjGdgBr3ljreHlS7YGrsuIOf 8uagltwEiRPUmJYveRzNiQWikbrKm15uZjIbt6VG9SJNHBjbcb6wAVMlCAaxCpBRJ/Vj/1 5Uf9ihQiSWOdYSZYIaw1HBF/AW8XCiIGj0IRM3zDEe1u/uDrRRKvV2Nrh+7QdA== Received: by freefall.freebsd.org (Postfix, from userid 1354) id ABFF4EDE0; Tue, 9 Apr 2024 16:41:16 +0000 (UTC) From: Jan Beich To: ports-committers@FreeBSD.org Cc: dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 2e435f459ff0 - main - x11-servers/xwayland-devel: drop HiDPI patches to unblock updates In-Reply-To: <202404091605.439G5SdT042027@gitrepo.freebsd.org> (Jan Beich's message of "Tue, 9 Apr 2024 16:05:28 GMT") References: <202404091605.439G5SdT042027@gitrepo.freebsd.org> Date: Tue, 09 Apr 2024 18:41:12 +0200 Message-ID: <4jca-qyjb-wny@FreeBSD.org> List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-ports-main+owner@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Jan Beich writes: > The branch main has been updated by jbeich: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=2e435f459ff0a25e517011514c441c2a437ed79c > > commit 2e435f459ff0a25e517011514c441c2a437ed79c > Author: Jan Beich > AuthorDate: 2024-04-09 15:18:03 +0000 > Commit: Jan Beich > CommitDate: 2024-04-09 16:05:20 +0000 > > x11-servers/xwayland-devel: drop HiDPI patches to unblock updates > > - Rootful HiDPI[1] introduces non-trivial conflicts to rootless HiDPI > - AUR tracks Xwayland releases, so cannot help with rebases > - Sway should probably adopt force_zero_scaling from Hyprland >= 0.27 > > [1] https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1197 This reverts https://cgit.freebsd.org/ports/commit/?id=dce99729d741 I've tried to adjust the reference after push but it's not allowed. $ git push --push-option=confirm-subject freebsd 'refs/notes/*' Enumerating objects: 15, done. Counting objects: 100% (15/15), done. Delta compression using up to 8 threads Compressing objects: 100% (10/10), done. Writing objects: 100% (10/10), 1002 bytes | 1002.00 KiB/s, done. Total 10 (delta 6), reused 0 (delta 0), pack-reused 0 remote: ================================================================ remote: Disallowed reference: refs/notes/commits remote: ================================================================ remote: FATAL: VREF/REFERENCE-CHECK/ports: helper program exit status 256 remote: error: hook declined to update refs/notes/commits To gitrepo-dev.FreeBSD.org:ports.git ! [remote rejected] refs/notes/commits -> refs/notes/commits (hook declined) error: failed to push some refs to 'gitrepo-dev.FreeBSD.org:ports.git'