Author: cazfi
Date: Thu Dec 31 19:18:52 2015
New Revision: 31275

URL: http://svn.gna.org/viewcvs/freeciv?rev=31275&view=rev
Log:
Added gtk3x-client to documentation

See patch #6734

Modified:
    trunk/INSTALL
    trunk/doc/BUGS
    trunk/doc/README
    trunk/doc/README.packaging

Modified: trunk/INSTALL
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/INSTALL?rev=31275&r1=31274&r2=31275&view=diff
==============================================================================
--- trunk/INSTALL       (original)
+++ trunk/INSTALL       Thu Dec 31 19:18:52 2015
@@ -4,7 +4,7 @@
 
 This file describes how to compile and install Freeciv. Last time we
 made sure this file is up to date was 16-Jul-06.
-Last minor update was 20-Oct-15.
+Last minor update was 20-Dec-15.
 
 There may be a localized version of this file in the ./doc directory,
 named INSTALL.<locale> (e.g., INSTALL.de).
@@ -14,8 +14,9 @@
      1. Prerequisites for the clients:
           1a. Prerequisites for the Gtk2 client:
           1b. Prerequisites for the Gtk3 client:
-          1c. Prerequisites for the SDL2 client:
-          1d. Prerequisites for the Qt client:
+          1c. Prerequisites for the Gtk3x client:
+          1d. Prerequisites for the SDL2 client:
+          1e. Prerequisites for the Qt client:
      2. Generating Makefiles
           2a. Generating the Makefile for svn versions:
           2b. Generating the Makefile for release versions:
@@ -110,6 +111,7 @@
 The Freeciv client comes in the following forms:
 * Gtk+ 2.0 widget library ("Gtk+ 2.0").
 * Gtk+ 3.0 widget library ("Gtk+ 3.0").
+* Gtk+ 3.0 widget library, latest versions ("Gtk+ 3.x")
 * SDL2
 * Qt
 
@@ -258,7 +260,74 @@
 If you are going to make these yourself, build and install them in the
 following order: pkg-config, Glib, Atk, Pango, Gdk-Pixbuf, Gtk+.
 
-1c. Prerequisites for the SDL2 client:
+1c. Prerequisites for the Gtk+ 3.x client:
+==========================================
+
+ - "pkg-config".
+
+   "pkg-config" is a system for managing library compile/link flags that
+   works with automake and autoconf. You may obtain it at:
+
+      http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.tar.gz
+
+ - The "Glib" utility library.
+
+   The "Glib" utility library provides non-graphical functions used by the
+   "Gdk" and "Gtk+" libraries, like hash tables, single linked lists, etc.
+
+   Freeciv requires a version of "Glib" greater or equal to 2.36
+
+   If the Freeciv configure process tells you that you don't have the
+   Glib library installed, then it may be obtained from here:
+
+     http://ftp.gnome.org/pub/gnome/sources/glib/2.46/glib-2.46.2.tar.xz
+
+ - The "Atk" accessibility library.
+
+   The "Atk" library provides a set of interfaces for accessibility.
+   It allows people with disabilities to utilize all the functionality
+   provided by Gtk+ apps. You may obtain it at:
+
+     http://ftp.gnome.org/pub/gnome/sources/atk/2.18/atk-2.18.0.tar.xz
+
+ - The "Pango" text layout and rendering library.
+
+   "Pango" is library for layout and rendering of text, with an emphasis
+   on internationalization. You may obtain it at:
+
+     http://ftp.gnome.org/pub/gnome/sources/pango/1.38/pango-1.38.1.tar.xz
+
+ - The "Gdk-Pixbuf" image loading/saving library
+
+   "Gdk-Pixbuf" used to be part of "Gtk+" itself, but is now separate
+   project. It may be obtained from:
+
+     
http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.32/gdk-pixbuf-2.32.3.tar.xz
+
+ - The "Gtk+" widget library.
+
+   The "Gtk+" widget library was designed for the GIMP graphics program.
+   Since then it has gained popularity as an easy to program, free toolkit.
+
+   The "Gtk+" library comes with one companion libraries:
+
+     "Gdk":
+       Provides an abstraction layer over X-Windows/LinuxFB/Win32 to implement
+       basic drawing functions, windows, clipping, etc.
+
+   Freeciv requires a version of "Gtk+" greater or equal to 3.14.0.
+
+   If the Freeciv configure process tells you that you don't have the
+   Gtk+ library installed, then it may be obtained from here:
+
+     http://ftp.gnome.org/pub/gnome/sources/gtk+/3.18/gtk+-3.18.6.tar.xz
+
+   "Gtk+" depends on the "Glib", "Atk", "Gdk-Pixbuf", and "Pango" libraries.
+
+If you are going to make these yourself, build and install them in the
+following order: pkg-config, Glib, Atk, Pango, Gdk-Pixbuf, Gtk+.
+
+1d. Prerequisites for the SDL2 client:
 =====================================
 
  - The "SDL2" library.
@@ -299,7 +368,7 @@
 
    http://download.savannah.gnu.org/releases/freetype/freetype-2.5.4.tar.bz2
 
-1d. Prerequisites for the Qt client:
+1e. Prerequisites for the Qt client:
 ====================================
 
  - C++ compiler.

Modified: trunk/doc/BUGS
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/BUGS?rev=31275&r1=31274&r2=31275&view=diff
==============================================================================
--- trunk/doc/BUGS      (original)
+++ trunk/doc/BUGS      Thu Dec 31 19:18:52 2015
@@ -40,7 +40,7 @@
 
    - Describe the problem, including any messages that were displayed.
 
-   - Indicate which client(s) you are using (gtk2, gtk3, SDL2, or Qt).
+   - Indicate which client(s) you are using (gtk2, gtk3, gtk3x, SDL2, or Qt).
 
    - Tell us the name and version of:
 

Modified: trunk/doc/README
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README?rev=31275&r1=31274&r2=31275&view=diff
==============================================================================
--- trunk/doc/README    (original)
+++ trunk/doc/README    Thu Dec 31 19:18:52 2015
@@ -95,6 +95,9 @@
   number of features gtk-clients have.
 
 freeciv-sdl2: This uses Simple DirectMedia Layer libraries version 2.
+
+freeciv-gtk3x: This uses GTK+ 3 libraries. This is development version of
+  a client to get turned to use gtk4 once it's released.
 
 
 Starting a game:

Modified: trunk/doc/README.packaging
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=31275&r1=31274&r2=31275&view=diff
==============================================================================
--- trunk/doc/README.packaging  (original)
+++ trunk/doc/README.packaging  Thu Dec 31 19:18:52 2015
@@ -29,6 +29,9 @@
 * Sdl-client has been dropped completely
 * Minimum libcurl version is now 7.15.4
 * Minimum libtool version is now 2.2
+* Added gtk3x-client. The difference between gtk3-client and gtk3x-client is
+  that latter is adjusted for, and depends on, as new gtk3 version as
+  possible. Once gtk4 gets released, this client is turned to gtk4-client.
 
 ----------------------------------------------------------------------
 Compatibility of modified versions
@@ -128,7 +131,7 @@
 ---------------------------------
 Starting from 2.2 it has been possible to build multiple clients running
 'make' just once. Just give configure option "--enable-client" comma
-separated list of clients to compile, e.g. "--enable-client=gtk3,gtk2,sdl2,qt"
+separated list of clients to compile, e.g. 
"--enable-client=gtk3,gtk2,gtk3x,sdl2,qt"
 
 ----------------------------------------------------------------------
 Savegame compression support


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

Reply via email to