<pre style='margin:0'>
Haren S (harens) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7a684cf658d3be802ab95fd33add17a9e14f2834">https://github.com/macports/macports-ports/commit/7a684cf658d3be802ab95fd33add17a9e14f2834</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7a684cf658d unciv: add patch files missing from previous commit
</span>7a684cf658d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7a684cf658d3be802ab95fd33add17a9e14f2834
</span>Author: harens <12570877+harens@users.noreply.github.com>
AuthorDate: Wed Mar 20 09:35:06 2024 +0000
<span style='display:block; white-space:pre;color:#404040;'> unciv: add patch files missing from previous commit
</span>---
games/unciv/files/patch-gradle-wrappers.diff | 13 ------------
games/unciv/files/patch-remove-mobile-build.diff | 25 +++---------------------
2 files changed, 3 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/unciv/files/patch-gradle-wrappers.diff b/games/unciv/files/patch-gradle-wrappers.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ccdd06a14ee..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/unciv/files/patch-gradle-wrappers.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Patch in a placeholder to "download" the gradle distfile from the place
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-where MacPorts has already downloaded it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gradle/wrapper/gradle-wrapper.properties.orig 2023-02-06 15:51:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gradle/wrapper/gradle-wrapper.properties 2023-02-18 16:18:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Mon Feb 06 15:51:42 CST 2023
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distributionBase=GRADLE_USER_HOME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+distributionUrl=file\://@DISTPATH@/gradle-@GRADLE_VERSION@-bin.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distributionPath=wrapper/dists
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- zipStorePath=wrapper/dists
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- zipStoreBase=GRADLE_USER_HOME
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/unciv/files/patch-remove-mobile-build.diff b/games/unciv/files/patch-remove-mobile-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 67d8ccd3e06..c6c58425e8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/unciv/files/patch-remove-mobile-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/unciv/files/patch-remove-mobile-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-For some reason, unciv seems to always try and build the android version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Follow the AUR's fix and remove the android section completely.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Also fixes errors relating to robovm dependency by removing the ios build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build.gradle.kts.original 2023-09-13 12:44:59.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build.gradle.kts 2023-09-13 12:50:46.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,37 +94,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build.gradle.kts.original 2024-01-28 20:05:16.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build.gradle.kts 2024-01-28 20:05:37.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,24 +92,7 @@
</span>
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,19 +21,6 @@ Also fixes errors relating to robovm dependency by removing the ios build.
</span> - natives("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86")
- natives("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64")
- }
<span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--project(":ios") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- apply(plugin = "kotlin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- apply(plugin = "robovm")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dependencies {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "implementation"(project(":core"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "implementation"("com.mobidevelop.robovm:robovm-rt:$roboVMVersion")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "implementation"("com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "implementation"("com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "implementation"("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span> -}
</pre><pre style='margin:0'>
</pre>