[Freeciv-Dev] [patch #2830] ser - fcser, civ - fcgui

2011-07-28 Thread Marko Lindqvist

Update of patch #2830 (project freeciv):

  Status: In Progress = Ready For Test 

___

Follow-up Comment #1:

Patch

In addition to applying this, you must rename ser.in - fcser.in and civ.in
- fcgui.in in bootstrap/.

(file #13684)
___

Additional Item Attachment:

File name: fcser_2830.diffSize:1 KB


___

Reply to this item at:

  http://gna.org/patch/?2830

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] My personal freeciv 2.4 and 2.5 Roadmap

2011-07-28 Thread Marko Lindqvist
On 27 July 2011 19:17, Andreas Røsdal andre...@pvv.ntnu.no wrote:
 On Wed, 27 Jul 2011, Marko Lindqvist wrote:

 freeciv.net

 I'll be more active in freeciv and freeciv.net merge during 2.5
 development


 Great, Marko. Let me know if there is anything I can do to help, and don't
 hesitate to ask me if you have any questions!

 Well, first we need common grounds to work on. We need patches to
apply to *current* freeciv trunk in order to get freeciv.net version
of it. Do you have such patches, or do you plan to update them soon?

 Currently you have modified freeciv in freeciv.net version control.
I'm going to make new implementation so that patches are applied only
build time, making maintenance (update of freeciv version used) much
easier.


 - ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18058] trunk: data/nation data/flags/Makefile.am inconsistence

2011-07-28 Thread Egor Vyscrebentsov

Follow-up Comment #5, bug #18058 (project freeciv):

Obvious fix to check_flags inspired by africa/south_africa.

(file #13685)
___

Additional Item Attachment:

File name: check_flags-space.diff Size:0 KB


___

Reply to this item at:

  http://gna.org/bugs/?18058

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18376] Xaw: incorrect gray alpha png load

2011-07-28 Thread Egor Vyscrebentsov

Update of bug #18376 (project freeciv):

  Status:None = Fixed  
 Assigned to:None = evyscr 
 Open/Closed:Open = Closed 

___

Follow-up Comment #8:

Patch was applied to affected S2_1, S2_2, S2_3 without any modification.

___

Reply to this item at:

  http://gna.org/bugs/?18376

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] My personal freeciv 2.4 and 2.5 Roadmap

2011-07-28 Thread Andreas Røsdal



On Thu, 28 Jul 2011, Marko Lindqvist wrote:


On 27 July 2011 19:17, Andreas Røsdal andre...@pvv.ntnu.no wrote:

On Wed, 27 Jul 2011, Marko Lindqvist wrote:


freeciv.net

I'll be more active in freeciv and freeciv.net merge during 2.5
development



Great, Marko. Let me know if there is anything I can do to help, and don't
hesitate to ask me if you have any questions!


Well, first we need common grounds to work on. We need patches to
apply to *current* freeciv trunk in order to get freeciv.net version
of it. Do you have such patches, or do you plan to update them soon?


I don't have such patches yet, but it would be possible to modify the 
freeciv.net codebase to work with current freeciv trunk.



Currently you have modified freeciv in freeciv.net version control.
I'm going to make new implementation so that patches are applied only
build time, making maintenance (update of freeciv version used) much
easier.


Ok.

Andreas___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18419] database.lua not in distribution tarball

2011-07-28 Thread Jacob Nevins

Follow-up Comment #4, bug #18419 (project freeciv):

 Well, *something* has changed recently [...]
Huh. civ2/nations.ruleset is definitely missing from 2.3.x and 2.2.x
tarballs. No ideas. Perhaps some side effect of patch #2243?

Anyway, I'm inclined to commit the civ2 fix for 2.3.0, as changing the set of
nations in a ruleset midway through a stable release series seems like it
could cause trouble. Best to fix it at the start. (By the same token, I'd
leave it off S2_2.)

I've tested the data/civ2/Makefile.am part of the patch with make dist on
S2_3, built from the tarball, and checked how nations behave with the civ2
ruleset in the resulting executables.

___

Reply to this item at:

  http://gna.org/bugs/?18419

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18432] The server crashes without an error message if anyone has a unit with move_rate = 0

2011-07-28 Thread Micke

URL:
  http://gna.org/bugs/?18432

 Summary: The server crashes without an error message if
anyone has a unit with move_rate = 0
 Project: Freeciv
Submitted by: someswede
Submitted on: Thu Jul 28 20:42:09 2011
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.4 r 20006
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

I found an old bug, #13889, which may or may not be related.
If any player owns a unit with move_rate = 0, the server will crash without
any logged or displayed message, not even a seg fault - probably only at the
end of a turn, but I can't tell for sure.





___

Reply to this item at:

  http://gna.org/bugs/?18432

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Jacob Nevins

Follow-up Comment #15, bug #18396 (project freeciv):

Here's a patch patch which should fix the binary-mode thing I spotted in
fz_from_file(). As expected, makes no difference on Unix.

Can someone make a Windows S2_3 build with this patch, so we can see if it
helps with the help issue? Doesn't have to support l10n. If it does help, I'll
plan to commit it for 2.3.0-RC2 this weekend.

(file #13686)
___

Additional Item Attachment:

File name: S2_3-201107-typos-bis.diff Size:25 KB


___

Reply to this item at:

  http://gna.org/bugs/?18396

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Jacob Nevins

Update of bug #18396 (project freeciv):

 Planned Release: 2.3.1,2.4.0 = 2.3.0,2.4.0


___

Reply to this item at:

  http://gna.org/bugs/?18396

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18419] database.lua not in distribution tarball

2011-07-28 Thread Marko Lindqvist

Follow-up Comment #5, bug #18419 (project freeciv):

 Anyway, I'm inclined to commit the civ2 fix for 2.3.0, as
 changing the set of nations in a ruleset midway through a stable
 release series seems like it could cause trouble. Best to fix it
 at the start.

Well, if we are pushing this fast track to S2_3, extra aggressive testing is
needed. Both of these should work (this patch should not be able to break
things), but they must be checked to make sure there is no other bugs
interacting badly with this:
- How savegames created in earlier stable series, with nations no longer
available in use, behave?
- Did you test only in build tree? Please test also installed (make
install) version


___

Reply to this item at:

  http://gna.org/bugs/?18419

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Marko Lindqvist

Follow-up Comment #16, bug #18396 (project freeciv):

 Can someone make a Windows S2_3 build with this patch, so we can
 see if it helps with the help issue?

I think I can. If I understand correctly, in addition to applying your patch
I should also unix2dos helpdata.txt? Or do I just leave it to you? After all,
this should be tested with both unix and Windows line-endings (while fixing
Win one, should not break unix one)

___

Reply to this item at:

  http://gna.org/bugs/?18396

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Jacob Nevins

Follow-up Comment #17, bug #18396 (project freeciv):

 in addition to applying your patch I should also unix2dos 
 helpdata.txt? Or do I just leave it to you?
I can do that bit myself. I'll test both ways round, of course.

___

Reply to this item at:

  http://gna.org/bugs/?18396

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Marko Lindqvist

Follow-up Comment #18, bug #18396 (project freeciv):

Umh, did you attach wrong patch? File is named ...typos... (not anything
about binary mode) and contents seem to fit that name.

___

Reply to this item at:

  http://gna.org/bugs/?18396

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Jacob Nevins

Follow-up Comment #19, bug #18396 (project freeciv):

Bother, sorry! Try this one.

(file #13687)
___

Additional Item Attachment:

File name: trunk-S2_3-bz2-binary-file.diff Size:1 KB


___

Reply to this item at:

  http://gna.org/bugs/?18396

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Marko Lindqvist
On 28 July 2011 23:59, Marko Lindqvist no-reply.invalid-addr...@gna.org wrote:

 Follow-up Comment #16, bug #18396 (project freeciv):

 Can someone make a Windows S2_3 build with this patch, so we can
 see if it helps with the help issue?

 I think I can.

Compiling... This time I'll test providing all of freeciv in just one
zip-file. This is actually smaller download than earlier ones, as
there's no freeciv-data.zip with all stuff from data directory in svn,
but only those things that get installed by make install.
In theory even translations may work. I have not explicitly configured
localedir, and if I read configure.ac correctly, it sets it as
./share/locale by default when compiling for Windows. So your
working directory should be freeciv tree root when running this with
LANG set correctly: bin/freeciv-gtk2.

Latest freeciv-modpack changes have not been tested on Win. You may
want to check that too.


 - ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Marko Lindqvist
On 29 July 2011 00:45, Marko Lindqvist cazf...@gmail.com wrote:
 On 28 July 2011 23:59, Marko Lindqvist no-reply.invalid-addr...@gna.org 
 wrote:

 Follow-up Comment #16, bug #18396 (project freeciv):

 Can someone make a Windows S2_3 build with this patch, so we can
 see if it helps with the help issue?

 I think I can.

 Compiling...

 http://www.cazfi.net/~cazfi/fcwintest/

 Built against crosser 0.6.5.103.


 - ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18419] database.lua and civ2/nations.ruleset not in distribution tarball

2011-07-28 Thread Jacob Nevins

Update of bug #18419 (project freeciv):

 Summary: database.lua not in distribution tarball =
database.lua and civ2/nations.ruleset not in distribution tarball

___

Follow-up Comment #6:

 - How savegames created in earlier stable series, with nations 
 no longer available in use, behave?
I just created a civ2 savegame with 16 nations (each with cities) in a 2.2.7
installation (i.e., one without the nation restrictions). Loading this into a
S2_3 installation, it seemed to cope as well as could be expected:

+verbose+
Ramón Rubial Cavia had invalid nation; changing to French.
Sejong had invalid nation; changing to Incas.
Gao had invalid nation; changing to Chinese.
Wilhelm Tell had invalid nation; changing to Babylonians.
...
-verbose-

Played for a few turns and all seemed well.

I also created a civ2 savegame with 30 nations. Since civ2/nations.ruleset
only defines 25 (including barbarians), I expected loading this to fail and
indeed it did, albeit less gracefully than it could have:

+verbose+
1: Usyaslav Brachyslavich had invalid nation; changing to French.
1: Chandra Gupta II had invalid nation; changing to Spanish.
1: No nation found!
Segmentation fault (core dumped)
-verbose-

(In the same situation, a 2.2.7 server dies with plrhand.c:1383:
pick_a_nation: Assertion `0' failed rather than a segfault.)

This isn't great, and should be looked at. However, a server in this
situation (not enough nations for savegame) doesn't have a lot of options. If
we're unhappy with that, we can never make this change. (We would have had the
same issue when the restricted nation set was originally committed, had it
been done right.)

 - Did you test only in build tree? Please test also installed 
 (make install) version 
I've now tested an installation (including the above tests), and it behaved
as I expected.

(Another reason for fixing this is that without it, civ2 games run by
developers in their svn trees will not be the same as civ2 games run by
users.)

___

Reply to this item at:

  http://gna.org/bugs/?18419

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #2843] Make secfile reading cope with \r\n and \n\r line endings on all platforms

2011-07-28 Thread Jacob Nevins

URL:
  http://gna.org/patch/?2843

 Summary: Make secfile reading cope with \r\n and \n\r line
endings on all platforms
 Project: Freeciv
Submitted by: jtn
Submitted on: Fri Jul 29 00:30:49 2011
Category: general
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: jtn
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 

___

Details:

Following on from bug #18396:

Attached patch makes secfile reading treat \r\n and \n\r line endings the
same as \n, if it sees them (e.g., if opening a file with DOS/Windows line
endings on Unix).

Tested on Unix. I haven't checked what happens with a Windows build of
Freeciv opening a Unix file in text mode; it depends if fgets() treats the
lone \n as a line ending.

(I briefly wondered if there might be crazy-but-theoretically-supported
multibyte character encodings where 0x0D might be a valid thing to see at the
start or end of a line. But any such encoding was pretty much doomed anyway if
opened in text mode. Certainly UTF-8 doesn't fall into this category.)

This probably wants some testing...



___

File Attachments:


---
Date: Fri Jul 29 00:30:49 2011  Name: trunk-S2_3-secfile-crlf.diff  Size: 1kB
  By: jtn

http://gna.org/patch/download.php?file_id=13688

___

Reply to this item at:

  http://gna.org/patch/?2843

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Jacob Nevins

Follow-up Comment #20, bug #18396 (project freeciv):

Trunk version attached.

If this doesn't solve the problem, then plan B is something along the lines
of patch #2843, but I don't think that's something I'd want to rush into RC2.

(file #13689)
___

Additional Item Attachment:

File name: trunk-bz2-binary-file.diff Size:1 KB


___

Reply to this item at:

  http://gna.org/bugs/?18396

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #2844] Two boolean player_is_at_war functions for 2.4 r 20006.

2011-07-28 Thread Micke

URL:
  http://gna.org/patch/?2844

 Summary: Two boolean player_is_at_war functions for 2.4 r
20006.
 Project: Freeciv
Submitted by: someswede
Submitted on: Fri Jul 29 00:37:14 2011
Category: None
Priority: 5 - Normal
  Status: None
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 

___

Details:

This patch adds two functions to common/player.h and common/player.c for
checking if a given player is at war with anyone at all and anyone
non-barbarian, respectively.




___

File Attachments:


---
Date: Fri Jul 29 00:37:14 2011  Name: player_at_war.diff  Size: 2kB   By:
someswede

http://gna.org/patch/download.php?file_id=13690

___

Reply to this item at:

  http://gna.org/patch/?2844

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Jacob Nevins

Follow-up Comment #21, bug #18396 (project freeciv):

(one Windows build later)

Sadly, this patch doesn't appear to change the behaviour wrt the help
localisation :(

___

Reply to this item at:

  http://gna.org/bugs/?18396

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] [bug #18396] Translations for help and options not displayed

2011-07-28 Thread Jacob Nevins
Marko Lindqvist writes:
 On 28 July 2011 23:59, Marko Lindqvist no-reply.invalid-addr...@gna.org 
 wrote:
  Can someone make a Windows S2_3 build with this patch, so we can
  see if it helps with the help issue?
 
  I think I can.
 
 Compiling... This time I'll test providing all of freeciv in just one
 zip-file. This is actually smaller download than earlier ones, as
 there's no freeciv-data.zip with all stuff from data directory in svn,
 but only those things that get installed by make install.
 In theory even translations may work. I have not explicitly configured
 localedir, and if I read configure.ac correctly, it sets it as
 ./share/locale by default when compiling for Windows. So your
 working directory should be freeciv tree root when running this with
 LANG set correctly: bin/freeciv-gtk2.

I got this working by extracting the Freeciv files such that
bin/share/etc were under winstack-...\bin (the CWD), setting
FREECIV_PATH=share\freeciv at the command prompt, and running
bin\freeciv-gtk2.exe.

Sadly, the problem I was looking at remains unsolved.

However, localisation _did_ work (at least fr_FR.utf-8).

 Latest freeciv-modpack changes have not been tested on Win. You may
 want to check that too.

freeciv-modpack.exe seems happy. I downloaded and (after tweaking
FREECIV_PATH) played the ancients modpack.

(BTW, I notice that that modpack is constructed such that rulesetdir
must be ancients/data. This doesn't work well with the selector in the
client, which ends up setting it to just ancients, which doesn't
work.)

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #2814] Bring Scottish Gaelic (gd) translation into use

2011-07-28 Thread Jacob Nevins

Update of patch #2814 (project freeciv):

  Status:  Ready For Test = Done   
 Open/Closed:Open = Closed 
 Planned Release: 2.3.1,2.4.0 = 2.3.0,2.4.0


___

Reply to this item at:

  http://gna.org/patch/?2814

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #2844] Two boolean player_is_at_war functions for 2.4 r 20006.

2011-07-28 Thread Marko Lindqvist

Update of patch #2844 (project freeciv):

Category:None = general
  Status:None = Ready For Test 
 Assigned to:None = cazfi  

___

Follow-up Comment #1:

Patch seems ok, but can you also tell us why are these needed (have you
further patches in mind)? I'm not going to add helper functions to maintain
that nobody will ever use.

___

Reply to this item at:

  http://gna.org/patch/?2844

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #2823] Orientation scripting

2011-07-28 Thread Marko Lindqvist

Update of patch #2823 (project freeciv):

  Status:  Ready For Test = Done   
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/patch/?2823

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #2719] [metaticket] Unit orientation

2011-07-28 Thread Marko Lindqvist

Update of patch #2719 (project freeciv):

  Status: In Progress = Done   
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/patch/?2719

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev