From owner-svn-ports-head@freebsd.org  Mon May 11 19:33:32 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 1C7652E9544;
 Mon, 11 May 2020 19:33:32 +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)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49LWLz6tGdz3yxJ;
 Mon, 11 May 2020 19:33:31 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1354)
 id D5A4CB82E; Mon, 11 May 2020 19:33:31 +0000 (UTC)
From: Jan Beich <jbeich@FreeBSD.org>
To: Mathieu Arnold <mat@freebsd.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: Re: svn commit: r534295 - head/x11-servers/xwayland-devel
References: <202005072205.047M5hQE025839@repo.freebsd.org>
 <20200511083241.kyjptz3ctrtebgdr@aching.in.mat.cc>
Date: Mon, 11 May 2020 21:33:28 +0200
In-Reply-To: <20200511083241.kyjptz3ctrtebgdr@aching.in.mat.cc> (Mathieu
 Arnold's message of "Mon, 11 May 2020 10:32:41 +0200")
Message-ID: <v9l2-p8qf-wny@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 May 2020 19:33:32 -0000

Mathieu Arnold <mat@freebsd.org> writes:

> On Thu, May 07, 2020 at 10:05:43PM +0000, Jan Beich wrote:
>
>> Author: jbeich
>> Date: Thu May  7 22:05:42 2020
>> New Revision: 534295
>> URL: https://svnweb.freebsd.org/changeset/ports/534295
>> 
>> Log:
>>   x11-servers/xwayland-devel: regen patches (gitlab bug)
>>   
>>   -2.24.1
>>   +2.26.2
>
> This is not really a gitlab bug, it is how git format-patch works, it
> appends it version to the patch, so when the version changes, the patch
> changes.
>
> As it is a known caveat of using patch from gitlab instances, it would
> probably be better to put the patches in the files directory instead of
> depending on the hope that the software will be updated and the patches
> will become obsolete before a new version of git comes around.

See https://reviews.freebsd.org/D24810

I prefer vendoring approach because:
- hard to desync between upstream and files/patch-* versions
- other ports/ committers cannot mix in unrelated fixes
- patches are ordered, so can be applied en masse
- low maintenance due to common format and one place to change