[gtkmm30] 2.90.7, remove application support to match glib
Tom Callaway
spot at fedoraproject.org
Thu Sep 30 16:32:28 UTC 2010
commit b05aad62cb732d92af09b2e14bb6253faae3d1bf
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Thu Sep 30 12:32:24 2010 -0400
2.90.7, remove application support to match glib
.gitignore | 1 +
gtkmm-2.90.7-no-application.patch | 714 +++++++++++++++++++++++++++++++++++++
gtkmm30.spec | 11 +-
sources | 2 +-
4 files changed, 725 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f4b4f16..fc16cdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gtkmm-2.90.5.tar.bz2
+/gtkmm-2.90.7.tar.bz2
diff --git a/gtkmm-2.90.7-no-application.patch b/gtkmm-2.90.7-no-application.patch
new file mode 100644
index 0000000..7ec2a5a
--- /dev/null
+++ b/gtkmm-2.90.7-no-application.patch
@@ -0,0 +1,714 @@
+diff -up gtkmm-2.90.7/gtk/gtkmm/application.cc.no-application gtkmm-2.90.7/gtk/gtkmm/application.cc
+--- gtkmm-2.90.7/gtk/gtkmm/application.cc.no-application 2010-09-02 05:15:14.000000000 -0400
++++ gtkmm-2.90.7/gtk/gtkmm/application.cc 2010-09-29 15:02:02.106924002 -0400
+@@ -1,194 +0,0 @@
+-// Generated by gtkmmproc -- DO NOT MODIFY!
+-
+-
+-#include <gtkmm/application.h>
+-#include <gtkmm/private/application_p.h>
+-
+-// -*- c++ -*-
+-/* $Id: action.ccg,v 1.11 2006/05/10 20:59:27 murrayc Exp $ */
+-
+-/* Copyright 2003 The gtkmm Development Team
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-#include <gtk/gtk.h>
+-
+-namespace Gtk
+-{
+-
+-Glib::RefPtr<Application> Application::create(const Glib::ustring& appid)
+-{
+- return Glib::wrap(gtk_application_new(appid.c_str(), 0, 0));
+-}
+-
+-
+-} // namespace Gtk
+-
+-
+-namespace
+-{
+-} // anonymous namespace
+-
+-
+-namespace Glib
+-{
+-
+-Glib::RefPtr<Gtk::Application> wrap(GtkApplication* object, bool take_copy)
+-{
+- return Glib::RefPtr<Gtk::Application>( dynamic_cast<Gtk::Application*> (Glib::wrap_auto ((GObject*)(object), take_copy)) );
+- //We use dynamic_cast<> in case of multiple inheritance.
+-}
+-
+-} /* namespace Glib */
+-
+-
+-namespace Gtk
+-{
+-
+-
+-/* The *_Class implementation: */
+-
+-const Glib::Class& Application_Class::init()
+-{
+- if(!gtype_) // create the GType if necessary
+- {
+- // Glib::Class has to know the class init function to clone custom types.
+- class_init_func_ = &Application_Class::class_init_function;
+-
+- // This is actually just optimized away, apparently with no harm.
+- // Make sure that the parent type has been created.
+- //CppClassParent::CppObjectType::get_type();
+-
+- // Create the wrapper type, with the same class/instance size as the base type.
+- register_derived_type(gtk_application_get_type());
+-
+- // Add derived versions of interfaces, if the C type implements any interfaces:
+-
+- }
+-
+- return *this;
+-}
+-
+-
+-void Application_Class::class_init_function(void* g_class, void* class_data)
+-{
+- BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
+- CppClassParent::class_init_function(klass, class_data);
+-
+-
+-}
+-
+-
+-Glib::ObjectBase* Application_Class::wrap_new(GObject* object)
+-{
+- return new Application((GtkApplication*)object);
+-}
+-
+-
+-/* The implementation: */
+-
+-GtkApplication* Application::gobj_copy()
+-{
+- reference();
+- return gobj();
+-}
+-
+-Application::Application(const Glib::ConstructParams& construct_params)
+-:
+- Gio::Application(construct_params)
+-{
+-
+-}
+-
+-Application::Application(GtkApplication* castitem)
+-:
+- Gio::Application((GApplication*)(castitem))
+-{}
+-
+-
+-Application::~Application()
+-{}
+-
+-
+-Application::CppClassType Application::application_class_; // initialize static member
+-
+-GType Application::get_type()
+-{
+- return application_class_.init().get_type();
+-}
+-
+-
+-GType Application::get_base_type()
+-{
+- return gtk_application_get_type();
+-}
+-
+-
+-Glib::RefPtr<Application> Application::create(const Glib::ustring& appid, int& argc, char**& argv)
+-{
+- return Glib::wrap(gtk_application_new(appid.c_str(), &argc, &(argv)));
+-}
+-
+-
+-void Application::set_action_group(const Glib::RefPtr<ActionGroup>& group)
+-{
+-gtk_application_set_action_group(gobj(), Glib::unwrap(group));
+-}
+-
+-Window* Application::create_window()
+-{
+- return Glib::wrap(gtk_application_create_window(gobj()));
+-}
+-
+-Window* Application::get_window()
+-{
+- return Glib::wrap(gtk_application_get_window(gobj()));
+-}
+-
+-const Window* Application::get_window() const
+-{
+- return const_cast<Application*>(this)->get_window();
+-}
+-
+-Glib::SListHandle<Window*> Application::get_windows()
+-{
+- return Glib::SListHandle<Window*>(const_cast<GSList*>(gtk_application_get_windows(gobj())), Glib::OWNERSHIP_NONE);
+-}
+-
+-Glib::SListHandle<const Window*> Application::get_windows() const
+-{
+- return Glib::SListHandle<const Window*>(const_cast<GSList*>(gtk_application_get_windows(const_cast<GtkApplication*>(gobj()))), Glib::OWNERSHIP_NONE);
+-}
+-
+-void Application::add_window(Window& window)
+-{
+-gtk_application_add_window(gobj(), (window).gobj());
+-}
+-
+-void Application::run()
+-{
+-gtk_application_run(gobj());
+-}
+-
+-void Application::quit()
+-{
+-gtk_application_quit(gobj());
+-}
+-
+-
+-} // namespace Gtk
+-
+-
+diff -up gtkmm-2.90.7/gtk/gtkmm/application.h.no-application gtkmm-2.90.7/gtk/gtkmm/application.h
+--- gtkmm-2.90.7/gtk/gtkmm/application.h.no-application 2010-09-02 05:13:56.000000000 -0400
++++ gtkmm-2.90.7/gtk/gtkmm/application.h 2010-09-29 15:02:02.107924002 -0400
+@@ -1,289 +0,0 @@
+-// -*- c++ -*-
+-// Generated by gtkmmproc -- DO NOT MODIFY!
+-#ifndef _GTKMM_APPLICATION_H
+-#define _GTKMM_APPLICATION_H
+-
+-#include <gtkmmconfig.h>
+-
+-
+-#include <glibmm.h>
+-
+-/* Copyright (C) 2003 The gtkmm Development Team
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-
+-#include <giomm/application.h>
+-#include <gtkmm/window.h>
+-#include <gtkmm/actiongroup.h>
+-
+-
+-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+-typedef struct _GtkApplication GtkApplication;
+-typedef struct _GtkApplicationClass GtkApplicationClass;
+-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+-
+-
+-namespace Gtk
+-{ class Application_Class; } // namespace Gtk
+-namespace Gtk
+-{
+-
+-/** TODO
+- */
+-
+-class Application
+- : public Gio::Application
+-{
+-protected:
+-
+-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+-
+-public:
+- typedef Application CppObjectType;
+- typedef Application_Class CppClassType;
+- typedef GtkApplication BaseObjectType;
+- typedef GtkApplicationClass BaseClassType;
+-
+-private: friend class Application_Class;
+- static CppClassType application_class_;
+-
+-private:
+- // noncopyable
+- Application(const Application&);
+- Application& operator=(const Application&);
+-
+-protected:
+- explicit Application(const Glib::ConstructParams& construct_params);
+- explicit Application(GtkApplication* castitem);
+-
+-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+-
+-public:
+- virtual ~Application();
+-
+-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+- static GType get_type() G_GNUC_CONST;
+-
+-
+- static GType get_base_type() G_GNUC_CONST;
+-#endif
+-
+- ///Provides access to the underlying C GObject.
+- GtkApplication* gobj() { return reinterpret_cast<GtkApplication*>(gobject_); }
+-
+- ///Provides access to the underlying C GObject.
+- const GtkApplication* gobj() const { return reinterpret_cast<GtkApplication*>(gobject_); }
+-
+- ///Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs.
+- GtkApplication* gobj_copy();
+-
+-private:
+-
+-
+-public:
+-
+-
+- /** Create a new Gtk::Application, or if one has already been initialized
+- * in this process, return the existing instance. This function will as
+- * a side effect initialize the display system; see gtk_init().
+- *
+- * For the behavior if this application is running in another process,
+- * see Glib::application_new().
+- *
+- * @newin{3,0}
+- * @param appid System-dependent application identifier.
+- * @param argc System argument count.
+- * @param argv System argument vector.
+- * @return A newly-referenced Gtk::Application.
+- */
+- static Glib::RefPtr<Application> create(const Glib::ustring& appid, int& argc, char**& argv);
+-
+- //TODO: Documentation
+- static Glib::RefPtr<Application> create(const Glib::ustring& appid);
+-
+-
+- /** Set @a group as this application's global action group.
+- * This will ensure the operating system interface uses
+- * these actions as follows:
+- *
+- * <itemizedlist>
+- * <listitem>In GNOME 2 this exposes the actions for scripting.</listitem>
+- * <listitem>In GNOME 3, this function populates the application menu.</listitem>
+- * <listitem>In Windows prior to version 7, this function does nothing.</listitem>
+- * <listitem>In Windows 7, this function adds "Tasks" to the Jump List.</listitem>
+- * <listitem>In Mac OS X, this function extends the Dock menu.</listitem>
+- * </itemizedlist>
+- *
+- * It is an error to call this function more than once.
+- *
+- * @newin{3,0}
+- * @param group A Gtk::ActionGroup.
+- */
+- void set_action_group(const Glib::RefPtr<ActionGroup>& group);
+-
+-
+- /** Creates a new Gtk::Window for the application.
+- *
+- * This function calls the Gtk::Application::create_window() virtual function,
+- * which can be overridden by sub-classes, for instance to use Gtk::Builder to
+- * create the user interface. After creating a new Gtk::Window instance, it will
+- * be added to the list of toplevels associated to the application.
+- *
+- * @newin{3,0}
+- * @return The newly created application Gtk::Window.
+- */
+- Window* create_window();
+-
+-
+- /** A simple Gtk::Application has a "default window". This window should
+- * act as the primary user interaction point with your application.
+- * The window returned by this function is of type Gtk::WINDOW_TYPE_TOPLEVEL
+- * and its properties such as "title" and "icon-name" will be initialized
+- * as appropriate for the platform.
+- *
+- * If the user closes this window, and your application hasn't created
+- * any other windows, the default action will be to call quit().
+- *
+- * If your application has more than one toplevel window (e.g. an
+- * single-document-interface application with multiple open documents),
+- * or if you are constructing your toplevel windows yourself (e.g. using
+- * Gtk::Builder), use create_window() or
+- * add_window() instead.
+- *
+- * @newin{3,0}
+- * @return The default Gtk::Window for this application.
+- */
+- Window* get_window();
+-
+- /** A simple Gtk::Application has a "default window". This window should
+- * act as the primary user interaction point with your application.
+- * The window returned by this function is of type Gtk::WINDOW_TYPE_TOPLEVEL
+- * and its properties such as "title" and "icon-name" will be initialized
+- * as appropriate for the platform.
+- *
+- * If the user closes this window, and your application hasn't created
+- * any other windows, the default action will be to call quit().
+- *
+- * If your application has more than one toplevel window (e.g. an
+- * single-document-interface application with multiple open documents),
+- * or if you are constructing your toplevel windows yourself (e.g. using
+- * Gtk::Builder), use create_window() or
+- * add_window() instead.
+- *
+- * @newin{3,0}
+- * @return The default Gtk::Window for this application.
+- */
+- const Window* get_window() const;
+-
+-
+- /** Retrieves the list of windows previously registered with
+- * create_window() or add_window().
+- *
+- * @newin{3,0}
+- * @return A pointer
+- * to the list of Gtk::Window<!-- -->s registered by this application,
+- * or <tt>0</tt>. The returned SList is owned by the Gtk::Application
+- * and it should not be modified or freed directly.
+- */
+- Glib::SListHandle<Window*> get_windows();
+-
+-
+- /** Retrieves the list of windows previously registered with
+- * create_window() or add_window().
+- *
+- * @newin{3,0}
+- * @return A pointer
+- * to the list of Gtk::Window<!-- -->s registered by this application,
+- * or <tt>0</tt>. The returned SList is owned by the Gtk::Application
+- * and it should not be modified or freed directly.
+- */
+- Glib::SListHandle<const Window*> get_windows() const;
+-
+-
+- /** Adds a window to the Gtk::Application.
+- *
+- * If all the windows managed by Gtk::Application are closed, the
+- * Gtk::Application will call quit(), and quit
+- * the application.
+- *
+- * If your application uses only a single toplevel window, you can
+- * use get_window(). If you are using a sub-class
+- * of Gtk::Application you should call create_window()
+- * to let the Gtk::Application instance create a Gtk::Window and add
+- * it to the list of toplevels of the application. You should call
+- * this function only to add Gtk::Window<!-- -->s that you created
+- * directly using Gtk::Window::new().
+- *
+- * @newin{3,0}
+- * @param window A toplevel window to add to @a app.
+- */
+- void add_window(Window& window);
+-
+- /** Runs the main loop; see Glib::application_run().
+- * The default implementation for Gtk::Application uses gtk_main().
+- *
+- * @newin{3,0}
+- */
+- void run();
+-
+- /** Request the application exit. This function invokes
+- * Glib::application_quit_with_data(), which normally will
+- * in turn cause @a app to emit Gtk::Application::quit.
+- *
+- * To control an application's quit behavior (for example, to ask for
+- * files to be saved), connect to the Gtk::Application::quit signal
+- * handler.
+- *
+- * @newin{3,0}
+- */
+- void quit();
+-
+- //gtkmmproc error: window : property defs lookup failed.;
+-
+-
+-public:
+-
+-public:
+- //C++ methods used to invoke GTK+ virtual functions:
+-
+-protected:
+- //GTK+ Virtual Functions (override these to change behaviour):
+-
+- //Default Signal Handlers::
+-
+-
+-};
+-
+-} // namespace Gtk
+-
+-
+-namespace Glib
+-{
+- /** A Glib::wrap() method for this object.
+- *
+- * @param object The C instance.
+- * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
+- * @result A C++ instance that wraps this C instance.
+- *
+- * @relates Gtk::Application
+- */
+- Glib::RefPtr<Gtk::Application> wrap(GtkApplication* object, bool take_copy = false);
+-}
+-
+-
+-#endif /* _GTKMM_APPLICATION_H */
+-
+diff -up gtkmm-2.90.7/gtk/gtkmm/Makefile.in.no-application gtkmm-2.90.7/gtk/gtkmm/Makefile.in
+--- gtkmm-2.90.7/gtk/gtkmm/Makefile.in.no-application 2010-09-15 04:39:37.000000000 -0400
++++ gtkmm-2.90.7/gtk/gtkmm/Makefile.in 2010-09-29 15:02:02.110924000 -0400
+@@ -85,7 +85,7 @@ libgtkmm_ at GTKMM_API_VERSION@_la_DEPENDEN
+ $(am__DEPENDENCIES_1)
+ am__libgtkmm_ at GTKMM_API_VERSION@_la_SOURCES_DIST = aboutdialog.cc \
+ accelgroup.cc accellabel.cc action.cc actiongroup.cc \
+- activatable.cc adjustment.cc alignment.cc application.cc \
++ activatable.cc adjustment.cc alignment.cc \
+ arrow.cc aspectframe.cc assistant.cc bin.cc border.cc box.cc \
+ buildable.cc builder.cc button.cc buttonbox.cc calendar.cc \
+ celleditable.cc celllayout.cc cellrenderer.cc \
+@@ -134,7 +134,7 @@ am__libgtkmm_ at GTKMM_API_VERSION@_la_SOUR
+ treemodelcolumn.cc treeview_private.cc
+ am__objects_1 = aboutdialog.lo accelgroup.lo accellabel.lo action.lo \
+ actiongroup.lo activatable.lo adjustment.lo alignment.lo \
+- application.lo arrow.lo aspectframe.lo assistant.lo bin.lo \
++ arrow.lo aspectframe.lo assistant.lo bin.lo \
+ border.lo box.lo buildable.lo builder.lo button.lo \
+ buttonbox.lo calendar.lo celleditable.lo celllayout.lo \
+ cellrenderer.lo cellrendereraccel.lo cellrenderercombo.lo \
+@@ -232,7 +232,7 @@ SOURCES = $(libgtkmm_ at GTKMM_API_VERSION@
+ DIST_SOURCES = $(am__libgtkmm_ at GTKMM_API_VERSION@_la_SOURCES_DIST)
+ am__binding_include_HEADERS_DIST = aboutdialog.h accelgroup.h \
+ accellabel.h action.h actiongroup.h activatable.h adjustment.h \
+- alignment.h application.h arrow.h aspectframe.h assistant.h \
++ alignment.h arrow.h aspectframe.h assistant.h \
+ bin.h border.h box.h buildable.h builder.h button.h \
+ buttonbox.h calendar.h celleditable.h celllayout.h \
+ cellrenderer.h cellrendereraccel.h cellrenderercombo.h \
+@@ -455,7 +455,6 @@ gtkmm_files_any_hg = \
+ activatable.hg \
+ adjustment.hg \
+ alignment.hg \
+- application.hg \
+ arrow.hg \
+ aspectframe.hg \
+ assistant.hg \
+@@ -785,7 +784,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/activatable.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/adjustment.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/alignment.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/application.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/arrow.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aspectframe.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/assistant.Plo at am__quote@
+diff -up gtkmm-2.90.7/gtk/gtkmm/private/application_p.h.no-application gtkmm-2.90.7/gtk/gtkmm/private/application_p.h
+--- gtkmm-2.90.7/gtk/gtkmm/private/application_p.h.no-application 2010-08-03 11:28:49.000000000 -0400
++++ gtkmm-2.90.7/gtk/gtkmm/private/application_p.h 2010-09-29 15:02:41.771924121 -0400
+@@ -1,48 +0,0 @@
+-// -*- c++ -*-
+-// Generated by gtkmmproc -- DO NOT MODIFY!
+-#ifndef _GTKMM_APPLICATION_P_H
+-#define _GTKMM_APPLICATION_P_H
+-
+-
+-#include <giomm/private/application_p.h>
+-
+-#include <glibmm/class.h>
+-
+-namespace Gtk
+-{
+-
+-class Application_Class : public Glib::Class
+-{
+-public:
+-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+- typedef Application CppObjectType;
+- typedef GtkApplication BaseObjectType;
+- typedef GtkApplicationClass BaseClassType;
+- typedef Gio::Application_Class CppClassParent;
+- typedef GApplicationClass BaseClassParent;
+-
+- friend class Application;
+-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+-
+- const Glib::Class& init();
+-
+-
+- static void class_init_function(void* g_class, void* class_data);
+-
+- static Glib::ObjectBase* wrap_new(GObject*);
+-
+-protected:
+-
+- //Callbacks (default signal handlers):
+- //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
+- //You could prevent the original default signal handlers being called by overriding the *_impl method.
+-
+- //Callbacks (virtual functions):
+-};
+-
+-
+-} // namespace Gtk
+-
+-
+-#endif /* _GTKMM_APPLICATION_P_H */
+-
+diff -up gtkmm-2.90.7/gtk/gtkmm/wrap_init.cc.no-application gtkmm-2.90.7/gtk/gtkmm/wrap_init.cc
+--- gtkmm-2.90.7/gtk/gtkmm/wrap_init.cc.no-application 2010-09-15 04:45:56.000000000 -0400
++++ gtkmm-2.90.7/gtk/gtkmm/wrap_init.cc 2010-09-29 15:02:02.111924000 -0400
+@@ -20,7 +20,6 @@
+ #include "activatable.h"
+ #include "adjustment.h"
+ #include "alignment.h"
+-#include "application.h"
+ #include "arrow.h"
+ #include "aspectframe.h"
+ #include "assistant.h"
+@@ -196,7 +195,6 @@ GType gtk_action_get_type(void);
+ GType gtk_action_group_get_type(void);
+ GType gtk_adjustment_get_type(void);
+ GType gtk_alignment_get_type(void);
+-GType gtk_application_get_type(void);
+ GType gtk_arrow_get_type(void);
+ GType gtk_aspect_frame_get_type(void);
+ GType gtk_assistant_get_type(void);
+@@ -379,7 +377,6 @@ namespace Gtk { class Action_Class { pu
+ namespace Gtk { class ActionGroup_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
+ namespace Gtk { class Adjustment_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
+ namespace Gtk { class Alignment_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
+-namespace Gtk { class Application_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
+ namespace Gtk { class Arrow_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
+ namespace Gtk { class AspectFrame_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
+ namespace Gtk { class Assistant_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
+@@ -562,7 +559,6 @@ void wrap_init()
+ Glib::wrap_register(gtk_action_group_get_type(), &Gtk::ActionGroup_Class::wrap_new);
+ Glib::wrap_register(gtk_adjustment_get_type(), &Gtk::Adjustment_Class::wrap_new);
+ Glib::wrap_register(gtk_alignment_get_type(), &Gtk::Alignment_Class::wrap_new);
+- Glib::wrap_register(gtk_application_get_type(), &Gtk::Application_Class::wrap_new);
+ Glib::wrap_register(gtk_arrow_get_type(), &Gtk::Arrow_Class::wrap_new);
+ Glib::wrap_register(gtk_aspect_frame_get_type(), &Gtk::AspectFrame_Class::wrap_new);
+ Glib::wrap_register(gtk_assistant_get_type(), &Gtk::Assistant_Class::wrap_new);
+@@ -733,7 +729,6 @@ void wrap_init()
+ Gtk::ActionGroup::get_type();
+ Gtk::Adjustment::get_type();
+ Gtk::Alignment::get_type();
+- Gtk::Application::get_type();
+ Gtk::Arrow::get_type();
+ Gtk::AspectFrame::get_type();
+ Gtk::Assistant::get_type();
+diff -up gtkmm-2.90.7/gtk/src/application.hg.no-application gtkmm-2.90.7/gtk/src/application.hg
+--- gtkmm-2.90.7/gtk/src/application.hg.no-application 2010-09-02 05:14:52.000000000 -0400
++++ gtkmm-2.90.7/gtk/src/application.hg 2010-09-29 15:02:02.112924000 -0400
+@@ -1,67 +0,0 @@
+-/* Copyright (C) 2003 The gtkmm Development Team
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-_CONFIGINCLUDE(gtkmmconfig.h)
+-
+-#include <giomm/application.h>
+-#include <gtkmm/window.h>
+-#include <gtkmm/actiongroup.h>
+-
+-_DEFS(gtkmm,gtk)
+-_PINCLUDE(giomm/private/application_p.h)
+-
+-namespace Gtk
+-{
+-
+-/** TODO
+- */
+-class Application
+- : public Gio::Application
+-{
+-protected:
+- _CLASS_GOBJECT(Application, GtkApplication, GTK_APPLICATION, Gio::Application, GApplication)
+-
+-public:
+-
+-#m4 _CONVERSION(`int& ',`gint**',`&($3)')
+-#m4 _CONVERSION(`char**&',`gchar***',`&($3)')
+- _WRAP_METHOD(static Glib::RefPtr<Application> create(const Glib::ustring& appid, int& argc, char**& argv), gtk_application_new)
+-
+- //TODO: Documentation
+- static Glib::RefPtr<Application> create(const Glib::ustring& appid);
+-
+- _WRAP_METHOD(void set_action_group(const Glib::RefPtr<ActionGroup>& group), gtk_application_set_action_group)
+-
+- _WRAP_METHOD(Window* create_window(), gtk_application_create_window)
+-
+- _WRAP_METHOD(Window* get_window(), gtk_application_get_window)
+- _WRAP_METHOD(const Window* get_window() const, gtk_application_get_window, constversion)
+-
+-#m4 _CONVERSION(`const GSList*',`Glib::SListHandle<Window*>',`$2(const_cast<GSList*>($3), Glib::OWNERSHIP_NONE)')
+- _WRAP_METHOD(Glib::SListHandle<Window*> get_windows(), gtk_application_get_windows)
+-
+-#m4 _CONVERSION(`const GSList*',`Glib::SListHandle<const Window*>',`$2(const_cast<GSList*>($3), Glib::OWNERSHIP_NONE)')
+- _WRAP_METHOD(Glib::SListHandle<const Window*> get_windows() const, gtk_application_get_windows)
+-
+- _WRAP_METHOD(void add_window(Window& window), gtk_application_add_window)
+- _WRAP_METHOD(void run(), gtk_application_run)
+- _WRAP_METHOD(void quit(), gtk_application_quit)
+-
+- _WRAP_PROPERTY("window", Gtk::Window*);
+-};
+-
+-} // namespace Gtk
+diff -up gtkmm-2.90.7/gtk/src/Makefile.in.no-application gtkmm-2.90.7/gtk/src/Makefile.in
+--- gtkmm-2.90.7/gtk/src/Makefile.in.no-application 2010-09-15 04:39:37.000000000 -0400
++++ gtkmm-2.90.7/gtk/src/Makefile.in 2010-09-29 15:02:02.113924000 -0400
+@@ -241,7 +241,6 @@ gtkmm_files_any_hg = \
+ activatable.hg \
+ adjustment.hg \
+ alignment.hg \
+- application.hg \
+ arrow.hg \
+ aspectframe.hg \
+ assistant.hg \
diff --git a/gtkmm30.spec b/gtkmm30.spec
index 34d2050..c401d36 100644
--- a/gtkmm30.spec
+++ b/gtkmm30.spec
@@ -3,8 +3,8 @@
%define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
Name: gtkmm30
-Version: 2.90.5
-Release: 3%{?dist}
+Version: 2.90.7
+Release: 1%{?dist}
Summary: C++ interface for the GTK+ library
Group: System Environment/Libraries
@@ -13,6 +13,8 @@ URL: http://www.gtkmm.org/
Source0: http://ftp.gnome.org/pub/GNOME/sources/gtkmm/%{release_version}/gtkmm-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: gtkmm-2.90.7-no-application.patch
+
BuildRequires: atkmm-devel
BuildRequires: cairomm-devel
BuildRequires: glibmm24-devel
@@ -52,6 +54,7 @@ This package contains the full API documentation for %{name}.
%prep
%setup -q -n gtkmm-%{version}
+%patch0 -p1 -b .no-application
# Copy demos before build to avoid including built binaries in -doc package
mkdir -p _docs
@@ -120,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 29 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.90.7-1
+- 2.90.7
+- no more "application" support in glib
+
* Wed Sep 29 2010 jkeating - 2.90.5-3
- Rebuilt for gcc bug 634757
diff --git a/sources b/sources
index ee2b5ec..0fecfc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-333d4711644003cb5b917817dfbfeaca gtkmm-2.90.5.tar.bz2
+193afd0dc22fa39ff1512bfbbe247fc7 gtkmm-2.90.7.tar.bz2
More information about the scm-commits
mailing list