Bugzilla Bug 67109

Hi,

a new beta of freeciv is out, it has a lot of improvements compared to the stable versin so I think its worth having it in portage.

Stefan Schweizer(genstef)

freeciv 2 is pretty fresh yet.  Reopen when it's come along a bit more.

*** Bug 68496 has been marked as a duplicate of this bug. ***

Amended the title to say beta2.  Not that it makes a difference.  It's just
more... correct.

*** Bug 70007 has been marked as a duplicate of this bug. ***

Created an attachment (id=44591) [edit]
Ebuild for beta4 with DEPEND fixes

beta4 makes libiconv non-optional, but from what I can tell, libiconv is a part
of glibc, now?

-AD Rutledge

I was not able to compile freeciv-2.0.0beta4, with this ebuild. I was however,
able to compile by extracting in the home directory and running configure and
make. The problem was sdl, when I removed the lines that had sdl,
freeciv-2.0.0beta4 compiled without a single problem.

Besides that it works fine, for a beta version. I was also able to use the 3D
effect (civ3)

Its beta5 now.  I can confirm the problem in Comment #6.  Here's the error:

make[4]: Entering directory `/var/tmp/portage/freeciv-2.0.0_beta5/work/freeciv-2.0.0-beta5/client/gui-sdl'i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I. -I../..  -I. -I./.. -I./../include -I../../utility -I../../common -I../../common/aicore -I../../intl -I./../agents -I/usr/include/SDL -D_REENTRANT -I/usr/include/freetype2   -march=athlon-xp -O3 -pipe -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -I/usr/include/SDL -D_REENTRANT -c chatline.c
i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I. -I../..  -I. -I./.. -I./../include -I../../utility -I../../common -I../../common/aicore -I../../intl -I./../agents -I/usr/include/SDL -D_REENTRANT -I/usr/include/freetype2   -march=athlon-xp -O3 -pipe -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -I/usr/include/SDL -D_REENTRANT -c citydlg.c
chatline.c: In function `inputline_return_callback':
chatline.c:92: error: too few arguments to function `real_append_output_window'
chatline.c: In function `real_append_output_window':
chatline.c:151: warning: passing arg 2 of `add_notify_window' makes pointer from integer without a cast
chatline.c:151: error: too many arguments to function `add_notify_window'
citydlg.c: In function `activate_and_exit_units_orders_city_dlg_callback':
citydlg.c:289: error: structure has no member named `x'
citydlg.c:289: error: structure has no member named `y'
citydlg.c:289: error: too many arguments to function `center_tile_mapcanvas'
citydlg.c: In function `units_orders_city_dlg_callback':
citydlg.c:423: error: structure has no member named `x'
citydlg.c:423: error: structure has no member named `y'
citydlg.c:423: error: too many arguments to function `center_tile_mapcanvas'
citydlg.c: In function `misc_panel_city_dlg_callback':
citydlg.c:913: error: `CITIZEN_TAXMAN' undeclared (first use in this function)
citydlg.c:913: error: (Each undeclared identifier is reported only once
citydlg.c:913: error: for each function it appears in.)
citydlg.c:920: error: `CITIZEN_ELVIS' undeclared (first use in this function)
citydlg.c:927: error: `CITIZEN_SCIENTIST' undeclared (first use in this function)
citydlg.c: In function `create_city_options_widget_list':
citydlg.c:1030: error: `CITIZEN_SCIENTIST' undeclared (first use in this function)
citydlg.c:1035: error: `CITIZEN_TAXMAN' undeclared (first use in this function)
citydlg.c:1040: error: `CITIZEN_ELVIS' undeclared (first use in this function)

If build with -sdl then it builds correctly (because it doesn't build the sdl client).  Game seems to work correctly (I wanted to see the hex tile graphics).  For some reason,  the X civ client seems to start fullscreen and I don't see how to make it return to being a normal X window but maybe its just me.

I will submit this bug upstream because the sdl thing is probably not Gentoo's fault.

beta6 is out, same error.

Created an attachment (id=47546) [edit]
freeciv-2.0.0_beta6.ebuild

From upstream:

"The SDL client is no longer being maintained, alas."

http://bugs.freeciv.org/Ticket/Display.html?id=11782

The attached ebuild for beta6 has all the sdl stuff removed.

I think beta6 has come alot very much now .. it should be ready to go into the
tree.

The latest ebuild postet on this bug works for me.

games herd: Can you please take care of this?

beta6 works here out of the box. thanks!

works here (beta6)

beta7 seems to work using same ebuild as beta6.

*** Bug 79402 has been marked as a duplicate of this bug. ***

I want to emerge freeciv and have the following USE-flags set:
[code]whiterabbit ~ # emerge -pv freeciv

These are the packages that I would merge, in order:

Calculating dependencies ...done!
[ebuild  N    ] games-strategy/freeciv-1.14.2  +X -Xaw3d -gtk +gtk2 +nls +readline 0 kB [/code]

I expect to get the gtk-2 client of freeciv, but no way, I always get the fuc**** xaw client. When I pass the -X flag, I get only the server, not the client (of cause).

The ebuild looks like it would prefer the gtk-2 useflag over the xaw useflag as far as I know:
[code]IUSE="X Xaw3d gtk gtk2 nls readline"

RDEPEND="X? ( virtual/x11 )
        Xaw3d? ( x11-libs/Xaw3d )
        readline? ( sys-libs/readline )
        sys-libs/zlib
        >=media-libs/libsdl-1.1.4
        media-libs/sdl-mixer
        media-libs/sdl-image
        gtk? (
                        gtk2? (
                                >=x11-libs/gtk+-2.0.0
                                >=dev-libs/glib-2.0.0
                                >=dev-libs/atk-1.0.3
                                >=x11-libs/pango-1.0.5
                        )
                        !gtk2? (
                                =x11-libs/gtk+-1*
                                >=dev-libs/glib-1.2.5
                                >=media-libs/imlib-1.9.2
                        )
                )"
DEPEND="${RDEPEND}
        nls? ( sys-devel/gettext )
        >=sys-apps/sed-4"

src_compile() {
        local myclient="no"
        use X && myclient="xaw"
        use Xaw3d && myclient="xaw3d"
        if use gtk ; then
                use gtk2 \
                        && myclient="gtk-2.0" \
                        || myclient="gtk"
        fi
        egamesconf \
[/code]

But the portage logfile shows, that the xaw client is installed, not the gtk-2:

[code]./configure --prefix=/usr/games --host=i686-pc-linux-gnu --mandir=/usr/share/man 
--infodir=/usr/share/info --datadir=/usr/share/games --sysconfdir=/etc/games --lo
calstatedir=/var/games --disable-dependency-tracking --with-zlib --with-readline 
--enable-nls --enable-client=xaw
[quote]

Am I doing something wrong? I tryied differnt USE-flags, but didn`t suceed.

EDIT: Works when I set both the gtk and gtk2 USE flag. Shouldn`t it work with
the gtk2 USE flag only?

No.

The gtk USE flag enables gtk support.  This means all gtk support, either gtk1 *or* gtk2.  The gtk2 USE flag simply means "if there is both gtk1 *and* gtk2 support, I prefer gtk2".  If you do not have gtk in USE, you will not get *any* optional gtk interface.  If you do not have gtk2 in USE, you will get the gtk1 interface.  So to get the gtk2 interface, you need both gtk and gtk2 in USE.

Created an attachment (id=50982) [edit]
beta7 ebuild with ~amd64

Change to beta7 is only the file name, added ~amd64 to the keywords - could
someone add this ebuild to portage, it seems to be working good (and I used
beta4-6 x86 with only one problem, that's fine for ~ isn't it?)

Also a USE flag sdl or something for a dependency to sdl-mixer would be useful,
I will try adding that tomorrow.. if I don't post it assume I failed ;)

I should sleep more.. no point having a sdl flag if that's not maintained
anymore, shame on me

reopen when it's not beta.  Thanks.

*** Bug 82922 has been marked as a duplicate of this bug. ***

*** Bug 84764 has been marked as a duplicate of this bug. ***

renaming to freeciv-2.0.0_rc1.ebuild works fine 

*** Bug 88623 has been marked as a duplicate of this bug. ***

*** Bug 89469 has been marked as a duplicate of this bug. ***

2.0.0 has been released.

Bonus points if someone fixes up the nls handling for 2.0.0, improves the deps
and includes support for the dedicated use flag for bug #71283

Created an attachment (id=56624) [edit]
Ebuild for 2.0.0 stable

This should work as an ebuild for the 2.0.0 stable release.

(From update of attachment 56624 [edit])
No, it doesn't handle do any of the things I mentioned.

(From update of attachment 56624 [edit])
No, it doesn't do any of the things I mentioned.

Better to have freeciv-2.0.0 (even without nls support, it can excluded from
IUSE until it correctly handled).

So maybe to disable nls in IUSE and create ebuild for freeciv-2.0.0 with minus
or tilde keyword?

Created an attachment (id=56904) [edit]
freeciv-2.0.0.ebuild

If I understand this correctly, there is no need for sdl use flag any more as
it is broken and unmaintained.

also we should install to /usr/lib/X11/app-defaults instead of
/usr/X11R6/lib/X11/app-defaults, don't we?

nls works out of the box, with the provided ebuild.

So here are the changes I made to the ebuild:

##############################################################################
--- freeciv-2.0.0.ebuild.old	2005-04-22 07:50:55.685353784 +0000
+++ freeciv-2.0.0.ebuild	2005-04-22 07:51:48.265360408 +0000
@@ -13,18 +13,14 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="X Xaw3d gtk gtk2 sdl nls readline"
+KEYWORDS="~ppc ~x86"
+IUSE="X Xaw3d gtk gtk2 nls readline"
 
 
 RDEPEND="X? ( virtual/x11 )
	Xaw3d? ( x11-libs/Xaw3d )
	readline? ( sys-libs/readline )
	sys-libs/zlib
-	sdl? (
-		>=media-libs/libsdl-1.1.4
-		media-libs/sdl-mixer
-		media-libs/sdl-image )
	gtk? (
			gtk2? (
				>=x11-libs/gtk+-2.0.0
@@ -73,7 +69,7 @@
 src_install() {
	make DESTDIR="${D}" install || die "make install failed"
 
-	insinto /usr/X11R6/lib/X11/app-defaults
+	insinto /usr/lib/X11/app-defaults
	doins data/Freeciv || die "doins failed"
 
	dodoc ChangeLog INSTALL NEWS \
@@ -82,4 +78,4 @@
	# install sounds
	cp -R ../stdsounds* "${D}${GAMES_DATADIR}/${PN}"
	prepgamesdirs
-}
\ No newline at end of file
+}
##############################################################################

When i save the game, the game lost information about hidden's properties of
map. Is normal?

The ebuild works for me too

<AOL-mode>
/me too.
Works here.
</AOL-mode>

freeciv-2.0.0.ebuild (5th) works on amd64.

The most recent submitted ebuild installs files in the wrong locations as well.
/usr/games/share/ isn't the right place for desktop files.  /usr/share/games/locale isn't the right place for the locale files.

*** Bug 90580 has been marked as a duplicate of this bug. ***

I will attach an updated ebuild which:
 - fixes locale installation path
 - fixes .desktop installation path
 - adds the "dedicated" use flag (removes some useless stuffs if built as a dedicated server, and also removes the "X" flag because xaw becomes the default client if not built as a dedicated server)
 - remove the libogg deps, because they were not used

The only remaining issue i see is deps on sound-related libraries, which are completly broken. I will come back on this later, but in the mean time you can have a look here to see what is missing:
http://tdegreni.free.fr/gentoo/freeciv-gtk2.ps
(The lib deps shown are all direct dynamic linking deps. The graph is built by dotfinder.py, which you can find in the same directory.)

Created an attachment (id=57671) [edit]
freeciv-2.0.1.ebuild

Other TODO items:

* The civclient (the gtk2 one at least) generates an empty "music.raw" file in the current directory. That's bad.

* I wonder what to do with the civmanual binary. It is meant to generate some localized html manual pages for the server. It should probably be ran by the ebuild but not installed (only the html pages would be). But in that case, this pages may not be localized... Any idea?

Created an attachment (id=57681) [edit]
freeciv-2.0.1.ebuild

Here is a version that:
 - fixes the sound libs dependencies
 - create html manual and install it instead of installing 'civmanual' (it
won't be localized, but that's not that important since the informations are
also available in the client and server online help anyway)
 - cleanup a few more things

About sound plugins:
 - i couldn't reproduce my zero-length "music.raw" file bug with any of the
plugin, so i have no idea what happened the first time.
 - here, the alsa plugin behaves badly if I let the introduction music looping
more than a few seconds. Would be nice if other people could test it, cause if
it doesn't work for anybody, then there is no point in keeping that option.

freeciv-2.0.1.ebuild added to portage.

Also, freeciv-2.0.1 runs fine on amd64, the ebuild should at least have the
~amd64 keyword (freeciv 1.14 had amd64)