Re: [UPDATE]: games/freeorion 0.49

2020-05-03 Thread Tom Murphy
May 2, 2020 11:16 AM, "Ingo Schwarze"  wrote:

> Hi Tom,
> 
> Tom Murphy wrote on Fri, May 01, 2020 at 01:34:08PM +0100:
> 
>> Any update on this? Can it be committed?
>> (I am the maintainer)
> 
> Thanks for working on this, but now is not the time to commit
> an Update because we are preparing the OpenBSD 6.7 release
> right now. Updating the game is non-essential for the release,
> and besdes, FreeOrion is a very massive beast.
> 
> I think this should better wait until after the release has been
> rolled out of the door.
> 
> Yours,
> Ingo

Hi Ingo,

   Not a problem, I know it was cutting it a bit fine. Hope the
release process is going smoothly!

Kind regards,
Tom



Re: [UPDATE]: games/freeorion 0.49

2020-05-02 Thread Ingo Schwarze
Hi Tom,

Tom Murphy wrote on Fri, May 01, 2020 at 01:34:08PM +0100:

>   Any update on this? Can it be committed?
>   (I am the maintainer)

Thanks for working on this, but now is not the time to commit
an Update because we are preparing the OpenBSD 6.7 release
right now.  Updating the game is non-essential for the release,
and besdes, FreeOrion is a very massive beast.

I think this should better wait until after the release has been
rolled out of the door.

Yours,
  Ingo


>   I believe the memory issues for compiling are just that
>   ulimit -d needs to be increased to allow it to compile.



Re: [UPDATE]: games/freeorion 0.49

2020-05-01 Thread Tom Murphy
Hi,

  Any update on this? Can it be committed?
  (I am the maintainer)

  I believe the memory issues for compiling are just that
  ulimit -d needs to be increased to allow it to compile.

  Thanks,
  Tom



Re: [UPDATE]: games/freeorion 0.49

2020-04-11 Thread Elias M. Mariani
Great Tom,
OK mariani@

I tried to compile and got "out-of-memory" issues, but is probably
just my old PC.
That is why I'm taking your word on compiling an running.

Cheers.
Elias.

On Sat, Apr 11, 2020 at 10:52 AM Tom Murphy  wrote:
>
> On Fri, Apr 10, 2020 at 11:05:33AM -0300, Elias M. Mariani wrote:
> > Hi Tom,
> > - You should remove REVISION.
> > - The patch has an offset:
> > Patching file CMakeLists.txt using Plan A...
> > Hunk #1 succeeded at 459 (offset 65 lines).
> >
> > A make update-patches should fix it.
> >
> > OK mariani@ with those changes.
> > I take your word on compiling and running. :)
> >
> > Cheers.
> > Elias.
>
> Hi Elias,
>
>Many thanks for the review! I've removed REVISION and
>updated the patch. Here's the new diff below.
>
>Thanks,
>Tom
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/freeorion/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- Makefile23 Nov 2019 22:08:42 -  1.5
> +++ Makefile11 Apr 2020 13:50:05 -
> @@ -1,11 +1,10 @@
>  # $OpenBSD: Makefile,v 1.5 2019/11/23 22:08:42 cwen Exp $
>
> -V =0.4.8
> +V =0.4.9
>  COMMENT =  turn-based space empire and galactic conquest computer game
> -DISTNAME = FreeOrion_v${V}_2018-08-23.26f16b0_Source
> +DISTNAME = FreeOrion_v${V}_2020-02-02.db53471_Source
>  PKGNAME =  freeorion-${V}
>  CATEGORIES =   games
> -REVISION = 1
>
>  HOMEPAGE = https://www.freeorion.org/
>  MAINTAINER =   Tom Murphy 
> @@ -18,7 +17,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL
>  WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
>  WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
>  WANTLIB += boost_python-mt boost_regex-mt boost_serialization-mt
> -WANTLIB += boost_signals-mt boost_system-mt boost_thread-mt c
> +WANTLIB += boost_system-mt boost_thread-mt c
>  WANTLIB += freetype m ogg openal png ${MODPY_WANTLIB} vorbis vorbisenc
>  WANTLIB += vorbisfile z
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/freeorion/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo3 Oct 2018 11:43:46 -   1.1.1.1
> +++ distinfo11 Apr 2020 13:50:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 
> 1AXb60Ovt/p2k3zxXNsQsV6BjaFx7B6wPkocPsu6Rvc=
> -SIZE (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 106254059
> +SHA256 (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 
> Vomzpsq55s+8g9joLvMlu54AcRJi0msEbwg+pf3E1uE=
> +SIZE (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 124662273
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/games/freeorion/patches/patch-CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt1 Nov 2019 19:17:31 -   1.1
> +++ patches/patch-CMakeLists_txt11 Apr 2020 13:50:05 -
> @@ -4,7 +4,7 @@ Remove hardcoded optimisation option.
>  Index: CMakeLists.txt
>  --- CMakeLists.txt.orig
>  +++ CMakeLists.txt
> -@@ -394,7 +394,6 @@ target_compile_options(freeorionparseobj
> +@@ -459,7 +459,6 @@ target_compile_options(freeorionparseobj
>   $<$:-fvisibility=hidden>
>   $<$:-ftemplate-depth=512>
>   $<$:-ftemplate-depth=512>
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/games/freeorion/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST   3 Oct 2018 11:43:48 -   1.1.1.1
> +++ pkg/PLIST   11 Apr 2020 13:50:06 -
> @@ -3,10 +3,10 @@
>  @bin bin/freeorionca
>  @bin bin/freeoriond
>  lib/freeorion/
> -lib/freeorion/libGiGi.so
> -lib/freeorion/libGiGiSDL.so
> -lib/freeorion/libfreeorioncommon.so
> -lib/freeorion/libfreeorionparse.so
> +@so lib/freeorion/libGiGi.so
> +@so lib/freeorion/libGiGiSDL.so
> +@so lib/freeorion/libfreeorioncommon.so
> +@so lib/freeorion/libfreeorionparse.so
>  share/applications/freeorion.desktop
>  share/freeorion/
>  share/freeorion/default/
> @@ -48,7 +48,11 @@ share/freeorion/default/data/art/encyclo
>  
> share/freeorion/default/data/art/encyclopedia/planet_environments/pt_toxic02.png
>  
> share/freeorion/default/data/art/encyclopedia/planet_environments/pt_tundra.png
>  share/freeorion/default/data/art/fields/
> -share/freeorion/default/data/art/fields/rainbow_storm.png
> +share/freeorion/default/data/art/fields/accretion_disc.png
> +share/freeorion/default/data/art/fields/ion_storm.png
> +share/freeorion/default/data/art/fields/molecular_cloud.png
> +share/freeorion/default/data/art/fields/star_forming_nebula_1.png
> +share/freeorion/default/data/art/fields/star_forming_nebula_2.png
>  

Re: [UPDATE]: games/freeorion 0.49

2020-04-11 Thread Tom Murphy
On Fri, Apr 10, 2020 at 11:05:33AM -0300, Elias M. Mariani wrote:
> Hi Tom,
> - You should remove REVISION.
> - The patch has an offset:
> Patching file CMakeLists.txt using Plan A...
> Hunk #1 succeeded at 459 (offset 65 lines).
> 
> A make update-patches should fix it.
> 
> OK mariani@ with those changes.
> I take your word on compiling and running. :)
> 
> Cheers.
> Elias.

Hi Elias,

   Many thanks for the review! I've removed REVISION and
   updated the patch. Here's the new diff below.

   Thanks,
   Tom


Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile23 Nov 2019 22:08:42 -  1.5
+++ Makefile11 Apr 2020 13:50:05 -
@@ -1,11 +1,10 @@
 # $OpenBSD: Makefile,v 1.5 2019/11/23 22:08:42 cwen Exp $
 
-V =0.4.8
+V =0.4.9
 COMMENT =  turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2018-08-23.26f16b0_Source
+DISTNAME = FreeOrion_v${V}_2020-02-02.db53471_Source
 PKGNAME =  freeorion-${V}
 CATEGORIES =   games
-REVISION = 1
 
 HOMEPAGE = https://www.freeorion.org/
 MAINTAINER =   Tom Murphy 
@@ -18,7 +17,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL
 WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
 WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
 WANTLIB += boost_python-mt boost_regex-mt boost_serialization-mt
-WANTLIB += boost_signals-mt boost_system-mt boost_thread-mt c
+WANTLIB += boost_system-mt boost_thread-mt c
 WANTLIB += freetype m ogg openal png ${MODPY_WANTLIB} vorbis vorbisenc
 WANTLIB += vorbisfile z
 
Index: distinfo
===
RCS file: /cvs/ports/games/freeorion/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo3 Oct 2018 11:43:46 -   1.1.1.1
+++ distinfo11 Apr 2020 13:50:05 -
@@ -1,2 +1,2 @@
-SHA256 (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 
1AXb60Ovt/p2k3zxXNsQsV6BjaFx7B6wPkocPsu6Rvc=
-SIZE (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 106254059
+SHA256 (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 
Vomzpsq55s+8g9joLvMlu54AcRJi0msEbwg+pf3E1uE=
+SIZE (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 124662273
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/games/freeorion/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt1 Nov 2019 19:17:31 -   1.1
+++ patches/patch-CMakeLists_txt11 Apr 2020 13:50:05 -
@@ -4,7 +4,7 @@ Remove hardcoded optimisation option.
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -394,7 +394,6 @@ target_compile_options(freeorionparseobj
+@@ -459,7 +459,6 @@ target_compile_options(freeorionparseobj
  $<$:-fvisibility=hidden>
  $<$:-ftemplate-depth=512>
  $<$:-ftemplate-depth=512>
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/freeorion/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   3 Oct 2018 11:43:48 -   1.1.1.1
+++ pkg/PLIST   11 Apr 2020 13:50:06 -
@@ -3,10 +3,10 @@
 @bin bin/freeorionca
 @bin bin/freeoriond
 lib/freeorion/
-lib/freeorion/libGiGi.so
-lib/freeorion/libGiGiSDL.so
-lib/freeorion/libfreeorioncommon.so
-lib/freeorion/libfreeorionparse.so
+@so lib/freeorion/libGiGi.so
+@so lib/freeorion/libGiGiSDL.so
+@so lib/freeorion/libfreeorioncommon.so
+@so lib/freeorion/libfreeorionparse.so
 share/applications/freeorion.desktop
 share/freeorion/
 share/freeorion/default/
@@ -48,7 +48,11 @@ share/freeorion/default/data/art/encyclo
 
share/freeorion/default/data/art/encyclopedia/planet_environments/pt_toxic02.png
 share/freeorion/default/data/art/encyclopedia/planet_environments/pt_tundra.png
 share/freeorion/default/data/art/fields/
-share/freeorion/default/data/art/fields/rainbow_storm.png
+share/freeorion/default/data/art/fields/accretion_disc.png
+share/freeorion/default/data/art/fields/ion_storm.png
+share/freeorion/default/data/art/fields/molecular_cloud.png
+share/freeorion/default/data/art/fields/star_forming_nebula_1.png
+share/freeorion/default/data/art/fields/star_forming_nebula_2.png
 share/freeorion/default/data/art/galaxy_decoration/
 share/freeorion/default/data/art/galaxy_decoration/blue_set/
 share/freeorion/default/data/art/galaxy_decoration/blue_set/gaseous01.png
@@ -527,6 +531,11 @@ share/freeorion/default/data/art/icons/p
 share/freeorion/default/data/art/icons/planet/tiny.png
 share/freeorion/default/data/art/icons/planet/toxic.png
 share/freeorion/default/data/art/icons/planet/tundra.png
+share/freeorion/default/data/art/icons/planet_status_attacked.png

Re: [UPDATE]: games/freeorion 0.49

2020-04-10 Thread Elias M. Mariani
Hi Tom,
- You should remove REVISION.
- The patch has an offset:
Patching file CMakeLists.txt using Plan A...
Hunk #1 succeeded at 459 (offset 65 lines).

A make update-patches should fix it.

OK mariani@ with those changes.
I take your word on compiling and running. :)

Cheers.
Elias.


On Fri, Apr 10, 2020 at 7:29 AM Tom Murphy  wrote:
>
> Hi,
>
>   Attached is a diff to bring games/freeorion to 0.4.9.
>   I removed boost_signals-mt from WANTLIB since it was
>   being listed as an extra lib.
>
>   Compiles fine and runs for me.
>
>   OK?
>
>   Thanks,
>   Tom
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/freeorion/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- Makefile23 Nov 2019 22:08:42 -  1.5
> +++ Makefile10 Apr 2020 08:55:18 -
> @@ -1,8 +1,8 @@
>  # $OpenBSD: Makefile,v 1.5 2019/11/23 22:08:42 cwen Exp $
>
> -V =0.4.8
> +V =0.4.9
>  COMMENT =  turn-based space empire and galactic conquest computer game
> -DISTNAME = FreeOrion_v${V}_2018-08-23.26f16b0_Source
> +DISTNAME = FreeOrion_v${V}_2020-02-02.db53471_Source
>  PKGNAME =  freeorion-${V}
>  CATEGORIES =   games
>  REVISION = 1
> @@ -18,7 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL
>  WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
>  WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
>  WANTLIB += boost_python-mt boost_regex-mt boost_serialization-mt
> -WANTLIB += boost_signals-mt boost_system-mt boost_thread-mt c
> +WANTLIB += boost_system-mt boost_thread-mt c
>  WANTLIB += freetype m ogg openal png ${MODPY_WANTLIB} vorbis vorbisenc
>  WANTLIB += vorbisfile z
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/freeorion/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo3 Oct 2018 11:43:46 -   1.1.1.1
> +++ distinfo10 Apr 2020 08:55:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 
> 1AXb60Ovt/p2k3zxXNsQsV6BjaFx7B6wPkocPsu6Rvc=
> -SIZE (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 106254059
> +SHA256 (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 
> Vomzpsq55s+8g9joLvMlu54AcRJi0msEbwg+pf3E1uE=
> +SIZE (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 124662273
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/games/freeorion/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST   3 Oct 2018 11:43:48 -   1.1.1.1
> +++ pkg/PLIST   10 Apr 2020 08:55:18 -
> @@ -3,10 +3,10 @@
>  @bin bin/freeorionca
>  @bin bin/freeoriond
>  lib/freeorion/
> -lib/freeorion/libGiGi.so
> -lib/freeorion/libGiGiSDL.so
> -lib/freeorion/libfreeorioncommon.so
> -lib/freeorion/libfreeorionparse.so
> +@so lib/freeorion/libGiGi.so
> +@so lib/freeorion/libGiGiSDL.so
> +@so lib/freeorion/libfreeorioncommon.so
> +@so lib/freeorion/libfreeorionparse.so
>  share/applications/freeorion.desktop
>  share/freeorion/
>  share/freeorion/default/
> @@ -48,7 +48,11 @@ share/freeorion/default/data/art/encyclo
>  
> share/freeorion/default/data/art/encyclopedia/planet_environments/pt_toxic02.png
>  
> share/freeorion/default/data/art/encyclopedia/planet_environments/pt_tundra.png
>  share/freeorion/default/data/art/fields/
> -share/freeorion/default/data/art/fields/rainbow_storm.png
> +share/freeorion/default/data/art/fields/accretion_disc.png
> +share/freeorion/default/data/art/fields/ion_storm.png
> +share/freeorion/default/data/art/fields/molecular_cloud.png
> +share/freeorion/default/data/art/fields/star_forming_nebula_1.png
> +share/freeorion/default/data/art/fields/star_forming_nebula_2.png
>  share/freeorion/default/data/art/galaxy_decoration/
>  share/freeorion/default/data/art/galaxy_decoration/blue_set/
>  share/freeorion/default/data/art/galaxy_decoration/blue_set/gaseous01.png
> @@ -527,6 +531,11 @@ share/freeorion/default/data/art/icons/p
>  share/freeorion/default/data/art/icons/planet/tiny.png
>  share/freeorion/default/data/art/icons/planet/toxic.png
>  share/freeorion/default/data/art/icons/planet/tundra.png
> +share/freeorion/default/data/art/icons/planet_status_attacked.png
> +share/freeorion/default/data/art/icons/planet_status_conquered.png
> +share/freeorion/default/data/art/icons/planet_status_supply.png
> +share/freeorion/default/data/art/icons/planet_status_unhappy.png
> +share/freeorion/default/data/art/icons/planet_status_warning.png
>  share/freeorion/default/data/art/icons/ready.png
>  share/freeorion/default/data/art/icons/ship_hulls/
>  
> share/freeorion/default/data/art/icons/ship_hulls/agregate_asteroid_hull_small.png
> @@ -700,6 +709,7 @@ share/freeorion/default/data/art/icons/s
>  share/freeorion/default/data/art/icons/sitrep/tech_researched.png
>  

[UPDATE]: games/freeorion 0.49

2020-04-10 Thread Tom Murphy
Hi,

  Attached is a diff to bring games/freeorion to 0.4.9.
  I removed boost_signals-mt from WANTLIB since it was
  being listed as an extra lib.

  Compiles fine and runs for me.

  OK?

  Thanks,
  Tom

Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile23 Nov 2019 22:08:42 -  1.5
+++ Makefile10 Apr 2020 08:55:18 -
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.5 2019/11/23 22:08:42 cwen Exp $
 
-V =0.4.8
+V =0.4.9
 COMMENT =  turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2018-08-23.26f16b0_Source
+DISTNAME = FreeOrion_v${V}_2020-02-02.db53471_Source
 PKGNAME =  freeorion-${V}
 CATEGORIES =   games
 REVISION = 1
@@ -18,7 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL
 WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
 WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
 WANTLIB += boost_python-mt boost_regex-mt boost_serialization-mt
-WANTLIB += boost_signals-mt boost_system-mt boost_thread-mt c
+WANTLIB += boost_system-mt boost_thread-mt c
 WANTLIB += freetype m ogg openal png ${MODPY_WANTLIB} vorbis vorbisenc
 WANTLIB += vorbisfile z
 
Index: distinfo
===
RCS file: /cvs/ports/games/freeorion/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo3 Oct 2018 11:43:46 -   1.1.1.1
+++ distinfo10 Apr 2020 08:55:18 -
@@ -1,2 +1,2 @@
-SHA256 (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 
1AXb60Ovt/p2k3zxXNsQsV6BjaFx7B6wPkocPsu6Rvc=
-SIZE (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 106254059
+SHA256 (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 
Vomzpsq55s+8g9joLvMlu54AcRJi0msEbwg+pf3E1uE=
+SIZE (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 124662273
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/freeorion/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   3 Oct 2018 11:43:48 -   1.1.1.1
+++ pkg/PLIST   10 Apr 2020 08:55:18 -
@@ -3,10 +3,10 @@
 @bin bin/freeorionca
 @bin bin/freeoriond
 lib/freeorion/
-lib/freeorion/libGiGi.so
-lib/freeorion/libGiGiSDL.so
-lib/freeorion/libfreeorioncommon.so
-lib/freeorion/libfreeorionparse.so
+@so lib/freeorion/libGiGi.so
+@so lib/freeorion/libGiGiSDL.so
+@so lib/freeorion/libfreeorioncommon.so
+@so lib/freeorion/libfreeorionparse.so
 share/applications/freeorion.desktop
 share/freeorion/
 share/freeorion/default/
@@ -48,7 +48,11 @@ share/freeorion/default/data/art/encyclo
 
share/freeorion/default/data/art/encyclopedia/planet_environments/pt_toxic02.png
 share/freeorion/default/data/art/encyclopedia/planet_environments/pt_tundra.png
 share/freeorion/default/data/art/fields/
-share/freeorion/default/data/art/fields/rainbow_storm.png
+share/freeorion/default/data/art/fields/accretion_disc.png
+share/freeorion/default/data/art/fields/ion_storm.png
+share/freeorion/default/data/art/fields/molecular_cloud.png
+share/freeorion/default/data/art/fields/star_forming_nebula_1.png
+share/freeorion/default/data/art/fields/star_forming_nebula_2.png
 share/freeorion/default/data/art/galaxy_decoration/
 share/freeorion/default/data/art/galaxy_decoration/blue_set/
 share/freeorion/default/data/art/galaxy_decoration/blue_set/gaseous01.png
@@ -527,6 +531,11 @@ share/freeorion/default/data/art/icons/p
 share/freeorion/default/data/art/icons/planet/tiny.png
 share/freeorion/default/data/art/icons/planet/toxic.png
 share/freeorion/default/data/art/icons/planet/tundra.png
+share/freeorion/default/data/art/icons/planet_status_attacked.png
+share/freeorion/default/data/art/icons/planet_status_conquered.png
+share/freeorion/default/data/art/icons/planet_status_supply.png
+share/freeorion/default/data/art/icons/planet_status_unhappy.png
+share/freeorion/default/data/art/icons/planet_status_warning.png
 share/freeorion/default/data/art/icons/ready.png
 share/freeorion/default/data/art/icons/ship_hulls/
 
share/freeorion/default/data/art/icons/ship_hulls/agregate_asteroid_hull_small.png
@@ -700,6 +709,7 @@ share/freeorion/default/data/art/icons/s
 share/freeorion/default/data/art/icons/sitrep/tech_researched.png
 share/freeorion/default/data/art/icons/sitrep/tech_unlocked.png
 share/freeorion/default/data/art/icons/sitrep/victory.png
+share/freeorion/default/data/art/icons/sitrep/weapon_upgrade.png
 share/freeorion/default/data/art/icons/specials_huge/
 share/freeorion/default/data/art/icons/specials_huge/abandoned-colony.png
 share/freeorion/default/data/art/icons/specials_huge/ancient_ruins.png
@@ -1990,6 +2000,34 @@ share/freeorion/default/data/art/planets
 share/freeorion/default/data/art/planets/rings/rings05.png