[PR PATCH] godot: fix mbedtls with builtin version

[PR PATCH] godot: fix mbedtls with builtin version

[dataCobra]

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

There is a new pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot
https://github.com/void-linux/void-packages/pull/52166

godot: fix mbedtls with builtin version
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

1. Fixing mbedtls with using builtin version instead.
2. Remove update check feature.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-52166.patch --]
[-- Type: text/x-diff, Size: 2212 bytes --]

From 007cb25c7867008e736d767317fcabb9a9df184d Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 10 Sep 2024 12:23:32 +0200
Subject: [PATCH] godot: fix mbedtls with builtin version

---
 srcpkgs/godot/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 18e37f9d48a777..b83e2a62cf71d9 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,23 +1,23 @@
 # Template file for 'godot'
 pkgname=godot
 version=4.3
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
 make_build_args="platform=linuxbsd target=editor progress=no production=yes
- lto=auto builtin_brotli=false builtin_enet=false
- builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
- builtin_icu4c=false builtin_libogg=false builtin_libpng=false
- builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false
- builtin_mbedtls=false builtin_miniupnpc=false builtin_pcre2=false
- builtin_zlib=false builtin_zstd=false"
+ lto=auto builtin_brotli=false builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_icu4c=false
+ builtin_libogg=false builtin_libpng=false builtin_libtheora=false
+ builtin_libvorbis=false builtin_libwebp=false builtin_mbedtls=true
+ builtin_miniupnpc=false builtin_pcre2=false builtin_zlib=false
+ builtin_zstd=false engine_update_check=false"
 hostmakedepends="pkg-config clang"
 makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
  libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
  libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
- libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
- pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
- speech-dispatcher-devel brotli-devel icu-devel"
+ libenet-devel zlib-devel miniupnpc-devel pcre2-devel pulseaudio-devel
+ graphite-devel harfbuzz-devel libzstd-devel speech-dispatcher-devel
+ brotli-devel icu-devel"
 depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="dataCobra <datacobra@thinkbot.de>"

Re: godot: fix mbedtls with builtin version

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52166#issuecomment-2340276407

Comment:
This PR fixes: https://github.com/void-linux/void-packages/issues/52164.

Re: godot: fix mbedtls with builtin version

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52166#issuecomment-2340285650

Comment:
does mbedtls2-devel not work? 

> This PR fixes: https://github.com/void-linux/void-packages/issues/52164.

put this in the top comment so it actually closes it

Re: godot: fix mbedtls with builtin version

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52166#issuecomment-2340276407

Comment:
This PR fixes: https://github.com/void-linux/void-packages/issues/52164.

Re: godot: fix mbedtls with builtin version

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52166#issuecomment-2340297347

Comment:
> does mbedtls2-devel not work?

I'll test that.

Re: [PR PATCH] [Updated] godot: fix mbedtls with builtin version

[dataCobra]

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

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

https://github.com/dataCobra/void-packages godot
https://github.com/void-linux/void-packages/pull/52166

godot: fix mbedtls with builtin version
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

1. Fixing mbedtls with using builtin version instead.
2. Remove update check feature.

This PR fixes: https://github.com/void-linux/void-packages/issues/52164.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-52166.patch --]
[-- Type: text/x-diff, Size: 1967 bytes --]

From 7c2090ad7b5e679eb8e6b07a9afa7fed6878d3ae Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 10 Sep 2024 12:45:37 +0200
Subject: [PATCH] godot: fix mbedtls with builtin version

---
 srcpkgs/godot/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 18e37f9d48a777..d55f0a157727cb 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,21 +1,21 @@
 # Template file for 'godot'
 pkgname=godot
 version=4.3
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
 make_build_args="platform=linuxbsd target=editor progress=no production=yes
- lto=auto builtin_brotli=false builtin_enet=false
- builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
- builtin_icu4c=false builtin_libogg=false builtin_libpng=false
- builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false
+ lto=auto builtin_brotli=false builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_icu4c=false
+ builtin_libogg=false builtin_libpng=false builtin_libtheora=false
+ builtin_libvorbis=false builtin_libwebp=false builtin_mbedtls=true
  builtin_mbedtls=false builtin_miniupnpc=false builtin_pcre2=false
- builtin_zlib=false builtin_zstd=false"
+ builtin_zlib=false builtin_zstd=false engine_update_check=false"
 hostmakedepends="pkg-config clang"
 makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
  libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
  libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
- libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-devel
  pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
  speech-dispatcher-devel brotli-devel icu-devel"
 depends="speech-dispatcher"

Re: [PR PATCH] [Updated] godot: fix mbedtls with builtin version

[dataCobra]

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

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

https://github.com/dataCobra/void-packages godot
https://github.com/void-linux/void-packages/pull/52166

godot: fix mbedtls with builtin version
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

1. Fixing `mbedtls` with using `mbedtls2` version instead.
2. Remove update check feature.

This PR fixes: https://github.com/void-linux/void-packages/issues/52164.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-52166.patch --]
[-- Type: text/x-diff, Size: 1955 bytes --]

From 4bf41f94a0b4ff65ad4de3e4a8340f8c136502b2 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 10 Sep 2024 12:47:55 +0200
Subject: [PATCH] godot: use mbedtls2 package

---
 srcpkgs/godot/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 18e37f9d48a777..d55f0a157727cb 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,21 +1,21 @@
 # Template file for 'godot'
 pkgname=godot
 version=4.3
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
 make_build_args="platform=linuxbsd target=editor progress=no production=yes
- lto=auto builtin_brotli=false builtin_enet=false
- builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
- builtin_icu4c=false builtin_libogg=false builtin_libpng=false
- builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false
+ lto=auto builtin_brotli=false builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_icu4c=false
+ builtin_libogg=false builtin_libpng=false builtin_libtheora=false
+ builtin_libvorbis=false builtin_libwebp=false builtin_mbedtls=true
  builtin_mbedtls=false builtin_miniupnpc=false builtin_pcre2=false
- builtin_zlib=false builtin_zstd=false"
+ builtin_zlib=false builtin_zstd=false engine_update_check=false"
 hostmakedepends="pkg-config clang"
 makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
  libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
  libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
- libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-devel
  pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
  speech-dispatcher-devel brotli-devel icu-devel"
 depends="speech-dispatcher"

Re: godot: use mbedtls2 package

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52166#issuecomment-2340324013

Comment:
So `mbedtls2-devel` does work. I've changed the PR accordingly.

Re: godot: use mbedtls2 package

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52166#issuecomment-2340327293

Comment:
remove the unnecessary changes like reflowing/sorting, it makes it impossible to read the diff

Re: godot: use mbedtls2 package

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52166#issuecomment-2340329142

Comment:
> remove the unnecessary changes like reflowing/sorting, it makes it impossible to read the diff

will do.

Re: [PR PATCH] [Updated] godot: use mbedtls2 package

[dataCobra]

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

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

https://github.com/dataCobra/void-packages godot
https://github.com/void-linux/void-packages/pull/52166

godot: use mbedtls2 package
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

1. Fixing `mbedtls` with using `mbedtls2` version instead.
2. Remove update check feature.

This PR fixes: https://github.com/void-linux/void-packages/issues/52164.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-52166.patch --]
[-- Type: text/x-diff, Size: 1639 bytes --]

From 03561ed1c37b5254d73a0ebf0a5a773504d9d71b Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 10 Sep 2024 13:03:32 +0200
Subject: [PATCH] godot: use mbedtls2 package

---
 srcpkgs/godot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 18e37f9d48a777..7098eaff8d1473 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
 # Template file for 'godot'
 pkgname=godot
 version=4.3
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
 make_build_args="platform=linuxbsd target=editor progress=no production=yes
@@ -10,12 +10,12 @@ make_build_args="platform=linuxbsd target=editor progress=no production=yes
  builtin_icu4c=false builtin_libogg=false builtin_libpng=false
  builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false
  builtin_mbedtls=false builtin_miniupnpc=false builtin_pcre2=false
- builtin_zlib=false builtin_zstd=false"
+ builtin_zlib=false builtin_zstd=false engine_update_check=false"
 hostmakedepends="pkg-config clang"
 makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
  libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
  libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
- libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-devel
  pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
  speech-dispatcher-devel brotli-devel icu-devel"
 depends="speech-dispatcher"

Re: godot: use mbedtls2 package

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52166#issuecomment-2340354745

Comment:
> remove the unnecessary changes like reflowing/sorting, it makes it impossible to read the diff

Removed the unnecessary changes.

Re: [PR PATCH] [Merged]: godot: use mbedtls2 package

[classabbyamp]

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

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

godot: use mbedtls2 package
https://github.com/void-linux/void-packages/pull/52166

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

1. Fixing `mbedtls` with using `mbedtls2` version instead.
2. Remove update check feature.

This PR fixes: https://github.com/void-linux/void-packages/issues/52164.