[cluttermm] clutter_signals.defs: Add and use a patch.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cluttermm] clutter_signals.defs: Add and use a patch.
- Date: Fri, 28 Mar 2014 08:47:42 +0000 (UTC)
commit f4695b5625b2d7e0d257d3417c345c157f7a03dd
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Mar 28 09:46:20 2014 +0100
clutter_signals.defs: Add and use a patch.
* clutter/src/clutter_signals.defs.patch: Add this patch that
makes the necessary manual changes.
* codegen/gen_scripts/clutter_generate_extra_defs.sh: Use
the patch after generating clutter_signals.defs.
gtkmm does this too.
clutter/src/clutter_signals.defs.patch | 150 ++++++++++++++++++++
codegen/gen_scripts/clutter_generate_extra_defs.sh | 4 +-
2 files changed, 152 insertions(+), 2 deletions(-)
---
diff --git a/clutter/src/clutter_signals.defs.patch b/clutter/src/clutter_signals.defs.patch
new file mode 100644
index 0000000..68352af
--- /dev/null
+++ b/clutter/src/clutter_signals.defs.patch
@@ -0,0 +1,150 @@
+--- ./../../clutter/src/clutter_signals.defs.orig 2014-03-28 09:43:55.674529132 +0100
++++ ./../../clutter/src/clutter_signals.defs 2014-03-28 09:45:15.750527612 +0100
+@@ -43,102 +43,109 @@
+ )
+
+ (define-signal event
+ (of-object "ClutterActor")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+ '("ClutterEvent*" "p0")
+ )
+ )
+-
++;; Hand-edited to use more specific event type
+ (define-signal button-press-event
+ (of-object "ClutterActor")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("ClutterEvent*" "p0")
++ '("ClutterButtonEvent*" "p0")
+ )
+ )
+
++;; Hand-edited to use more specific event type
+ (define-signal button-release-event
+ (of-object "ClutterActor")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("ClutterEvent*" "p0")
++ '("ClutterButtonEvent*" "p0")
+ )
+ )
+
++;; Hand-edited to use more specific event type
+ (define-signal scroll-event
+ (of-object "ClutterActor")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("ClutterEvent*" "p0")
++ '("ClutterScrollEvent*" "p0")
+ )
+ )
+
++;; Hand-edited to use more specific event type
+ (define-signal key-press-event
+ (of-object "ClutterActor")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("ClutterEvent*" "p0")
++ '("ClutterKeyEvent*" "p0")
+ )
+ )
+
++;; Hand-edited to use more specific event type
+ (define-signal key-release-event
+ (of-object "ClutterActor")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("ClutterEvent*" "p0")
++ '("ClutterKeyEvent*" "p0")
+ )
+ )
+
++;; Hand-edited to use more specific event type
+ (define-signal motion-event
+ (of-object "ClutterActor")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("ClutterEvent*" "p0")
++ '("ClutterMotionEvent*" "p0")
+ )
+ )
+
+ (define-signal key-focus-in
+ (of-object "ClutterActor")
+ (return-type "void")
+ (when "last")
+ )
+
+ (define-signal key-focus-out
+ (of-object "ClutterActor")
+ (return-type "void")
+ (when "last")
+ )
+
++;; Hand-edited to use more specific event type
+ (define-signal enter-event
+ (of-object "ClutterActor")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("ClutterEvent*" "p0")
++ '("ClutterCrossingEvent*" "p0")
+ )
+ )
+
++;; Hand-edited to use more specific event type
+ (define-signal leave-event
+ (of-object "ClutterActor")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("ClutterEvent*" "p0")
++ '("ClutterCrossingEvent*" "p0")
+ )
+ )
+
+ (define-signal captured-event
+ (of-object "ClutterActor")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+ '("ClutterEvent*" "p0")
+ )
+@@ -2430,26 +2437,27 @@
+ (define-signal delete-text
+ (of-object "ClutterText")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("gint" "p0")
+ '("gint" "p1")
+ )
+ )
+
++; We add the const- manually:
+ (define-signal cursor-event
+ (of-object "ClutterText")
+ (return-type "void")
+ (when "last")
+ (parameters
+- '("ClutterGeometry*" "p0")
++ '("const-ClutterGeometry*" "p0")
+ )
+ )
+
+ (define-signal cursor-changed
+ (of-object "ClutterText")
+ (return-type "void")
+ (when "last")
+ )
+
+ (define-signal activate
diff --git a/codegen/gen_scripts/clutter_generate_extra_defs.sh
b/codegen/gen_scripts/clutter_generate_extra_defs.sh
index 0068698..8b10beb 100755
--- a/codegen/gen_scripts/clutter_generate_extra_defs.sh
+++ b/codegen/gen_scripts/clutter_generate_extra_defs.sh
@@ -26,8 +26,8 @@ if [ $# -eq 0 ]
then
# Without LC_ALL=C documentation (docs "xxx") may be translated in the .defs file.
LC_ALL=C "$GEN_DIR"/generate_extra_defs > "$OUT_DEFS_FILE"
- #PATCH_OPTIONS="--backup --version-control=simple --suffix=.orig"
- #patch $PATCH_OPTIONS "$OUT_DEFS_FILE" "$OUT_DEFS_FILE".patch
+ PATCH_OPTIONS="--backup --version-control=simple --suffix=.orig"
+ patch $PATCH_OPTIONS "$OUT_DEFS_FILE" "$OUT_DEFS_FILE".patch
elif [ "$1" = "--make-patch" ]
then
diff --unified=10 "$OUT_DEFS_FILE".orig "$OUT_DEFS_FILE" > "$OUT_DEFS_FILE".patch
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]