From cc48d95b96afdab5937727a102454f818547ad62 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Thu, 23 Mar 2023 22:10:39 +0000 Subject: [PATCH 1/4] Stop pulling mobile in on desktop builds --- .../painter/gl/{gl_const_other.go => gl_const_mobile.go} | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename internal/painter/gl/{gl_const_other.go => gl_const_mobile.go} (55%) diff --git a/internal/painter/gl/gl_const_other.go b/internal/painter/gl/gl_const_mobile.go similarity index 55% rename from internal/painter/gl/gl_const_other.go rename to internal/painter/gl/gl_const_mobile.go index 239bee4572..a83f825f4b 100644 --- a/internal/painter/gl/gl_const_other.go +++ b/internal/painter/gl/gl_const_mobile.go @@ -1,5 +1,8 @@ -//go:build !darwin && !js && !wasm -// +build !darwin,!js,!wasm +//go:build !darwin && !js && !wasm && (android || ios) +// +build !darwin +// +build !js +// +build !wasm +// +build android ios package gl From d404b0c600b88fa9c9224262157be7403f1990f6 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Thu, 23 Mar 2023 22:21:30 +0000 Subject: [PATCH 2/4] And fix mobile simulation build --- internal/painter/gl/gl_const_mobile.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/painter/gl/gl_const_mobile.go b/internal/painter/gl/gl_const_mobile.go index a83f825f4b..c480e93aff 100644 --- a/internal/painter/gl/gl_const_mobile.go +++ b/internal/painter/gl/gl_const_mobile.go @@ -1,8 +1,8 @@ -//go:build !darwin && !js && !wasm && (android || ios) +//go:build !darwin && !js && !wasm && (android || ios || mobile) // +build !darwin // +build !js // +build !wasm -// +build android ios +// +build android ios mobile package gl From e55b0649d3f88e4eb17cc39d48fc4191843a82bc Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Thu, 23 Mar 2023 22:40:23 +0000 Subject: [PATCH 3/4] Prep for fast v2.3.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eb6d6c456..f90a0e4f84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ This file lists the main changes with each version of the Fyne toolkit. More detailed release notes can be found on the [releases page](https://github.com/fyne-io/fyne/releases). +## 2.3.3 - 24 March 2023 + +### Fixed + +* Linux, Windows and BSD builds could fail if gles was missing + ## 2.3.2 - 20 March 2023 ### Fixed From fc4750250840da999586e8db4e5d6e02caa631d9 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Fri, 24 Mar 2023 09:04:07 +0000 Subject: [PATCH 4/4] Giving Dymium credit --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f90a0e4f84..ef7759b508 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,8 +13,8 @@ More detailed release notes can be found on the [releases page](https://github.c ### Fixed -* Fyne does not run perfectly on ARM-based MacOS platforms (#3639) -* Panic on closing window in form submit on Мac M2 (#3397) +* Fyne does not run perfectly on ARM-based MacOS platforms (#3639) * +* Panic on closing window in form submit on Мac M2 (#3397) * * Wobbling slider effect for very small steps (#3648) * Fix memory leak in test canvas refresh * Optimise text texture memory by switching to single channel @@ -33,6 +33,9 @@ More detailed release notes can be found on the [releases page](https://github.c * Mobile simulator not compiling on Apple M1/2 * Cropped letters in certain cases with the new v2.3.0 theme (#3500) +Many thanks indeed to [Dymium](https://dymium.io) for sponsoring an Apple +M2 device which allowed us to complete the marked (*) issues. + ## 2.3.1 - 13 February 2023