Debian pkg: updates from upstream.

diff --git a/debian/patches/0001-DESTDIR-support.patch b/debian/patches/0001-DESTDIR-support.patch
index faad6637372b55792d1661b04ff2a18384aaea64..3a118e930c11b7572b657af3d49da24d58927ab6 100644 (file)
--- a/debian/patches/0001-DESTDIR-support.patch
+++ b/debian/patches/0001-DESTDIR-support.patch
@@ -7,10 +7,10 @@ Subject: DESTDIR support.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 6c6f9b6..ee33785 100644
+index 4b3af31..af81c81 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -62,10 +62,10 @@
+@@ -62,10 +62,10 @@ libzakform_include_HEADERS = \
  libzakform_includedir = $(includedir)/libzakform
  
  install-exec-hook:

diff --git a/debian/patches/0002-aclocal-old-version.patch b/debian/patches/0002-aclocal-old-version.patch
index 22e322594251c3fa1c3f85b4244e522211084144..ed22d9b10b98c3006f10b5f05360a564870107b9 100644 (file)
--- a/debian/patches/0002-aclocal-old-version.patch
+++ b/debian/patches/0002-aclocal-old-version.patch
@@ -7,7 +7,7 @@ Subject: aclocal old version.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/autogen.sh b/autogen.sh
-index 83f5de2..9e5ebc4 100755
+index c32ddd7..2529218 100755
 --- a/autogen.sh
 +++ b/autogen.sh
 @@ -22,7 +22,7 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then

diff --git a/debian/patches/0003-Glib-old-version.patch b/debian/patches/0003-Glib-old-version.patch
index 4dbf13264bbea9d8674891fca4f8770f1fdd36e0..d8c18ae6a69784275c33ad11c9e2dedd64633f8c 100644 (file)
--- a/debian/patches/0003-Glib-old-version.patch
+++ b/debian/patches/0003-Glib-old-version.patch
@@ -8,10 +8,10 @@ Subject: Glib old version.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 1f2bffe..e4f599e 100644
+index e9e8e77..c155161 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -47,8 +47,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+@@ -50,8 +50,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
  AM_GLIB_GNU_GETTEXT
  
  # Checks for libraries.

diff --git a/debian/patches/0004-Glib-old-version-gobject-macro.patch b/debian/patches/0004-Glib-old-version-gobject-macro.patch
index 39071b274159e8abe630d2723f8e874d76117fb8..78bbf88fb1aa2c3647929f0e7db567b513b5cf03 100644 (file)
--- a/debian/patches/0004-Glib-old-version-gobject-macro.patch
+++ b/debian/patches/0004-Glib-old-version-gobject-macro.patch
@@ -19,10 +19,10 @@ Subject: Glib old version - gobject macro.
  13 files changed, 214 insertions(+), 27 deletions(-)
 
 diff --git a/src/form.h b/src/form.h
-index 55e7991..a2f3eb8 100644
+index dacd822..d28a332 100644
 --- a/src/form.h
 +++ b/src/form.h
-@@ -31,9 +31,20 @@
+@@ -32,9 +32,20 @@
  
  G_BEGIN_DECLS
  
@@ -47,10 +47,10 @@ index 55e7991..a2f3eb8 100644
  struct _ZakFormFormClass
  {
 diff --git a/src/formelement.h b/src/formelement.h
-index c3fd519..c513e18 100644
+index 22bcbc1..47e4adb 100644
 --- a/src/formelement.h
 +++ b/src/formelement.h
-@@ -31,8 +31,20 @@
+@@ -32,8 +32,20 @@
  G_BEGIN_DECLS
  
  

diff --git a/debian/patches/0005-Glib-old-version-private.patch b/debian/patches/0005-Glib-old-version-private.patch
index a933969f2f31424d988dd961978cc67f0dda23c2..0f4a8df0853bd4d96fff4ba30d813a3f3e2c14f5 100644 (file)
--- a/debian/patches/0005-Glib-old-version-private.patch
+++ b/debian/patches/0005-Glib-old-version-private.patch
@@ -3,7 +3,7 @@ Date: Fri, 27 May 2016 10:54:40 +0200
 Subject: Glib old version - private.
 
 ---
- src/form.c                         | 46 +++++++++++++------------
+ src/form.c                         | 40 ++++++++++++----------
  src/formelement.c                  | 70 ++++++++++++++++++++------------------
  src/formelementfilterluc.c         |  7 ----
  src/formelementfiltertrim.c        |  7 ----
@@ -20,13 +20,13 @@ Subject: Glib old version - private.
  src/formvalidatorcompare.h         |  2 +-
  src/formvalidatorcomparedate.c     |  7 ----
  src/formvalidatorcomparedate.h     |  2 +-
- 17 files changed, 93 insertions(+), 126 deletions(-)
+ 17 files changed, 90 insertions(+), 123 deletions(-)
 
 diff --git a/src/form.c b/src/form.c
-index 226ca90..03c076f 100644
+index 7fd21a0..ff60b3c 100644
 --- a/src/form.c
 +++ b/src/form.c
-@@ -51,6 +51,8 @@
+@@ -51,6 +51,8 @@ static void zak_form_form_get_property (GObject *object,
  static void zak_form_form_dispose (GObject *gobject);
  static void zak_form_form_finalize (GObject *gobject);
  
@@ -35,7 +35,7 @@ index 226ca90..03c076f 100644
  typedef struct
        {
                GPtrArray *ar_elements;
-@@ -65,7 +67,7 @@ typedef struct
+@@ -58,7 +60,7 @@ typedef struct
                GPtrArray *ar_messages;
        } ZakFormFormPrivate;
  
@@ -44,7 +44,7 @@ index 226ca90..03c076f 100644
  
  #ifdef G_OS_WIN32
  static HMODULE backend_dll = NULL;
-@@ -101,6 +103,8 @@ zak_form_form_class_init (ZakFormFormClass *class)
+@@ -94,6 +96,8 @@ zak_form_form_class_init (ZakFormFormClass *class)
        object_class->dispose = zak_form_form_dispose;
        object_class->finalize = zak_form_form_finalize;
  
@@ -53,7 +53,7 @@ index 226ca90..03c076f 100644
        class->get_elements = zak_form_form_get_elements;
  }
  
-@@ -497,7 +501,7 @@ zak_form_form_add_element (ZakFormForm *zakform, ZakFormElement *element)
+@@ -292,7 +296,7 @@ zak_form_form_add_element (ZakFormForm *zakform, ZakFormElement *element)
  
        ZakFormFormPrivate *priv;
  
@@ -62,7 +62,7 @@ index 226ca90..03c076f 100644
  
        g_ptr_array_add (priv->ar_elements, g_object_ref (element));
        ret = TRUE;
-@@ -526,7 +530,7 @@ ZakFormElement
+@@ -321,7 +325,7 @@ ZakFormElement
  
        guint i;
  
@@ -71,7 +71,7 @@ index 226ca90..03c076f 100644
  
        ret = NULL;
        for (i = 0; i < priv->ar_elements->len; i++)
-@@ -601,7 +605,7 @@ zak_form_form_add_validator (ZakFormForm *zakform, ZakFormValidator *validator)
+@@ -396,7 +400,7 @@ zak_form_form_add_validator (ZakFormForm *zakform, ZakFormValidator *validator)
  
        ZakFormFormPrivate *priv;
  
@@ -80,7 +80,7 @@ index 226ca90..03c076f 100644
  
        g_ptr_array_add (priv->ar_validators, g_object_ref (validator));
        ret = TRUE;
-@@ -697,7 +701,7 @@ zak_form_form_clear (ZakFormForm *zakform)
+@@ -492,7 +496,7 @@ zak_form_form_clear (ZakFormForm *zakform)
  
        g_return_if_fail (ZAK_FORM_IS_FORM (zakform));
  
@@ -89,7 +89,7 @@ index 226ca90..03c076f 100644
  
        for (i = 0; i < priv->ar_elements->len; i++)
                {
-@@ -721,7 +725,7 @@ zak_form_form_set_as_original (ZakFormForm *zakform)
+@@ -516,7 +520,7 @@ zak_form_form_set_as_original (ZakFormForm *zakform)
  
        g_return_if_fail (ZAK_FORM_IS_FORM (zakform));
  
@@ -98,7 +98,7 @@ index 226ca90..03c076f 100644
  
        for (i = 0; i < priv->ar_elements->len; i++)
                {
-@@ -746,7 +750,7 @@ zak_form_form_set_editable (ZakFormForm *zakform, gboolean editable)
+@@ -541,7 +545,7 @@ zak_form_form_set_editable (ZakFormForm *zakform, gboolean editable)
  
        g_return_if_fail (ZAK_FORM_IS_FORM (zakform));
  
@@ -107,7 +107,7 @@ index 226ca90..03c076f 100644
  
        for (i = 0; i < priv->ar_elements->len; i++)
                {
-@@ -773,7 +777,7 @@ zak_form_form_is_valid (ZakFormForm *zakform)
+@@ -568,7 +572,7 @@ zak_form_form_is_valid (ZakFormForm *zakform)
  
        GPtrArray *ar_messages;
  
@@ -116,7 +116,7 @@ index 226ca90..03c076f 100644
  
        ret = TRUE;
  
-@@ -810,7 +814,7 @@ GPtrArray
+@@ -605,7 +609,7 @@ GPtrArray
  {
        ZakFormFormPrivate *priv;
  
@@ -125,7 +125,7 @@ index 226ca90..03c076f 100644
  
        return priv->ar_messages;
  }
-@@ -830,7 +834,7 @@ zak_form_form_is_changed (ZakFormForm *zakform)
+@@ -625,7 +629,7 @@ zak_form_form_is_changed (ZakFormForm *zakform)
  
        ZakFormFormPrivate *priv;
  
@@ -134,7 +134,7 @@ index 226ca90..03c076f 100644
  
        ret = FALSE;
  
-@@ -858,7 +862,7 @@ zak_form_form_load (ZakFormForm *zakform, ZakFormIProvider *provider)
+@@ -653,7 +657,7 @@ zak_form_form_load (ZakFormForm *zakform, ZakFormIProvider *provider)
  {
        ZakFormFormPrivate *priv;
  
@@ -143,7 +143,7 @@ index 226ca90..03c076f 100644
  
        return zak_form_iprovider_load (provider, priv->ar_elements);
  }
-@@ -874,7 +878,7 @@ zak_form_form_insert (ZakFormForm *zakform, ZakFormIProvider *provider)
+@@ -669,7 +673,7 @@ zak_form_form_insert (ZakFormForm *zakform, ZakFormIProvider *provider)
  {
        ZakFormFormPrivate *priv;
  
@@ -152,7 +152,7 @@ index 226ca90..03c076f 100644
  
        return zak_form_iprovider_insert (provider, priv->ar_elements);
  }
-@@ -890,7 +894,7 @@ zak_form_form_update (ZakFormForm *zakform, ZakFormIProvider *provider)
+@@ -685,7 +689,7 @@ zak_form_form_update (ZakFormForm *zakform, ZakFormIProvider *provider)
  {
        ZakFormFormPrivate *priv;
  
@@ -161,7 +161,7 @@ index 226ca90..03c076f 100644
  
        return zak_form_iprovider_update (provider, priv->ar_elements);
  }
-@@ -906,7 +910,7 @@ zak_form_form_delete (ZakFormForm *zakform, ZakFormIProvider *provider)
+@@ -701,7 +705,7 @@ zak_form_form_delete (ZakFormForm *zakform, ZakFormIProvider *provider)
  {
        ZakFormFormPrivate *priv;
  
@@ -170,7 +170,7 @@ index 226ca90..03c076f 100644
  
        return zak_form_iprovider_delete (provider, priv->ar_elements);
  }
-@@ -919,7 +923,7 @@ zak_form_form_set_property (GObject *object,
+@@ -714,7 +718,7 @@ zak_form_form_set_property (GObject *object,
                     GParamSpec *pspec)
  {
        ZakFormForm *zak_form_form = (ZakFormForm *)object;
@@ -179,7 +179,7 @@ index 226ca90..03c076f 100644
  
        switch (property_id)
                {
-@@ -936,7 +940,7 @@ zak_form_form_get_property (GObject *object,
+@@ -731,7 +735,7 @@ zak_form_form_get_property (GObject *object,
                     GParamSpec *pspec)
  {
        ZakFormForm *zak_form_form = (ZakFormForm *)object;
@@ -188,7 +188,7 @@ index 226ca90..03c076f 100644
  
        switch (property_id)
                {
-@@ -950,7 +954,7 @@ static void
+@@ -745,7 +749,7 @@ static void
  zak_form_form_dispose (GObject *gobject)
  {
        ZakFormForm *zak_form_form = (ZakFormForm *)gobject;
@@ -197,7 +197,7 @@ index 226ca90..03c076f 100644
  
  
  
-@@ -962,7 +966,7 @@ static void
+@@ -757,7 +761,7 @@ static void
  zak_form_form_finalize (GObject *gobject)
  {
        ZakFormForm *zak_form_form = (ZakFormForm *)gobject;
@@ -207,10 +207,10 @@ index 226ca90..03c076f 100644
  
  
 diff --git a/src/formelement.c b/src/formelement.c
-index eb9a601..ea3542c 100644
+index 824952f..44ca18a 100644
 --- a/src/formelement.c
 +++ b/src/formelement.c
-@@ -66,6 +65,8 @@
+@@ -66,6 +66,8 @@ static void zak_form_element_get_property (GObject *object,
  static void zak_form_element_dispose (GObject *gobject);
  static void zak_form_element_finalize (GObject *gobject);
  
@@ -219,7 +219,7 @@ index eb9a601..ea3542c 100644
  typedef struct
        {
                gchar *name;
-@@ -86,7 +88,7 @@ typedef struct
+@@ -87,7 +89,7 @@ typedef struct
                GPtrArray *pa_messages;
        } ZakFormElementPrivate;
  
@@ -228,7 +228,8 @@ index eb9a601..ea3542c 100644
  
  static void
  zak_form_element_class_init (ZakFormElementClass *class)
-@@ -100,5 +102,7 @@ zak_form_element_class_init (ZakFormElementClass *class)
+@@ -99,6 +101,8 @@ zak_form_element_class_init (ZakFormElementClass *class)
+       object_class->dispose = zak_form_element_dispose;
        object_class->finalize = zak_form_element_finalize;
  
 +      g_type_class_add_private (object_class, sizeof (ZakFormElementPrivate));
@@ -236,7 +237,7 @@ index eb9a601..ea3542c 100644
        g_object_class_install_property (object_class, PROP_NAME,
                                         g_param_spec_string ("name",
                                                              "Name",
-@@ -250,7 +254,7 @@ zak_form_element_add_extension (ZakFormElement *element, GObject *extension)
+@@ -249,7 +253,7 @@ zak_form_element_add_extension (ZakFormElement *element, ZakFormElementExtension
  {
        ZakFormElementPrivate *priv;
  
@@ -245,7 +246,7 @@ index eb9a601..ea3542c 100644
  
        g_ptr_array_add (priv->pa_extensions, extension);
  }
-@@ -426,7 +430,7 @@ zak_form_element_set_name (ZakFormElement *element, const gchar *name)
+@@ -425,7 +429,7 @@ zak_form_element_set_name (ZakFormElement *element, const gchar *name)
  {
        ZakFormElementPrivate *priv;
  
@@ -254,7 +255,7 @@ index eb9a601..ea3542c 100644
  
        if (priv->name != NULL)
                {
-@@ -448,7 +452,7 @@ gchar
+@@ -447,7 +451,7 @@ gchar
  
        gchar *ret;
  
@@ -263,7 +264,7 @@ index eb9a601..ea3542c 100644
  
        ret = g_strdup (priv->name);
  
-@@ -466,7 +470,7 @@ zak_form_element_set_long_name (ZakFormElement *element, const gchar *long_name)
+@@ -465,7 +469,7 @@ zak_form_element_set_long_name (ZakFormElement *element, const gchar *long_name)
  {
        ZakFormElementPrivate *priv;
  
@@ -272,7 +273,7 @@ index eb9a601..ea3542c 100644
  
        if (priv->long_name != NULL)
                {
-@@ -495,7 +499,7 @@ gchar
+@@ -494,7 +498,7 @@ gchar
  
        gchar *ret;
  
@@ -281,7 +282,7 @@ index eb9a601..ea3542c 100644
  
        if (priv->long_name == NULL)
                {
-@@ -520,7 +524,7 @@ zak_form_element_set_is_key (ZakFormElement *element, gboolean is_key)
+@@ -519,7 +523,7 @@ zak_form_element_set_is_key (ZakFormElement *element, gboolean is_key)
  {
        ZakFormElementPrivate *priv;
  
@@ -290,7 +291,7 @@ index eb9a601..ea3542c 100644
  
        priv->is_key = is_key;
  }
-@@ -535,7 +539,7 @@ zak_form_element_get_is_key (ZakFormElement *element)
+@@ -534,7 +538,7 @@ zak_form_element_get_is_key (ZakFormElement *element)
  {
        ZakFormElementPrivate *priv;
  
@@ -299,7 +300,7 @@ index eb9a601..ea3542c 100644
  
        return priv->is_key;
  }
-@@ -551,7 +555,7 @@ zak_form_element_set_provider_type (ZakFormElement *element, const gchar *type)
+@@ -550,7 +554,7 @@ zak_form_element_set_provider_type (ZakFormElement *element, const gchar *type)
  {
        ZakFormElementPrivate *priv;
  
@@ -308,7 +309,7 @@ index eb9a601..ea3542c 100644
  
        if (priv->type != NULL)
                {
-@@ -573,7 +577,7 @@ gchar
+@@ -572,7 +576,7 @@ gchar
  
        gchar *ret;
  
@@ -317,7 +318,7 @@ index eb9a601..ea3542c 100644
  
        ret = g_strdup (priv->type);
  
-@@ -819,7 +823,7 @@ zak_form_element_set_value_gvalue (ZakFormElement *element, GValue *value)
+@@ -818,7 +822,7 @@ zak_form_element_set_value_gvalue (ZakFormElement *element, GValue *value)
  
        ret = TRUE;
  
@@ -326,7 +327,7 @@ index eb9a601..ea3542c 100644
  
        if (priv->value != NULL)
                {
-@@ -848,7 +852,7 @@ GValue
+@@ -847,7 +851,7 @@ GValue
  
        GValue *ret;
  
@@ -335,7 +336,7 @@ index eb9a601..ea3542c 100644
  
        if (ZAK_FORM_ELEMENT_GET_CLASS (element)->get_value != NULL)
                {
-@@ -900,7 +904,7 @@ zak_form_element_set_default_value_gvalue (ZakFormElement *element, GValue *valu
+@@ -899,7 +903,7 @@ zak_form_element_set_default_value_gvalue (ZakFormElement *element, GValue *valu
  
        ret = TRUE;
  
@@ -344,7 +345,7 @@ index eb9a601..ea3542c 100644
  
        if (priv->default_value != NULL)
                {
-@@ -923,7 +927,7 @@ GValue
+@@ -922,7 +926,7 @@ GValue
  {
        ZakFormElementPrivate *priv;
  
@@ -353,7 +354,7 @@ index eb9a601..ea3542c 100644
  
        return priv->default_value;
  }
-@@ -966,7 +970,7 @@ zak_form_element_set_original_value_gvalue (ZakFormElement *element, GValue *val
+@@ -965,7 +969,7 @@ zak_form_element_set_original_value_gvalue (ZakFormElement *element, GValue *val
  
        ret = TRUE;
  
@@ -362,7 +363,7 @@ index eb9a601..ea3542c 100644
  
        if (priv->original_value != NULL)
                {
-@@ -989,7 +993,7 @@ GValue
+@@ -988,7 +992,7 @@ GValue
  {
        ZakFormElementPrivate *priv;
  
@@ -371,7 +372,7 @@ index eb9a601..ea3542c 100644
  
        return priv->original_value;
  }
-@@ -1049,7 +1053,7 @@ zak_form_element_set_format (ZakFormElement *element, GHashTable *format)
+@@ -1062,7 +1066,7 @@ zak_form_element_set_format (ZakFormElement *element, GHashTable *format)
  {
        ZakFormElementPrivate *priv;
  
@@ -380,7 +381,7 @@ index eb9a601..ea3542c 100644
  
        if (priv->format != NULL)
                {
-@@ -1073,7 +1077,7 @@ GHashTable
+@@ -1086,7 +1090,7 @@ GHashTable
  
        GHashTable *ret;
  
@@ -389,7 +390,7 @@ index eb9a601..ea3542c 100644
  
        ret = g_hash_table_ref (priv->format);
  
-@@ -1091,7 +1095,7 @@ zak_form_element_set_visible (ZakFormElement *element, gboolean visible)
+@@ -1104,7 +1108,7 @@ zak_form_element_set_visible (ZakFormElement *element, gboolean visible)
  {
        ZakFormElementPrivate *priv;
  
@@ -398,7 +399,7 @@ index eb9a601..ea3542c 100644
  
        priv->visible = visible;
  
-@@ -1113,7 +1117,7 @@ zak_form_element_get_visible (ZakFormElement *element)
+@@ -1126,7 +1130,7 @@ zak_form_element_get_visible (ZakFormElement *element)
  
        gboolean ret;
  
@@ -407,7 +408,7 @@ index eb9a601..ea3542c 100644
  
        if (ZAK_FORM_ELEMENT_GET_CLASS (element)->get_visible != NULL)
                {
-@@ -1138,7 +1142,7 @@ zak_form_element_set_editable (ZakFormElement *element, gboolean editable)
+@@ -1151,7 +1155,7 @@ zak_form_element_set_editable (ZakFormElement *element, gboolean editable)
  {
        ZakFormElementPrivate *priv;
  
@@ -416,7 +417,7 @@ index eb9a601..ea3542c 100644
  
        priv->editable = editable;
  
-@@ -1160,7 +1164,7 @@ zak_form_element_get_editable (ZakFormElement *element)
+@@ -1173,7 +1177,7 @@ zak_form_element_get_editable (ZakFormElement *element)
  
        gboolean ret;
  
@@ -425,7 +426,7 @@ index eb9a601..ea3542c 100644
  
        if (ZAK_FORM_ELEMENT_GET_CLASS (element)->get_editable != NULL)
                {
-@@ -1185,7 +1189,7 @@ zak_form_element_set_to_load (ZakFormElement *element, gboolean to_load)
+@@ -1198,7 +1202,7 @@ zak_form_element_set_to_load (ZakFormElement *element, gboolean to_load)
  {
        ZakFormElementPrivate *priv;
  
@@ -434,7 +435,7 @@ index eb9a601..ea3542c 100644
  
        priv->to_load = to_load;
  }
-@@ -1200,7 +1204,7 @@ zak_form_element_get_to_load (ZakFormElement *element)
+@@ -1213,7 +1217,7 @@ zak_form_element_get_to_load (ZakFormElement *element)
  {
        ZakFormElementPrivate *priv;
  
@@ -443,7 +444,7 @@ index eb9a601..ea3542c 100644
  
        return priv->to_load;
  }
-@@ -1216,7 +1220,7 @@ zak_form_element_set_to_save (ZakFormElement *element, gboolean to_save)
+@@ -1229,7 +1233,7 @@ zak_form_element_set_to_save (ZakFormElement *element, gboolean to_save)
  {
        ZakFormElementPrivate *priv;
  
@@ -452,7 +453,7 @@ index eb9a601..ea3542c 100644
  
        priv->to_save = to_save;
  }
-@@ -1231,7 +1235,7 @@ zak_form_element_get_to_save (ZakFormElement *element)
+@@ -1244,7 +1248,7 @@ zak_form_element_get_to_save (ZakFormElement *element)
  {
        ZakFormElementPrivate *priv;
  
@@ -461,7 +462,7 @@ index eb9a601..ea3542c 100644
  
        return priv->to_save;
  }
-@@ -1259,7 +1259,7 @@ zak_form_element_clear (ZakFormElement *element)
+@@ -1259,7 +1263,7 @@ zak_form_element_clear (ZakFormElement *element)
  {
        ZakFormElementPrivate *priv;
  
@@ -470,7 +471,7 @@ index eb9a601..ea3542c 100644
  
        if (ZAK_FORM_ELEMENT_GET_CLASS (element)->clear != NULL)
                {
-@@ -1314,7 +1318,7 @@ zak_form_element_is_valid (ZakFormElement *element)
+@@ -1334,7 +1338,7 @@ zak_form_element_is_valid (ZakFormElement *element)
  
        ZakFormElementClass *klass = ZAK_FORM_ELEMENT_GET_CLASS (element);
  
@@ -479,7 +480,7 @@ index eb9a601..ea3542c 100644
  
        ret = TRUE;
        ret_callback = FALSE;
-@@ -1367,7 +1371,7 @@ zak_form_element_is_valid (ZakFormElement *element)
+@@ -1394,7 +1398,7 @@ zak_form_element_is_valid (ZakFormElement *element)
  GPtrArray
  *zak_form_element_get_messages (ZakFormElement *element)
  {
@@ -488,7 +489,7 @@ index eb9a601..ea3542c 100644
  
        return priv->pa_messages;
  }
-@@ -1424,7 +1428,7 @@ zak_form_element_set_property (GObject *object,
+@@ -1451,7 +1455,7 @@ zak_form_element_set_property (GObject *object,
                     GParamSpec *pspec)
  {
        ZakFormElement *zak_form_element = (ZakFormElement *)object;
@@ -497,7 +498,7 @@ index eb9a601..ea3542c 100644
  
        switch (property_id)
                {
-@@ -1489,7 +1493,7 @@ zak_form_element_get_property (GObject *object,
+@@ -1516,7 +1520,7 @@ zak_form_element_get_property (GObject *object,
                     GParamSpec *pspec)
  {
        ZakFormElement *zak_form_element = (ZakFormElement *)object;
@@ -506,7 +507,7 @@ index eb9a601..ea3542c 100644
  
        switch (property_id)
                {
-@@ -1551,7 +1555,7 @@ static void
+@@ -1578,7 +1582,7 @@ static void
  zak_form_element_dispose (GObject *gobject)
  {
        ZakFormElement *zak_form_element = (ZakFormElement *)gobject;
@@ -515,7 +516,7 @@ index eb9a601..ea3542c 100644
  
  
  
-@@ -1563,7 +1567,7 @@ static void
+@@ -1590,7 +1594,7 @@ static void
  zak_form_element_finalize (GObject *gobject)
  {
        ZakFormElement *zak_form_element = (ZakFormElement *)gobject;
@@ -646,7 +647,7 @@ index 063b3b2..2ac0232 100644
  
  
 diff --git a/src/formelementvalidatordate.c b/src/formelementvalidatordate.c
-index 55f0ca9..61708b4 100644
+index 580fd2d..0ea883d 100644
 --- a/src/formelementvalidatordate.c
 +++ b/src/formelementvalidatordate.c
 @@ -45,13 +45,6 @@ static void zak_form_element_validator_date_finalize (GObject *gobject);
@@ -851,7 +852,7 @@ index 24c1f8b..df5cc82 100644
  
  
 diff --git a/src/formvalidatorcompare.c b/src/formvalidatorcompare.c
-index 2053b14..d07ec6b 100644
+index be2e534..b5570f7 100644
 --- a/src/formvalidatorcompare.c
 +++ b/src/formvalidatorcompare.c
 @@ -47,13 +47,6 @@ static void zak_form_validator_compare_finalize (GObject *gobject);
@@ -882,7 +883,7 @@ index 45690ca..6f153de 100644
  #define ZAK_FORM_IS_VALIDATOR_COMPARE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE))
  #define ZAK_FORM_IS_VALIDATOR_COMPARE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPARE))
 diff --git a/src/formvalidatorcomparedate.c b/src/formvalidatorcomparedate.c
-index 13089ee..edb658e 100644
+index 038aa66..7b5f8ed 100644
 --- a/src/formvalidatorcomparedate.c
 +++ b/src/formvalidatorcomparedate.c
 @@ -47,13 +47,6 @@ static void zak_form_validator_compare_date_finalize (GObject *gobject);

diff --git a/debian/patches/0006-Some-new-functions-not-replaced.patch b/debian/patches/0006-Some-new-functions-not-replaced.patch
index 245d7004dc88931c890920f77a02a6a8be415dd3..d113f7e87041efb2d31bfbdc2e14314ee5e6f403 100644 (file)
--- a/debian/patches/0006-Some-new-functions-not-replaced.patch
+++ b/debian/patches/0006-Some-new-functions-not-replaced.patch
@@ -10,10 +10,10 @@ Subject: Some new functions not replaced.
  4 files changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/src/form.c b/src/form.c
-index 03c076f..4d6a76a 100644
+index ff60b3c..ed889e8 100644
 --- a/src/form.c
 +++ b/src/form.c
-@@ -113,7 +113,7 @@ zak_form_form_init (ZakFormForm *zak_form_form)
+@@ -106,7 +106,7 @@ zak_form_form_init (ZakFormForm *zak_form_form)
  {
        gchar *localedir;
  
@@ -23,10 +23,10 @@ index 03c076f..4d6a76a 100644
        priv->ar_elements = g_ptr_array_new ();
        priv->ar_validators = g_ptr_array_new ();
 diff --git a/src/formelement.c b/src/formelement.c
-index ea3542c..93b29c4 100644
+index 44ca18a..240fd73 100644
 --- a/src/formelement.c
 +++ b/src/formelement.c
-@@ -222,7 +222,7 @@ zak_form_element_class_init (ZakFormElementClass *class)
+@@ -221,7 +221,7 @@ zak_form_element_class_init (ZakFormElementClass *class)
  static void
  zak_form_element_init (ZakFormElement *zak_form_element)
  {

diff --git a/debian/patches/0007-Glib-old-version-private.patch b/debian/patches/0007-Glib-old-version-private.patch
index 0a01ddbc8fed0f1b9f4fe06d29509aafbe66b5af..fdad06db5b9888656edb40dfe6b3b506806d6250 100644 (file)
--- a/debian/patches/0007-Glib-old-version-private.patch
+++ b/debian/patches/0007-Glib-old-version-private.patch
@@ -11,10 +11,10 @@ Subject: Glib old version private.
  5 files changed, 22 insertions(+), 20 deletions(-)
 
 diff --git a/src/form.c b/src/form.c
-index 4d6a76a..db77782 100644
+index ed889e8..b5917b4 100644
 --- a/src/form.c
 +++ b/src/form.c
-@@ -556,7 +556,7 @@ ZakFormElement
+@@ -351,7 +351,7 @@ ZakFormElement
  GPtrArray
  *zak_form_form_get_elements (ZakFormForm *zakform)
  {
@@ -23,7 +23,7 @@ index 4d6a76a..db77782 100644
  
        return priv->ar_elements;
  }
-@@ -576,7 +576,7 @@ GPtrArray
+@@ -371,7 +371,7 @@ GPtrArray
  
        guint i;
  
@@ -32,7 +32,7 @@ index 4d6a76a..db77782 100644
  
        ar = g_ptr_array_new ();
        for (i = 0; i < priv->ar_elements->len; i++)
-@@ -652,7 +652,7 @@ ZakFormValidator
+@@ -447,7 +447,7 @@ ZakFormValidator
  GPtrArray
  *zak_form_form_get_validators (ZakFormForm *zakform)
  {
@@ -41,7 +41,7 @@ index 4d6a76a..db77782 100644
  
        return priv->ar_validators;
  }
-@@ -672,7 +672,7 @@ GPtrArray
+@@ -467,7 +467,7 @@ GPtrArray
  
        guint i;
  
@@ -51,10 +51,10 @@ index 4d6a76a..db77782 100644
        ar = g_ptr_array_new ();
        for (i = 0; i < priv->ar_validators->len; i++)
 diff --git a/src/formelement.c b/src/formelement.c
-index 93b29c4..e37ee52 100644
+index 240fd73..79efe25 100644
 --- a/src/formelement.c
 +++ b/src/formelement.c
-@@ -268,7 +268,7 @@ zak_form_element_add_extension (ZakFormElement *element, GObject *extension)
+@@ -267,7 +267,7 @@ zak_form_element_add_extension (ZakFormElement *element, ZakFormElementExtension
  GPtrArray
  *zak_form_element_get_extensions (ZakFormElement *element)
  {
@@ -63,7 +63,7 @@ index 93b29c4..e37ee52 100644
  
        return priv->pa_extensions;
  }
-@@ -288,7 +288,7 @@ GPtrArray
+@@ -287,7 +287,7 @@ GPtrArray
  
        guint i;
  
@@ -72,7 +72,7 @@ index 93b29c4..e37ee52 100644
  
        ar = g_ptr_array_new ();
        for (i = 0; i < priv->pa_extensions->len; i++)
-@@ -314,7 +314,7 @@ zak_form_element_add_filter (ZakFormElement *element, ZakFormElementFilter *filt
+@@ -313,7 +313,7 @@ zak_form_element_add_filter (ZakFormElement *element, ZakFormElementFilter *filt
  {
        ZakFormElementPrivate *priv;
  
@@ -81,7 +81,7 @@ index 93b29c4..e37ee52 100644
  
        g_ptr_array_add (priv->pa_filters, filter);
  }
-@@ -331,7 +331,7 @@ zak_form_element_filter (ZakFormElement *element)
+@@ -330,7 +330,7 @@ zak_form_element_filter (ZakFormElement *element)
  
        ZakFormElementPrivate *priv;
  
@@ -90,7 +90,7 @@ index 93b29c4..e37ee52 100644
  
        for (i = 0; i < priv->pa_filters->len; i++)
                {
-@@ -355,7 +355,7 @@ zak_form_element_filter (ZakFormElement *element)
+@@ -354,7 +354,7 @@ zak_form_element_filter (ZakFormElement *element)
  GPtrArray
  *zak_form_element_get_filters (ZakFormElement *element)
  {
@@ -99,7 +99,7 @@ index 93b29c4..e37ee52 100644
  
        return priv->pa_filters;
  }
-@@ -404,7 +404,7 @@ GPtrArray
+@@ -403,7 +403,7 @@ GPtrArray
  
        guint i;
  
@@ -108,7 +108,7 @@ index 93b29c4..e37ee52 100644
  
        ar = g_ptr_array_new ();
        for (i = 0; i < priv->pa_filters->len; i++)
-@@ -1266,7 +1266,7 @@ zak_form_element_add_validator (ZakFormElement *element, ZakFormElementValidator
+@@ -1286,7 +1286,7 @@ zak_form_element_add_validator (ZakFormElement *element, ZakFormElementValidator
  {
        ZakFormElementPrivate *priv;
  
@@ -117,7 +117,7 @@ index 93b29c4..e37ee52 100644
  
        g_ptr_array_add (priv->pa_validators, validator);
  }
-@@ -1385,7 +1385,7 @@ GPtrArray
+@@ -1412,7 +1412,7 @@ GPtrArray
  GPtrArray
  *zak_form_element_get_validators(ZakFormElement *element)
  {
@@ -126,7 +126,7 @@ index 93b29c4..e37ee52 100644
  
        return priv->pa_validators;
  }
-@@ -1405,7 +1405,7 @@ GPtrArray
+@@ -1432,7 +1432,7 @@ GPtrArray
  
        guint i;
  

diff --git a/debian/patches/0008-Glib-old-macro-for-ZakFormValidatorComposite.patch b/debian/patches/0008-Glib-old-macro-for-ZakFormValidatorComposite.patch
index 7a43e4f4f93bad86ac46002cfabf0d0b1a131159..d3e294ff46e35fedfeab853eddd39360bdfd6e31 100644 (file)
--- a/debian/patches/0008-Glib-old-macro-for-ZakFormValidatorComposite.patch
+++ b/debian/patches/0008-Glib-old-macro-for-ZakFormValidatorComposite.patch
@@ -22,7 +22,7 @@ index 40ef5c5..21e5b0a 100644
  #define ZAK_FORM_IS_VALIDATOR(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_VALIDATOR))
  #define ZAK_FORM_IS_VALIDATOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_VALIDATOR))
 diff --git a/src/formvalidatorcomposite.c b/src/formvalidatorcomposite.c
-index e5bdbe4..2c57fb4 100644
+index a6911aa..72abfee 100644
 --- a/src/formvalidatorcomposite.c
 +++ b/src/formvalidatorcomposite.c
 @@ -49,13 +49,6 @@ static void zak_form_validator_composite_finalize (GObject *gobject);

diff --git a/debian/patches/0009-Glib-old-version-private.patch b/debian/patches/0009-Glib-old-version-private.patch
index 450184bd9e02b7dcfb4cc1566ffbe2766f40163e..9a27b3af57e2f3999fae44b5d353a2983955de22 100644 (file)
--- a/debian/patches/0009-Glib-old-version-private.patch
+++ b/debian/patches/0009-Glib-old-version-private.patch
@@ -3,18 +3,18 @@ Date: Sun, 21 May 2017 15:13:30 +0200
 Subject: Glib old version private.
 
 ---
- src/form.c                 | 4 ++--
+ src/form.c                 | 2 +-
  src/formelement.c          | 4 ++--
  src/formelementfilter.c    | 4 ++--
  src/formelementvalidator.c | 4 ++--
  src/formvalidator.c        | 4 ++--
- 5 files changed, 10 insertions(+), 10 deletions(-)
+ 5 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/src/form.c b/src/form.c
-index db77782..3090dde 100644
+index b5917b4..ea86cc8 100644
 --- a/src/form.c
 +++ b/src/form.c
-@@ -627,7 +627,7 @@ ZakFormValidator
+@@ -422,7 +422,7 @@ ZakFormValidator
  
        guint i;
  
@@ -24,10 +24,10 @@ index db77782..3090dde 100644
        validator = NULL;
  
 diff --git a/src/formelement.c b/src/formelement.c
-index e37ee52..5f7c9ca 100644
+index 79efe25..0b74e43 100644
 --- a/src/formelement.c
 +++ b/src/formelement.c
-@@ -373,7 +373,7 @@ ZakFormElementFilter
+@@ -372,7 +372,7 @@ ZakFormElementFilter
  
        guint i;
  
@@ -36,7 +36,7 @@ index e37ee52..5f7c9ca 100644
  
        filter = NULL;
  
-@@ -1284,7 +1284,7 @@ ZakFormElementValidator
+@@ -1304,7 +1304,7 @@ ZakFormElementValidator
  
        guint i;
  

diff --git a/debian/patches/0010-Glib-old-version-private.patch b/debian/patches/0010-Glib-old-version-private.patch
new file mode 100644 (file)
index 0000000..a19ed2b
--- /dev/null
+++ b/debian/patches/0010-Glib-old-version-private.patch
@@ -0,0 +1,108 @@
+From: Andrea Zagli <azagli@libero.it>
+Date: Sat, 24 Jun 2017 11:08:48 +0200
+Subject: Glib old version private.
+
+---
+ src/formelementextension.c | 16 ++++++++++------
+ src/formelementextension.h | 16 ++++++++++++++--
+ 2 files changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/src/formelementextension.c b/src/formelementextension.c
+index 7a9f964..e82aea6 100644
+--- a/src/formelementextension.c
++++ b/src/formelementextension.c
+@@ -50,12 +50,14 @@ static void zak_form_element_extension_get_property (GObject *object,
+ static void zak_form_element_extension_dispose (GObject *gobject);
+ static void zak_form_element_extension_finalize (GObject *gobject);
+ 
++#define ZAK_FORM_ELEMENT_EXTENSION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_EXTENSION, ZakFormElementExtensionPrivate))
++
+ typedef struct
+       {
+               gpointer useless;
+       } ZakFormElementExtensionPrivate;
+ 
+-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ZakFormElementExtension, zak_form_element_extension, G_TYPE_OBJECT)
++G_DEFINE_ABSTRACT_TYPE (ZakFormElementExtension, zak_form_element_extension, G_TYPE_OBJECT)
+ 
+ static void
+ zak_form_element_extension_class_init (ZakFormElementExtensionClass *class)
+@@ -66,12 +68,14 @@ zak_form_element_extension_class_init (ZakFormElementExtensionClass *class)
+       object_class->get_property = zak_form_element_extension_get_property;
+       object_class->dispose = zak_form_element_extension_dispose;
+       object_class->finalize = zak_form_element_extension_finalize;
++
++      g_type_class_add_private (object_class, sizeof (ZakFormElementExtensionPrivate));
+ }
+ 
+ static void
+ zak_form_element_extension_init (ZakFormElementExtension *zak_form_element)
+ {
+-      ZakFormElementExtensionPrivate *priv = zak_form_element_extension_get_instance_private (zak_form_element);
++      ZakFormElementExtensionPrivate *priv = ZAK_FORM_ELEMENT_EXTENSION_GET_PRIVATE (zak_form_element);
+ 
+ }
+ 
+@@ -98,7 +102,7 @@ zak_form_element_extension_set_property (GObject *object,
+                    GParamSpec *pspec)
+ {
+       ZakFormElementExtension *zak_form_element_extension = (ZakFormElementExtension *)object;
+-      ZakFormElementExtensionPrivate *priv = zak_form_element_extension_get_instance_private (zak_form_element_extension);
++      ZakFormElementExtensionPrivate *priv = ZAK_FORM_ELEMENT_EXTENSION_GET_PRIVATE (zak_form_element_extension);
+ 
+       switch (property_id)
+               {
+@@ -115,7 +119,7 @@ zak_form_element_extension_get_property (GObject *object,
+                    GParamSpec *pspec)
+ {
+       ZakFormElementExtension *zak_form_element_extension = (ZakFormElementExtension *)object;
+-      ZakFormElementExtensionPrivate *priv = zak_form_element_extension_get_instance_private (zak_form_element_extension);
++      ZakFormElementExtensionPrivate *priv = ZAK_FORM_ELEMENT_EXTENSION_GET_PRIVATE (zak_form_element_extension);
+ 
+       switch (property_id)
+               {
+@@ -129,7 +133,7 @@ static void
+ zak_form_element_extension_dispose (GObject *gobject)
+ {
+       ZakFormElementExtension *zak_form_element_extension = (ZakFormElementExtension *)gobject;
+-      ZakFormElementExtensionPrivate *priv = zak_form_element_extension_get_instance_private (zak_form_element_extension);
++      ZakFormElementExtensionPrivate *priv = ZAK_FORM_ELEMENT_EXTENSION_GET_PRIVATE (zak_form_element_extension);
+ 
+ 
+ 
+@@ -141,7 +145,7 @@ static void
+ zak_form_element_extension_finalize (GObject *gobject)
+ {
+       ZakFormElementExtension *zak_form_element_extension = (ZakFormElementExtension *)gobject;
+-      ZakFormElementExtensionPrivate *priv = zak_form_element_extension_get_instance_private (zak_form_element_extension);
++      ZakFormElementExtensionPrivate *priv = ZAK_FORM_ELEMENT_EXTENSION_GET_PRIVATE (zak_form_element_extension);
+ 
+ 
+ 
+diff --git a/src/formelementextension.h b/src/formelementextension.h
+index 35fac40..37d551e 100644
+--- a/src/formelementextension.h
++++ b/src/formelementextension.h
+@@ -28,8 +28,20 @@
+ G_BEGIN_DECLS
+ 
+ 
+-#define ZAK_FORM_TYPE_ELEMENT_EXTENSION zak_form_element_extension_get_type ()
+-G_DECLARE_DERIVABLE_TYPE (ZakFormElementExtension, zak_form_element_extension, ZAK_FORM, ELEMENT_EXTENSION, GObject)
++#define ZAK_FORM_TYPE_ELEMENT_EXTENSION                 (zak_form_element_extension_get_type ())
++#define ZAK_FORM_ELEMENT_EXTENSION(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_EXTENSION, ZakFormElementExtension))
++#define ZAK_FORM_ELEMENT_EXTENSION_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_EXTENSION, ZakFormElementExtensionClass))
++#define ZAK_FORM_IS_ELEMENT_EXTENSION(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_EXTENSION))
++#define ZAK_FORM_IS_ELEMENT_EXTENSION_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_EXTENSION))
++#define ZAK_FORM_ELEMENT_EXTENSION_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_ELEMENT_EXTENSION, ZakFormElementExtensionClass))
++
++typedef struct _ZakFormElementExtension ZakFormElementExtension;
++typedef struct _ZakFormElementExtensionClass ZakFormElementExtensionClass;
++
++struct _ZakFormElementExtension
++      {
++              GObject parent;
++      };
+ 
+ struct _ZakFormElementExtensionClass
+       {

diff --git a/debian/patches/series b/debian/patches/series
index 8eb0a229b7a803cf96ee022c99d7961ca393d421..717ea2cdce62545d4b89a97b00f9e0fcb963d612 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0007-Glib-old-version-private.patch
 0008-Glib-old-macro-for-ZakFormValidatorComposite.patch
 0009-Glib-old-version-private.patch
+0010-Glib-old-version-private.patch