GNOME.org
 

[gtkmm-documentation] Prepare for gtkmm-4.0

commit 1e36b073152d4234214b35062e9ecf2dc861a5b3
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Wed Nov 16 09:47:57 2016 +0100

    Prepare for gtkmm-4.0
    
    * configure.ac: Require giomm-2.52 and gtkmm-4.0.
    * docs/tutorial/C/index-in.docbook: Change some gtkmm 3 to gtkmm 4.
    Many more changes remain to be done.
    * docs/tutorial/Makefile.am: Install in $(datadir)/doc/gtkmm-4.0.
    * docs/tutorial/insert_example_code.pl: Add "(For use with gtkmm 4)"
    to the source code listings.

 configure.ac                         |    6 ++--
 docs/tutorial/C/index-in.docbook     |   43 +++++++++++++++++++---------------
 docs/tutorial/Makefile.am            |    2 +-
 docs/tutorial/insert_example_code.pl |    2 +-
 4 files changed, 29 insertions(+), 24 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2bbd6c1..46f6c89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 ## This file is part of gtkmm-documentation.
 
 AC_PREREQ([2.59])
-AC_INIT([gtkmm-documentation], [3.20.0],
+AC_INIT([gtkmm-documentation], [3.89.0],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
         [gtkmm-documentation], [http://www.gtkmm.org/])
 
@@ -25,8 +25,8 @@ MM_AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
 AC_PATH_PROG([PERL], [perl], [perl])
 AC_PROG_SED
 
-PKG_CHECK_MODULES([GIOMM], [giomm-2.4 >= 2.48.0])
-PKG_CHECK_MODULES([GTKMM], [gtkmm-3.0 >= 3.20.0])
+PKG_CHECK_MODULES([GIOMM], [giomm-2.52 >= 2.51.1])
+PKG_CHECK_MODULES([GTKMM], [gtkmm-4.0  >= 3.89.0])
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 
 # glib-compile-resources and C compiler are needed to generate and compile
diff --git a/docs/tutorial/C/index-in.docbook b/docs/tutorial/C/index-in.docbook
index 1cf8353..92b87c0 100644
--- a/docs/tutorial/C/index-in.docbook
+++ b/docs/tutorial/C/index-in.docbook
@@ -32,7 +32,7 @@ name
 
   <bookinfo>
 
-    <title>Programming with &gtkmm; 3</title>
+    <title>Programming with &gtkmm; 4</title>
 
     <authorgroup>
       <author>
@@ -175,16 +175,16 @@ See the <ulink url="https://wiki.gnome.org/Projects/gtkmm/FAQ";>FAQ</ulink> for m
 <sect1 id="sec-installation-dependencies">
 <title>Dependencies</title>
 <para>
-  Before attempting to install &gtkmm; 3.0, you might first need to install these other
-  packages.
+  Before attempting to install &gtkmm;<application>-4.0</application>,
+  you might first need to install these other packages.
 </para>
 <itemizedlist>
-  <listitem><para><application>libsigc++ 2.0</application></para></listitem>
-  <listitem><para><application>GTK+ 3.0</application></para></listitem>
-  <listitem><para><application>glibmm</application></para></listitem>
-  <listitem><para><application>cairomm</application></para></listitem>
-  <listitem><para><application>pangomm</application></para></listitem>
-  <listitem><para><application>atkmm</application></para></listitem>
+  <listitem><para><application>libsigc++-3.0</application></para></listitem>
+  <listitem><para><application>gtk+-4.0</application></para></listitem>
+  <listitem><para><application>glibmm-2.52</application></para></listitem>
+  <listitem><para><application>cairomm-1.16</application></para></listitem>
+  <listitem><para><application>pangomm-2.42</application></para></listitem>
+  <listitem><para><application>atkmm-2.26</application></para></listitem>
 </itemizedlist>
 <para>
 These dependencies have their own dependencies, including the following
@@ -216,8 +216,8 @@ applications and libraries:
 </para>
 <para>
     The names of the &gtkmm; packages vary from distribution to distribution
-    (e.g. <application>libgtkmm-3.0-dev</application> on Debian and Ubuntu or
-    <application>gtkmm30-devel</application> on Red Hat Fedora), so check with
+    (e.g. <application>libgtkmm-4.0-dev</application> on Debian and Ubuntu or
+    <application>gtkmm40-devel</application> on Red Hat Fedora), so check with
     your distribution's package management program for the correct package name
     and install it like you would any other package.
 </para>
@@ -225,8 +225,8 @@ applications and libraries:
 <para>
 The package names will not change when new API/ABI-compatible versions of &gtkmm;
 are released. Otherwise they would not be API/ABI-compatible. So don't be
-surprised, for instance, to find &gtkmm; 3.8 supplied by Debian's
-<application>libgtkmm-3.0-dev</application> package.
+surprised, for instance, to find &gtkmm; 4.8 supplied by Debian's
+<application>libgtkmm-4.0-dev</application> package.
 </para>
 </note>
 </sect2>
@@ -333,9 +333,9 @@ suffices.
 <para>
 The next statement:
 
-<programlisting>Glib::RefPtr&lt;Gtk::Application&gt; app = Gtk::Application::create(argc, argv, 
"org.gtkmm.examples.base");</programlisting>
+<programlisting>auto app = Gtk::Application::create(argc, argv, "org.gtkmm.examples.base");</programlisting>
 
-creates a <classname>Gtk::Application</classname> object, stored in a <classname>RefPtr</classname> 
smartpointer. This is needed in all &gtkmm;
+creates a <classname>Gtk::Application</classname> object, stored in a <classname>Glib::RefPtr</classname> 
smartpointer. This is needed in all &gtkmm;
 applications. The <methodname>create()</methodname> method for this object initializes &gtkmm;, and checks 
the
 arguments passed to your application on the command line, looking for
 standard options such as <literal>--display</literal>. It takes these from the argument list, leaving 
anything it does not
@@ -358,7 +358,7 @@ Your <function>main()</function> function will then return with an appropriate s
 <para>
 After putting the source code in <literal>simple.cc</literal> you can compile
 the above program with <application>gcc</application> using:
-<programlisting>g++ simple.cc -o simple `pkg-config gtkmm-3.0 --cflags --libs`</programlisting>
+<programlisting>g++ simple.cc -o simple `pkg-config gtkmm-4.0 --cflags --libs`</programlisting>
 Note that you must surround the <literal>pkg-config</literal> invocation with backquotes.
 Backquotes cause the shell to execute the command inside them, and to use
 the command's output as part of the command line.
@@ -385,13 +385,18 @@ find them in. Try running it from your shell-prompt to see the results on your s
 <para>
 However, this is even simpler when using the <function>PKG_CHECK_MODULES()</function> macro in a standard 
configure.ac file with autoconf and automake.
 For instance:
-<programlisting>PKG_CHECK_MODULES([MYAPP], [gtkmm-3.0 >= 3.8.0])</programlisting>
+<programlisting>PKG_CHECK_MODULES([MYAPP], [gtkmm-4.0 >= 4.8.0])</programlisting>
 This checks for the presence of gtkmm and defines MYAPP_LIBS and MYAPP_CFLAGS for use in your Makefile.am 
files.
 </para>
-<para>gtkmm-3.0 is the name of the current stable API. There was an older API called gtkmm-2-4 which 
installs in parallel when it is available. There were several versions of gtkmm-2.4, such as gtkmm 2.10 and 
there are several versions of the gtkmm-3.0 API. Note that the API name does not change for every version 
because that would be an incompatible API and ABI break. Theoretically, there might be a future gtkmm-4.0 API 
which would install in parallel with gtkmm-3.0 without affecting existing applications.
+<para>gtkmm-4.0 is the name of the current stable API. There are older APIs called gtkmm-2.4
+and gtkmm-3.0 which install in parallel when they are available. There are several
+versions of gtkmm-2.4, such as gtkmm 2.10 and there are several versions of the gtkmm-3.0 API.
+Note that the API name does not change for every version because that would be an incompatible
+API and ABI break. There might be a future gtkmm-5.0 API which would install in parallel
+with gtkmm-4.0 without affecting existing applications.
 </para>
 
-<para>Note that if you mention extra modules in addition to gtkmm-3.0, they should be separated by spaces, 
not commas.
+<para>Note that if you mention extra modules in addition to gtkmm-4.0, they should be separated by spaces, 
not commas.
 </para>
 <para>
 Openismus has more <ulink url="http://www.openismus.com/documents/linux/automake/automake.shtml";>basic help 
with automake and autoconf</ulink>.
diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
index a0d86b2..c16e594 100644
--- a/docs/tutorial/Makefile.am
+++ b/docs/tutorial/Makefile.am
@@ -2,7 +2,7 @@
 
 @YELP_HELP_RULES@
 
-gtkmm_docdir = $(datadir)/doc/gtkmm-3.0
+gtkmm_docdir = $(datadir)/doc/gtkmm-4.0
 
 # Function: $(call vpath_listall,PATTERN ...)
 # Get all filenames which match a PATTERN from the list.  Look for files
diff --git a/docs/tutorial/insert_example_code.pl b/docs/tutorial/insert_example_code.pl
index 383c4b0..fa3a84c 100755
--- a/docs/tutorial/insert_example_code.pl
+++ b/docs/tutorial/insert_example_code.pl
@@ -70,7 +70,7 @@ sub process_source_file($$$)
   my ($directory, $source_file, $skip_leading_comments) = @_;
   my $found_start = !$skip_leading_comments;
 
-  print "<para>File: <filename>$source_file</filename> (For use with gtkmm 3, not gtkmm 2)\n";
+  print "<para>File: <filename>$source_file</filename> (For use with gtkmm 4)\n";
   print "</para>\n";
   print "<programlisting>\n";
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]