Github messages for voidlinux
 help / color / mirror / Atom feed
From: Piraty <Piraty@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] freecad: evade vsed strict mode for flaky version info
Date: Sun, 02 Oct 2022 21:18:39 +0200	[thread overview]
Message-ID: <20221002191839.aH1ztkAs9mH-CJXtlEyMllZYQQW1Mm7hukuRHLbqLgc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39629@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages freecad-evade-vsed-strict-mode
https://github.com/void-linux/void-packages/pull/39629

freecad: evade vsed strict mode for flaky version info
to fix CI and help https://github.com/void-linux/void-packages/pull/36356/ build correctly

A patch file from https://github.com/void-linux/void-packages/pull/39629.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freecad-evade-vsed-strict-mode-39629.patch --]
[-- Type: text/x-diff, Size: 949 bytes --]

From 413c2746decf224f54584c19316ecb06fe54950c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 2 Oct 2022 21:15:18 +0200
Subject: [PATCH] freecad: evade vsed strict mode for flaky version info

to fix CI
---
 srcpkgs/freecad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 6963278981fc..85f6cf44daf6 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -44,9 +44,10 @@ fi
 
 post_extract() {
 	# Report exact minor version
+	# Freecad has a record of shipping mismatching version info
 	vminor=${version#*.}
 	vminor=${vminor%%.*}
-	vsed -i -e "s,^\(set(PACKAGE_VERSION_MINOR\) .*,\1 \"${vminor}\")," CMakeLists.txt
+	sed -i -e "s,^\(set(PACKAGE_VERSION_MINOR\) .*,\1 \"${vminor}\")," CMakeLists.txt
 
 	# SubWCRev.py (SCM check) reports "unknown" for these fields
 	vsed -e "s,\${PACKAGE_WCREF},${revision}_voidlinux," \

  reply	other threads:[~2022-10-02 19:18 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-02 19:18 [PR PATCH] " Piraty
2022-10-02 19:18 ` Piraty [this message]
2022-10-03 13:53 ` [PR PATCH] [Merged]: " classabbyamp

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221002191839.aH1ztkAs9mH-CJXtlEyMllZYQQW1Mm7hukuRHLbqLgc@z \
    --to=piraty@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).