patchFreeciv - Patches: patch #2812, Fix modpack initialization

 
 
Show feedback again

patch #2812: Fix modpack initialization

Submitted by:  Christian Prochaska <cproc>
Submitted on:  Sun 17 Jul 2011 03:14:57 AM UTC  
 
Category: module installerPriority: 5 - Normal
Status: DonePrivacy: Public
Assigned to: Marko Lindqvist <cazfi>Open/Closed: Closed
Planned Release: 2.3.0,2.4.0

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

(Jump to the original submission Jump to the original submission)

Fri 29 Jul 2011 06:02:20 AM UTC, SVN revision 20032:

Fixed freeciv-modpack initialization.

Patch by Christian Prochaska and myself

See gna patch #2812

(Browse SVN revision 20032)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 27 Jul 2011 08:22:19 PM UTC, SVN revision 20014:

Get gthread compilation flags with PKG_CHECK_MODULES. I assume this to
fix compilation problem reported by Jordi Negrevernis i Font

See gna patch #2812

(Browse SVN revision 20014)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 27 Jul 2011 08:19:36 PM UTC, comment #10:

Patch for S2_3 that uses PKG_CHECK_MODULES() there too. Applies on top of already committed patch.

Compiles for both linux and MinGW, works on linux (I cannot test Windows)

Jordi Negrevernis i Font reports that currently S2_3 does not compile for him and I assume this to fix it. So committing this immediately as compilation fix.

(file #13680)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 21 Jul 2011 03:50:44 PM UTC, comment #9:

This at least compiles for both linux and MinGW.

(file #13617)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 21 Jul 2011 03:15:18 PM UTC, comment #8:

My turn to steal this ticket in order to implement configure stuff with proper PKG_CHECK_MODULES()

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 20 Jul 2011 09:02:15 PM UTC, comment #7:

I have not (yet) looked the patch, but manually writing something like "-lgthread2.0" sounds suspicious anyway. You should probably be using pkg-config.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 20 Jul 2011 08:56:59 PM UTC, comment #6:

> I can fix the Gtk2 case, but not the Gtk3 case: I don't know
> what to put in MP_gtk_LIBS where we have "-lgthread2.0" in Gtk2,
> if anything. Any ideas?


gthreads are part of glib, not gtk, so it doesn't matter if we are building gtk2- or gtk3-version. AFAIK you should use same "-lgthread2.0".

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 20 Jul 2011 08:21:37 PM UTC, comment #5:

Thanks for the patch. Stealing and quick committing to S2_3 for 2.3.0.
(Justification for breaking code freeze: this takes freeciv-modpack.exe from useless to useful, and looks to have a low risk of breaking anything else.)

However, the configure.ac bit of the patch doesn't apply cleanly to trunk, so the ticket stays open. I can fix the Gtk2 case, but not the Gtk3 case: I don't know what to put in MP_gtk_LIBS where we have "-lgthread2.0" in Gtk2, if anything. Any ideas?

Jacob Nevins <jtn>
Project Administrator
Wed 20 Jul 2011 08:06:44 PM UTC, SVN revision 19986:

More initialization fixes for freeciv-modpack, and add an explicit dependency
on libgthread on Windows. After this, freeciv-modpack can actually download
modpacks on Windows.

Reported and patched by Christian Prochaska (cproc@gna).

See gna patch #2812.

(Browse SVN revision 19986)

Jacob Nevins <jtn>
Project Administrator
Mon 18 Jul 2011 10:06:13 PM UTC, comment #3:

NB, the patch attached here also includes the patch for bug #18354.

Jacob Nevins <jtn>
Project Administrator
Sun 17 Jul 2011 07:08:14 PM UTC, comment #2:

(Oh, and freeciv-modpack launched fine from the start menu (thanks). Suggest it's called "Freeciv modpack installer" rather than just "Freeciv Modpack.)

Jacob Nevins <jtn>
Project Administrator
Sun 17 Jul 2011 07:06:41 PM UTC, comment #1:

I tried this build on my Windows 7 Home Premium installation, and it worked apparently fine[*] for me too.

[*] Not everything went smoothly, but I think these are separate problems:

  • Downloading cazfi's Amplio modpack, it was corrupted, but checking back on Linux the corruption happens there too. See bug #18369.
  • Downloading the currently advertised "ancients" modpack, there was no corruption, but the first time I tried to start a client (with spawned server) afterwards, the server crashed. I couldn't reproduce this afterward. (I've never used the Ancients modpack before.) Since the files were fine, I think this is entirely separate.
Jacob Nevins <jtn>
Project Administrator
Sun 17 Jul 2011 03:14:57 AM UTC, original submission:

$subject + add libgthread dependency on Windows, where it is not already a dependency of GTK+ as on Linux.

Modpack downloading seems to work now on Windows. Here's an S2_3 Windows package for testing: http://download.gna.org/freeciv/packages/windows/testing/Freeciv-S2_3-2011-07-17-win32-gtk2-setup.exe

Christian Prochaska <cproc>
Project Administrator

 

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #13617:  GthreadInit_2812.diff added by cazfi (3kB - text/plain)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by cazfi (Posted a comment)
  • -unavailable- added by jtn (Posted a comment)
  • -unavailable- added by cproc (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 11 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Fri 29 Jul 2011 06:02:33 AM UTCcazfiStatusReady For Test=>Done
      Open/ClosedOpen=>Closed
    Wed 27 Jul 2011 08:19:36 PM UTCcazfiAttached File-=>Added GthreadPcCheck_2812-S2_3.diff, #13680
    Thu 21 Jul 2011 03:50:44 PM UTCcazfiAttached File-=>Added GthreadInit_2812.diff, #13617
      StatusNeed Info=>Ready For Test
    Thu 21 Jul 2011 03:15:18 PM UTCcazfiAssigned tojtn=>cazfi
    Wed 20 Jul 2011 08:21:37 PM UTCjtnStatusNone=>Need Info
      Assigned toNone=>jtn
      Planned Release2.3.1,2.4.0=>2.3.0,2.4.0
    Sun 17 Jul 2011 07:06:47 PM UTCjtnPlanned Release=>2.3.1,2.4.0
    Sun 17 Jul 2011 03:14:57 AM UTCcprocAttached File-=>Added modpack_initialization.diff, #13597
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup