Bug#690348: unblock: gtkmm3.0/3.4.2-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package gtkmm3.0
gtkmm3.0 3.4.2 is a new upstream release but it's only bug fixes and
documentation tweaks.
Debian wise the changes include the switch to xz (gtkmm is in the set
of GNOME packages via gnome-system-monitor) and a small fix which
excludes the doxygen tags files from being compressed, since doxygen
can't handle those and thus creates broken cross references.
I've split the debian specific changes from the upstream specific
changes into two separate debdiffs.
>From the upstream debdiff I excluded the usual autotools generated
jitter, the differences in the generated doc files caused by upstream
using a newer doxygen version and I've also excluded an upstream commit
[1] which basically is a massive white space cleanup but has no
functional changes.
The package has been in unstable for 2 weeks without a bug report.
Cheers,
Michael
unblock gtkmm3.0/3.4.2-1
[1]
http://git.gnome.org/browse/gtkmm/commit/?h=gtkmm-3-4&id=13e15723b01f5792bbb7d2b8a0e5b3da5b82b8a6
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Index: debian/changelog
===================================================================
--- debian/changelog (Revision 35827)
+++ debian/changelog (Revision 35844)
@@ -1,9 +1,10 @@
-gtkmm3.0 (3.4.2-1) UNRELEASED; urgency=low
+gtkmm3.0 (3.4.2-1) unstable; urgency=low
* New upstream stable release.
+ * Don't compress doxygen tag files since doxygen can't handle those.
* Enable xz compression for binary packages.
- -- Michael Biebl <biebl@debian.org> Tue, 25 Sep 2012 20:16:55 +0200
+ -- Michael Biebl <biebl@debian.org> Sat, 29 Sep 2012 08:36:51 +0200
gtkmm3.0 (3.4.0-2) unstable; urgency=low
Index: debian/rules
===================================================================
--- debian/rules (Revision 35827)
+++ debian/rules (Revision 35844)
@@ -19,5 +19,8 @@
DEB_COMPRESS_EXCLUDE_libgtkmm-3-doc = examples
DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
-# Use xz compression.
+# Don't compress doxygen tag files
+DEB_COMPRESS_EXCLUDE = .tag
+
+# Use xz compression
DEB_DH_BUILDDEB_ARGS ?= -- -Zxz
ChangeLog | 19 +++++++++++++++++++
NEWS | 4 ++++
configure.ac | 2 +-
gtk/src/applicationwindow.hg | 40 +++++++++++++++++++++++++++++++++++++++-
gtk/src/fontselection.hg | 2 +-
gtk/src/iconview.hg | 2 --
gtk/src/targetlist.hg | 2 +-
gtk/src/textview.hg | 2 +-
gtk/src/treemodelfilter.hg | 4 +++-
9 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a10f42e..21204a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+3.4.2:
+
+2012-09-27 Murray Cumming <murrayc@murrayc.com>
+
+ ApplicationWindow: Add class documentation.
+
+ * gtk/src/applicationwindow.hg: Add class overview documentation
+ based on the GTK+ documentation.
+
+2012-09-18 Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
+
+ Improve the use of _IGNORE.
+
+ * gtk/src/fontselection.hg:
+ * gtk/src/targetlist.hg:
+ * gtk/src/textview.hg: Correct an _IGNORE.
+ * gtk/src/iconview.hg: Remove _IGNORE(gtk_tree_view_get_tooltip_context).
+ * gtk/src/treemodelfilter.hg: Remove _IGNORE(gtk_tree_model_filter_new).
+
3.4.1:
2012-08-29 Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
diff --git a/NEWS b/NEWS
index ad60673..1f55533 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+3.4.2 (stable):
+
+* Minor documentation improvements.
+
3.4.1 (stable):
Gtk:
diff --git a/configure.ac b/configure.ac
index a61c74c..06d6c40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU Lesser General Public License
## along with this library. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([gtkmm], [3.4.1],
+AC_INIT([gtkmm], [3.4.2],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
[gtkmm], [http://www.gtkmm.org/])
AC_PREREQ([2.59])
diff --git a/gtk/src/applicationwindow.hg b/gtk/src/applicationwindow.hg
index 47c6733..427a35c 100644
--- a/gtk/src/applicationwindow.hg
+++ b/gtk/src/applicationwindow.hg
@@ -27,7 +27,45 @@ _PINCLUDE(gtkmm/private/window_p.h)
namespace Gtk
{
-/** TODO
+/** A Gtk::Window subclass with Gtk::Application support.
+ *
+ * ApplicationWindow is a Gtk::Window subclass that offers some
+ * extra functionality for better integration with Gtk::Application
+ * features. Notably, it can handle both the application menu as well
+ * as the menubar. See set_app_menu() and
+ * set_menubar().
+ *
+ * This class derives from Gio::ActionGroup and Gio::ActionMap,
+ * to let you add window-specific actions that will be exported by the
+ * associated Gtk::Application, together with its application-wide
+ * actions. Window-specific actions are prefixed with the "win."
+ * prefix and application-wide actions are prefixed with the "app."
+ * prefix. Actions must be addressed with the prefixed name when
+ * referring to them from a Gio::MenuModel.
+ *
+ * Note that widgets that are placed inside a Gtk::ApplicationWindow
+ * can also activate these actions, if they implement the
+ * Gtk::Actionable interface.
+ *
+ * As with Gtk::Application, the GDK lock will be acquired when
+ * processing actions arriving from other processes and should therefore
+ * be held when activating actions locally (if GDK threads are enabled).
+ *
+ * The settings Gtk::Settings::property_gtk_shell_shows_app_menu() and
+ * Gtk::Settings::property_gtk_shell_shows_menubar() tell GTK+ whether the
+ * desktop environment is showing the application menu and menubar
+ * models outside the application as part of the desktop shell.
+ * For instance, on OS X, both menus will be displayed remotely;
+ * on Windows neither will be. gnome-shell (starting with version 3.4)
+ * will display the application menu, but not the menubar.
+ *
+ * If the desktop environment does not display the menubar, then
+ * Gtk::ApplicationWindow will automatically show a Gtk::MenuBar for it.
+ * (see the <a href="http://developer.gnome.org/gtk3/stable/GtkApplication.html#GtkApplication.description";>GtkApplication documentation</a> for some screenshots of how this
+ * looks on different platforms).
+ * This behaviour can be overridden with the Gtk::ApplicationWindow::property_show_menubar()
+ * property. If the desktop environment does not display the application
+ * menu, then it will automatically be included in the menubar.
*/
class ApplicationWindow
: public Gtk::Window,
diff --git a/gtk/src/fontselection.hg b/gtk/src/fontselection.hg
index 21fb820..a48298e 100644
--- a/gtk/src/fontselection.hg
+++ b/gtk/src/fontselection.hg
@@ -105,7 +105,7 @@ class FontSelectionDialog : public Dialog
{
_CLASS_GTKOBJECT(FontSelectionDialog,GtkFontSelectionDialog,GTK_FONT_SELECTION_DIALOG,Gtk::Dialog,GtkDialog)
_IS_DEPRECATED
- _IGNORE(gtk_font_selection_dialog_get_font)
+ _IGNORE(gtk_font_selection_dialog_get_font_selection)
_UNMANAGEABLE()
public:
diff --git a/gtk/src/iconview.hg b/gtk/src/iconview.hg
index 76e9c5b..77f82e6 100644
--- a/gtk/src/iconview.hg
+++ b/gtk/src/iconview.hg
@@ -337,8 +337,6 @@ public:
*/
void set_tooltip_cell(const Glib::RefPtr<Tooltip>& tooltip, const TreeModel::Path& path);
- _IGNORE(gtk_tree_view_get_tooltip_context)
-
/**
* @param x: the x coordinate (relative to widget coordinates)
* @param y: the y coordinate (relative to widget coordinates)
diff --git a/gtk/src/targetlist.hg b/gtk/src/targetlist.hg
index e89d5ed..cebb88d 100644
--- a/gtk/src/targetlist.hg
+++ b/gtk/src/targetlist.hg
@@ -33,7 +33,7 @@ class TargetList
//GtkTargetList is actually registered as a boxed type, but it has custom
//reference-counting instead of copy/free functions, so we use it via RefPtr.
_CLASS_OPAQUE_REFCOUNTED(TargetList, GtkTargetList, NONE, gtk_target_list_ref, gtk_target_list_unref)
- _IGNORE(gtk_selection_data_copy, gtk_selection_data_free)
+ _IGNORE(gtk_target_list_ref, gtk_target_list_unref)
public:
static Glib::RefPtr<Gtk::TargetList> create(const std::vector<TargetEntry>& targets);
diff --git a/gtk/src/textview.hg b/gtk/src/textview.hg
index 5a66937..f7bcd65 100644
--- a/gtk/src/textview.hg
+++ b/gtk/src/textview.hg
@@ -138,7 +138,7 @@ public:
int window_x, int window_y,
int& buffer_x, int& buffer_y) const, gtk_text_view_window_to_buffer_coords)
- _IGNORE(gtk_text_view_get_hadjustment, gtk_tree_view_get_vadjustment) //deprecated
+ _IGNORE(gtk_text_view_get_hadjustment, gtk_text_view_get_vadjustment) //deprecated
_WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_window(TextWindowType win), gtk_text_view_get_window, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_window(TextWindowType win) const, gtk_text_view_get_window, refreturn, constversion)
diff --git a/gtk/src/treemodelfilter.hg b/gtk/src/treemodelfilter.hg
index c918be4..7202bd2 100644
--- a/gtk/src/treemodelfilter.hg
+++ b/gtk/src/treemodelfilter.hg
@@ -42,7 +42,9 @@ protected:
explicit TreeModelFilter(const Glib::RefPtr<TreeModel>& child_model);
explicit TreeModelFilter(const Glib::RefPtr<TreeModel>& child_model, const TreeModel::Path& virtual_root);
- _IGNORE(gtk_tree_model_filter_new)
+ dnl // Don't _IGNORE(gtk_tree_model_filter_new). It's listed in gtk_methods.defs as
+ dnl // a method of GtkTreeModel. Ignoring it would make gmmproc think that this
+ dnl // file wraps GtkTreeModel, and it would list all GtkTreeModel methods as unwrapped.
public:
Reply to: