Author: cazfi
Date: Sun Apr  2 18:24:54 2017
New Revision: 35195

URL: http://svn.gna.org/viewcvs/freeciv?rev=35195&view=rev
Log:
Plug gtk3x-client to build

It builds against gtk+-3.89.2.
It only builds. It doesn't work yet.

See hrm Feature #647936

Modified:
    trunk/client/Makefile.am
    trunk/configure.ac
    trunk/m4/gtk3x-client.m4

Modified: trunk/client/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/Makefile.am?rev=35195&r1=35194&r2=35195&view=diff
==============================================================================
--- trunk/client/Makefile.am    (original)
+++ trunk/client/Makefile.am    Sun Apr  2 18:24:54 2017
@@ -31,7 +31,7 @@
        freeciv-gtk3.22.appdata.xml
 endif
 if CLIENT_GUI_GTK_3X
-GUI_SUBDIRS += gui-gtk-3.22
+GUI_SUBDIRS += gui-gtk-4.0
 endif
 if CLIENT_GUI_QT
 GUI_SUBDIRS += gui-qt

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=35195&r1=35194&r2=35195&view=diff
==============================================================================
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Sun Apr  2 18:24:54 2017
@@ -423,6 +423,7 @@
 
 gui_gtk3=no
 gui_gtk3_22=no
+gui_gtk3x=no
 gui_sdl2=no
 gui_qt=no
 gui_stub=no
@@ -442,6 +443,8 @@
       gui_gtk3=yes
     elif test "x$gui" = "xgtk3.22" ; then
       gui_gtk3_22=yes
+    elif test "x$gui" = "xgtk3x" ; then
+      gui_gtk3x=yes
     elif test "x$gui" = "xgtk" ; then
       AC_MSG_WARN([for requested client 'gtk' enabled gtk3-client, that has 
changed since earlier versions and will change again in the future])
       gui_gtk3=yes
@@ -974,6 +977,9 @@
   dnl SDL2-specific overrides
   FC_SDL2_CLIENT
 
+  dnl Gtk-3x-specific overrides
+  FC_GTK3X_CLIENT
+
   dnl Stub-specific overrides
   if test "x$gui_stub" = "xyes" || test "x$client" = "xall" ; then
     gui_stub=yes
@@ -992,6 +998,7 @@
 if test "x$client" = "xall" ; then
   if test "x$gui_gtk3" = "xyes" ||
      test "x$gui_gtk3_22" = "xyes" ||
+     test "x$gui_gtk3x" = "xyes" ||
      test "x$gui_sdl2" = "xyes" ||
      test "x$gui_qt" = "xyes" ||
      test "x$gui_stub" = "xyes" ; then
@@ -1254,7 +1261,7 @@
 AM_CONDITIONAL(CLIENT_GUI_SDL2, test "x$gui_sdl2" = "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_GTK_3X, test "x$gui_gtk3x" = "xyes")
 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")
@@ -1695,6 +1702,7 @@
           client/gui-sdl2/Makefile
          client/gui-gtk-3.0/Makefile
          client/gui-gtk-3.22/Makefile
+          client/gui-gtk-4.0/Makefile
           client/gui-qt/Makefile
          client/gui-stub/Makefile
           client/luascript/Makefile
@@ -1779,6 +1787,10 @@
     QT:      $gui_qt
     Stub:    $gui_stub
 
+  In-development client frontends:
+   (these are not yet ready for general use)
+    Gtk-3x:  $gui_gtk3x
+
   == Server ==
   Build freeciv server:  $server
     AI modules support:    $enable_aimodules

Modified: trunk/m4/gtk3x-client.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3x-client.m4?rev=35195&r1=35194&r2=35195&view=diff
==============================================================================
--- trunk/m4/gtk3x-client.m4    (original)
+++ trunk/m4/gtk3x-client.m4    Sun Apr  2 18:24:54 2017
@@ -8,7 +8,7 @@
   # 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],
+    PKG_CHECK_MODULES([GTK3X], [gtk+-4.0 >= 3.89.2],
       [
         GTK3X_CFLAGS="$GTK3X_CFLAGS 
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_90"
         GTK3X_CFLAGS="$GTK3X_CFLAGS 
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50"


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

Reply via email to