[SCM] gsequencer/master: provide patch to fix Bug#857930

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Thu Mar 16 16:26:18 UTC 2017


The following commit has been merged in the master branch:
commit 654200f478c34eef2c8d40ebd0eda3a4f8f0f49e
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Thu Mar 16 17:26:07 2017 +0100

    provide patch to fix Bug#857930

diff --git a/debian/patches/fix-gparamspec-mixed.diff b/debian/patches/fix-gparamspec-mixed.diff
new file mode 100644
index 0000000..5cd8488
--- /dev/null
+++ b/debian/patches/fix-gparamspec-mixed.diff
@@ -0,0 +1,196 @@
+--- a/ags/audio/ags_audio.c
++++ b/ags/audio/ags_audio.c
+@@ -569,11 +569,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("notation\0",
+-				   "containing notation\0",
+-				   "The notation it contains\0",
+-				   AGS_TYPE_NOTATION,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("notation\0",
++				    "containing notation\0",
++				    "The notation it contains\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_NOTATION,
+ 				  param_spec);
+@@ -585,11 +584,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("automation\0",
+-				   "containing automation\0",
+-				   "The automation it contains\0",
+-				   AGS_TYPE_AUTOMATION,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("automation\0",
++				    "containing automation\0",
++				    "The automation it contains\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_AUTOMATION,
+ 				  param_spec);
+@@ -601,11 +599,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("recall-id\0",
+-				   "assigned recall id\0",
+-				   "The assigned recall id\0",
+-				   AGS_TYPE_RECALL_ID,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("recall-id\0",
++				    "assigned recall id\0",
++				    "The assigned recall id\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_OUTPUT,
+ 				  param_spec);
+@@ -617,11 +614,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("recycling-context\0",
+-				   "assigned recycling context\0",
+-				   "The assigned recall id\0",
+-				   AGS_TYPE_RECYCLING_CONTEXT,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("recycling-context\0",
++				    "assigned recycling context\0",
++				    "The assigned recall id\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_OUTPUT,
+ 				  param_spec);
+@@ -633,11 +629,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("recall-container\0",
+-				   "containing recall container\0",
+-				   "The recall container it contains\0",
+-				   AGS_TYPE_RECALL_CONTAINER,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("recall-container\0",
++				    "containing recall container\0",
++				    "The recall container it contains\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_RECALL_CONTAINER,
+ 				  param_spec);
+@@ -649,11 +644,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("play\0",
+-				   "containing play\0",
+-				   "The play it contains\0",
+-				   AGS_TYPE_RECALL,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("play\0",
++				    "containing play\0",
++				    "The play it contains\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_PLAY,
+ 				  param_spec);
+@@ -665,11 +659,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("recall\0",
+-				   "containing recall\0",
+-				   "The recall it contains\0",
+-				   AGS_TYPE_RECALL,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("recall\0",
++				    "containing recall\0",
++				    "The recall it contains\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_RECALL,
+ 				  param_spec);
+--- a/ags/audio/ags_channel.c
++++ b/ags/audio/ags_channel.c
+@@ -394,11 +394,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("recall-id\0",
+-				   "assigned recall id\0",
+-				   "The recall id it is assigned with\0",
+-				   AGS_TYPE_RECALL_ID,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("recall-id\0",
++				    "assigned recall id\0",
++				    "The recall id it is assigned with\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_RECALL_ID,
+ 				  param_spec);
+@@ -410,11 +409,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("recall-container\0",
+-				   "containing recall-container\0",
+-				   "The recall container it contains\0",
+-				   AGS_TYPE_RECALL_CONTAINER,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("recall-container\0",
++				    "containing recall-container\0",
++				    "The recall container it contains\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_RECALL_CONTAINER,
+ 				  param_spec);
+@@ -426,11 +424,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("recall\0",
+-				   "containing recall\0",
+-				   "The recall it contains\0",
+-				   AGS_TYPE_RECALL,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("recall\0",
++				    "containing recall\0",
++				    "The recall it contains\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_RECALL,
+ 				  param_spec);
+@@ -442,11 +439,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("play\0",
+-				   "containing play\0",
+-				   "The play it contains\0",
+-				   AGS_TYPE_RECALL,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("play\0",
++				    "containing play\0",
++				    "The play it contains\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_PLAY,
+ 				  param_spec);
+@@ -506,11 +502,10 @@
+    * 
+    * Since: 0.7.2
+    */
+-  param_spec = g_param_spec_object("pattern\0",
+-				   "containing pattern\0",
+-				   "The pattern it contains\0",
+-				   AGS_TYPE_PATTERN,
+-				   G_PARAM_READABLE | G_PARAM_WRITABLE);
++  param_spec = g_param_spec_pointer("pattern\0",
++				    "containing pattern\0",
++				    "The pattern it contains\0",
++				    G_PARAM_READABLE | G_PARAM_WRITABLE);
+   g_object_class_install_property(gobject,
+ 				  PROP_PATTERN,
+ 				  param_spec);
diff --git a/debian/patches/series b/debian/patches/series
index bc3dc54..15aca26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ fix-duplicated-flag-definition.diff
 fix-null-pointer-dereference.diff
 fix-missing-midi-connection-dialog.diff
 fix-leak-while-g-timeout-function.diff
+fix-gparamspec-mixed.diff

-- 
gsequencer packaging



More information about the pkg-multimedia-commits mailing list