From 0cafcf7ba73ce1cb5bcaf902afcedb138679d733 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sat, 8 Jun 2024 01:07:10 +0200 Subject: [PATCH 1/3] wraps: - update wrap revision of sdl - update wrap revision of libpng --- subprojects/libpng.wrap | 10 +++++----- subprojects/sdl2.wrap | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/subprojects/libpng.wrap b/subprojects/libpng.wrap index d8a4abff..2c5f9c6a 100644 --- a/subprojects/libpng.wrap +++ b/subprojects/libpng.wrap @@ -3,11 +3,11 @@ directory = libpng-1.6.43 source_url = https://github.com/glennrp/libpng/archive/v1.6.43.tar.gz source_filename = libpng-1.6.43.tar.gz source_hash = fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a -patch_filename = libpng_1.6.43-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.43-1/get_patch -patch_hash = 0e995446c607ef2e618fb561929acf91e4bdd8017d2e18a7a3b68ba41da345e6 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.43-1/libpng-1.6.43.tar.gz -wrapdb_version = 1.6.43-1 +patch_filename = libpng_1.6.43-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.43-2/get_patch +patch_hash = 49951297edf03e81d925ab03726555f09994ad1ed78fb539a269216430eef3da +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.43-2/libpng-1.6.43.tar.gz +wrapdb_version = 1.6.43-2 [provide] libpng = libpng_dep diff --git a/subprojects/sdl2.wrap b/subprojects/sdl2.wrap index 19edabb7..4d80614c 100644 --- a/subprojects/sdl2.wrap +++ b/subprojects/sdl2.wrap @@ -3,11 +3,11 @@ directory = SDL2-2.30.3 source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.30.3/SDL2-2.30.3.tar.gz source_filename = SDL2-2.30.3.tar.gz source_hash = 820440072f8f5b50188c1dae104f2ad25984de268785be40c41a099a510f0aec -patch_filename = sdl2_2.30.3-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.30.3-1/get_patch -patch_hash = f8aaab6f4ae09798c0c28c042c3dc678dd4d09b67598ea73ff14da7ae67be97d -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.30.3-1/SDL2-2.30.3.tar.gz -wrapdb_version = 2.30.3-1 +patch_filename = sdl2_2.30.3-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.30.3-2/get_patch +patch_hash = 2c08bde67b3896db88e01481c379322625ea6c928cdb68ead91d0e3749863bc2 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.30.3-2/SDL2-2.30.3.tar.gz +wrapdb_version = 2.30.3-2 diff_files = SDL2-2.30.3_android.diff, SDL2-2.30.3_mingw.diff [provide] From 8710f6cbf3bf3e37eb47061ab39b849a1031cdb7 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Tue, 18 Jun 2024 14:28:23 +0200 Subject: [PATCH 2/3] android: update gradle version and AGP --- platforms/android/build.gradle | 2 +- platforms/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/android/build.gradle b/platforms/android/build.gradle index 0c4c2c36..3ce3cac2 100644 --- a/platforms/android/build.gradle +++ b/platforms/android/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.4.1' + classpath 'com.android.tools.build:gradle:8.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/platforms/android/gradle/wrapper/gradle-wrapper.properties b/platforms/android/gradle/wrapper/gradle-wrapper.properties index 21b43b9f..c690bd98 100644 --- a/platforms/android/gradle/wrapper/gradle-wrapper.properties +++ b/platforms/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Jan 02 02:01:38 CET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 90fe4298e901924d500eb4c591e3e63882c31130 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Tue, 18 Jun 2024 15:43:24 +0200 Subject: [PATCH 3/3] wraps: remove unnecessary mingw patch fix --- .../packagefiles/SDL2-2.30.3_mingw.diff | 24 ------------------- subprojects/sdl2.wrap | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 subprojects/packagefiles/SDL2-2.30.3_mingw.diff diff --git a/subprojects/packagefiles/SDL2-2.30.3_mingw.diff b/subprojects/packagefiles/SDL2-2.30.3_mingw.diff deleted file mode 100644 index 93b0f089..00000000 --- a/subprojects/packagefiles/SDL2-2.30.3_mingw.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/meson.build b/meson.build -index 6d49243..e095a61 100644 ---- a/meson.build -+++ b/meson.build -@@ -1190,8 +1190,7 @@ endif - sdl2_dep = declare_dependency( - link_with : sdl2, - dependencies : deps, -- include_directories : core_inc, -- compile_args : c_args, -+ include_directories : core_inc - ) - - test_deps = [] -@@ -1215,8 +1214,7 @@ sdl2_test = static_library('sdl2_test', - sdl2_test_dep = declare_dependency( - link_with : sdl2_test, - dependencies : [sdl2_dep], -- include_directories : core_inc, -- compile_args : c_args, -+ include_directories : core_inc - ) - - meson.override_dependency('sdl2', sdl2_dep) diff --git a/subprojects/sdl2.wrap b/subprojects/sdl2.wrap index 4d80614c..1d96b0db 100644 --- a/subprojects/sdl2.wrap +++ b/subprojects/sdl2.wrap @@ -8,7 +8,7 @@ patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.30.3-2/get_patch patch_hash = 2c08bde67b3896db88e01481c379322625ea6c928cdb68ead91d0e3749863bc2 source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.30.3-2/SDL2-2.30.3.tar.gz wrapdb_version = 2.30.3-2 -diff_files = SDL2-2.30.3_android.diff, SDL2-2.30.3_mingw.diff +diff_files = SDL2-2.30.3_android.diff [provide] sdl2 = sdl2_dep