* [PR PATCH] Fix build of swiften & openimageio
@ 2022-05-26 19:30 JamiKettunen
2022-05-26 19:32 ` [PR PATCH] [Updated] " JamiKettunen
2022-05-27 15:46 ` [PR PATCH] [Merged]: " leahneukirchen
0 siblings, 2 replies; 3+ messages in thread
From: JamiKettunen @ 2022-05-26 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
There is a new pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages build-fixes
https://github.com/void-linux/void-packages/pull/37303
Fix build of swiften & openimageio
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37303.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-fixes-37303.patch --]
[-- Type: text/x-diff, Size: 3500 bytes --]
From f992bdcd2956ea9046c04c6a429b62c4c691f7cd Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:55:43 +0300
Subject: [PATCH 1/2] openimageio: remove pointless pre_build vsed
This was an error with XBPS_STRICT:
=> openimageio-2.2.15.1_3: running pre_build ...
=> ERROR: openimageio-2.2.15.1_3: vsed: regex "s;-isystem;-I;g" didn't change file "src/cmake/compiler.cmake"
---
srcpkgs/openimageio/template | 3 ---
1 file changed, 3 deletions(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..8abf3b05d6a3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -36,9 +36,6 @@ fi
pre_build() {
local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
# Add libatomic to the targets
vsed -i src/libOpenImageIO/CMakeLists.txt \
From 937b87d328697de08ca60547aa1e200089d98c51 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 22:23:33 +0300
Subject: [PATCH 2/2] swiften: fix indentation of fix-cross-build.patch
This used to apply fine previously due to more lax default patch_args,
fix it to build in 2022.
---
srcpkgs/swiften/patches/fix-cross-build.patch | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/swiften/patches/fix-cross-build.patch b/srcpkgs/swiften/patches/fix-cross-build.patch
index 906e60ce07de..c00178208a63 100644
--- a/srcpkgs/swiften/patches/fix-cross-build.patch
+++ b/srcpkgs/swiften/patches/fix-cross-build.patch
@@ -1,19 +1,19 @@
--- a/3rdParty/LibMiniUPnPc/SConscript 2016-09-07 10:29:12.251340787 +0200
+++ b/3rdParty/LibMiniUPnPc/SConscript 2016-09-07 10:29:49.165342691 +0200
-@@ -46,11 +46,11 @@
- if myenv["PLATFORM"] == "win32":
- myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"])
+@@ -46,11 +46,11 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) :
+ if myenv["PLATFORM"] == "win32":
+ myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"])
-- if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
-- conf = Configure(conf_env)
-- if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
-- myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
-- conf.Finish()
-+ #if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
-+ # conf = Configure(conf_env)
-+ # if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
-+ # myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
-+ # conf.Finish()
+- if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
+- conf = Configure(conf_env)
+- if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
+- myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
+- conf.Finish()
++ #if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
++ # conf = Configure(conf_env)
++ # if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
++ # myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
++ # conf.Finish()
- myenv.WriteVal("src/miniupnpc/miniupnpcstrings.h", myenv.Value(
+ myenv.WriteVal("src/miniupnpc/miniupnpcstrings.h", myenv.Value(
"""
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] Fix build of swiften & openimageio
2022-05-26 19:30 [PR PATCH] Fix build of swiften & openimageio JamiKettunen
@ 2022-05-26 19:32 ` JamiKettunen
2022-05-27 15:46 ` [PR PATCH] [Merged]: " leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: JamiKettunen @ 2022-05-26 19:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1263 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages build-fixes
https://github.com/void-linux/void-packages/pull/37303
Fix build of swiften & openimageio
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37303.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-fixes-37303.patch --]
[-- Type: text/x-diff, Size: 3381 bytes --]
From 269275aa1780acdb274c251494b3f6162e9d8619 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:55:43 +0300
Subject: [PATCH 1/2] openimageio: remove pointless pre_build vsed
This caused an error with XBPS_STRICT set due to the vsed not changing
anything.
---
srcpkgs/openimageio/template | 3 ---
1 file changed, 3 deletions(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..8abf3b05d6a3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -36,9 +36,6 @@ fi
pre_build() {
local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
# Add libatomic to the targets
vsed -i src/libOpenImageIO/CMakeLists.txt \
From 39dd8be437c434a58bfec187a7446d2117d31b80 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 22:23:33 +0300
Subject: [PATCH 2/2] swiften: fix indentation of fix-cross-build.patch
This used to apply fine previously due to more lax default patch_args,
fix it to build in 2022.
---
srcpkgs/swiften/patches/fix-cross-build.patch | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/swiften/patches/fix-cross-build.patch b/srcpkgs/swiften/patches/fix-cross-build.patch
index 906e60ce07de..c00178208a63 100644
--- a/srcpkgs/swiften/patches/fix-cross-build.patch
+++ b/srcpkgs/swiften/patches/fix-cross-build.patch
@@ -1,19 +1,19 @@
--- a/3rdParty/LibMiniUPnPc/SConscript 2016-09-07 10:29:12.251340787 +0200
+++ b/3rdParty/LibMiniUPnPc/SConscript 2016-09-07 10:29:49.165342691 +0200
-@@ -46,11 +46,11 @@
- if myenv["PLATFORM"] == "win32":
- myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"])
+@@ -46,11 +46,11 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) :
+ if myenv["PLATFORM"] == "win32":
+ myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"])
-- if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
-- conf = Configure(conf_env)
-- if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
-- myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
-- conf.Finish()
-+ #if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
-+ # conf = Configure(conf_env)
-+ # if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
-+ # myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
-+ # conf.Finish()
+- if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
+- conf = Configure(conf_env)
+- if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
+- myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
+- conf.Finish()
++ #if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
++ # conf = Configure(conf_env)
++ # if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
++ # myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
++ # conf.Finish()
- myenv.WriteVal("src/miniupnpc/miniupnpcstrings.h", myenv.Value(
+ myenv.WriteVal("src/miniupnpc/miniupnpcstrings.h", myenv.Value(
"""
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: Fix build of swiften & openimageio
2022-05-26 19:30 [PR PATCH] Fix build of swiften & openimageio JamiKettunen
2022-05-26 19:32 ` [PR PATCH] [Updated] " JamiKettunen
@ 2022-05-27 15:46 ` leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2022-05-27 15:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
There's a merged pull request on the void-packages repository
Fix build of swiften & openimageio
https://github.com/void-linux/void-packages/pull/37303
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-27 15:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-26 19:30 [PR PATCH] Fix build of swiften & openimageio JamiKettunen
2022-05-26 19:32 ` [PR PATCH] [Updated] " JamiKettunen
2022-05-27 15:46 ` [PR PATCH] [Merged]: " leahneukirchen
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).