1 --- gnucash-2.6.12/src/optional/gtkmm/gncmm/wrap_init.cpp.orig 2015-12-01 21:54:54.000000000 +0100
2 +++ gnucash-2.6.12/src/optional/gtkmm/gncmm/wrap_init.cpp 2016-04-09 08:46:19.147136139 +0200
4 GType qof_instance_get_type (void);
7 -//Declarations of the *_Class::wrap_new() methods, instead of including all the private headers:
8 +//Private headers have to be included. Otherwise one definition rule is violated.
10 -namespace gnc { class Account_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
11 -namespace gnc { class Book_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
12 -namespace gnc { class Commodity_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
13 -namespace gnc { class GncInstance_Class { public : static Glib::ObjectBase* wrap_new(GObject*); }; }
14 -namespace gnc { class Split_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
15 -namespace gnc { class Transaction_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
16 +#include "private/Account_p.hpp"
17 +#include "private/Book_p.hpp"
18 +#include "private/Commodity_p.hpp"
19 +#include "private/GncInstance_p.hpp"
20 +#include "private/Split_p.hpp"
21 +#include "private/Transaction_p.hpp"
25 --- gnucash-2.6.12/src/optional/gtkmm/gncmm/private/GncInstance_p.hpp.orig 2015-06-29 01:43:24.000000000 +0200
26 +++ gnucash-2.6.12/src/optional/gtkmm/gncmm/private/GncInstance_p.hpp 2016-04-09 09:42:14.883898423 +0200
29 // Generated by gtkmmproc -- DO NOT MODIFY!
30 -#ifndef _GNCMM_GNC_COMMODITY_P_H
31 -#define _GNCMM_GNC_COMMODITY_P_H
32 +#ifndef _GNCMM_GNC_GNCINSTANCE_P_H
33 +#define _GNCMM_GNC_GNCINSTANCE_P_H
36 #include <glibmm/private/object_p.h>
37 --- gnucash-2.6.12/src/optional/gtkmm/test/Makefile.am.orig 2016-01-25 17:33:23.000000000 +0100
38 +++ gnucash-2.6.12/src/optional/gtkmm/test/Makefile.am 2016-04-09 11:18:22.803435318 +0200
43 -test_gtkmm_HEADERS = \
45 $(top_srcdir)/${MODULEPATH}/gncmm/Book.hpp
47 #The tests might require more libraries, but try to keep them