Merge pull request #751 from cazfi/srvup

freeciv · Sep 26, 2023 · 4e3a3c2 · 4e3a3c2
2 parents cc758a5 + 61dcffb
commit 4e3a3c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/freeciv/patches/meson_webperimental.patch b/freeciv/patches/meson_webperimental.patch
@@ -1,7 +1,7 @@
 diff -Nurd freeciv/meson.build freeciv/meson.build
---- freeciv/meson.build	2023-07-08 22:29:27.412954972 +0300
-+++ freeciv/meson.build	2023-07-08 22:29:38.109087948 +0300
-@@ -3913,7 +3913,8 @@
+--- freeciv/meson.build	2023-09-18 14:09:39.566957086 +0300
++++ freeciv/meson.build	2023-09-18 14:09:48.663044888 +0300
+@@ -4158,7 +4158,8 @@
    'sandbox',
    'civ1',
    'civ2',
@@ -11,7 +11,7 @@ diff -Nurd freeciv/meson.build freeciv/meson.build
    ]
 
  ruleset_files = [
-@@ -3941,6 +3942,8 @@
+@@ -4186,6 +4187,8 @@
    'data/sandbox.modpack',
    'data/civ1.modpack',
    'data/civ2.modpack',
@@ -20,7 +20,7 @@ diff -Nurd freeciv/meson.build freeciv/meson.build
    install_dir : join_paths(get_option('datadir'), 'freeciv')
    )
 
-@@ -3975,6 +3978,11 @@
+@@ -4220,6 +4223,11 @@
    )
 
  install_data(

diff --git a/freeciv/version.txt b/freeciv/version.txt
@@ -1,9 +1,9 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=a413d3d183415a1effece2386b14fc8b2898d86d
+FCREV=886e5c7b4ff38f3c712f8010752caac956eb25e0
 
-ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Jul.22"
+ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Aug.28"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are