Hi,
Not sure if it is right place, but here is really braindead cluttermm
patch fixing build with clutter r3434.
Just in case anyone would need it, and would not want duplicate my
(sed) efforts.
Cheers,
Piotr
Index: clutter/src/container.hg
===================================================================
--- clutter/src/container.hg (wersja 1761)
+++ clutter/src/container.hg (kopia robocza)
@@ -18,7 +18,7 @@
#include <cluttermm/actor.h>
#include <glibmm/interface.h>
#include <glibmm/ustring.h>
-#include <clutter/clutter-container.h>
+#include <clutter/clutter.h>
_DEFS(cluttermm,clutter)
_PINCLUDE(glibmm/private/interface_p.h)
Index: clutter/src/group.ccg
===================================================================
--- clutter/src/group.ccg (wersja 1761)
+++ clutter/src/group.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-group.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/clone-texture.ccg
===================================================================
--- clutter/src/clone-texture.ccg (wersja 1761)
+++ clutter/src/clone-texture.ccg (kopia robocza)
@@ -15,8 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-clone-texture.h>
-#include <clutter/clutter-enum-types.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/texture.hg
===================================================================
--- clutter/src/texture.hg (wersja 1761)
+++ clutter/src/texture.hg (kopia robocza)
@@ -17,7 +17,7 @@
#include <cluttermm/actor.h>
#include <cluttermm/types.h>
-#include <clutter/clutter-texture.h> // For CoglHandle
+#include <clutter/clutter.h> // For CoglHandle
_DEFS(cluttermm,clutter)
_PINCLUDE(cluttermm/private/actor_p.h)
Index: clutter/src/rectangle.ccg
===================================================================
--- clutter/src/rectangle.ccg (wersja 1761)
+++ clutter/src/rectangle.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-rectangle.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/types.hg
===================================================================
--- clutter/src/types.hg (wersja 1761)
+++ clutter/src/types.hg (kopia robocza)
@@ -15,11 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-event.h>
-#include <clutter/clutter-units.h>
-#include <clutter/clutter-color.h>
-#include <clutter/clutter-main.h>
+#include <clutter/clutter.h>
_DEFS(cluttermm,clutter)
Index: clutter/src/behaviour-bspline.ccg
===================================================================
--- clutter/src/behaviour-bspline.ccg (wersja 1761)
+++ clutter/src/behaviour-bspline.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-behaviour-bspline.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/behaviour-rotate.ccg
===================================================================
--- clutter/src/behaviour-rotate.ccg (wersja 1761)
+++ clutter/src/behaviour-rotate.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-behaviour-rotate.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/container.ccg
===================================================================
--- clutter/src/container.ccg (wersja 1761)
+++ clutter/src/container.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-container.h>
+#include <clutter/clutter.h>
static void SignalProxy_Container_foreach_callback(ClutterActor *actor, gpointer user_data)
Index: clutter/src/scriptable.ccg
===================================================================
--- clutter/src/scriptable.ccg (wersja 1761)
+++ clutter/src/scriptable.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-scriptable.h>
+#include <clutter/clutter.h>
namespace Clutter
Index: clutter/src/effecttemplate.ccg
===================================================================
--- clutter/src/effecttemplate.ccg (wersja 1761)
+++ clutter/src/effecttemplate.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-effect.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/script.ccg
===================================================================
--- clutter/src/script.ccg (wersja 1761)
+++ clutter/src/script.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-script.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/stage.hg
===================================================================
--- clutter/src/stage.hg (wersja 1761)
+++ clutter/src/stage.hg (kopia robocza)
@@ -17,7 +17,7 @@
#include <cluttermm/group.h>
#include <cluttermm/color.h>
-#include <clutter/clutter-stage.h> // For ClutterPerspective
+#include <clutter/clutter.h> // For ClutterPerspective
_DEFS(cluttermm,clutter)
_PINCLUDE(cluttermm/private/group_p.h)
Index: clutter/src/behaviour-scale.ccg
===================================================================
--- clutter/src/behaviour-scale.ccg (wersja 1761)
+++ clutter/src/behaviour-scale.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-behaviour-scale.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/score.hg
===================================================================
--- clutter/src/score.hg (wersja 1761)
+++ clutter/src/score.hg (kopia robocza)
@@ -17,7 +17,7 @@
#include <glibmm/object.h>
#include <cluttermm/timeline.h>
-#include <clutter/clutter-score.h>
+#include <clutter/clutter.h>
_DEFS(cluttermm,clutter)
_PINCLUDE(glibmm/private/object_p.h)
Index: clutter/src/label.ccg
===================================================================
--- clutter/src/label.ccg (wersja 1761)
+++ clutter/src/label.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-label.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/behaviour-ellipse.ccg
===================================================================
--- clutter/src/behaviour-ellipse.ccg (wersja 1761)
+++ clutter/src/behaviour-ellipse.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-behaviour-ellipse.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/behaviour.ccg
===================================================================
--- clutter/src/behaviour.ccg (wersja 1761)
+++ clutter/src/behaviour.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-behaviour.h>
+#include <clutter/clutter.h>
static void SignalProxy_behaviours_foreach_callback(ClutterBehaviour* behaviour, ClutterActor *actor, gpointer user_data)
{
Index: clutter/src/alpha.ccg
===================================================================
--- clutter/src/alpha.ccg (wersja 1761)
+++ clutter/src/alpha.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-alpha.h>
+#include <clutter/clutter.h>
static guint32 SignalProxy_Alpha_callback(ClutterAlpha *alpha, gpointer user_data)
{
Index: clutter/src/behaviour-depth.ccg
===================================================================
--- clutter/src/behaviour-depth.ccg (wersja 1761)
+++ clutter/src/behaviour-depth.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-behaviour-depth.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/alpha.hg
===================================================================
--- clutter/src/alpha.hg (wersja 1761)
+++ clutter/src/alpha.hg (kopia robocza)
@@ -17,7 +17,7 @@
#include <glibmm/object.h>
#include <cluttermm/timeline.h>
-#include <clutter/clutter-alpha.h>
+#include <clutter/clutter.h>
_DEFS(cluttermm,clutter)
_PINCLUDE(glibmm/private/object_p.h)
Index: clutter/src/scriptable.hg
===================================================================
--- clutter/src/scriptable.hg (wersja 1761)
+++ clutter/src/scriptable.hg (kopia robocza)
@@ -18,7 +18,7 @@
#include <glibmm/interface.h>
#include <glibmm/ustring.h>
#include <cluttermm/script.h>
-#include <clutter/clutter-scriptable.h>
+#include <clutter/clutter.h>
_DEFS(cluttermm,clutter)
_PINCLUDE(glibmm/private/interface_p.h)
Index: clutter/src/script.hg
===================================================================
--- clutter/src/script.hg (wersja 1761)
+++ clutter/src/script.hg (kopia robocza)
@@ -17,7 +17,7 @@
#include <glibmm/object.h>
#include <cluttermm/timeline.h>
-#include <clutter/clutter-script.h>
+#include <clutter/clutter.h>
_DEFS(cluttermm,clutter)
_PINCLUDE(glibmm/private/object_p.h)
Index: clutter/src/actor.ccg
===================================================================
--- clutter/src/actor.ccg (wersja 1761)
+++ clutter/src/actor.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-actor.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/behaviour-opacity.ccg
===================================================================
--- clutter/src/behaviour-opacity.ccg (wersja 1761)
+++ clutter/src/behaviour-opacity.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-behaviour-opacity.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/texture.ccg
===================================================================
--- clutter/src/texture.ccg (wersja 1761)
+++ clutter/src/texture.ccg (kopia robocza)
@@ -15,8 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-texture.h>
-#include <clutter/clutter-enum-types.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/entry.ccg
===================================================================
--- clutter/src/entry.ccg (wersja 1761)
+++ clutter/src/entry.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-entry.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/stage.ccg
===================================================================
--- clutter/src/stage.ccg (wersja 1761)
+++ clutter/src/stage.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-stage.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/types.ccg
===================================================================
--- clutter/src/types.ccg (wersja 1761)
+++ clutter/src/types.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-types.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/timeline.ccg
===================================================================
--- clutter/src/timeline.ccg (wersja 1761)
+++ clutter/src/timeline.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-timeline.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/shader.hg
===================================================================
--- clutter/src/shader.hg (wersja 1761)
+++ clutter/src/shader.hg (kopia robocza)
@@ -16,7 +16,7 @@
*/
#include <glibmm/object.h>
-#include <clutter/clutter-shader.h>
+#include <clutter/clutter.h>
_DEFS(cluttermm,clutter)
_PINCLUDE(glibmm/private/object_p.h)
Index: clutter/src/actor.hg
===================================================================
--- clutter/src/actor.hg (wersja 1761)
+++ clutter/src/actor.hg (kopia robocza)
@@ -20,7 +20,7 @@
#include <cluttermm/scriptable.h>
#include <cluttermm/shader.h>
#include <cluttermm/types.h> // For Event*
-#include <clutter/clutter-actor.h> // For ClutterActorBox
+#include <clutter/clutter.h> // For ClutterActorBox
_DEFS(cluttermm,clutter)
_PINCLUDE(glibmm/private/object_p.h)
Index: clutter/src/score.ccg
===================================================================
--- clutter/src/score.ccg (wersja 1761)
+++ clutter/src/score.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-score.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/behaviour-path.ccg
===================================================================
--- clutter/src/behaviour-path.ccg (wersja 1761)
+++ clutter/src/behaviour-path.ccg (kopia robocza)
@@ -15,7 +15,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <clutter/clutter-behaviour-path.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/src/media.hg
===================================================================
--- clutter/src/media.hg (wersja 1761)
+++ clutter/src/media.hg (kopia robocza)
@@ -17,7 +17,7 @@
#include <glibmm/interface.h>
#include <glibmm/ustring.h>
-#include <clutter/clutter-media.h>
+#include <clutter/clutter.h>
_DEFS(cluttermm,clutter)
_PINCLUDE(glibmm/private/interface_p.h)
Index: clutter/cluttermm/event.h
===================================================================
--- clutter/cluttermm/event.h (wersja 1761)
+++ clutter/cluttermm/event.h (kopia robocza)
@@ -21,9 +21,8 @@
#include <glibmm.h>
#include <cluttermm/types.h>
-#include <clutter/clutter-event.h>
// We also need these in C++:
-#include <clutter/clutter-keysyms.h>
+#include <clutter/clutter.h>
namespace Clutter
{
Index: clutter/cluttermm/frame-source.cc
===================================================================
--- clutter/cluttermm/frame-source.cc (wersja 1761)
+++ clutter/cluttermm/frame-source.cc (kopia robocza)
@@ -20,9 +20,6 @@
#include <cluttermm/frame-source.h>
#include <clutter/clutter.h>
-// TODO: Remove this as soon as it is included from clutter.h:
-#include <clutter/clutter-frame-source.h>
-
namespace
{
Index: configure.in
===================================================================
--- configure.in (wersja 1761)
+++ configure.in (kopia robocza)
@@ -74,7 +74,7 @@
# Note: We depend on cairomm only because pangomm depends on it
# (but it was not in the pangomm .pc file until recently).
PKG_CHECK_MODULES(CLUTTERMM,
- [clutter-0.8
+ [clutter-0.9
glibmm-2.4 >= 2.14
pangomm-1.4 >= 2.12
cairomm-1.0])
@@ -84,7 +84,7 @@
# the API version of the library. Libraries and pkg-config files will have this
# value appended to them, e.g. libclutter-0.8.so
-API_VER=[0.8]
+API_VER=[0.9]
AC_SUBST(API_VER)
GMM_PROCDIR=`pkg-config --variable=gmmprocdir glibmm-2.4`
