Hello community,
here is the log from the commit of package glibmm2
checked in at Mon Dec 1 17:52:03 CET 2008.
--------
--- GNOME/glibmm2/glibmm2.changes 2008-10-22 22:35:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/glibmm2/glibmm2.changes 2008-11-29 02:00:42.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 28 19:17:05 EST 2008 - hfiguiere@suse.de
+
+- Add patch glibmm2-bgo555743.diff
+ + fix warnings in installed header. bgo#555743
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
glibmm2-bgo555743.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glibmm2.spec ++++++
--- /var/tmp/diff_new_pack.J29834/_old 2008-12-01 17:51:46.000000000 +0100
+++ /var/tmp/diff_new_pack.J29834/_new 2008-12-01 17:51:46.000000000 +0100
@@ -24,13 +24,15 @@
BuildRequires: gtk2-devel
BuildRequires: libsigc++2-devel
Version: 2.18.1
-Release: 1
+Release: 2
Group: System/Libraries
License: LGPL v2.1 or later
Summary: C++ Interface for GLib2
Url: http://www.gtkmm.org/
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
Patch0: glibmm2-includes.patch
+# PATCH-FIX-UPSTREAM glibmm2-bgo555743.diff - bgo#555743 - hfiguiere@novell.com
+Patch1: glibmm2-bgo555743.diff
AutoReqProv: on
Provides: glibmm24 = %{version}
Obsoletes: glibmm24
@@ -97,8 +99,16 @@
%prep
%setup -q -n %{_name}-%{version}
%patch0
+%patch1 -p0
%build
+# touch doc files to not cause their rebuild.
+# comment these 3 line when you don't patch any source file
+# like in glibmm2-bgo555743.diff
+touch docs/reference/html/index.html
+touch docs/reference/xml/index.xml
+touch docs/reference/glibmm-2.4.devhelp
+#
autoreconf -f -i
# needed for glibmm-2.12.2:
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -145,6 +155,9 @@
%{_libdir}/giomm-2.4
%changelog
+* Fri Nov 28 2008 hfiguiere@suse.de
+- Add patch glibmm2-bgo555743.diff
+ + fix warnings in installed header. bgo#555743
* Wed Oct 22 2008 maw@suse.de
- Update to version 2.18.1:
+ Bugs fixed: bgo#506410, bgo#529496, bgo#539891, bgo#555576,
++++++ glibmm2-bgo555743.diff ++++++
Index: glib/src/nodetree.hg
===================================================================
--- glib/src/nodetree.hg (revision 745)
+++ glib/src/nodetree.hg (working copy)
@@ -88,8 +88,8 @@
clone();
}
- explicit NodeTree(const T& data) :
- data_(data)
+ explicit NodeTree(const T& the_data) :
+ data_(the_data)
{
clone();
}
@@ -207,9 +207,9 @@
* @param data the data for the new NodeTree
* @return the new NodeTree
*/
- NodeTree<T>* insert_data(int position, const T& data)
+ NodeTree<T>* insert_data(int position, const T& the_data)
{
- NodeTree<T>* node = new NodeTree<T>(data);
+ NodeTree<T>* node = new NodeTree<T>(the_data);
insert(position, *node);
return node;
}
@@ -221,9 +221,9 @@
* @param data the data for the new NodeTree
* @return the new NodeTree
*/
- NodeTree<T>* insert_data_before(NodeTree<T>& sibling, const T& data)
+ NodeTree<T>* insert_data_before(NodeTree<T>& sibling, const T& the_data)
{
- NodeTree<T>* node = new NodeTree<T>(data);
+ NodeTree<T>* node = new NodeTree<T>(the_data);
insert_before(sibling, *node);
return node;
}
@@ -234,9 +234,9 @@
* @param data the data for the new NodeTree
* @return the new NodeTree
*/
- NodeTree<T>* append_data(const T& data)
+ NodeTree<T>* append_data(const T& the_data)
{
- NodeTree<T>* node = new NodeTree<T>(data);
+ NodeTree<T>* node = new NodeTree<T>(the_data);
append(*node);
return node;
}
@@ -247,9 +247,9 @@
* @param data the data for the new NodeTree
* @return the new NodeTree
*/
- NodeTree<T>* prepend_data(const T& data)
+ NodeTree<T>* prepend_data(const T& the_data)
{
- NodeTree<T>* node = new NodeTree<T>(data);
+ NodeTree<T>* node = new NodeTree<T>(the_data);
prepend(*node);
return node;
}
@@ -331,13 +331,13 @@
* @param data The data for which to search.
* @return the found child, or 0 if the data is not found
*/
- NodeTree<T>* find_child(const T& data, TraverseFlags flags = TRAVERSE_ALL)
+ NodeTree<T>* find_child(const T& the_data, TraverseFlags flags = TRAVERSE_ALL)
{
sigc::slot real_slot = sigc::ptr_fun(on_compare_child);
GNode* child = 0;
typedef sigc::slot type_foreach_gnode_slot;
- type_foreach_gnode_slot bound_slot = sigc::bind(real_slot, data, &child);
+ type_foreach_gnode_slot bound_slot = sigc::bind(real_slot, the_data, &child);
g_node_children_foreach(gobj(), (GTraverseFlags)flags, c_callback_foreach_compare_child, reinterpret_cast<gpointer>(&bound_slot));
@@ -350,9 +350,9 @@
* @param data The data for which to search.
* @return the found child, or 0 if the data is not found
*/
- const NodeTree<T>* find_child(const T& data, TraverseFlags flags = TRAVERSE_ALL) const
+ const NodeTree<T>* find_child(const T& the_data, TraverseFlags flags = TRAVERSE_ALL) const
{
- return const_cast(this)->find_child(flags, data);
+ return const_cast(this)->find_child(flags, the_data);
}
_IGNORE(g_node_find_child)
@@ -364,14 +364,14 @@
* @param data The data for which to search.
* @return The found node, or 0 if the data is not found.
*/
- NodeTree<T>* find(const T& data, TraverseType order = TRAVERSE_IN_ORDER, TraverseFlags flags = TRAVERSE_ALL)
+ NodeTree<T>* find(const T& the_data, TraverseType order = TRAVERSE_IN_ORDER, TraverseFlags flags = TRAVERSE_ALL)
{
//We use a sigc::slot for the C callback, so we can bind some extra data.
sigc::slot real_slot = sigc::ptr_fun(on_compare_node);
GNode* child = 0;
typedef sigc::slot type_traverse_gnode_slot;
- type_traverse_gnode_slot bound_slot = sigc::bind(real_slot, data, &child);
+ type_traverse_gnode_slot bound_slot = sigc::bind(real_slot, the_data, &child);
g_node_traverse(const_cast(gobj()), (GTraverseType)order, (GTraverseFlags)flags, -1, c_callback_traverse_compare_node, reinterpret_cast<gpointer>(&bound_slot));
@@ -385,9 +385,9 @@
* @param data The data for which to search.
* @return The found node, or 0 if the data is not found.
*/
- const NodeTree<T>* find(const T& data, TraverseType order = TRAVERSE_IN_ORDER, TraverseFlags flags = TRAVERSE_ALL) const
+ const NodeTree<T>* find(const T& the_data, TraverseType order = TRAVERSE_IN_ORDER, TraverseFlags flags = TRAVERSE_ALL) const
{
- return const_cast(this)->find(order, flags, data);
+ return const_cast(this)->find(order, flags, the_data);
}
_IGNORE(g_node_find)
@@ -396,13 +396,13 @@
* @param data The data to find.
* @return The index of the child which contains data, or -1 if the data is not found.
*/
- int child_index(const T& data) const
+ int child_index(const T& the_data) const
{
int n = 0;
for(const NodeTree<T>* i = first_child(); i != 0; i = i->next_sibling())
{
- if((i->data()) == data)
+ if((i->data()) == the_data)
return n;
n++;
--- glib/glibmm/nodetree.h 2008-11-28 16:15:37.000000000 -0500
+++ glib/glibmm/nodetree.h 2008-09-04 23:15:12.000000000 -0400
@@ -100,8 +100,8 @@
clone();
}
- explicit NodeTree(const T& data) :
- data_(data)
+ explicit NodeTree(const T& the_data) :
+ data_(the_data)
{
clone();
}
@@ -218,9 +218,9 @@
* @param data the data for the new NodeTree
* @return the new NodeTree
*/
+ NodeTree<T>* insert_data(int position, const T& the_data)
- NodeTree<T>* insert_data(int position, const T& data)
{
+ NodeTree<T>* node = new NodeTree<T>(the_data);
- NodeTree<T>* node = new NodeTree<T>(data);
insert(position, *node);
return node;
}
@@ -232,9 +232,9 @@
* @param data the data for the new NodeTree
* @return the new NodeTree
*/
+ NodeTree<T>* insert_data_before(NodeTree<T>& sibling, const T& the_data)
- NodeTree<T>* insert_data_before(NodeTree<T>& sibling, const T& data)
{
+ NodeTree<T>* node = new NodeTree<T>(the_data);
- NodeTree<T>* node = new NodeTree<T>(data);
insert_before(sibling, *node);
return node;
}
@@ -245,9 +245,9 @@
* @param data the data for the new NodeTree
* @return the new NodeTree
*/
+ NodeTree<T>* append_data(const T& the_data)
- NodeTree<T>* append_data(const T& data)
{
+ NodeTree<T>* node = new NodeTree<T>(the_data);
- NodeTree<T>* node = new NodeTree<T>(data);
append(*node);
return node;
}
@@ -258,9 +258,9 @@
* @param data the data for the new NodeTree
* @return the new NodeTree
*/
+ NodeTree<T>* prepend_data(const T& the_data)
- NodeTree<T>* prepend_data(const T& data)
{
+ NodeTree<T>* node = new NodeTree<T>(the_data);
- NodeTree<T>* node = new NodeTree<T>(data);
prepend(*node);
return node;
}
@@ -341,13 +341,13 @@
* @param data The data for which to search.
* @return the found child, or 0 if the data is not found
*/
+ NodeTree<T>* find_child(const T& the_data, TraverseFlags flags = TRAVERSE_ALL)
- NodeTree<T>* find_child(const T& data, TraverseFlags flags = TRAVERSE_ALL)
{
sigc::slot real_slot = sigc::ptr_fun(on_compare_child);
GNode* child = 0;
typedef sigc::slot type_foreach_gnode_slot;
+ type_foreach_gnode_slot bound_slot = sigc::bind(real_slot, the_data, &child);
- type_foreach_gnode_slot bound_slot = sigc::bind(real_slot, data, &child);
g_node_children_foreach(gobj(), (GTraverseFlags)flags, c_callback_foreach_compare_child, reinterpret_cast<gpointer>(&bound_slot));
@@ -360,9 +360,9 @@
* @param data The data for which to search.
* @return the found child, or 0 if the data is not found
*/
+ const NodeTree<T>* find_child(const T& the_data, TraverseFlags flags = TRAVERSE_ALL) const
- const NodeTree<T>* find_child(const T& data, TraverseFlags flags = TRAVERSE_ALL) const
{
+ return const_cast(this)->find_child(flags, the_data);
- return const_cast(this)->find_child(flags, data);
}
@@ -373,14 +373,14 @@
* @param data The data for which to search.
* @return The found node, or 0 if the data is not found.
*/
+ NodeTree<T>* find(const T& the_data, TraverseType order = TRAVERSE_IN_ORDER, TraverseFlags flags = TRAVERSE_ALL)
- NodeTree<T>* find(const T& data, TraverseType order = TRAVERSE_IN_ORDER, TraverseFlags flags = TRAVERSE_ALL)
{
//We use a sigc::slot for the C callback, so we can bind some extra data.
sigc::slot real_slot = sigc::ptr_fun(on_compare_node);
GNode* child = 0;
typedef sigc::slot type_traverse_gnode_slot;
+ type_traverse_gnode_slot bound_slot = sigc::bind(real_slot, the_data, &child);
- type_traverse_gnode_slot bound_slot = sigc::bind(real_slot, data, &child);
g_node_traverse(const_cast(gobj()), (GTraverseType)order, (GTraverseFlags)flags, -1, c_callback_traverse_compare_node, reinterpret_cast<gpointer>(&bound_slot));
@@ -394,9 +394,9 @@
* @param data The data for which to search.
* @return The found node, or 0 if the data is not found.
*/
+ const NodeTree<T>* find(const T& the_data, TraverseType order = TRAVERSE_IN_ORDER, TraverseFlags flags = TRAVERSE_ALL) const
- const NodeTree<T>* find(const T& data, TraverseType order = TRAVERSE_IN_ORDER, TraverseFlags flags = TRAVERSE_ALL) const
{
+ return const_cast(this)->find(order, flags, the_data);
- return const_cast(this)->find(order, flags, data);
}
@@ -405,13 +405,13 @@
* @param data The data to find.
* @return The index of the child which contains data, or -1 if the data is not found.
*/
+ int child_index(const T& the_data) const
- int child_index(const T& data) const
{
int n = 0;
for(const NodeTree<T>* i = first_child(); i != 0; i = i->next_sibling())
{
+ if((i->data()) == the_data)
- if((i->data()) == data)
return n;
n++;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org