Hello community, here is the log from the commit of package gtkmm2 for openSUSE:Factory checked in at 2013-04-20 17:44:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkmm2 (Old) and /work/SRC/openSUSE:Factory/.gtkmm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtkmm2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkmm2/gtkmm2.changes 2013-04-14 10:14:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtkmm2.new/gtkmm2.changes 2013-04-20 17:44:07.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Apr 19 18:11:31 UTC 2013 - [email protected] + +- Add gtkmm2-includes.patch: Fix header inclusions. +- Add --enable-maintainer-mode and --enable-documentation to + configure: due to above patch, we need to rebuild sources. +- Add perl(XML::Parser), graphviz, doxygen and xsltproc + BuildRequires: enable-maintainer-mode makes use of this module. + +------------------------------------------------------------------- New: ---- gtkmm2-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkmm2.spec ++++++ --- /var/tmp/diff_new_pack.mS7VTY/_old 2013-04-20 17:44:09.000000000 +0200 +++ /var/tmp/diff_new_pack.mS7VTY/_new 2013-04-20 17:44:09.000000000 +0200 @@ -25,6 +25,8 @@ Group: System/Libraries Url: http://www.gtkmm.org/ Source: http://download.gnome.org/sources/gtkmm/2.24/%{_name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gtkmm2-includes.patch bgo#697835 [email protected] -- Fix include headers of gtkmm +Patch0: gtkmm2-includes.patch BuildRequires: atkmm-devel BuildRequires: cairomm-devel BuildRequires: fdupes @@ -33,6 +35,11 @@ BuildRequires: libsigc++2-devel BuildRequires: pangomm-devel >= 2.27.1 BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.0 +# Needed for patch0 +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: xsltproc +BuildRequires: perl(XML::Parser) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -72,12 +79,16 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build # FIXME: cannot autoreconf, HAVE_MKFIFO is missing. #ACLOCAL="aclocal -I scripts" autoreconf -f -i +# --enable-maintainer-mode is needed for patch0 %configure \ - --disable-static + --disable-static \ + --enable-maintainer-mode\ + --enable-documentation make %{?_smp_mflags} gtkmm_docdir=%{_docdir}/%{name}/docs %install ++++++ gtkmm2-includes.patch ++++++ Index: gtkmm-2.24.3/gdk/gdkmm/rgb.cc =================================================================== --- gtkmm-2.24.3.orig/gdk/gdkmm/rgb.cc +++ gtkmm-2.24.3/gdk/gdkmm/rgb.cc @@ -18,7 +18,6 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glibmm/listhandle.h> #include <gdkmm/rgb.h> #include <gdk/gdk.h> Index: gtkmm-2.24.3/gdk/src/color.hg =================================================================== --- gtkmm-2.24.3.orig/gdk/src/color.hg +++ gtkmm-2.24.3/gdk/src/color.hg @@ -23,6 +23,9 @@ _CONFIGINCLUDE(gdkmmconfig.h) _DEFS(gdkmm,gdk) +#include <glibmm/value.h> +#include <glibmm/arrayhandle.h> + namespace Gdk { Index: gtkmm-2.24.3/gdk/src/pixbufanimationiter.hg =================================================================== --- gtkmm-2.24.3.orig/gdk/src/pixbufanimationiter.hg +++ gtkmm-2.24.3/gdk/src/pixbufanimationiter.hg @@ -20,6 +20,7 @@ */ #include <glibmm/object.h> +#include <glibmm/timeval.h> #include <gdkmm/pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h> Index: gtkmm-2.24.3/gdk/src/screen.hg =================================================================== --- gtkmm-2.24.3.orig/gdk/src/screen.hg +++ gtkmm-2.24.3/gdk/src/screen.hg @@ -21,6 +21,7 @@ //#include <gdkmm/visual.h> //#include <gdkmm/window.h> +#include <glibmm/listhandle.h> #include <gdkmm/region.h> //Just to solve GDK_DISABLE_DEPRECATED problems when this header is included from elsewhere. #include <gdkmm/rectangle.h> #include <glibmm/object.h> Index: gtkmm-2.24.3/gdk/src/types.hg =================================================================== --- gtkmm-2.24.3.orig/gdk/src/types.hg +++ gtkmm-2.24.3/gdk/src/types.hg @@ -22,6 +22,9 @@ _DEFS(gdkmm,gdk) #include <gdk/gdk.h> #include <gdkmmconfig.h> +#include <glibmm/listhandle.h> +#include <glibmm/arrayhandle.h> + /* Shadow ERROR macro (from wingdi.h). */ #if defined(ERROR) && !defined(GTKMM_MACRO_SHADOW_ERROR) Index: gtkmm-2.24.3/gtk/gtkmm/selectiondata_private.cc =================================================================== --- gtkmm-2.24.3.orig/gtk/gtkmm/selectiondata_private.cc +++ gtkmm-2.24.3/gtk/gtkmm/selectiondata_private.cc @@ -19,7 +19,6 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glibmm/listhandle.h> #include <gtkmm/selectiondata_private.h> namespace Gtk Index: gtkmm-2.24.3/gtk/src/main.hg =================================================================== --- gtkmm-2.24.3.orig/gtk/src/main.hg +++ gtkmm-2.24.3/gtk/src/main.hg @@ -22,6 +22,7 @@ #include <sigc++/sigc++.h> #include <gdkmm/types.h> //For GdkEventKey +#include <glibmm/optioncontext.h> _DEFS(gtkmm,gtk) Index: gtkmm-2.24.3/gtk/src/treemodel.hg =================================================================== --- gtkmm-2.24.3.orig/gtk/src/treemodel.hg +++ gtkmm-2.24.3/gtk/src/treemodel.hg @@ -26,7 +26,6 @@ _PINCLUDE(glibmm/private/interface_p.h) #m4 _PUSH(SECTION_CC_PRE_INCLUDES) //Include this before the other headers, such as treeiter.h, //so that the undef in GdkRegion is used. -#include <glibmm/listhandle.h> #include <gtkmm/treepath.h> #m4 _POP() Index: gtkmm-2.24.3/gtk/src/widget.hg =================================================================== --- gtkmm-2.24.3.orig/gtk/src/widget.hg +++ gtkmm-2.24.3/gtk/src/widget.hg @@ -986,11 +986,13 @@ dnl */ _WRAP_SIGNAL(void drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const SelectionData& selection_data, guint info, guint time), "drag_data_received") +#ifndef GTKMM_DISABLE_DEPRECATED //Note that the deprecated keyword has no effect on _WRAP_SIGNAL() yet. //It doesn't seem like a good idea to put virtual functions in #ifdefs, because that would change the size of the class instances. /** @deprecated This should never have been in the API. It was never meaningful. */ - _WRAP_SIGNAL(Glib::RefPtr<Atk::Object> get_accessible(), "get_accessible", ifdef GTKMM_ATKMM_ENABLED, refreturn, deprecated) + _WRAP_SIGNAL(Glib::RefPtr<Atk::Object> get_accessible(), "get_accessible", ifdef GTKMM_ATKMM_ENABLED, refreturn) +#endif // GTKMM_DISABLE_DEPRECATED _WRAP_SIGNAL(void screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen), "screen_changed") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
