On 4/6/19 4:19 PM, Douglas R. Reno via blfs-dev wrote:

On 4/6/19 3:40 PM, Pierre Labastie via blfs-dev wrote:
On 06/04/2019 19:03, Ken Moffat via blfs-dev wrote:
On Sat, Apr 06, 2019 at 10:56:01AM -0500, Douglas R. Reno via blfs-dev wrote:
On 4/6/19 8:29 AM, Roger Koehler via blfs-dev wrote:
I believe you meant to say:

patch -Np1 -i ../mesa-19.0.1-add_xdemos-1.patch

not

patch -Np1 -i ../mesa-19.0.1-add_xdemos-2.patch

The former is on the server, the latter is not.

Fixed at r21427
Thanks.  I could have sworn I changed the version in the text.

There are two places where there is the patch version:
in the url and in the "patch -Np1 -i ..." command. I always forget one, too.

Pierre

I've got a suggestion based off this:

Should we add an entity with the name of the patch, including the version? This entity could be something like:

<!ENTITY nss-patch "nss-&nss-version;-standalone-1.patch"/>

So in the case of NSS, we'd be looking at:

<ulink url="&patch-root;/&nss-patch;"/> for the download URL, and

patch -Np1 -i ../&nss-patch; &amp;&amp;


This would prevent version mismatches for patches, as well as simplify maintenance whenever we have to rediff a patch (take liboauth's OpenSSL changes as an example, and the work in #11181 as a result of that). In addition, it'll make it harder to create typos when adding new patches to a package. However, it would require changes to around 80 individual pages. Also, in the case of multiple patches on a single page (there are a few IIRC), we'd have to do something like:

<!ENTITY nss-patch-1 "nss-&nss-version;-standalone-1.patch"/> AND <!ENTITY nss-patch-2 "nss-&nss-version;-standalone-2.patch"/>, and make changes to the instructions there as well.

Well we ~can~ do that, but I wouldn't make any effort to change all the patch entries. The reason is that the -1 doesn't change very often. If it doesn't change, then it is automatically handled now.

  -- Bruce

--
http://lists.linuxfromscratch.org/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to