[packages/libgda5] - updated to 5.0.4 - removed obsolete gi,doc-fixes patches - added missing patch (missing doc files

qboosh qboosh at pld-linux.org
Sun Jun 9 07:13:25 CEST 2013


commit 31af1ee2ffcfcf61f22217b36744c373223796b9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 9 07:13:15 2013 +0200

    - updated to 5.0.4
    - removed obsolete gi,doc-fixes patches
    - added missing patch (missing doc files from libgda git)
    - added vala patch (allow using vala 0.20, but still doesn't build with vala)

 doc-fixes.patch       |  23 -----
 gi.patch              |  26 ------
 libgda5-missing.patch | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++
 libgda5-vala.patch    |  11 +++
 libgda5.spec          |  18 ++--
 5 files changed, 256 insertions(+), 58 deletions(-)
---
diff --git a/libgda5.spec b/libgda5.spec
index 9482d56..21e803d 100644
--- a/libgda5.spec
+++ b/libgda5.spec
@@ -3,7 +3,7 @@
 # Conditional build:
 %bcond_without	apidocs		# don't generate API documentation
 %bcond_without	static_libs	# don't build static libraries
-%bcond_with	vala		# Vala support
+%bcond_with	vala		# Vala support (doesn't build as of 5.0.4/vala 0.20)
 # - database plugins:
 %bcond_without	jdbc		# build without JDBC plugin
 %bcond_without	ldap		# build without LDAP plugin
@@ -18,16 +18,16 @@
 Summary:	GNU Data Access library
 Summary(pl.UTF-8):	Biblioteka GNU Data Access
 Name:		libgda5
-Version:	5.0.3
-Release:	3
+Version:	5.0.4
+Release:	1
 License:	LGPL v2+/GPL v2+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgda/5.0/libgda-%{version}.tar.xz
-# Source0-md5:	58efdf8f727b5a0b1e5fb35d19ee76a7
+# Source0-md5:	33880eae7203c1aed2edb512733cf270
 Patch0:		%{name}-configure.patch
-Patch1:		gi.patch
-Patch2:		graphviz-api.patch
-Patch3:		doc-fixes.patch
+Patch1:		graphviz-api.patch
+Patch2:		%{name}-missing.patch
+Patch3:		%{name}-vala.patch
 URL:		http://www.gnome-db.org/
 BuildRequires:	autoconf >= 2.67
 BuildRequires:	automake >= 1:1.8
@@ -69,7 +69,7 @@ BuildRequires:	readline-devel >= 5.0
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	sqlite3-devel >= 3.6.11
 BuildRequires:	tar >= 1:1.22
-%{?with_vala:BuildRequires:	vala >= 0.14}
+%{?with_vala:BuildRequires:	vala >= 0.20}
 BuildRequires:	xz
 Requires:	glib2 >= 1:2.28.0
 Conflicts:	libgda4 < 4.2.10-2
@@ -391,7 +391,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f libgda-5.0.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/gda-list-config
 %attr(755,root,root) %{_bindir}/gda-list-config-5.0
 %attr(755,root,root) %{_bindir}/gda-list-server-op
diff --git a/doc-fixes.patch b/doc-fixes.patch
deleted file mode 100644
index 813fa64..0000000
--- a/doc-fixes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr libgda-5.0.3.old/doc/C/libgda-5.0-docs.sgml libgda-5.0.3/doc/C/libgda-5.0-docs.sgml
---- libgda-5.0.3.old/doc/C/libgda-5.0-docs.sgml	2012-01-24 19:39:55.000000000 +0100
-+++ libgda-5.0.3/doc/C/libgda-5.0-docs.sgml	2013-04-07 15:55:37.155192668 +0200
-@@ -310,7 +310,6 @@
-     <xi:include href="gettingstarted.xml"/>
-     <xi:include href="migration.xml"/>
-     <xi:include href="migration2.xml"/>
--    <xi:include href="migration3.xml"/>
-     <xi:include href="prov-notes.xml"/>
-     <xi:include href="limitations.xml"/>
-   </part>  
-diff -uNr libgda-5.0.3.old/tools/browser/doc/gda-browser-docs.sgml libgda-5.0.3/tools/browser/doc/gda-browser-docs.sgml
---- libgda-5.0.3.old/tools/browser/doc/gda-browser-docs.sgml	2012-01-24 19:06:49.000000000 +0100
-+++ libgda-5.0.3/tools/browser/doc/gda-browser-docs.sgml	2013-04-07 15:30:00.193516920 +0200
-@@ -161,7 +161,7 @@
- 
-   <part id="part_index">
-     <title>Appendix</title>
--      <xi:include href="fdl-appendix.xml"/>
-+      <xi:include href="fdl-appendix.sgml"/>
-   </part>
- </book>
- 
diff --git a/gi.patch b/gi.patch
deleted file mode 100644
index 7c7399c..0000000
--- a/gi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4dd8c531a7042a74e4fbd34c8614c72d67018024 Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba at gnome-db.org>
-Date: Sun, 23 Sep 2012 22:07:01 +0200
-Subject: [PATCH] Correction for bug #684141
-
-Mark GDA_SERVER_PROVIDER_UNDEFINED_LIMITING_THREAD as not introspectable
----
- libgda/gda-server-provider.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libgda/gda-server-provider.h b/libgda/gda-server-provider.h
-index c0397e5..c448f00 100644
---- a/libgda/gda-server-provider.h
-+++ b/libgda/gda-server-provider.h
-@@ -303,6 +303,9 @@ typedef void (*GdaServerProviderAsyncCallback) (GdaServerProvider *provider, Gda
- typedef void (*GdaServerProviderExecCallback) (GdaServerProvider *provider, GdaConnection *cnc, guint task_id, 
- 					       GObject *result_obj, const GError *error, gpointer data);
- 
-+/**
-+ * GDA_SERVER_PROVIDER_UNDEFINED_LIMITING_THREAD: (skip)
-+ */
- #define GDA_SERVER_PROVIDER_UNDEFINED_LIMITING_THREAD ((gpointer)0x1)
- struct _GdaServerProviderClass {
- 	GObjectClass parent_class;
--- 
-1.7.12.1
diff --git a/libgda5-missing.patch b/libgda5-missing.patch
new file mode 100644
index 0000000..087611f
--- /dev/null
+++ b/libgda5-missing.patch
@@ -0,0 +1,236 @@
+--- libgda-5.0.4/doc/C/data-model-writing.xml.orig	1970-01-01 01:00:00.000000000 +0100
++++ libgda-5.0.4/doc/C/data-model-writing.xml	2013-06-08 21:31:36.889155994 +0200
+@@ -0,0 +1,190 @@
++<?xml version="1.0"?>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
++"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"[
++<!ENTITY LIBGDA          "<application>Libgda</application>">
++]>
++<sect1 id="gda-data-model-writing">
++  <title>Implementing your own data model</title>
++  <para>
++    You may need at some point to implement your own data model because the implementations in
++    &LIBGDA; don't suit your needs. This section is dedicated to explaining to you how this can be done.
++  </para>
++  <para>
++    Implementing a new <link linkend="GdaDataModel">GdaDataModel</link> is simply a matter of
++    creating a new GObject which implements the <link linkend="GdaDataModel">GdaDataModel</link>
++    interface, which is described below. Thos new class needs to inherit GObject, but needs not
++    be direct descendant of it. The way to subclass an object using GLib
++    is not covered in this documentation, for this matter reref to
++    <link linkend="howto-gobject-code">GObject's documentation</link>, or
++    <ulink url="http://developer.gnome.org/gobject/stable/howto-gobject.html">online</ulink>.
++  </para>
++
++  <sect2 id="gda-data-model-writing-virtual-methods">
++    <title>Virtual methods</title>
++    <para>
++      The interface's methods which can and/or need to be implemented are defined below.
++    </para>
++
++    <sect3 id="i_get_n_rows">
++      <title>i_get_n_rows() - optional</title>
++      <para>This method, if implemented, returns the total number of rows in the data model, or -1 if
++      unknown. If it's not implemented, then it is assumed that -1 is returned in all cases.</para>
++    </sect3>
++
++    <sect3 id="i_get_n_columns">
++      <title>i_get_n_columns() - required</title>
++      <para>This method, returns the total number of columns in the data model, or -1 if unknown.</para>
++    </sect3>
++
++    <sect3 id="i_describe_column">
++      <title>i_describe_column() - required</title>
++      <para>This method describes a column; it returns (without any ownership to the caller) a
++      <link linkend="GdaColumn">GdaColumn</link> for each existing column, or NULL otherwise.</para>
++    </sect3>
++
++    <sect3 id="i_get_access_flags">
++      <title>i_get_access_flags() - required</title>
++      <para>This method defines how the data model may be accessed (randomly, only using a cursor, ...)</para>
++    </sect3>
++
++    <sect3 id="i_get_value_at">
++      <title>i_get_value_at() - required for random access</title>
++      <para>This method is used to access the contents of a data model, specifically
++      a <link linkend="GValue">GValue</link> is returned for each (column,row) position.
++      It must return NULL if the data model experienced an error for the specific (column,row)
++      position. See <link linkend="gda-data-model-get-value-at">gda_data_model_get_value_at()</link>
++      for more information about the lifetime of the returned GValue.</para>
++    </sect3>
++
++    <sect3 id="i_get_attributes_at">
++      <title>i_get_attributes_at() - optional</title>
++      <para>This method returns, for a (column,row) position in the data model, the attributes
++      of the adressed "cell".</para>
++    </sect3>
++
++    <sect3 id="i_create_iter">
++      <title>i_create_iter() - optional</title>
++      <para>This method can be implemented to create specific
++      <link linkend="GdaDataModelIter">GdaDataModelIter</link> or to customize them.</para>
++    </sect3>
++
++    <sect3 id="i_iter_at_row">
++      <title>i_iter_at_row() - optional</title>
++      <para>This method can be implemented if a specific implementation allows an iterator
++      to be moved quickly to a specific row (faster than iterating from row to row to the
++      requested row).</para>
++    </sect3>
++
++    <sect3 id="i_iter_next">
++      <title>i_iter_next() - required for cursor based access</title>
++      <para>This method is called to move an iterator to the next row; it's not necessary to
++      implement it if the data models supports random access.</para>
++    </sect3>
++
++    <sect3 id="i_iter_prev">
++      <title>i_iter_prev() - optional for cursor based access</title>
++      <para>This method is called to move an iterator to the previous row. It is only necessary to
++      implement it if the data model does not support random access and supports moving the
++      cursor backward.</para>
++    </sect3>
++
++    <sect3 id="i_set_value_at">
++      <title>i_set_value_at() - optional</title>
++      <para>This method needs to be defined if the data model allows each value in a (column,row) position
++      to be modified individually.
++      </para>
++    </sect3>
++
++    <sect3 id="i_iter_set_value">
++      <title>i_iter_set_value() - optional</title>
++      <para>This method can be defined if a specific treatment is required when a modification made
++      to a <link linkend="GdaDataModelIter">GdaDataModelIter</link> is propagated to the data model.
++      It should seldom, if ever, be necessary to implement it.</para>
++    </sect3>
++
++    <sect3 id="i_set_values">
++      <title>i_set_values() - optional</title>
++      <para>This method needs to be defined if the data model allows modifications to be made for
++      one complete row at a time. See the
++      <link linkend="gda-data-model-set-values">gda_data_model_set_values()</link> method for
++      more information about the arguments</para>
++    </sect3>
++
++    <sect3 id="i_append_values">
++      <title>i_append_values() - optional</title>
++      <para>This method can be implemented if the data model needs to support adding a row and defining the
++      values to be added in the same operation.
++      See <link linkend="gda-data-model-append-values">gda_data_model_append_values()</link> for
++      more information.</para>
++    </sect3>
++
++    <sect3 id="i_append_row">
++      <title>i_append_row() - optional</title>
++      <para>This method needs to be defined if the data model needs to support adding an empty row (i.e.
++      without any value specified in the new row).</para>
++    </sect3>
++
++    <sect3 id="i_remove_row">
++      <title>i_remove_row() - optional</title>
++      <para>This method should be implemented if the data model needs to support row removal.</para>
++    </sect3>
++
++    <sect3 id="i_find_row">
++      <title>i_find_row() - optional</title>
++      <para>This method can be implemented if the data model implements an indexing scheme which
++      allows it to find rows from values quickly than by analysing each row after another to
++      find the requested values.</para>
++    </sect3>
++
++    <sect3 id="i_set_notify">
++      <title>i_set_notify() - optional</title>
++      <para>This method should be implemented if the data model needs to honor the
++      <link linkend="gda-data-model-freeze">gda_data_model_freeze()</link> and
++      <link linkend="gda-data-model-thaw">gda_data_model_thaw()</link> methods. If
++      this method is not implemented, then these two methods will have no effect.
++      </para>
++    </sect3>
++
++    <sect3 id="i_get_notify">
++      <title>i_get_notify() - optional</title>
++      <para>This method should be implemented if the data model needs to honor the
++      <link linkend="gda-data-model-freeze">gda_data_model_freeze()</link> and
++      <link linkend="gda-data-model-thaw">gda_data_model_thaw()</link> methods. If
++      this method is not implemented, then these two methods will have no effect.</para>
++    </sect3>
++
++    <sect3 id="i_send_hint">
++      <title>i_send_hint() - optional</title>
++      <para>This method should be implemented if the data model needs to be able to treat
++      hints, see <link linkend="gda-data-model-send-hint">gda_data_model_send_hint()</link> for
++      more information</para>
++    </sect3>
++
++    <sect3 id="i_get_exceptions">
++      <title>i_get_exceptions() - optional</title>
++      <para>This method needs to be implemented if the data model keeps exceptions about the errors
++      it has encountered and may "export" these exceptions using the
++      <link linkend="gda-data-model-get-exceptions">gda_data_model_get_exceptions()</link> method.</para>
++    </sect3>
++  </sect2>
++
++  <sect2 id="gda-data-model-writing-signalling">
++    <title>Signalling changes</title>
++    <para>
++      When the data model changes, it must signal those changes using one of the following methods:
++      <itemizedlist>
++        <listitem><para><link linkend="gda-data-model-row-inserted">gda_data_model_row_inserted()</link>: to be called after a row has been inserted</para></listitem>
++        <listitem><para><link linkend="gda-data-model-row-updated">gda_data_model_row_updated()</link>: to be called after a row has been updated</para></listitem>
++        <listitem><para><link linkend="gda-data-model-row-removed">gda_data_model_row_removed()</link>: to be called after a row has been removed</para></listitem>
++        <listitem><para><link linkend="gda-data-model-reset">gda_data_model_reset()</link>: to be called
++	when the data model has changed in a way it's not possible or desirable to signal all the changes
++	using any combination of the above methods (for example when the whole contents has changed, or
++	when the number and/or types of columns has changed)</para></listitem>
++      </itemizedlist>
++    </para>
++    <para>
++      Moreover, when the data model's access flags have changed, the implementation should signal it by
++      emitting the <link linkend="GdaDataModel-access-changed">"access-changed"</link> signal.
++    </para>
++  </sect2>
++</sect1>
+--- libgda-5.0.4/doc/C/migration3.xml.orig	1970-01-01 01:00:00.000000000 +0100
++++ libgda-5.0.4/doc/C/migration3.xml	2013-06-08 21:31:36.889155994 +0200
+@@ -0,0 +1,40 @@
++<?xml version="1.0"?>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
++          "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"[
++<!ENTITY LIBGDA          "<application>Libgda</application>">
++]>
++<chapter id="migration-3" xmlns:xi="http://www.w3.org/2003/XInclude">
++  <title>Migration from 4.X versions</title>
++  <sect1><title>Overview</title>
++    <para>Version 5.0 of &LIBGDA; is a small evolution to adapt to the GTK3 environment; as such it is API
++    compatible with versions 4.0.x or 4.2.x. However there are some few behavioural changes explicited
++    below.
++    </para>
++  </sect1>  
++
++  <sect1><title>GDA_TYPE_NULL</title>
++    <para>
++      Previous versions of &LIBGDA; represented SQL NULL values as a <link linkend="GValue">GValue</link> completely filled
++      with zeros (i.e. of type G_TYPE_INVALID), and GDA_TYPE_NULL was thus equivalent to G_TYPE_INVALID.
++    </para>
++    <para>
++      This new version introduces a new specific type for the same GDA_TYPE_NULL (which means
++      GDA_TYPE_NULL no longer equals G_TYPE_INVALID). The most common sources of errors brought by this
++      change are:
++      <itemizedlist>
++	<listitem><para>if you used <link linkend="g-value-init">g_value_init()</link> on a
++	value of type GDA_TYPE_NULL, then you'll have to eight clear the value first, or replace
++	that call with a call to <link linkend="gda-value-reset-with-type">gda_value_reset_with_type()</link></para></listitem>
++	<listitem><para>the <link linkend="gda-g-type-from-string">gda_g_type_from_string()</link> function
++	now returns G_TYPE_INVALID if it does not know how to interpret the argument, so testing the return
++	value now also involves testing for the G_TYPE_INVALID value.</para></listitem>
++	<listitem><para>creating a GValue using <link linkend="g-new0">g_new0()</link> resulted
++	in a GDA_TYPE_NULL value, which is not longer the case; the value needs to be initialized
++	with a call to <link linkend="g-value-init">g_value_init()</link></para></listitem>
++	<listitem><para>testing for NULL values using G_IS_VALUE does not work anymore, you'll have to
++	replace them with <link linkend="GDA-VALUE-HOLDS-NULL:CAPS">GDA_VALUE_HOLDS_NULL()</link></para></listitem>
++      </itemizedlist>
++    </para>
++  </sect1>  
++
++</chapter>
diff --git a/libgda5-vala.patch b/libgda5-vala.patch
new file mode 100644
index 0000000..8b4f702
--- /dev/null
+++ b/libgda5-vala.patch
@@ -0,0 +1,11 @@
+--- libgda-5.0.4/configure.ac.orig	2013-06-03 22:04:37.000000000 +0200
++++ libgda-5.0.4/configure.ac	2013-06-08 21:54:49.422460301 +0200
+@@ -485,7 +485,7 @@
+ have_vala=no
+ if test "x$found_introspection" = "xyes"
+ then
+-    VALA_MODULES="libvala-0.16 >= 0.15.1"
++    VALA_MODULES="libvala-0.20 >= 0.15.1"
+     PKG_CHECK_MODULES(VALA, $VALA_MODULES,
+         if test "$enable_vala" = "yes" -o "$enable_vala" = "auto"
+ 	then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgda5.git/commitdiff/31af1ee2ffcfcf61f22217b36744c373223796b9



More information about the pld-cvs-commit mailing list