[cluttermm/cluttermm-1.2] Remove files and api not available to wrap for clutter 1.2.
- From: Chris Kühl <chriskuehl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cluttermm/cluttermm-1.2] Remove files and api not available to wrap for clutter 1.2.
- Date: Thu, 3 Feb 2011 14:33:08 +0000 (UTC)
commit be9e7da9b4bc2d4c811f346160b399035c32afdd
Author: Chris Kühl <chrisk openismus com>
Date: Thu Feb 3 13:10:20 2011 +0100
Remove files and api not available to wrap for clutter 1.2.
* clutter/src/filelist.am: Removed effect.hg from list.
* clutter/src/texture.hg: Removed set_pick_with_alpha.
* codegen/extradefs/generate_extra_defs_clutter.c: Removed
CLUTTER_TYPE_EFFECT
* configure.ac: Decreased version requirements.
ChangeLog | 6 ++++++
clutter/src/filelist.am | 1 -
clutter/src/texture.hg | 3 ---
codegen/extradefs/generate_extra_defs_clutter.cc | 1 -
configure.ac | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 38420d3..7a1c2dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-03 Chris Kühl <chrisk openismus com>
+
+ Remove files not in clutter 1.2.
+
+ * clutter/src/filelist.am: Removed effect.hg from list.
+
2011-02-01 Chris Kühl <chrisk openismus com>
Added missing methods for vfuncs in LayoutManager.
diff --git a/clutter/src/filelist.am b/clutter/src/filelist.am
index bf99b3d..6f2b56d 100644
--- a/clutter/src/filelist.am
+++ b/clutter/src/filelist.am
@@ -32,7 +32,6 @@ files_hg = \
color.hg \
container.hg \
device-manager.hg \
- effect.hg \
fixed-layout.hg \
flow-layout.hg \
group.hg \
diff --git a/clutter/src/texture.hg b/clutter/src/texture.hg
index 0afe74d..d949d1c 100644
--- a/clutter/src/texture.hg
+++ b/clutter/src/texture.hg
@@ -91,9 +91,6 @@ public:
_WRAP_METHOD(bool get_load_data_async() const, clutter_texture_get_load_data_async)
_WRAP_METHOD(void set_load_data_async(bool load_async=true), clutter_texture_set_load_data_async)
- _WRAP_METHOD(void set_pick_with_alpha(bool pick_with_alpha = true), clutter_texture_set_pick_with_alpha)
- _WRAP_METHOD(bool get_pick_with_alpha() const, clutter_texture_get_pick_with_alpha)
-
// TODO: figure out what to do with this GError parameter
//_WRAP_SIGNAL(void load_finished(GError* error), "load_finished")
_WRAP_SIGNAL(void size_change(int width, int height), "size_change")
diff --git a/codegen/extradefs/generate_extra_defs_clutter.cc b/codegen/extradefs/generate_extra_defs_clutter.cc
index fca0a0e..b9b7316 100644
--- a/codegen/extradefs/generate_extra_defs_clutter.cc
+++ b/codegen/extradefs/generate_extra_defs_clutter.cc
@@ -46,7 +46,6 @@ int main(int argc, char** argv)
<< get_defs(CLUTTER_TYPE_COLOR)
<< get_defs(CLUTTER_TYPE_CONTAINER)
<< get_defs(CLUTTER_TYPE_DEVICE_MANAGER)
- << get_defs(CLUTTER_TYPE_EFFECT)
<< get_defs(CLUTTER_TYPE_EVENT)
<< get_defs(CLUTTER_TYPE_FIXED_LAYOUT)
<< get_defs(CLUTTER_TYPE_FLOW_LAYOUT)
diff --git a/configure.ac b/configure.ac
index 3c56010..021eade 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
-AC_SUBST([CLUTTERMM_MODULES], ['clutter-1.0 >= 1.3.8 pangomm-1.4 >= 2.27.1 atkmm-1.6 >= 2.22.2'])
+AC_SUBST([CLUTTERMM_MODULES], ['clutter-1.0 >= 1.2.0 pangomm-1.4 >= 2.24 atkmm-1.6 >= 2.20'])
PKG_CHECK_MODULES([CLUTTERMM], [$CLUTTERMM_MODULES])
MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir pangomm-1.4 atkmm-1.6])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]