From 501fd99b7c27bf73f62341689352653b59efbe2f Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 24 Jun 2017 12:10:12 +0200 Subject: [PATCH] Debian pkg: updates from upstream. --- debian/changelog | 12 ++++++--- ...3-Glib-old-gobject-macro-new-classes.patch | 25 +++++++++---------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 043642c..fe614fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -libzakformgdaex (0.0.1-1~3.gbp068620) UNRELEASED; urgency=medium +libzakformgdaex (0.0.1-1~4.gbp5d09ed) UNRELEASED; urgency=medium - ** SNAPSHOT build @068620cdbd90a7eec2618a00d94529019248ab40 ** + ** SNAPSHOT build @5d09ed4b3e62ae9f0aa2aa6b9db799fd37d926c6 ** [ Andrea Zagli ] * Initial release @@ -19,4 +19,10 @@ libzakformgdaex (0.0.1-1~3.gbp068620) UNRELEASED; urgency=medium [ tux ] - -- tux Mon, 22 May 2017 17:44:16 +0200 + [ Andrea Zagli ] + * Debian pgk: updated from upstream. + * Added class ZakFormElementExtension. + + [ tux ] + + -- tux Sat, 24 Jun 2017 11:55:10 +0200 diff --git a/debian/patches/0003-Glib-old-gobject-macro-new-classes.patch b/debian/patches/0003-Glib-old-gobject-macro-new-classes.patch index 6a380cd..68dd5db 100644 --- a/debian/patches/0003-Glib-old-gobject-macro-new-classes.patch +++ b/debian/patches/0003-Glib-old-gobject-macro-new-classes.patch @@ -24,15 +24,15 @@ index 9d2c162..55e8e3b 100644 gint like_type; } ZakFormGdaExElementExtensionPrivate; --G_DEFINE_TYPE_WITH_PRIVATE (ZakFormGdaExElementExtension, zak_form_gdaex_element_extension, G_TYPE_OBJECT) -+G_DEFINE_TYPE (ZakFormGdaExElementExtension, zak_form_gdaex_element_extension, G_TYPE_OBJECT) +-G_DEFINE_TYPE_WITH_PRIVATE (ZakFormGdaExElementExtension, zak_form_gdaex_element_extension, ZAK_FORM_TYPE_ELEMENT_EXTENSION) ++G_DEFINE_TYPE (ZakFormGdaExElementExtension, zak_form_gdaex_element_extension, ZAK_FORM_TYPE_ELEMENT_EXTENSION) static void zak_form_gdaex_element_extension_class_init (ZakFormGdaExElementExtensionClass *class) -@@ -65,12 +67,14 @@ zak_form_gdaex_element_extension_class_init (ZakFormGdaExElementExtensionClass * - object_class->get_property = zak_form_gdaex_element_extension_get_property; - object_class->dispose = zak_form_gdaex_element_extension_dispose; +@@ -68,12 +68,14 @@ object_class->finalize = zak_form_gdaex_element_extension_finalize; + + parent_class->xml_parsing = zak_form_gdaex_element_extension_xml_parsing; + + g_type_class_add_private (object_class, sizeof (ZakFormGdaExElementExtensionPrivate)); } @@ -202,12 +202,12 @@ diff --git a/src/formelementextension.h b/src/formelementextension.h index 32ab23f..b273d5b 100644 --- a/src/formelementextension.h +++ b/src/formelementextension.h -@@ -27,14 +27,27 @@ +@@ -27,14 +27,26 @@ G_BEGIN_DECLS -#define ZAK_FORM_GDAEX_TYPE_ELEMENT_EXTENSION zak_form_gdaex_element_extension_get_type () --G_DECLARE_DERIVABLE_TYPE (ZakFormGdaExElementExtension, zak_form_gdaex_element_extension, ZAK_FORM_GDAEX, ELEMENT_EXTENSION, GObject) +-G_DECLARE_DERIVABLE_TYPE (ZakFormGdaExElementExtension, zak_form_gdaex_element_extension, ZAK_FORM_GDAEX, ELEMENT_EXTENSION, ZakFormElementExtension) +#define ZAK_FORM_GDAEX_TYPE_ELEMENT_EXTENSION (zak_form_gdaex_provider_get_type ()) +#define ZAK_FORM_GDAEX_ELEMENT_EXTENSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_GDAEX_TYPE_ELEMENT_EXTENSION, ZakFormGdaExElementExtension)) +#define ZAK_FORM_GDAEX_ELEMENT_EXTENSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_GDAEX_TYPE_ELEMENT_EXTENSION, ZakFormGdaExElementExtensionClass)) @@ -220,16 +220,15 @@ index 32ab23f..b273d5b 100644 + +struct _ZakFormGdaExElementExtension +{ -+ GObject parent; ++ ZakFormElementExtension parent; +}; struct _ZakFormGdaExElementExtensionClass { -- GObjectClass parent_cleass; -+ GObjectClass parent_class; +- ZakFormElementExtensionClass parent_cleass; ++ ZakFormElementExtensionClass parent_class; }; -+ - GObject *zak_form_gdaex_element_extension_new (void); + ZakFormElementExtension *zak_form_gdaex_element_extension_new (void); - gchar *zak_form_gdaex_element_extension_get_where_table (ZakFormGdaExElementExtension *extension); + void zak_form_gdaex_element_extension_xml_parsing (ZakFormElementExtension *extension, xmlNode *xnode); -- 2.49.0