From: Andrea Zagli Date: Sun, 21 May 2017 12:36:17 +0000 (+0200) Subject: Debian pkg: updated patches for upstream changes. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=9fc7ab00af41a88b2167eda9cfee72280979b0c7;p=zakform%2Flibzakform Debian pkg: updated patches for upstream changes. --- diff --git a/debian/patches/0004-Glib-old-version-gobject-macro.patch b/debian/patches/0004-Glib-old-version-gobject-macro.patch index cd79f0e..c1d38fd 100644 --- a/debian/patches/0004-Glib-old-version-gobject-macro.patch +++ b/debian/patches/0004-Glib-old-version-gobject-macro.patch @@ -131,7 +131,7 @@ index eb00250..4c91a79 100644 +}; ZakFormElementFilterLuc *zak_form_element_filter_luc_new (void); - gboolean zak_form_element_filter_luc_xml_parsing (ZakFormElementFilter *filter, xmlNode *xnode); + diff --git a/src/formelementfiltertrim.h b/src/formelementfiltertrim.h index d74e0bf..0cb37e8 100644 --- a/src/formelementfiltertrim.h @@ -164,7 +164,7 @@ index d74e0bf..0cb37e8 100644 + ZakFormElementFilterTrim *zak_form_element_filter_trim_new (void); - gboolean zak_form_element_filter_trim_xml_parsing (ZakFormElementFilter *filter, xmlNode *xnode); + diff --git a/src/formelementvalidator.h b/src/formelementvalidator.h index 2ef9407..9711b60 100644 --- a/src/formelementvalidator.h @@ -287,7 +287,7 @@ index 4bb8b42..f8e62e0 100644 + }; ZakFormElementValidatorRegex *zak_form_element_validator_regex_new (void); - gboolean zak_form_element_validator_regex_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode); + diff --git a/src/formiprovider.h b/src/formiprovider.h index cabb51e..be970ae 100644 --- a/src/formiprovider.h @@ -369,7 +369,7 @@ index 02139d0..d4ab5ac 100644 + ZakFormValidatorCompare *zak_form_validator_compare_new (void); - gboolean zak_form_validator_compare_xml_parsing (ZakFormValidator *validator, xmlNode *xnode, GPtrArray *ar_elements); + diff --git a/src/formvalidatorcomparedate.h b/src/formvalidatorcomparedate.h index c8940ca..ec11584 100644 --- a/src/formvalidatorcomparedate.h @@ -401,4 +401,4 @@ index c8940ca..ec11584 100644 +}; ZakFormValidatorCompareDate *zak_form_validator_compare_date_new (void); - gboolean zak_form_validator_compare_date_xml_parsing (ZakFormValidator *validator, xmlNode *xnode, GPtrArray *ar_elements); + diff --git a/debian/patches/0005-Glib-old-version-private.patch b/debian/patches/0005-Glib-old-version-private.patch index ccabd4f..a79f7cd 100644 --- a/debian/patches/0005-Glib-old-version-private.patch +++ b/debian/patches/0005-Glib-old-version-private.patch @@ -354,9 +354,9 @@ index 9e6db5e..c0eb87e 100644 if (priv->value != NULL) { -@@ -751,7 +755,7 @@ gchar +@@ -848,7 +848,7 @@ gchar - gchar *ret; + GValue *ret; - priv = zak_form_element_get_instance_private (element); + priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element); @@ -379,7 +379,7 @@ index 9e6db5e..c0eb87e 100644 - priv = zak_form_element_get_instance_private (element); + priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element); - return g_strdup (priv->default_value); + return priv->default_value; } @@ -822,7 +826,7 @@ zak_form_element_set_original_value (ZakFormElement *element, const gchar *value @@ -397,7 +397,7 @@ index 9e6db5e..c0eb87e 100644 - priv = zak_form_element_get_instance_private (element); + priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element); - return g_strdup (priv->original_value); + return priv->original_value; } @@ -882,7 +886,7 @@ zak_form_element_set_format (ZakFormElement *element, GHashTable *format) { @@ -496,17 +496,17 @@ index 9e6db5e..c0eb87e 100644 - priv = zak_form_element_get_instance_private (element); + priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element); - zak_form_element_set_value (element, priv->default_value); + zak_form_element_set_value_gvalue (element, priv->default_value); } -@@ -1115,7 +1119,7 @@ zak_form_element_is_valid (ZakFormElement *element) +@@ -1315,7 +1315,7 @@ zak_form_element_is_valid (ZakFormElement *element) - ZakFormElementPrivate *priv; + ZakFormElementClass *klass = ZAK_FORM_ELEMENT_GET_CLASS (element); - priv = zak_form_element_get_instance_private (element); + priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element); ret = TRUE; - + ret_callback = FALSE; @@ -1155,7 +1159,7 @@ zak_form_element_is_valid (ZakFormElement *element) GPtrArray *zak_form_element_get_messages (ZakFormElement *element) @@ -574,8 +574,8 @@ diff --git a/src/formelementfiltertrim.c b/src/formelementfiltertrim.c index 6acafbd..8b658f1 100644 --- a/src/formelementfiltertrim.c +++ b/src/formelementfiltertrim.c -@@ -40,13 +40,6 @@ static void zak_form_element_filter_trim_finalize (GObject *gobject); - +@@ -41,13 +41,6 @@ + static gboolean zak_form_element_filter_trim_xml_parsing (ZakFormElementFilter *filter, xmlNode *xnode); static gchar *zak_form_element_filter_trim_filter (ZakFormElementFilter *filter_trim, const gchar *value); -struct _ZakFormElementFilterTrim @@ -592,7 +592,7 @@ diff --git a/src/formelementvalidator.c b/src/formelementvalidator.c index 65fb8db..27c2fbd 100644 --- a/src/formelementvalidator.c +++ b/src/formelementvalidator.c -@@ -46,13 +46,15 @@ static void zak_form_element_validator_get_property (GObject *object, +@@ -47,14 +47,16 @@ static void zak_form_element_validator_get_property (GObject *object, static void zak_form_element_validator_dispose (GObject *gobject); static void zak_form_element_validator_finalize (GObject *gobject); @@ -600,6 +600,7 @@ index 65fb8db..27c2fbd 100644 + typedef struct { + gchar *id; gboolean enabled; gchar *message; } ZakFormElementValidatorPrivate; @@ -609,35 +610,35 @@ index 65fb8db..27c2fbd 100644 static void zak_form_element_validator_class_init (ZakFormElementValidatorClass *class) -@@ -64,6 +66,8 @@ zak_form_element_validator_class_init (ZakFormElementValidatorClass *class) +@@ -66,6 +66,8 @@ zak_form_element_validator_class_init (ZakFormElementValidatorClass *class) object_class->dispose = zak_form_element_validator_dispose; object_class->finalize = zak_form_element_validator_finalize; + g_type_class_add_private (object_class, sizeof (ZakFormElementValidatorPrivate)); + - g_object_class_install_property (object_class, PROP_ENABLED, - g_param_spec_boolean ("enabled", - "Enabled", -@@ -111,7 +115,7 @@ void + g_object_class_install_property (object_class, PROP_ID, + g_param_spec_string ("id", + "Id", +@@ -195,7 +195,7 @@ void zak_form_element_validator_set_message (ZakFormElementValidator *validator, - const gchar *message) + const gchar *message) { - ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (validator); + ZakFormElementValidatorPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_GET_PRIVATE (validator); priv->message = g_strdup (message); } -@@ -125,7 +129,7 @@ zak_form_element_validator_set_message (ZakFormElementValidator *validator, +@@ -209,7 +209,7 @@ zak_form_element_validator_set_message (ZakFormElementValidator *validator, gchar *zak_form_element_validator_get_message (ZakFormElementValidator *validator) { - ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (validator); + ZakFormElementValidatorPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_GET_PRIVATE (validator); - return g_strdup (priv->message); + return g_strdup (priv->message); } @@ -166,7 +170,7 @@ zak_form_element_validator_set_property (GObject *object, - GParamSpec *pspec) + GParamSpec *pspec) { ZakFormElementValidator *zak_form_element_validator = (ZakFormElementValidator *)object; - ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (zak_form_element_validator); @@ -646,7 +647,7 @@ index 65fb8db..27c2fbd 100644 switch (property_id) { @@ -191,7 +195,7 @@ zak_form_element_validator_get_property (GObject *object, - GParamSpec *pspec) + GParamSpec *pspec) { ZakFormElementValidator *zak_form_element_validator = (ZakFormElementValidator *)object; - ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (zak_form_element_validator); @@ -676,8 +677,8 @@ diff --git a/src/formelementvalidatordate.c b/src/formelementvalidatordate.c index df7d0f5..b938f75 100644 --- a/src/formelementvalidatordate.c +++ b/src/formelementvalidatordate.c -@@ -42,13 +42,6 @@ static void zak_form_element_validator_date_finalize (GObject *gobject); - +@@ -45,13 +45,6 @@ + static gboolean zak_form_element_validator_date_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode); static gboolean zak_form_element_validator_date_validate (ZakFormElementValidator *validator_date, const gchar *value); -struct _ZakFormElementValidatorDate @@ -707,8 +708,8 @@ diff --git a/src/formelementvalidatornotempty.c b/src/formelementvalidatornotemp index a3ef4e2..63f6131 100644 --- a/src/formelementvalidatornotempty.c +++ b/src/formelementvalidatornotempty.c -@@ -46,13 +46,6 @@ static void zak_form_element_validator_notempty_finalize (GObject *gobject); - +@@ -47,13 +47,6 @@ + static gboolean zak_form_element_validator_notempty_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode); static gboolean zak_form_element_validator_notempty_validate (ZakFormElementValidator *validator_notempty, const gchar *value); -struct _ZakFormElementValidatorNotempty @@ -738,8 +739,8 @@ diff --git a/src/formelementvalidatorregex.c b/src/formelementvalidatorregex.c index a0d5b2b..aa8658a 100644 --- a/src/formelementvalidatorregex.c +++ b/src/formelementvalidatorregex.c -@@ -46,13 +46,6 @@ static void zak_form_element_validator_regex_finalize (GObject *gobject); - +@@ -47,13 +47,6 @@ + static gboolean zak_form_element_validator_regex_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode); static gboolean zak_form_element_validator_regex_validate (ZakFormElementValidator *validator_regex, const gchar *value); -struct _ZakFormElementValidatorRegex @@ -787,7 +788,7 @@ diff --git a/src/formvalidator.c b/src/formvalidator.c index eba0131..6cc3f4e 100644 --- a/src/formvalidator.c +++ b/src/formvalidator.c -@@ -46,13 +46,15 @@ static void zak_form_validator_get_property (GObject *object, +@@ -48,14 +48,16 @@ static void zak_form_validator_get_property (GObject *object, static void zak_form_validator_dispose (GObject *gobject); static void zak_form_validator_finalize (GObject *gobject); @@ -795,6 +796,7 @@ index eba0131..6cc3f4e 100644 + typedef struct { + gchar *id; gboolean enabled; gchar *message; } ZakFormValidatorPrivate; @@ -804,16 +806,16 @@ index eba0131..6cc3f4e 100644 static void zak_form_validator_class_init (ZakFormValidatorClass *class) -@@ -64,6 +66,8 @@ zak_form_validator_class_init (ZakFormValidatorClass *class) +@@ -67,6 +67,8 @@ zak_form_validator_class_init (ZakFormValidatorClass *class) object_class->dispose = zak_form_validator_dispose; object_class->finalize = zak_form_validator_finalize; + g_type_class_add_private (object_class, sizeof (ZakFormValidatorPrivate)); + - g_object_class_install_property (object_class, PROP_ENABLED, - g_param_spec_boolean ("enabled", - "Enabled", -@@ -82,7 +86,7 @@ zak_form_validator_class_init (ZakFormValidatorClass *class) + g_object_class_install_property (object_class, PROP_ID, + g_param_spec_string ("id", + "Id", +@@ -92,7 +92,7 @@ zak_form_validator_class_init (ZakFormValidatorClass *class) static void zak_form_validator_init (ZakFormValidator *zak_form_validator) { @@ -821,27 +823,27 @@ index eba0131..6cc3f4e 100644 + ZakFormValidatorPrivate *priv = ZAK_FORM_VALIDATOR_GET_PRIVATE (zak_form_validator); } - gboolean -@@ -111,7 +115,7 @@ void + /** +@@ -206,7 +206,7 @@ void zak_form_validator_set_message (ZakFormValidator *validator, - const gchar *message) + const gchar *message) { - ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (validator); + ZakFormValidatorPrivate *priv = ZAK_FORM_VALIDATOR_GET_PRIVATE (validator); priv->message = g_strdup (message); } -@@ -125,7 +129,7 @@ zak_form_validator_set_message (ZakFormValidator *validator, +@@ -220,7 +220,7 @@ gchar *zak_form_validator_get_message (ZakFormValidator *validator) { - ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (validator); + ZakFormValidatorPrivate *priv = ZAK_FORM_VALIDATOR_GET_PRIVATE (validator); - return g_strdup (priv->message); + return g_strdup (priv->message); } @@ -166,7 +170,7 @@ zak_form_validator_set_property (GObject *object, - GParamSpec *pspec) + GParamSpec *pspec) { ZakFormValidator *zak_form_validator = (ZakFormValidator *)object; - ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (zak_form_validator); @@ -849,8 +851,8 @@ index eba0131..6cc3f4e 100644 switch (property_id) { -@@ -191,7 +195,7 @@ zak_form_validator_get_property (GObject *object, - GParamSpec *pspec) +@@ -261,7 +261,7 @@ zak_form_validator_get_property (GObject *object, + GParamSpec *pspec) { ZakFormValidator *zak_form_validator = (ZakFormValidator *)object; - ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (zak_form_validator); @@ -858,7 +860,7 @@ index eba0131..6cc3f4e 100644 switch (property_id) { -@@ -213,7 +217,7 @@ static void +@@ -316,7 +316,7 @@ static void zak_form_validator_dispose (GObject *gobject) { ZakFormValidator *zak_form_validator = (ZakFormValidator *)gobject; @@ -867,7 +869,7 @@ index eba0131..6cc3f4e 100644 -@@ -225,7 +229,7 @@ static void +@@ -328,7 +328,7 @@ static void zak_form_validator_finalize (GObject *gobject) { ZakFormValidator *zak_form_validator = (ZakFormValidator *)gobject; @@ -880,8 +882,8 @@ diff --git a/src/formvalidatorcompare.c b/src/formvalidatorcompare.c index 02fedf6..6d4eac2 100644 --- a/src/formvalidatorcompare.c +++ b/src/formvalidatorcompare.c -@@ -45,13 +45,6 @@ static void zak_form_validator_compare_finalize (GObject *gobject); - +@@ -47,13 +47,6 @@ + static gboolean zak_form_validator_compare_xml_parsing (ZakFormValidator *validator, xmlNode *xnode, gpointer form); static gboolean zak_form_validator_compare_validate (ZakFormValidator *validator_notempty); -struct _ZakFormValidatorCompare @@ -893,7 +895,7 @@ index 02fedf6..6d4eac2 100644 - #define ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE, ZakFormValidatorComparePrivate)) - enum + typedef struct _ZakFormValidatorComparePrivate ZakFormValidatorComparePrivate; diff --git a/src/formvalidatorcompare.h b/src/formvalidatorcompare.h index d4ab5ac..91b9180 100644 --- a/src/formvalidatorcompare.h @@ -911,8 +913,8 @@ diff --git a/src/formvalidatorcomparedate.c b/src/formvalidatorcomparedate.c index 78e4360..2546163 100644 --- a/src/formvalidatorcomparedate.c +++ b/src/formvalidatorcomparedate.c -@@ -45,13 +45,6 @@ static void zak_form_validator_compare_date_finalize (GObject *gobject); - +@@ -47,13 +47,6 @@ + static gboolean zak_form_validator_compare_date_xml_parsing (ZakFormValidator *validator, xmlNode *xnode, gpointer form); static gboolean zak_form_validator_compare_date_validate (ZakFormValidator *validator_notempty); -struct _ZakFormValidatorCompareDate @@ -924,7 +926,7 @@ index 78e4360..2546163 100644 - #define ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE, ZakFormValidatorCompareDatePrivate)) - enum + typedef struct _ZakFormValidatorCompareDatePrivate ZakFormValidatorCompareDatePrivate; diff --git a/src/formvalidatorcomparedate.h b/src/formvalidatorcomparedate.h index ec11584..655680a 100644 --- a/src/formvalidatorcomparedate.h diff --git a/debian/patches/0006-Some-new-functions-not-replaced.patch b/debian/patches/0006-Some-new-functions-not-replaced.patch index 203580a..623eb89 100644 --- a/debian/patches/0006-Some-new-functions-not-replaced.patch +++ b/debian/patches/0006-Some-new-functions-not-replaced.patch @@ -39,7 +39,7 @@ diff --git a/src/formelementfilter.c b/src/formelementfilter.c index fe3ce9a..6d53784 100644 --- a/src/formelementfilter.c +++ b/src/formelementfilter.c -@@ -43,6 +43,8 @@ static void zak_form_element_filter_get_property (GObject *object, +@@ -44,6 +44,8 @@ static void zak_form_element_filter_get_property (GObject *object, static void zak_form_element_filter_dispose (GObject *gobject); static void zak_form_element_filter_finalize (GObject *gobject); @@ -47,8 +47,8 @@ index fe3ce9a..6d53784 100644 + typedef struct { - gboolean enabled; -@@ -71,7 +73,7 @@ zak_form_element_filter_class_init (ZakFormElementFilterClass *class) + gchar *id; +@@ -80,7 +80,7 @@ zak_form_element_filter_class_init (ZakFormElementFilterClass *class) static void zak_form_element_filter_init (ZakFormElementFilter *zak_form_element_filter) { @@ -56,9 +56,9 @@ index fe3ce9a..6d53784 100644 + ZakFormElementFilterPrivate *priv = ZAK_FORM_ELEMENT_FILTER_GET_PRIVATE (zak_form_element_filter); } - gchar + gboolean @@ -130,7 +132,7 @@ zak_form_element_filter_set_property (GObject *object, - GParamSpec *pspec) + GParamSpec *pspec) { ZakFormElementFilter *zak_form_element_filter = (ZakFormElementFilter *)object; - ZakFormElementFilterPrivate *priv = zak_form_element_filter_get_instance_private (zak_form_element_filter); @@ -67,7 +67,7 @@ index fe3ce9a..6d53784 100644 switch (property_id) { @@ -151,7 +153,7 @@ zak_form_element_filter_get_property (GObject *object, - GParamSpec *pspec) + GParamSpec *pspec) { ZakFormElementFilter *zak_form_element_filter = (ZakFormElementFilter *)object; - ZakFormElementFilterPrivate *priv = zak_form_element_filter_get_instance_private (zak_form_element_filter); diff --git a/debian/patches/0007-Glib-old-version-private.patch b/debian/patches/0007-Glib-old-version-private.patch index a0fc40c..c881c22 100644 --- a/debian/patches/0007-Glib-old-version-private.patch +++ b/debian/patches/0007-Glib-old-version-private.patch @@ -148,10 +148,10 @@ index 6d53784..f17663e 100644 static void zak_form_element_filter_class_init (ZakFormElementFilterClass *class) -@@ -68,6 +68,8 @@ zak_form_element_filter_class_init (ZakFormElementFilterClass *class) - "Enabled", - TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); +@@ -75,6 +75,8 @@ zak_form_element_filter_class_init (ZakFormElementFilterClass *class) + "Enabled", + TRUE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + g_type_class_add_private (object_class, sizeof (ZakFormElementFilterPrivate)); }