Debian pkg: new patches due to upstream changes.

diff --git a/.gitignore b/.gitignore
index 8129d065c7f857c37bb7f0e653878e9baf5e5522..6f0039519e176f797529c84f6082a95badd535c5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ intltool-*
 Rules-quot
 *.exe
 *.csv
+build/
\ No newline at end of file

diff --git a/debian/changelog b/debian/changelog
index c18aa346e43d59aefc937b2817177ff13ebd2676..d4b67468a6da44773635333873c2e0934505d150 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-libzakformgdaex (0.0.1-1~1.gbp001666) UNRELEASED; urgency=medium
+libzakformgdaex (0.0.1-1~2.gbpee218d) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @00166615b8f3d75eecbecf7cdb8cbd43caeefcf6 **
+  ** SNAPSHOT build @ee218d919020c32b2ee6256e21fd6f0a721fa75c **
 
   [ Andrea Zagli ]
   * Initial release
 
   [ tux ]
 
- -- Andrea Zagli <azagli@libero.it>  Sat, 10 Dec 2016 12:08:43 +0100
+  [ Andrea Zagli ]
+  * Debian pkg: new patches due to upstream changes.
+
+  [ tux ]
+
+ -- tux <tux@develop64.comune.scandicci.fi.it>  Sat, 04 Mar 2017 11:00:36 +0100

diff --git a/debian/gbp.conf b/debian/gbp.conf
index e58b4ba1a816758dcb7e7e724f2d52631b6944a3..05c3cab43c1421ca005f743b5cf34d507a720292 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,9 @@
 [buildpackage]
-export-dir=../build_area/wheezy
+export-dir=./build/wheezy
 debian-branch=debian/wheezy
 ignore-new=True
 upstream-tree=BRANCH
-upstream-branch=master
+upstream-branch=develop
 force-create=True
 export=WC
 dist=wheezy

diff --git a/debian/patches/0002-Glib-old-gobject-macro.patch b/debian/patches/0002-Glib-old-gobject-macro.patch
index 4237cccec207915846be47e4c0d7edcc55da0f1f..55547c4675878f232841ad63fc3abb475e85b331 100644 (file)
--- a/debian/patches/0002-Glib-old-gobject-macro.patch
+++ b/debian/patches/0002-Glib-old-gobject-macro.patch
@@ -8,10 +8,10 @@ Subject: Glib old gobject macro.
  2 files changed, 14 insertions(+), 7 deletions(-)
 
 diff --git a/src/form.c b/src/form.c
-index 07b0c95..6ecc242 100644
+index 3511092..dc75179 100644
 --- a/src/form.c
 +++ b/src/form.c
-@@ -46,11 +46,6 @@ static gboolean zak_form_gdaex_provider_insert (ZakFormIProvider *provider, GPtr
+@@ -49,11 +49,6 @@ static gboolean zak_form_gdaex_provider_insert (ZakFormIProvider *provider, GPtr
  static gboolean zak_form_gdaex_provider_update (ZakFormIProvider *provider, GPtrArray *elements);
  static gboolean zak_form_gdaex_provider_delete (ZakFormIProvider *provider, GPtrArray *elements);
  
@@ -24,7 +24,7 @@ index 07b0c95..6ecc242 100644
  
  typedef struct _ZakFormGdaexProviderPrivate ZakFormGdaexProviderPrivate;
 diff --git a/src/form.h b/src/form.h
-index 36c2574..9e7a1eb 100644
+index 670095e..bbc9124 100644
 --- a/src/form.h
 +++ b/src/form.h
 @@ -28,8 +28,20 @@

diff --git a/debian/patches/0003-Glib-old-gobject-macro-new-classes.patch b/debian/patches/0003-Glib-old-gobject-macro-new-classes.patch
new file mode 100644 (file)
index 0000000..6a380cd
--- /dev/null
+++ b/debian/patches/0003-Glib-old-gobject-macro-new-classes.patch
@@ -0,0 +1,235 @@
+From: Andrea Zagli <azagli@libero.it>
+Date: Sat, 4 Mar 2017 10:47:08 +0100
+Subject: Glib old gobject macro, new classes.
+
+---
+ src/formelementextension.c | 42 +++++++++++++++++++++++-------------------
+ src/formelementextension.h | 19 ++++++++++++++++---
+ 2 files changed, 39 insertions(+), 22 deletions(-)
+
+diff --git a/src/formelementextension.c b/src/formelementextension.c
+index 9d2c162..55e8e3b 100644
+--- a/src/formelementextension.c
++++ b/src/formelementextension.c
+@@ -44,6 +44,8 @@ static void zak_form_gdaex_element_extension_get_property (GObject *object,
+ static void zak_form_gdaex_element_extension_dispose (GObject *gobject);
+ static void zak_form_gdaex_element_extension_finalize (GObject *gobject);
+ 
++#define ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GDAEX_TYPE_ELEMENT_EXTENSION, ZakFormGdaExElementExtensionPrivate))
++
+ typedef struct
+       {
+               gchar *table;
+@@ -54,7 +56,7 @@ typedef struct
+               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)
+ 
+ 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;
+       object_class->finalize = zak_form_gdaex_element_extension_finalize;
++
++      g_type_class_add_private (object_class, sizeof (ZakFormGdaExElementExtensionPrivate));
+ }
+ 
+ static void
+ zak_form_gdaex_element_extension_init (ZakFormGdaExElementExtension *zak_form_gdaex_element_extension)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (zak_form_gdaex_element_extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (zak_form_gdaex_element_extension);
+ 
+       priv->table = NULL;
+       priv->table_alias = NULL;
+@@ -100,7 +104,7 @@ zak_form_gdaex_element_extension_xml_parsing (GObject *extension, xmlNode *xnode
+       xmlNode *xnodetmp;
+       gchar *prop;
+ 
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (ZAK_FORM_GDAEX_ELEMENT_EXTENSION (extension));
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (ZAK_FORM_GDAEX_ELEMENT_EXTENSION (extension));
+ 
+       xnodetmp = xnode->children;
+       while (xnodetmp)
+@@ -205,7 +209,7 @@ zak_form_gdaex_element_extension_xml_parsing (GObject *extension, xmlNode *xnode
+ gchar
+ *zak_form_gdaex_element_extension_get_where_table (ZakFormGdaExElementExtension *extension)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       return priv->table;
+ }
+@@ -218,7 +222,7 @@ gchar
+ void
+ zak_form_gdaex_element_extension_set_where_table (ZakFormGdaExElementExtension *extension, const gchar *table)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       if (table != NULL)
+               {
+@@ -240,7 +244,7 @@ zak_form_gdaex_element_extension_set_where_table (ZakFormGdaExElementExtension *
+ gchar
+ *zak_form_gdaex_element_extension_get_where_table_alias (ZakFormGdaExElementExtension *extension)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       return priv->table_alias;
+ }
+@@ -253,7 +257,7 @@ gchar
+ void
+ zak_form_gdaex_element_extension_set_where_table_alias (ZakFormGdaExElementExtension *extension, const gchar *table_alias)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       if (table_alias != NULL)
+               {
+@@ -275,7 +279,7 @@ zak_form_gdaex_element_extension_set_where_table_alias (ZakFormGdaExElementExten
+ gchar
+ *zak_form_gdaex_element_extension_get_where_field (ZakFormGdaExElementExtension *extension)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       return priv->field;
+ }
+@@ -288,7 +292,7 @@ gchar
+ void
+ zak_form_gdaex_element_extension_set_where_field (ZakFormGdaExElementExtension *extension, const gchar *field)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       if (field != NULL)
+               {
+@@ -310,7 +314,7 @@ zak_form_gdaex_element_extension_set_where_field (ZakFormGdaExElementExtension *
+ gchar
+ *zak_form_gdaex_element_extension_get_where_field_alias (ZakFormGdaExElementExtension *extension)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       return priv->field_alias;
+ }
+@@ -323,7 +327,7 @@ gchar
+ void
+ zak_form_gdaex_element_extension_set_where_field_alias (ZakFormGdaExElementExtension *extension, const gchar *field_alias)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       if (field_alias != NULL)
+               {
+@@ -345,7 +349,7 @@ zak_form_gdaex_element_extension_set_where_field_alias (ZakFormGdaExElementExten
+ GdaSqlOperatorType
+ zak_form_gdaex_element_extension_get_where_type (ZakFormGdaExElementExtension *extension)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       return priv->type;
+ }
+@@ -358,7 +362,7 @@ zak_form_gdaex_element_extension_get_where_type (ZakFormGdaExElementExtension *e
+ void
+ zak_form_gdaex_element_extension_set_where_type (ZakFormGdaExElementExtension *extension, GdaSqlOperatorType type)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       priv->type = type;
+ }
+@@ -372,7 +376,7 @@ zak_form_gdaex_element_extension_set_where_type (ZakFormGdaExElementExtension *e
+ gint
+ zak_form_gdaex_element_extension_get_where_like_type (ZakFormGdaExElementExtension *extension)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       return priv->like_type;
+ }
+@@ -385,7 +389,7 @@ zak_form_gdaex_element_extension_get_where_like_type (ZakFormGdaExElementExtensi
+ void
+ zak_form_gdaex_element_extension_set_where_like_type (ZakFormGdaExElementExtension *extension, gint type)
+ {
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (extension);
+ 
+       priv->like_type = type;
+ }
+@@ -398,7 +402,7 @@ zak_form_gdaex_element_extension_set_property (GObject *object,
+                    GParamSpec *pspec)
+ {
+       ZakFormGdaExElementExtension *zak_form_gdaex_element_extension = (ZakFormGdaExElementExtension *)object;
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (zak_form_gdaex_element_extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (zak_form_gdaex_element_extension);
+ 
+       switch (property_id)
+               {
+@@ -415,7 +419,7 @@ zak_form_gdaex_element_extension_get_property (GObject *object,
+                    GParamSpec *pspec)
+ {
+       ZakFormGdaExElementExtension *zak_form_gdaex_element_extension = (ZakFormGdaExElementExtension *)object;
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (zak_form_gdaex_element_extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (zak_form_gdaex_element_extension);
+ 
+       switch (property_id)
+               {
+@@ -429,7 +433,7 @@ static void
+ zak_form_gdaex_element_extension_dispose (GObject *gobject)
+ {
+       ZakFormGdaExElementExtension *zak_form_gdaex_element_extension = (ZakFormGdaExElementExtension *)gobject;
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (zak_form_gdaex_element_extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (zak_form_gdaex_element_extension);
+ 
+ 
+ 
+@@ -441,7 +445,7 @@ static void
+ zak_form_gdaex_element_extension_finalize (GObject *gobject)
+ {
+       ZakFormGdaExElementExtension *zak_form_gdaex_element_extension = (ZakFormGdaExElementExtension *)gobject;
+-      ZakFormGdaExElementExtensionPrivate *priv = zak_form_gdaex_element_extension_get_instance_private (zak_form_gdaex_element_extension);
++      ZakFormGdaExElementExtensionPrivate *priv = ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_PRIVATE (zak_form_gdaex_element_extension);
+ 
+ 
+ 
+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 @@
+ 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)
++#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))
++#define ZAK_FORM_GDAEX_IS_ELEMENT_EXTENSION(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_GDAEX_TYPE_ELEMENT_EXTENSION))
++#define ZAK_FORM_GDAEX_IS_ELEMENT_EXTENSION_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_GDAEX_TYPE_ELEMENT_EXTENSION))
++#define ZAK_FORM_GDAEX_ELEMENT_EXTENSION_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_GDAEX_TYPE_ELEMENT_EXTENSION, ZakFormGdaExElementExtensionClass))
++
++typedef struct _ZakFormGdaExElementExtension ZakFormGdaExElementExtension;
++typedef struct _ZakFormGdaExElementExtensionClass ZakFormGdaExElementExtensionClass;
++
++struct _ZakFormGdaExElementExtension
++{
++      GObject parent;
++};
+ 
+ struct _ZakFormGdaExElementExtensionClass
+ {
+-      GObjectClass parent_cleass;
++      GObjectClass parent_class;
+ };
+ 
++
+ GObject *zak_form_gdaex_element_extension_new (void);
+ 
+ gchar *zak_form_gdaex_element_extension_get_where_table (ZakFormGdaExElementExtension *extension);

diff --git a/debian/patches/0004-Gda-old-version-constantsnot-present.patch b/debian/patches/0004-Gda-old-version-constantsnot-present.patch
new file mode 100644 (file)
index 0000000..4c753ed
--- /dev/null
+++ b/debian/patches/0004-Gda-old-version-constantsnot-present.patch
@@ -0,0 +1,50 @@
+From: Andrea Zagli <azagli@libero.it>
+Date: Sat, 4 Mar 2017 10:52:12 +0100
+Subject: Gda old version constantsnot present.
+
+---
+ src/form.c                 |  4 +---
+ src/formelementextension.c | 10 ----------
+ 2 files changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/src/form.c b/src/form.c
+index dc75179..025c620 100644
+--- a/src/form.c
++++ b/src/form.c
+@@ -176,9 +176,7 @@ gchar
+                                               }
+ 
+                                       if (type == GDA_SQL_OPERATOR_TYPE_LIKE
+-                                          || type == GDA_SQL_OPERATOR_TYPE_ILIKE
+-                                          || type == GDA_SQL_OPERATOR_TYPE_NOTLIKE
+-                                          || type == GDA_SQL_OPERATOR_TYPE_NOTILIKE)
++                                          || type == GDA_SQL_OPERATOR_TYPE_ILIKE)
+                                               {
+                                                       gchar *str;
+                                                       gint like_type;
+diff --git a/src/formelementextension.c b/src/formelementextension.c
+index 55e8e3b..b560ced 100644
+--- a/src/formelementextension.c
++++ b/src/formelementextension.c
+@@ -157,21 +157,11 @@ zak_form_gdaex_element_extension_xml_parsing (GObject *extension, xmlNode *xnode
+                                                       zak_form_gdaex_element_extension_set_where_type ((ZakFormGdaExElementExtension *)extension,
+                                                                                                        GDA_SQL_OPERATOR_TYPE_LIKE);
+                                               }
+-                                      else if (g_strcmp0 (prop, "nlike") == 0)
+-                                              {
+-                                                      zak_form_gdaex_element_extension_set_where_type ((ZakFormGdaExElementExtension *)extension,
+-                                                                                                       GDA_SQL_OPERATOR_TYPE_NOTLIKE);
+-                                              }
+                                       else if (g_strcmp0 (prop, "ilike") == 0)
+                                               {
+                                                       zak_form_gdaex_element_extension_set_where_type ((ZakFormGdaExElementExtension *)extension,
+                                                                                                        GDA_SQL_OPERATOR_TYPE_ILIKE);
+                                               }
+-                                      else if (g_strcmp0 (prop, "nilike") == 0)
+-                                              {
+-                                                      zak_form_gdaex_element_extension_set_where_type ((ZakFormGdaExElementExtension *)extension,
+-                                                                                                       GDA_SQL_OPERATOR_TYPE_NOTILIKE);
+-                                              }
+ 
+                                       if (g_strcmp0 (prop, "like") == 0
+                                               || g_strcmp0 (prop, "nlike") == 0

diff --git a/debian/patches/series b/debian/patches/series
index 357c256ed0c9f8138976358343b09888e828d780..02d64dea0ffc03b69d0923d73871503d54ae2551 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-m4-spec.patch
 0002-Glib-old-gobject-macro.patch
+0003-Glib-old-gobject-macro-new-classes.patch
+0004-Gda-old-version-constantsnot-present.patch