Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] freecad: evade vsed strict mode for flaky version info
@ 2022-10-02 19:18 Piraty
  2022-10-02 19:18 ` [PR PATCH] [Updated] " Piraty
  2022-10-03 13:53 ` [PR PATCH] [Merged]: " classabbyamp
  0 siblings, 2 replies; 3+ messages in thread
From: Piraty @ 2022-10-02 19:18 UTC (permalink / raw)
  To: ml

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

There is a new 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: 939 bytes --]

From 560a06f2d05c0a9155c15ed26ab7dee5b833b7f6 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

---
 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," \

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] freecad: evade vsed strict mode for flaky version info
  2022-10-02 19:18 [PR PATCH] freecad: evade vsed strict mode for flaky version info Piraty
@ 2022-10-02 19:18 ` Piraty
  2022-10-03 13:53 ` [PR PATCH] [Merged]: " classabbyamp
  1 sibling, 0 replies; 3+ messages in thread
From: Piraty @ 2022-10-02 19:18 UTC (permalink / raw)
  To: ml

[-- 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," \

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: freecad: evade vsed strict mode for flaky version info
  2022-10-02 19:18 [PR PATCH] freecad: evade vsed strict mode for flaky version info Piraty
  2022-10-02 19:18 ` [PR PATCH] [Updated] " Piraty
@ 2022-10-03 13:53 ` classabbyamp
  1 sibling, 0 replies; 3+ messages in thread
From: classabbyamp @ 2022-10-03 13:53 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

freecad: evade vsed strict mode for flaky version info
https://github.com/void-linux/void-packages/pull/39629

Description:
to fix CI and help https://github.com/void-linux/void-packages/pull/36356/ build correctly

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-10-03 13:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-02 19:18 [PR PATCH] freecad: evade vsed strict mode for flaky version info Piraty
2022-10-02 19:18 ` [PR PATCH] [Updated] " Piraty
2022-10-03 13:53 ` [PR PATCH] [Merged]: " classabbyamp

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).