From: David Pirotte <david@altosw.be>
To: guile-devel <guile-devel@gnu.org>
Subject: guile-clutter, clutter-devel: 3 more patches
Date: Thu, 16 Oct 2014 12:53:48 -0300 [thread overview]
Message-ID: <20141016125348.54dbed41@capac> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 233 bytes --]
Hello,
guile-clutter
clutter-devel:
-] fix .gitignore, globally ignoring html and trs files
-] gnoring 4 funtions, in 1.12, that needs a special wrapper
-] update tests/wrapset.api for 1.12
Happy hacking.
David
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0002-fix-.gitignore-globally-ignoring-html-and-trs-files.patch --]
[-- Type: text/x-patch, Size: 881 bytes --]
From 09a02baa4f09c12be32739c1f206443ce9ced49b Mon Sep 17 00:00:00 2001
From: David PIROTTE <david@altosw.be>
Date: Wed, 15 Oct 2014 16:08:01 -0300
Subject: [PATCH 2/4] fix .gitignore, globally ignoring html and trs files
* .gitignore: *.html, *.trs added, specific html files removed.
---
.gitignore | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index f111a62..5ed7684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@ autom4te.cache/
*.log
*.la
*.lo
+*.trs
+*.html
/build-aux/compile
/build-aux/config.guess
/build-aux/config.sub
@@ -40,5 +42,3 @@ autom4te.cache/
/doc/clutter-glx/guile-gnome-clutter-glx.info
/doc/clutter-glx/version.texi
/doc/clutter/guile-gnome-clutter.info-3
-/doc/clutter-glx/guile-gnome-clutter-glx.html
-/doc/clutter/guile-gnome-clutter.html
--
2.1.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0003-ignoring-4-funtions-in-1.12-that-needs-a-special-wra.patch --]
[-- Type: text/x-patch, Size: 7549 bytes --]
From 86cd825802e33493f3c8a30182b0d9b22868448b Mon Sep 17 00:00:00 2001
From: David PIROTTE <david@altosw.be>
Date: Wed, 15 Oct 2014 18:23:51 -0300
Subject: [PATCH 3/4] ignoring 4 funtions, in 1.12, that needs a special
wrapper
* clutter/gnome/overrides/clutter.defs: adding
clutter_keyframe_transition_get[set]_key_frame,
clutter_keyframe_transition_set_modes and
clutter_timeline_get_step_progress to ignore-glob, they need a
special wrapper, are not essential, so I decided to leave this work
for later.
---
clutter/gnome/overrides/clutter.defs | 81 +++++++++++++++++++-----------------
1 file changed, 42 insertions(+), 39 deletions(-)
diff --git a/clutter/gnome/overrides/clutter.defs b/clutter/gnome/overrides/clutter.defs
index c365e8a..7206aae 100644
--- a/clutter/gnome/overrides/clutter.defs
+++ b/clutter/gnome/overrides/clutter.defs
@@ -356,84 +356,89 @@
(ignore-glob "CLUTTER_PRIVATE_FIELD"
"*_vertices"
"*_func"
- "clutter_alpha_new_full"
- "clutter_actor_get_transformation_matrix"
- "clutter_actor_animatev"
- "clutter_actor_animate_with_timelinev"
+ "clutter_matrix_init_from_array" ;; needs a special wrapper
+ ;;"clutter_main*" ;; fixme: do i need to do something special with clutter-main?
"clutter_actor_animate_with_alphav"
+ "clutter_actor_animate_with_timelinev"
+ "clutter_actor_animatev"
+ "clutter_actor_get_transformation_matrix"
"clutter_actor_iter_*"
"clutter_actor_queue_redraw_with_clip" ;; needs cairo_rectangle_int_t
+ "clutter_alpha_new_full"
"clutter_backend_get_cogl_context"
"clutter_binding_pool_install_action"
"clutter_binding_pool_override_action"
"clutter_box_packv"
"clutter_cairo_texture_invalidate_rectangle" ;; needs cairo_rectangle_int_t
- "clutter_color_hash"
"clutter_color_equal"
- "clutter_param_spec_color"
- "clutter_container_foreach_with_internals"
+ "clutter_color_hash"
"clutter_container_class_find_child_property"
"clutter_container_class_list_child_properties"
+ "clutter_container_foreach_with_internals"
"clutter_deform_effect_get_back_material"
"clutter_deform_effect_set_back_material"
"clutter_event_get_axes"
"clutter_frame_source_*"
- ;; "clutter_image_set_data" this 1 must be wrapped [>= 1.12]
+ "clutter_get_option_group"
+ "clutter_get_option_group_without_init"
+ "clutter_image_get_texture"
"clutter_image_set_area"
"clutter_image_set_bytes"
- "clutter_image_get_texture"
+ ;; "clutter_image_set_data" this 1 must be wrapped [>= 1.12]
"clutter_init*"
- "clutter_interval_peek_*"
"clutter_interval_compute_value"
- "clutter_get_option_group"
- "clutter_get_option_group_without_init"
- ;;"clutter_main*" ;; fixme: do i need to do something special with clutter-main?
- "clutter_threads*"
- "clutter_model*"
+ "clutter_interval_peek_*"
+ "clutter_keyframe_transition_get_key_frame" ;; since 1.12, needs a special wrapper
+ "clutter_keyframe_transition_set_key_frames" ;; since 1.12, needs a special wrapper
+ "clutter_keyframe_transition_set_modes" ;; since 1.12, needs a special wrapper
"clutter_layout_manager_list_child_properties"
"clutter_list_model*"
- "clutter_matrix_init_from_array" ;; needs a special wrapper
+ "clutter_model*"
+ "clutter_offscreen_effect_create_texture"
"clutter_offscreen_effect_get_target"
"clutter_offscreen_effect_get_texture"
- "clutter_offscreen_effect_create_texture"
"clutter_paint_node_add_path"
"clutter_paint_node_add_primitive"
+ "clutter_param_spec_color"
+ "clutter_param_spec_fixed"
+ "clutter_param_spec_units"
"clutter_pipeline_node_new"
- "clutter_scriptable*"
- "clutter_script_connect_signals*"
"clutter_script_add_search_paths"
- "clutter_shader_get_cogl_program"
+ "clutter_script_connect_signals*"
+ "clutter_scriptable*"
+ "clutter_shader_effect_get_program"
+ "clutter_shader_effect_get_shader"
"clutter_shader_get_cogl_fragment_shader"
+ "clutter_shader_get_cogl_program"
"clutter_shader_get_cogl_vertex_shader"
- "clutter_shader_effect_get_shader"
- "clutter_shader_effect_get_program"
"clutter_stage_get_redraw_clip_bounds" ;; needs cairo_rectangle_int_t
"clutter_stage_read_pixels"
- "clutter_texture_set_from_rgb_data"
- "clutter_texture_set_from_yuv_data"
- "clutter_texture_set_area_from_rgb_data"
- "clutter_texture_set_cogl_texture"
- "clutter_texture_get_cogl_texture"
- "clutter_texture_set_cogl_material"
"clutter_texture_get_cogl_material"
+ "clutter_texture_get_cogl_texture"
"clutter_texture_get_pixel_format"
"clutter_texture_node_new"
+ "clutter_texture_set_area_from_rgb_data"
+ "clutter_texture_set_cogl_material"
+ "clutter_texture_set_cogl_texture"
+ "clutter_texture_set_from_rgb_data"
+ "clutter_texture_set_from_yuv_data"
+ "clutter_threads*"
"clutter_timeline_do_tick"
+ "clutter_timeline_get_step_progress" ;; since 1.12, needs a special wrapper
"clutter_timeline_list_markers"
"clutter_timeout_pool*"
- "clutter_param_spec_units"
- "clutter_value_get_units"
- "clutter_value_set_units"
+ "clutter_util_next_p2"
+ "clutter_value_dup_paint_node"
"clutter_value_get_fixed"
+ "clutter_value_get_paint_node"
+ "clutter_value_get_shader_*"
+ "clutter_value_get_units"
"clutter_value_set_fixed"
"clutter_value_set_paint_node"
- "clutter_value_take_paint_node"
- "clutter_value_get_paint_node"
- "clutter_value_dup_paint_node"
"clutter_value_set_shader_*"
- "clutter_value_get_shader_*"
- "clutter_param_spec_fixed"
- "clutter_util_next_p2")
+ "clutter_value_set_units"
+ "clutter_value_take_paint_node")
+
;; Deprecated in 1.8 or before.
;;
@@ -686,7 +691,6 @@
"clutter_bin_layout_add"
"clutter_bin_layout_get_alignment"
"clutter_bin_layout_set_alignment"
-
"clutter_box_layout_pack"
"clutter_box_layout_set_vertical"
"clutter_box_layout_get_vertical"
@@ -702,7 +706,6 @@
"clutter_box_layout_get_easing_duration"
"clutter_box_layout_set_easing_mode"
"clutter_box_layout_get_easing_mode"
-
"clutter_cairo_texture_clear"
"clutter_cairo_texture_get_auto_resize"
"clutter_cairo_texture_get_surface_size"
--
2.1.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: 0004-update-tests-wrapset.api-for-1.12.patch --]
[-- Type: text/x-patch, Size: 5686 bytes --]
From bf6fe37b34905425e47e68a7509bd95455998061 Mon Sep 17 00:00:00 2001
From: David PIROTTE <david@altosw.be>
Date: Wed, 15 Oct 2014 18:50:50 -0300
Subject: [PATCH 4/4] update tests/wrapset.api for 1.12
* tests/wrapset.api: This file is generated automatically [see HACKING
for how that is done]. This fixes its content for 1.12.
---
tests/wrapset.api | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 63 insertions(+), 5 deletions(-)
diff --git a/tests/wrapset.api b/tests/wrapset.api
index d4583c9..1c75184 100644
--- a/tests/wrapset.api
+++ b/tests/wrapset.api
@@ -194,6 +194,9 @@
(clutter-actor-get-child-at-index
procedure
(arity 0 0 #t))
+ (clutter-actor-get-child-transform
+ procedure
+ (arity 0 0 #t))
(clutter-actor-get-children
procedure
(arity 1 0 #f))
@@ -347,6 +350,9 @@
(clutter-actor-get-text-direction
procedure
(arity 0 0 #t))
+ (clutter-actor-get-transform
+ procedure
+ (arity 0 0 #t))
(clutter-actor-get-transformed-paint-volume
procedure
(arity 0 0 #t))
@@ -512,6 +518,9 @@
(clutter-actor-set-child-below-sibling
procedure
(arity 0 0 #t))
+ (clutter-actor-set-child-transform
+ procedure
+ (arity 0 0 #t))
(clutter-actor-set-clip procedure (arity 0 0 #t))
(clutter-actor-set-clip-to-allocation
procedure
@@ -599,6 +608,9 @@
(clutter-actor-set-text-direction
procedure
(arity 0 0 #t))
+ (clutter-actor-set-transform
+ procedure
+ (arity 0 0 #t))
(clutter-actor-set-translation
procedure
(arity 0 0 #t))
@@ -737,6 +749,9 @@
(clutter-box-layout-get-homogeneous
procedure
(arity 0 0 #t))
+ (clutter-box-layout-get-orientation
+ procedure
+ (arity 0 0 #t))
(clutter-box-layout-get-pack-start
procedure
(arity 0 0 #t))
@@ -744,10 +759,10 @@
procedure
(arity 0 0 #t))
(clutter-box-layout-new procedure (arity 0 0 #t))
- (clutter-box-layout-pack
+ (clutter-box-layout-set-homogeneous
procedure
(arity 0 0 #t))
- (clutter-box-layout-set-homogeneous
+ (clutter-box-layout-set-orientation
procedure
(arity 0 0 #t))
(clutter-box-layout-set-pack-start
@@ -915,6 +930,9 @@
procedure
(arity 1 0 #f))
(clutter-do-event procedure (arity 0 0 #t))
+ (clutter-drag-action-get-drag-area
+ procedure
+ (arity 0 0 #t))
(clutter-drag-action-get-drag-axis
procedure
(arity 0 0 #t))
@@ -933,6 +951,9 @@
(clutter-drag-action-new
procedure
(arity 0 0 #t))
+ (clutter-drag-action-set-drag-area
+ procedure
+ (arity 0 0 #t))
(clutter-drag-action-set-drag-axis
procedure
(arity 0 0 #t))
@@ -1241,6 +1262,7 @@
procedure
(arity 0 0 #t))
(clutter-image-new procedure (arity 0 0 #t))
+ (clutter-image-set-data procedure (arity 6 0 #f))
(clutter-input-device-get-associated-device
procedure
(arity 0 0 #t))
@@ -1400,6 +1422,13 @@
(clutter-main-level procedure (arity 0 0 #t))
(clutter-main-quit procedure (arity 0 0 #t))
(clutter-margin-new procedure (arity 0 0 #t))
+ (clutter-matrix-alloc procedure (arity 0 0 #t))
+ (clutter-matrix-init-from-matrix
+ procedure
+ (arity 0 0 #t))
+ (clutter-matrix-init-identity
+ procedure
+ (arity 0 0 #t))
(clutter-offscreen-effect-get-target-size
procedure
(arity 1 0 #f))
@@ -1595,6 +1624,35 @@
(clutter-property-transition-set-property-name
procedure
(arity 0 0 #t))
+ (clutter-rect-alloc procedure (arity 0 0 #t))
+ (clutter-rect-clamp-to-pixel
+ procedure
+ (arity 0 0 #t))
+ (clutter-rect-contains-point
+ procedure
+ (arity 0 0 #t))
+ (clutter-rect-contains-rect
+ procedure
+ (arity 0 0 #t))
+ (clutter-rect-equals procedure (arity 0 0 #t))
+ (clutter-rect-get-center
+ procedure
+ (arity 0 0 #t))
+ (clutter-rect-get-height
+ procedure
+ (arity 0 0 #t))
+ (clutter-rect-get-width procedure (arity 0 0 #t))
+ (clutter-rect-get-x procedure (arity 0 0 #t))
+ (clutter-rect-get-y procedure (arity 0 0 #t))
+ (clutter-rect-init procedure (arity 0 0 #t))
+ (clutter-rect-inset procedure (arity 0 0 #t))
+ (clutter-rect-intersection
+ procedure
+ (arity 0 0 #t))
+ (clutter-rect-normalize procedure (arity 0 0 #t))
+ (clutter-rect-offset procedure (arity 0 0 #t))
+ (clutter-rect-union procedure (arity 0 0 #t))
+ (clutter-rect-zero procedure (arity 0 0 #t))
(clutter-rotate-action-new
procedure
(arity 0 0 #t))
@@ -1644,6 +1702,9 @@
(clutter-scroll-actor-scroll-to-point
procedure
(arity 0 0 #t))
+ (clutter-scroll-actor-scroll-to-rect
+ procedure
+ (arity 0 0 #t))
(clutter-scroll-actor-set-scroll-mode
procedure
(arity 0 0 #t))
@@ -1659,9 +1720,6 @@
(clutter-shader-effect-set-uniform-value
procedure
(arity 0 0 #t))
- (clutter-shader-error-quark
- procedure
- (arity 0 0 #t))
(clutter-size-alloc procedure (arity 0 0 #t))
(clutter-size-equals procedure (arity 0 0 #t))
(clutter-size-init procedure (arity 0 0 #t))
--
2.1.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 173 bytes --]
reply other threads:[~2014-10-16 15:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141016125348.54dbed41@capac \
--to=david@altosw.be \
--cc=guile-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).