[Freeciv-Dev] (PR#12132) gui-gtk is about to die!
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12132 >
> [jdorje - Thu Mar 17 02:50:18 2005]:
>
> Since the GTK client is obsolete, nobody wants to maintain it, and it is
> bitrotting fast, this patch removes it completely from configuration.
>
> As part of this patch the two files in m4/ should probably be removed
> from CVS.
>
> Note many remnants of gui-gtk remain. All the files in client/gui-gtk/
> are still there of course. Also INSTALL and freeciv.spec still have
> references to it. These can all be removed at our leisure at some later
> time.
Oops, here's a patch that works. data/freeciv.rc should probably also
be removed.
-jason
? confdefs.h
? conftest.c
? conftest.er1
? data/misc/citybar.png
? data/misc/citybar.spec
Index: Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/Makefile.am,v
retrieving revision 1.49
diff -u -r1.49 Makefile.am
--- Makefile.am 20 Oct 2004 02:01:02 -0000 1.49
+++ Makefile.am 17 Mar 2005 02:52:27 -0000
@@ -69,8 +69,6 @@
m4/glib.m4 \
m4/glibc21.m4 \
m4/gtk-2.0.m4 \
- m4/gtk.m4 \
- m4/gtk-client.m4 \
m4/gtk2-client.m4 \
m4/iconv.m4 \
m4/imlib.m4 \
Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.96
diff -u -r1.96 configure.ac
--- configure.ac 16 Mar 2005 05:26:59 -0000 1.96
+++ configure.ac 17 Mar 2005 02:52:27 -0000
@@ -59,13 +59,14 @@
dnl no=do not compile client, yes=guess it, *=use this client or error
AC_ARG_ENABLE(client,
-[ --enable-client[=no/yes/xaw3d/xaw/gtk/gtk2/win32/sdl/ftwl]
+[ --enable-client[=no/yes/xaw3d/xaw/gtk/win32/sdl/ftwl]
compile a client [default=yes] (if yes, guess type)],
[case "${enableval}" in
yes) client=yes ;;
no) client=no ;;
xaw3d) client=xaw
WITH_XAW3D=1 ;;
+ gtk) client=gtk-2.0 ;;
gtk2) client=gtk-2.0 ;;
gtk2.0) client=gtk-2.0 ;;
gtk20) client=gtk-2.0 ;;
@@ -366,9 +367,6 @@
dnl Gtk-2.0-specific overrides
FC_GTK2_CLIENT
- dnl Gtk-specific overrides
- FC_GTK_CLIENT
-
dnl SDL-specific overrides
FC_SDL_CLIENT
@@ -435,7 +433,6 @@
AM_CONDITIONAL(ALSA, test "x$ALSA" = "xyes")
AM_CONDITIONAL(WINMM, test "x$WINMM" = "xyes")
AM_CONDITIONAL(CLIENT_GUI_SDL, test "$gui_sources" = "gui-sdl")
-AM_CONDITIONAL(CLIENT_GUI_GTK, test "$gui_sources" = "gui-gtk")
AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test "$gui_sources" = "gui-gtk-2.0")
AM_CONDITIONAL(CLIENT_GUI_XAW, test "$gui_sources" = "gui-xaw")
AM_CONDITIONAL(CLIENT_GUI_BEOS, test "$gui_sources" = "gui-beos")
@@ -674,7 +671,6 @@
client/agents/Makefile
client/include/Makefile
client/gui-sdl/Makefile
- client/gui-gtk/Makefile
client/gui-gtk-2.0/Makefile
client/gui-xaw/Makefile
client/gui-win32/Makefile
Index: client/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/Makefile.am,v
retrieving revision 1.61
diff -u -r1.61 Makefile.am
--- client/Makefile.am 24 Sep 2004 15:33:31 -0000 1.61
+++ client/Makefile.am 17 Mar 2005 02:52:27 -0000
@@ -7,9 +7,6 @@
if CLIENT_GUI_SDL
GUI_SUBDIR = gui-sdl
endif
-if CLIENT_GUI_GTK
-GUI_SUBDIR = gui-gtk
-endif
if CLIENT_GUI_GTK_2_0
GUI_SUBDIR = gui-gtk-2.0
endif
Index: data/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/Makefile.am,v
retrieving revision 1.28
diff -u -r1.28 Makefile.am
--- data/Makefile.am 5 Feb 2005 07:15:38 -0000 1.28
+++ data/Makefile.am 17 Mar 2005 02:52:27 -0000
@@ -10,9 +10,6 @@
if CLIENT_GUI_XAW
CLIENT_EXTRA_FILES = Freeciv
endif
-if CLIENT_GUI_GTK
-CLIENT_EXTRA_FILES = freeciv.rc
-endif
if CLIENT_GUI_GTK_2_0
CLIENT_EXTRA_FILES = freeciv.rc-2.0
endif
@@ -35,7 +32,6 @@
EXTRA_DIST = \
Freeciv \
- freeciv.rc \
freeciv.rc-2.0 \
isophex.tilespec \
isotrident.tilespec \
|
|
