GNOME.org
 

[gtkmm-documentation] Use glibmm-2.66 instead of glibmm-2.64

commit da2ae7d9384a20daab9222c89a217df752db6350
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Tue Mar 24 18:23:59 2020 +0100

    Use glibmm-2.66 instead of glibmm-2.64
    
    We have changed the ABI name in glibmm.

 configure.ac                                       |  2 +-
 docs/tutorial/C/index-in.docbook                   | 28 +++++++++++-----------
 .../others/cellrenderercustom/cellrendererpopup.cc |  4 +++-
 meson.build                                        |  2 +-
 4 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 731f1cc..544bb8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ MM_AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
 AC_PATH_PROG([PERL], [perl], [perl])
 AC_PROG_SED
 
-PKG_CHECK_MODULES([GIOMM], [giomm-2.64 >= 2.63.1])
+PKG_CHECK_MODULES([GIOMM], [giomm-2.66 >= 2.65.2])
 PKG_CHECK_MODULES([GTKMM], [gtkmm-4.0  >= 3.97.1])
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 
diff --git a/docs/tutorial/C/index-in.docbook b/docs/tutorial/C/index-in.docbook
index 7076873..7396244 100644
--- a/docs/tutorial/C/index-in.docbook
+++ b/docs/tutorial/C/index-in.docbook
@@ -179,9 +179,9 @@ See the <ulink url="https://wiki.gnome.org/Projects/gtkmm/FAQ";>FAQ</ulink> for m
   you might first need to install these other packages.
 </para>
 <itemizedlist>
-  <listitem><para><application>libsigc++-3.0</application></para></listitem>
-  <listitem><para><application>gtk+-4.0</application></para></listitem>
-  <listitem><para><application>glibmm-2.60</application></para></listitem>
+  <listitem><para><application>sigc++-3.0</application></para></listitem>
+  <listitem><para><application>gtk4</application></para></listitem>
+  <listitem><para><application>glibmm-2.66</application></para></listitem>
   <listitem><para><application>cairomm-1.16</application></para></listitem>
   <listitem><para><application>pangomm-2.44</application></para></listitem>
   <listitem><para><application>atkmm-2.30</application></para></listitem>
@@ -192,12 +192,12 @@ applications and libraries:
 </para>
 <itemizedlist>
   <listitem><para><application>pkg-config</application></para></listitem>
-  <listitem><para><application>glib</application></para></listitem>
-  <listitem><para><application>ATK</application></para></listitem>
-  <listitem><para><application>Pango</application></para></listitem>
+  <listitem><para><application>glib-2.0</application></para></listitem>
+  <listitem><para><application>atk</application></para></listitem>
+  <listitem><para><application>pango</application></para></listitem>
   <listitem><para><application>cairo</application></para></listitem>
-  <listitem><para><application>gdk-pixbuf</application></para></listitem>
-  <listitem><para><application>graphene</application></para></listitem>
+  <listitem><para><application>gdk-pixbuf-2.0</application></para></listitem>
+  <listitem><para><application>graphene-1.0</application></para></listitem>
 </itemizedlist>
 </sect1>
 
@@ -691,7 +691,7 @@ orientation (vertical or horizontal) to be specified without requiring the use o
 </chapter>
 
 <chapter id="changes-gtkmm4">
-<title>Changes in &gtkmm;-4.0 and <application>glibmm-2.60</application></title>
+<title>Changes in &gtkmm;-4.0 and <application>glibmm-2.66</application></title>
 
 <para>&gtkmm;-4.0 is a new version of the &gtkmm; API that installs in parallel with the
 older &gtkmm;-2.4 and &gtkmm;-3.0 APIs. The last version of the &gtkmm;-3.0 API
@@ -707,7 +707,7 @@ directory, so your <application>pkg-config</application> check should ask for
 <literal>gtkmm-4.0</literal> rather than <literal>gtkmm-3.0</literal>.
 </para>
 
-<para>&gtkmm;-4.0 is used in combination with <application>glibmm-2.60</application>,
+<para>&gtkmm;-4.0 is used in combination with <application>glibmm-2.66</application>,
 which sets the global locale for your program. The older <application>glibmm-2.4</application>
 does not do that, and &gtkmm;-3.0 does it only to some extent. What this means is
 briefly that if your &gtkmm;-3.0 program contains a call to
@@ -722,7 +722,7 @@ to set the global locale for you, you should add a call to
 <para>There are lots and lots of differences between &gtkmm;-3.0 and &gtkmm;-4.0.
 The following lists are not complete.</para>
 
-<para>Some new classes were added in &gtkmm; 4 and <application>glibmm</application> 2.60:</para>
+<para>Some new classes were added in &gtkmm; 4 and <application>glibmm</application> 2.66:</para>
 
 <orderedlist>
 <listitem><simpara><classname>Glib::ExtraClassInit</classname> and <classname>Gtk::Snapshot</classname>:
@@ -790,7 +790,7 @@ when porting code that used &gtkmm;-3.0 and <application>glibmm</application>-2.
 </orderedlist>
 </para>
 
-<para>All deprecated API was removed in &gtkmm; 4.0 and <application>glibmm</application> 2.60,
+<para>All deprecated API was removed in &gtkmm; 4.0 and <application>glibmm</application> 2.66,
   though there will be new deprecations in future versions.</para>
 
 <para>As a first step to porting your source code to &gtkmm;-4.0 you should probably ensure
@@ -802,7 +802,7 @@ that can help with this by defining them optionally at build time. See the
 gtkmm-2.4 to gtkmm-3.0</ulink> wiki page for more details.</para>
 
 <para>See also <ulink url="https://developer.gnome.org/gtk4/unstable/gtk-migrating-3-to-4.html";>
-Migrating from GTK+ 3.x to GTK+ 4</ulink>.</para>
+Migrating from GTK 3.x to GTK 4</ulink>.</para>
 
 </chapter>
 
@@ -9376,7 +9376,7 @@ public:
     automatically when using the above build structure:
 <programlisting>
 $ cd gtk/src
-$ /usr/lib/glibmm-2.60/proc/gmmproc -I ../../tools/m4 --defs . button . ./../gtkmm
+$ /usr/lib/glibmm-2.66/proc/gmmproc -I ../../tools/m4 --defs . button . ./../gtkmm
 </programlisting>
 </para>
 <para>Notice that we provided <command>gmmproc</command> with the path to the
diff --git a/examples/others/cellrenderercustom/cellrendererpopup.cc 
b/examples/others/cellrenderercustom/cellrendererpopup.cc
index fe3212e..b4848b1 100644
--- a/examples/others/cellrenderercustom/cellrendererpopup.cc
+++ b/examples/others/cellrenderercustom/cellrendererpopup.cc
@@ -322,7 +322,9 @@ void CellRendererPopup::on_popup_arrow_clicked()
   popup_entry_->select_region(0, 0);
 
   int x = 0, y = 0;
-  native->get_surface()->get_position(x, y);
+  // Gdk::Surface::get_position() has been replaced by Gdk::Popup::get_position_x()
+  // and get_position_y(). How do you get a RefPtr to Gdk::Popup?
+  //native->get_surface()->get_position(x, y);
 
   const auto alloc = popup_entry_->get_allocation();
 
diff --git a/meson.build b/meson.build
index 253bb6a..fd901a1 100644
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@ endif
 
 gtkmm_pcname = 'gtkmm-4.0'
 gtkmm_dep = dependency(gtkmm_pcname, version: '>=3.97.1')
-giomm_dep = dependency('giomm-2.64', version: '>=2.63.1')
+giomm_dep = dependency('giomm-2.66', version: '>=2.65.2')
 gnome = import('gnome')
 
 # Installation directories are relative to {prefix}.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]