From f1d4277f7185caaa4f79894db39f474ab652e1f3 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Sat, 14 Dec 2024 08:40:13 -0800 Subject: [PATCH 1/8] flet: 0.25.2 --- {{cookiecutter.out_dir}}/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index b24efc0..5987ea9 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: sdk: flutter serious_python: 0.8.3 - flet: 0.25.1 + flet: 0.25.2 path: ^1.9.0 url_strategy: ^0.2.0 From d1ac51a023c3361a443a37570d24e4fc63494675 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Sun, 15 Dec 2024 13:53:26 -0800 Subject: [PATCH 2/8] file_picker: ^8.1.5 --- {{cookiecutter.out_dir}}/pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 5987ea9..3a14596 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -24,6 +24,7 @@ dependency_overrides: wakelock_plus: ^1.2.5 web: ^1.0.0 window_manager: ^0.4.3 + file_picker: ^8.1.5 # {% if 'flet_audio_recorder' in cookiecutter.flutter.dependencies %} record: ^5.1.1 From d3cdb4d89b059b2e075198776f4f9cf596ad5831 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Sun, 15 Dec 2024 13:58:58 -0800 Subject: [PATCH 3/8] file_picker: 8.1.4 --- {{cookiecutter.out_dir}}/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 3a14596..65c1a4a 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -24,7 +24,7 @@ dependency_overrides: wakelock_plus: ^1.2.5 web: ^1.0.0 window_manager: ^0.4.3 - file_picker: ^8.1.5 + file_picker: 8.1.4 # {% if 'flet_audio_recorder' in cookiecutter.flutter.dependencies %} record: ^5.1.1 From 1a48e040e8843df7f6872d9977c9f3aead0301fe Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Sun, 15 Dec 2024 14:02:22 -0800 Subject: [PATCH 4/8] file_picker: 8.1.5 --- {{cookiecutter.out_dir}}/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 65c1a4a..e2e8b1a 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -24,7 +24,7 @@ dependency_overrides: wakelock_plus: ^1.2.5 web: ^1.0.0 window_manager: ^0.4.3 - file_picker: 8.1.4 + file_picker: 8.1.5 # {% if 'flet_audio_recorder' in cookiecutter.flutter.dependencies %} record: ^5.1.1 From b81db9ffae8547c59075758905f83028a83bd6c1 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Sun, 15 Dec 2024 14:04:21 -0800 Subject: [PATCH 5/8] file_picker: 8.1.4 --- {{cookiecutter.out_dir}}/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index e2e8b1a..65c1a4a 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -24,7 +24,7 @@ dependency_overrides: wakelock_plus: ^1.2.5 web: ^1.0.0 window_manager: ^0.4.3 - file_picker: 8.1.5 + file_picker: 8.1.4 # {% if 'flet_audio_recorder' in cookiecutter.flutter.dependencies %} record: ^5.1.1 From 508569036ea2b0f7df501b74b05a14f18e6f39d0 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Mon, 16 Dec 2024 11:45:46 -0800 Subject: [PATCH 6/8] Remove file_picker override --- {{cookiecutter.out_dir}}/pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 65c1a4a..5987ea9 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -24,7 +24,6 @@ dependency_overrides: wakelock_plus: ^1.2.5 web: ^1.0.0 window_manager: ^0.4.3 - file_picker: 8.1.4 # {% if 'flet_audio_recorder' in cookiecutter.flutter.dependencies %} record: ^5.1.1 From 22478e808ea79a71766fc160733f4e4fb16bfba7 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Fri, 20 Dec 2024 08:40:29 -0800 Subject: [PATCH 7/8] serious_python 0.8.4 --- {{cookiecutter.out_dir}}/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 5987ea9..e497d60 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: flutter: sdk: flutter - serious_python: 0.8.3 + serious_python: 0.8.4 flet: 0.25.2 path: ^1.9.0 From f6b5b16bfd6859c2e32c2a36f158c8c73b4f2a82 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Mon, 6 Jan 2025 22:26:31 -0800 Subject: [PATCH 8/8] initialize_ctypes and serious_python 0.8.7 (#34) * serious_python: 0.8.6 * Added initialize_ctypes override * serious_python: 0.8.7 --- {{cookiecutter.out_dir}}/lib/main.dart | 47 ++++++++++++++++++++++++++ {{cookiecutter.out_dir}}/pubspec.yaml | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/lib/main.dart b/{{cookiecutter.out_dir}}/lib/main.dart index 2521104..5e34bc0 100644 --- a/{{cookiecutter.out_dir}}/lib/main.dart +++ b/{{cookiecutter.out_dir}}/lib/main.dart @@ -43,6 +43,53 @@ os.environ["CRYPTOGRAPHY_OPENSSL_NO_LEGACY"] = "1" # fix for: https://github.com/flet-dev/serious-python/issues/85#issuecomment-2065000974 os.environ["OPENBLAS_NUM_THREADS"] = "1" +def initialize_ctypes(): + import ctypes.util + import os + import pathlib + import sys + + android_native_lib_dir = os.getenv("ANDROID_NATIVE_LIBRARY_DIR") + + def find_library_override_imp(name: str): + if name is None: + return None + if pathlib.Path(name).exists(): + return name + if sys.platform == "ios": + for lf in [ + f"Frameworks/{name}.framework/{name}", + f"Frameworks/lib{name}.framework/lib{name}", + ]: + lib_path = pathlib.Path(sys.executable).parent.joinpath(lf) + if lib_path.exists(): + return str(lib_path) + elif android_native_lib_dir: + for lf in [f"lib{name}.so", f"{name}.so", name]: + lib_path = pathlib.Path(android_native_lib_dir).joinpath(lf) + if lib_path.exists(): + return str(lib_path) + return None + + find_library_original = ctypes.util.find_library + + def find_library_override(name): + return find_library_override_imp(name) or find_library_original(name) + + ctypes.util.find_library = find_library_override + + CDLL_init_original = ctypes.CDLL.__init__ + + def CDLL_init_override(self, name, *args, **kwargs): + CDLL_init_original( + self, find_library_override_imp(name) or name, *args, **kwargs + ) + + ctypes.CDLL.__init__ = CDLL_init_override + + +initialize_ctypes() + if os.getenv("FLET_PLATFORM") == "android": import ssl diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index e497d60..f053e9e 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: flutter: sdk: flutter - serious_python: 0.8.4 + serious_python: 0.8.7 flet: 0.25.2 path: ^1.9.0