Author: cazfi
Date: Wed Feb 15 17:10:02 2017
New Revision: 35034

URL: http://svn.gna.org/viewcvs/freeciv?rev=35034&view=rev
Log:
Finalized renaming old gtk3x-client as gtk3.22-client.

See gna patch #7749

Removed:
    branches/S3_0/m4/gtk3x-client.m4
Modified:
    branches/S3_0/Makefile.am
    branches/S3_0/client/Makefile.am
    branches/S3_0/client/gui-gtk-3.22/Makefile.am
    branches/S3_0/configure.ac
    branches/S3_0/m4/gtk3.22-client.m4

Modified: branches/S3_0/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/Makefile.am?rev=35034&r1=35033&r2=35034&view=diff
==============================================================================
--- branches/S3_0/Makefile.am   (original)
+++ branches/S3_0/Makefile.am   Wed Feb 15 17:10:02 2017
@@ -50,7 +50,6 @@
                m4/gtk2-client.m4               \
                m4/gtk3-client.m4               \
                m4/gtk3.22-client.m4            \
-               m4/gtk3x-client.m4              \
                m4/iconv.m4                     \
                m4/intlmacosx.m4                \
                m4/lib-ld.m4                    \

Modified: branches/S3_0/client/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/Makefile.am?rev=35034&r1=35033&r2=35034&view=diff
==============================================================================
--- branches/S3_0/client/Makefile.am    (original)
+++ branches/S3_0/client/Makefile.am    Wed Feb 15 17:10:02 2017
@@ -36,9 +36,6 @@
        freeciv-gtk3.22.desktop
 appdatafile_DATA += \
        freeciv-gtk3.22.appdata.xml
-endif
-if CLIENT_GUI_GTK_3X
-GUI_SUBDIRS += gui-gtk-3.22
 endif
 if CLIENT_GUI_QT
 GUI_SUBDIRS += gui-qt
@@ -229,32 +226,16 @@
 bin_PROGRAMS += freeciv-gtk3.22
 noinst_LTLIBRARIES += libfcgui-gtk3_22.la
 libfcgui_gtk3_22_la_SOURCES = $(freeciv_client_src)
-libfcgui_gtk3_22_la_LIBADD = gui-gtk-3.22/libgui-gtk3x.la $(clientlibs)
+libfcgui_gtk3_22_la_LIBADD = gui-gtk-3.22/libgui-gtk3_22.la $(clientlibs)
 freeciv_gtk3_22_SOURCES = dummy.c
-freeciv_gtk3_22_LDFLAGS = $(gui_gtk3x_ldflags)
+freeciv_gtk3_22_LDFLAGS = $(gui_gtk3_22_ldflags)
 freeciv_gtk3_22_LDADD = \
  $(SOUND_LIBS) \
  libfcgui-gtk3_22.la \
  $(top_builddir)/common/libfreeciv.la \
  $(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(CLIENTICON) \
  $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
- $(gui_gtk3x_libs)
-endif
-
-if CLIENT_GUI_GTK_3X
-bin_PROGRAMS += freeciv-gtk3x
-noinst_LTLIBRARIES += libfcgui-gtk3x.la
-libfcgui_gtk3x_la_SOURCES = $(freeciv_client_src)
-libfcgui_gtk3x_la_LIBADD = gui-gtk-3.22/libgui-gtk3x.la $(clientlibs)
-freeciv_gtk3x_SOURCES = dummy.c
-freeciv_gtk3x_LDFLAGS = $(gui_gtk3x_ldflags)
-freeciv_gtk3x_LDADD = \
- $(SOUND_LIBS) \
- libfcgui-gtk3x.la \
- $(top_builddir)/common/libfreeciv.la \
- $(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(CLIENTICON) \
- $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
- $(gui_gtk3x_libs)
+ $(gui_gtk3_22_libs)
 endif
 
 if CLIENT_GUI_SDL2

Modified: branches/S3_0/client/gui-gtk-3.22/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-gtk-3.22/Makefile.am?rev=35034&r1=35033&r2=35034&view=diff
==============================================================================
--- branches/S3_0/client/gui-gtk-3.22/Makefile.am       (original)
+++ branches/S3_0/client/gui-gtk-3.22/Makefile.am       Wed Feb 15 17:10:02 2017
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LTLIBRARIES = libgui-gtk3x.la
+noinst_LTLIBRARIES = libgui-gtk3_22.la
 AM_CPPFLAGS = \
        -I$(srcdir)/.. \
        -I$(srcdir)/../include \
@@ -12,9 +12,9 @@
        -I$(srcdir)/../agents \
        -I$(srcdir)/../luascript \
        -I$(top_srcdir)/dependencies/tinycthread \
-       $(gui_gtk3x_cflags) $(SOUND_CFLAGS)
+       $(gui_gtk3_22_cflags) $(SOUND_CFLAGS)
 
-libgui_gtk3x_la_SOURCES = \
+libgui_gtk3_22_la_SOURCES = \
        action_dialog.c \
        canvas.c        \
        canvas.h        \
@@ -102,4 +102,4 @@
        wldlg.c         \
        wldlg.h
 
-libgui_gtk3x_la_LIBADD = -lm
+libgui_gtk3_22_la_LIBADD = -lm

Modified: branches/S3_0/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/configure.ac?rev=35034&r1=35033&r2=35034&view=diff
==============================================================================
--- branches/S3_0/configure.ac  (original)
+++ branches/S3_0/configure.ac  Wed Feb 15 17:10:02 2017
@@ -1259,9 +1259,9 @@
 AC_SUBST([gui_gtk3_cflags])
 AC_SUBST([gui_gtk3_libs])
 AC_SUBST([gui_gtk3_ldflags])
-AC_SUBST([gui_gtk3x_cflags])
-AC_SUBST([gui_gtk3x_libs])
-AC_SUBST([gui_gtk3x_ldflags])
+AC_SUBST([gui_gtk3_22_cflags])
+AC_SUBST([gui_gtk3_22_libs])
+AC_SUBST([gui_gtk3_22_ldflags])
 AC_SUBST([gui_sdl2_cflags])
 AC_SUBST([gui_sdl2_libs])
 AC_SUBST([gui_sdl2_ldflags])
@@ -1303,7 +1303,6 @@
 AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test "x$gui_gtk2" = "xyes")
 AM_CONDITIONAL(CLIENT_GUI_GTK_3_0, test "x$gui_gtk3" = "xyes")
 AM_CONDITIONAL(CLIENT_GUI_GTK_3_22, test "x$gui_gtk3_22" = "xyes")
-AM_CONDITIONAL(CLIENT_GUI_GTK_3X, /bin/false)
 AM_CONDITIONAL(CLIENT_GUI_QT, test "x$gui_qt" = "xyes")
 AM_CONDITIONAL(CLIENT_GUI_STUB, test "x$gui_stub" = "xyes")
 AM_CONDITIONAL(MINGW, test x"$MINGW" = "xyes")

Modified: branches/S3_0/m4/gtk3.22-client.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/m4/gtk3.22-client.m4?rev=35034&r1=35033&r2=35034&view=diff
==============================================================================
--- branches/S3_0/m4/gtk3.22-client.m4  (original)
+++ branches/S3_0/m4/gtk3.22-client.m4  Wed Feb 15 17:10:02 2017
@@ -1,26 +1,26 @@
 # Try to configure the GTK+-3.22 client (gui-gtk-3.22)
 
-# FC_GTK3X_CLIENT
+# FC_GTK3_22_CLIENT
 # Test for GTK+-3.0 libraries needed for gui-gtk-3.22
 
 AC_DEFUN([FC_GTK3_22_CLIENT],
 [
   if test "x$gui_gtk3_22" = "xyes" ||
      test "x$client" = "xall" || test "x$client" = "xauto" ; then
-    PKG_CHECK_MODULES([GTK3X], [gtk+-3.0 >= 3.22.0],
+    PKG_CHECK_MODULES([GTK3_22], [gtk+-3.0 >= 3.22.0],
       [
-        GTK3X_CFLAGS="$GTK3X_CFLAGS 
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_20"
-        GTK3X_CFLAGS="$GTK3X_CFLAGS 
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50"
+        GTK3_22_CFLAGS="$GTK3_22_CFLAGS 
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_20"
+        GTK3_22_CFLAGS="$GTK3_22_CFLAGS 
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50"
         gui_gtk3_22=yes
         if test "x$client" = "xauto" ; then
           client=yes
         fi
-        gui_gtk3x_cflags="$GTK3X_CFLAGS"
-        gui_gtk3x_libs="$GTK3X_LIBS"
+        gui_gtk3_22_cflags="$GTK3_22_CFLAGS"
+        gui_gtk3_22_libs="$GTK3_22_LIBS"
         if test "x$MINGW" = "xyes"; then
           dnl Required to compile gtk3 on Windows platform
-          gui_gtk3x_cflags="$gui_gtk3x_cflags -mms-bitfields"
-          gui_gtk3x_ldflags="$gui_gtk3x_ldflags -mwindows"
+          gui_gtk3_22_cflags="$gui_gtk3_22_cflags -mms-bitfields"
+          gui_gtk3_22_ldflags="$gui_gtk3_22_ldflags -mwindows"
         fi
       ],
       [

Removed: branches/S3_0/m4/gtk3x-client.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/m4/gtk3x-client.m4?rev=35033&view=auto
==============================================================================
--- branches/S3_0/m4/gtk3x-client.m4    (original)
+++ branches/S3_0/m4/gtk3x-client.m4    (removed)
@@ -1,31 +0,0 @@
-# Try to configure the GTK+-3.x client (gui-gtk-3.9x)
-
-# FC_GTK3X_CLIENT
-# Test for GTK+-3.90 libraries needed for gui-gtk-3.9x
-
-AC_DEFUN([FC_GTK3X_CLIENT],
-[
-  # Add check "x$client" = "xauto"  when this becomes supported client
-  if test "x$gui_gtk3x" = "xyes" ||
-     test "x$client" = "xall" ; then
-    PKG_CHECK_MODULES([GTK3X], [gtk+-4.0 >= 3.89.0],
-      [
-        GTK3X_CFLAGS="$GTK3X_CFLAGS 
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_90"
-        GTK3X_CFLAGS="$GTK3X_CFLAGS 
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50"
-        gui_gtk3x=yes
-        if test "x$client" = "xauto" ; then
-          client=yes
-        fi
-        gui_gtk3x_cflags="$GTK3X_CFLAGS"
-        gui_gtk3x_libs="$GTK3X_LIBS"
-        if test "x$MINGW" = "xyes"; then
-          dnl Required to compile gtk3 on Windows platform
-          gui_gtk3x_cflags="$gui_gtk3x_cflags -mms-bitfields"
-          gui_gtk3x_ldflags="$gui_gtk3x_ldflags -mwindows"
-        fi
-      ],
-      [
-        FC_NO_CLIENT([gtk3x], [GTK+-3.9x libraries not found])
-      ])
-  fi
-])


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to