Accepting request 181448 from GNOME:Factory

Resubmit with fix from Zaitor (forwarded request 181443 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/181448
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtkmm2?expand=0&rev=54

gtkmm-2.24.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39
-size 10475704

gtkmm-2.24.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee
+size 10262212

gtkmm2-includes.patch

@@ -1,119 +0,0 @@
-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")
- 

gtkmm2.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Jun 29 12:27:24 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 2.24.4:
+  + Respinned tarball with matching gmmproc version (bgo#697835).
+- Drop gtkmm2-includes.patch: this was needed to work around
+  tarball issues.
+- Remove --enable-maintainer-mode and --enable-documentation
+  configure parameters: as we can use the tarball again, we don't
+  have to do the entire bootstrapping on our own.
+- Drop perl(XML::Parser), graphviz, doxygen and xsltproc
+  BuildRequires, which were only used to bootstrap.
+- Stop packaging INSTALL file as it is not needed.
+
 -------------------------------------------------------------------
 Fri Apr 19 18:11:31 UTC 2013 - dimstar@opensuse.org
 

gtkmm2.spec

@@ -18,15 +18,13 @@
 
 Name:           gtkmm2
 %define _name gtkmm
-Version:        2.24.3
+Version:        2.24.4
 Release:        0
 Summary:        C++ Interface for GTK2 (a GUI Library for X)
 License:        LGPL-2.1+
 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 dimstar@opensuse.org -- Fix include headers of gtkmm
-Patch0:         gtkmm2-includes.patch
 BuildRequires:  atkmm-devel
 BuildRequires:  cairomm-devel
 BuildRequires:  fdupes
@@ -35,11 +33,6 @@ BuildRequires:  glibmm2-devel >= 2.27.93
 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
@@ -79,16 +72,10 @@ freely combined to quickly create complex user interfaces.
 
 %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
@@ -105,7 +92,7 @@ rm -rf %{buildroot}
 
 %files -n libgtkmm-2_4-1
 %defattr (-, root, root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/*.so.*
 
 %files devel