commit f70986c965f84e4324bce5584e3010c784a53580
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Wed Jul 3 21:09:36 2019 +0200
- added format,graphviz,perl,gtkdoc patches, updated dependencies
libgnomedb3-format.patch | 168 +++++++++++++++++++++++++++++++++++++++++++++
libgnomedb3-graphviz.patch | 123 +++++++++++++++++++++++++++++++++
libgnomedb3-gtkdoc.patch | 30 ++++++++
libgnomedb3-perl.patch | 47 +++++++++++++
libgnomedb3.spec | 41 +++++++----
5 files changed, 394 insertions(+), 15 deletions(-)
---
diff --git a/libgnomedb3.spec b/libgnomedb3.spec
index 8043a1a..f95af15 100644
--- a/libgnomedb3.spec
+++ b/libgnomedb3.spec
@@ -10,7 +10,11 @@ Source0:
http://ftp.gnome.org/pub/GNOME/sources/libgnomedb/3.1/libgnomedb-%{vers
Patch0: %{name}-desktop.patch
Patch1: %{name}-gtk-doc.patch
Patch2: %{name}-build_fix.patch
-URL: http://www.gnome-db.org/
+Patch3: %{name}-format.patch
+Patch4: %{name}-graphviz.patch
+Patch5: %{name}-perl.patch
+Patch6: %{name}-gtkdoc.patch
+URL: https://www.gnome-db.org/
BuildRequires: GConf2-devel >= 2.0
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.8
@@ -18,12 +22,14 @@ BuildRequires: docbook-dtd412-xml
# only checked for, not used
#BuildRequires: evolution-data-server-devel >= 1.2
BuildRequires: gettext-tools
-BuildRequires: gnome-common >= 2.12.0
+BuildRequires: graphviz-devel
BuildRequires: goocanvas-devel >= 0.9
BuildRequires: gtk+2-devel >= 2:2.10.0
BuildRequires: gtk-doc >= 1.0
BuildRequires: gtksourceview-devel >= 1.0
BuildRequires: intltool
+BuildRequires: iso-codes
+BuildRequires: libgcrypt-devel >= 1.1.142
BuildRequires: libgda3-devel >= 3.1.2
BuildRequires: libglade2-devel >= 1:2.6.0
BuildRequires: libgladeui-devel >= 3.4.0
@@ -36,6 +42,7 @@ BuildRequires: scrollkeeper
# hildon-libs (only checked, not used)
Requires(post): /sbin/ldconfig
Requires(post,preun): GConf2 >= 2.0
+Requires: iso-codes
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -51,11 +58,12 @@ Summary(pl.UTF-8): Dla programistów widgetu GNOME-DB
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: GConf2-devel >= 2.0
+Requires: goocanvas-devel >= 0.9
+Requires: graphviz-devel
Requires: gtk+2-devel >= 2:2.10.0
Requires: gtksourceview-devel >= 1.0
Requires: libgda3-devel >= 3.1.1
Requires: libglade2-devel >= 1:2.6.0
-# for libgnomedb_graph only
Requires: libgnomecanvas-devel >= 2.0
%description devel
@@ -121,6 +129,10 @@ Wsparcie dla libgnomedb3 w Glade 3.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
%{__intltoolize}
@@ -142,10 +154,14 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
# no static modules and *.la for glade and libgnomedb modules
-rm -f
$RPM_BUILD_ROOT%{_libdir}/{glade3/modules,libglade/2.0,gnome-db-3.0/plugins/}/*.{la,a}
+%{__rm}
$RPM_BUILD_ROOT%{_libdir}/{glade3/modules,libglade/2.0,gnome-db-3.0/plugins}/*.{la,a}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgnomedb*.la
# move to examplesdir?
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-db-3.0/demo
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/gnome-db-3.0/demo
+
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@Latn,sr@latin}
%find_lang libgnomedb-3.0
@@ -171,13 +187,13 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS
%attr(755,root,root) %{_libdir}/libgnomedb-3.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnomedb-3.0.so.4
%attr(755,root,root) %{_libdir}/libgnomedb_extra-3.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnomedb_extra-3.0.so.4
%attr(755,root,root) %{_libdir}/libgnomedb_goo-3.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnomedb_goo-3.0.so.4
%attr(755,root,root) %{_libdir}/libgnomedb_graph-3.0.so.*.*.*
-%ghost %{_libdir}/libgnomedb-3.0.so.4
-%ghost %{_libdir}/libgnomedb_extra-3.0.so.4
-%ghost %{_libdir}/libgnomedb_goo-3.0.so.4
-%ghost %{_libdir}/libgnomedb_graph-3.0.so.4
+%attr(755,root,root) %ghost %{_libdir}/libgnomedb_graph-3.0.so.4
%dir %{_libdir}/gnome-db-3.0
%dir %{_libdir}/gnome-db-3.0/plugins
%attr(755,root,root)
%{_libdir}/gnome-db-3.0/plugins/libgnomedb_entry_builtin_plugins.so
@@ -198,10 +214,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libgnomedb_extra-3.0.so
%attr(755,root,root) %{_libdir}/libgnomedb_goo-3.0.so
%attr(755,root,root) %{_libdir}/libgnomedb_graph-3.0.so
-%{_libdir}/libgnomedb-3.0.la
-%{_libdir}/libgnomedb_extra-3.0.la
-%{_libdir}/libgnomedb_goo-3.0.la
-%{_libdir}/libgnomedb_graph-3.0.la
%{_includedir}/libgnomedb-3.0
%{_pkgconfigdir}/libgnomedb-3.0.pc
%{_pkgconfigdir}/libgnomedb-extra-3.0.pc
@@ -227,11 +239,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/gnome-db-demo
%{_desktopdir}/database-properties-3.0.desktop
%{_pixmapsdir}/libgnomedb-3.0
-%{_pixmapsdir}/libgnomedb-3.0/gnome-db.png
%files -n glade3-libgnomedb3
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/glade3/modules/libgladegnomedb.so
%{_datadir}/glade3/catalogs/gnomedb.xml
%{_datadir}/glade3/catalogs/gnomedb.xml.in
-%{_datadir}/glade3/pixmaps/*/*/*/*.png
+%{_datadir}/glade3/pixmaps/hicolor/16x16/actions/widget-gnomedb-gnome-db-*.png
diff --git a/libgnomedb3-format.patch b/libgnomedb3-format.patch
new file mode 100644
index 0000000..bade4d0
--- /dev/null
+++ b/libgnomedb3-format.patch
@@ -0,0 +1,168 @@
+--- libgnomedb-3.1.2/libgnomedb/gnome-db-util.c.orig 2007-09-02
08:24:53.000000000 +0200
++++ libgnomedb-3.1.2/libgnomedb/gnome-db-util.c 2019-07-03
16:01:15.934593069 +0200
+@@ -698,7 +698,7 @@
+ dialog = gtk_message_dialog_new_with_markup (parent,
+
GTK_DIALOG_DESTROY_WITH_PARENT |
+ GTK_DIALOG_MODAL, type,
+- GTK_BUTTONS_CLOSE, str);
++ GTK_BUTTONS_CLOSE, "%s",
str);
+
+ return dialog;
+ }
+--- libgnomedb-3.1.2/libgnomedb/utility.c.orig 2007-10-21 14:30:17.000000000
+0200
++++ libgnomedb-3.1.2/libgnomedb/utility.c 2019-07-03 16:10:39.504873281
+0200
+@@ -422,7 +422,7 @@
+ dlg = gtk_message_dialog_new_with_markup ((GtkWindow *)
gtk_widget_get_toplevel (GTK_WIDGET (form)), GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR,
+ with_question ?
GTK_BUTTONS_NONE : GTK_BUTTONS_CLOSE,
+- msg);
++ "%s", msg);
+ g_free (msg);
+
+ if (filled_error && filled_error->message) {
+--- libgnomedb-3.1.2/libgnomedb/plugins/common-pict.c.orig 2007-10-11
14:26:50.000000000 +0200
++++ libgnomedb-3.1.2/libgnomedb/plugins/common-pict.c 2019-07-03
16:14:28.720298181 +0200
+@@ -262,7 +262,7 @@
+ notice_msg = g_strdup_printf (_("Error while
interpreting data as an image:\n%s"),
+ loc_error &&
loc_error->message ? loc_error->message : _("No detail"));
+ g_error_free (loc_error);
+- g_set_error (error, 0, GPOINTER_TO_INT
(GTK_STOCK_DIALOG_WARNING), notice_msg);
++ g_set_error (error, 0, GPOINTER_TO_INT
(GTK_STOCK_DIALOG_WARNING), "%s", notice_msg);
+ g_free (notice_msg);
+ }
+
+--- libgnomedb-3.1.2/libgnomedb-graph/gnome-db-canvas-join.c.orig
2007-09-01 14:28:14.000000000 +0200
++++ libgnomedb-3.1.2/libgnomedb-graph/gnome-db-canvas-join.c 2019-07-03
18:10:56.939106420 +0200
+@@ -654,7 +654,7 @@
+ "which could be used to propose
a suitable join condition.\n\n"
+ "The database model may need to
be updated"));
+ dlg = gtk_message_dialog_new_with_markup (NULL,
GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
+- GTK_BUTTONS_CLOSE,
msg);
++ GTK_BUTTONS_CLOSE,
"%s", msg);
+ g_free (msg);
+ gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+@@ -688,7 +688,7 @@
+ _("Could not set the new
join condition:"),
+ error->message);
+ dlg = gtk_message_dialog_new_with_markup (NULL,
GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
+-
GTK_BUTTONS_CLOSE, msg);
++
GTK_BUTTONS_CLOSE, "%s", msg);
+ g_free (msg);
+ gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+--- libgnomedb-3.1.2/libgnomedb-graph/gnome-db-canvas-query-struct.c.orig
2007-09-01 14:28:14.000000000 +0200
++++ libgnomedb-3.1.2/libgnomedb-graph/gnome-db-canvas-query-struct.c
2019-07-03 18:21:35.772312230 +0200
+@@ -194,7 +194,7 @@
+ "create another target for that
table or view before "
+ "creating the new join."));
+ dlg = gtk_message_dialog_new_with_markup (NULL,
GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
+- GTK_BUTTONS_CLOSE,
msg);
++ GTK_BUTTONS_CLOSE,
"%s", msg);
+ g_free (msg);
+ gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+--- libgnomedb-3.1.2/libgnomedb-goo/gnome-db-goo.c.orig 2007-09-01
14:29:00.000000000 +0200
++++ libgnomedb-3.1.2/libgnomedb-goo/gnome-db-goo.c 2019-07-03
18:40:43.299428876 +0200
+@@ -373,7 +373,7 @@
+
+ errdlg = gtk_message_dialog_new_with_markup
((GtkWindow*) toplevel,
+
GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
+-
GTK_BUTTONS_CLOSE, error);
++
GTK_BUTTONS_CLOSE, "%s", error);
+ g_free (error);
+ gtk_dialog_run (GTK_DIALOG (errdlg));
+ gtk_widget_destroy (errdlg);
+--- libgnomedb-3.1.2/libgnomedb-goo/gnome-db-goo-join.c.orig 2007-09-01
14:29:00.000000000 +0200
++++ libgnomedb-3.1.2/libgnomedb-goo/gnome-db-goo-join.c 2019-07-03
18:46:35.017523456 +0200
+@@ -707,7 +707,7 @@
+ "which could be used to propose
a suitable join condition.\n\n"
+ "The database model may need to
be updated"));
+ dlg = gtk_message_dialog_new_with_markup (NULL,
GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
+- GTK_BUTTONS_CLOSE,
msg);
++ GTK_BUTTONS_CLOSE,
"%s", msg);
+ g_free (msg);
+ gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+@@ -741,7 +741,7 @@
+ _("Could not set the new
join condition:"),
+ error->message);
+ dlg = gtk_message_dialog_new_with_markup (NULL,
GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
+-
GTK_BUTTONS_CLOSE, msg);
++
GTK_BUTTONS_CLOSE, "%s", msg);
+ g_free (msg);
+ gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+--- libgnomedb-3.1.2/libgnomedb-goo/gnome-db-goo-query-struct.c.orig
2007-09-01 14:29:00.000000000 +0200
++++ libgnomedb-3.1.2/libgnomedb-goo/gnome-db-goo-query-struct.c
2019-07-03 18:48:30.276899042 +0200
+@@ -192,7 +192,7 @@
+ "create another target for that
table or view before "
+ "creating the new join."));
+ dlg = gtk_message_dialog_new_with_markup (NULL,
GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
+- GTK_BUTTONS_CLOSE,
msg);
++ GTK_BUTTONS_CLOSE,
"%s", msg);
+ g_free (msg);
+ gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+--- libgnomedb-3.1.2/control-center/dsn-properties-dialog.c.orig
2007-09-01 14:28:12.000000000 +0200
++++ libgnomedb-3.1.2/control-center/dsn-properties-dialog.c 2019-07-03
18:50:11.323018295 +0200
+@@ -199,7 +199,7 @@
+ if (cnc && GDA_IS_CONNECTION (cnc)) {
+ str = g_strdup_printf ("<b>%s</b>",
_("Connection successfully opened!"));
+ msgdialog =
gtk_message_dialog_new_with_markup (GTK_WINDOW (dialog), GTK_DIALOG_MODAL,
+-
GTK_MESSAGE_INFO, GTK_BUTTONS_OK, str);
++
GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", str);
+ g_free (str);
+ gda_connection_close (cnc);
+ }
+@@ -212,7 +212,7 @@
+ else
+ str = g_strdup_printf
("<b>%s</b>", _("Could not open connection"));
+ msgdialog =
gtk_message_dialog_new_with_markup (GTK_WINDOW (dialog), GTK_DIALOG_MODAL,
+-
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, str);
++
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", str);
+ g_free (str);
+ }
+
+@@ -238,7 +238,7 @@
+ GtkWidget *msgdialog;
+ str = g_strdup_printf ("<b>%s</b>", _("Could
not execute browser program (gnome-db-browser)."));
+ msgdialog = gtk_message_dialog_new_with_markup
(GTK_WINDOW (dialog), GTK_DIALOG_MODAL,
+-
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, str);
++
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", str);
+ g_free (str);
+ gtk_dialog_run (GTK_DIALOG (msgdialog));
+ gtk_widget_destroy (msgdialog);
+--- libgnomedb-3.1.2/testing/test-handlers.c.orig 2007-09-01
14:28:27.000000000 +0200
++++ libgnomedb-3.1.2/testing/test-handlers.c 2019-07-03 18:52:23.365636292
+0200
+@@ -441,7 +441,7 @@
+ error && error->message ?
error->message : "No detail");
+ label = gtk_label_new (str);
+ gtk_table_attach (GTK_TABLE (table), label, 1, 2, 2, 3,
GTK_FILL, 0, 0, 0);
+- g_warning (str);
++ g_warning ("%s", str);
+ g_error_free (error);
+ }
+ else {
+--- libgnomedb-3.1.2/extra/demos/ddl_queries.c.orig 2007-10-02
13:52:14.000000000 +0200
++++ libgnomedb-3.1.2/extra/demos/ddl_queries.c 2019-07-03 18:55:03.404769286
+0200
+@@ -467,7 +467,7 @@
+
+ dlg = gtk_message_dialog_new_with_markup (GTK_WINDOW
(data->top_window),
+ GTK_DIALOG_MODAL,
+- msg_type,
GTK_BUTTONS_CLOSE, msg);
++ msg_type,
GTK_BUTTONS_CLOSE, "%s", msg);
+ g_free (sql);
+ g_free (msg);
+
+--- libgnomedb-3.1.2/extra/gnome-db-browser.c.orig 2007-09-01
14:28:59.000000000 +0200
++++ libgnomedb-3.1.2/extra/gnome-db-browser.c 2019-07-03 18:57:25.577332404
+0200
+@@ -281,7 +281,7 @@
+ msg = gtk_message_dialog_new_with_markup (GTK_WINDOW
(config->mainwin),
+
GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
+- str);
++ "%s", str);
+ g_free (str);
+ if (gtk_dialog_run (GTK_DIALOG (msg)) == GTK_RESPONSE_YES)
+ update_dbms_data_cb (NULL, config);
diff --git a/libgnomedb3-graphviz.patch b/libgnomedb3-graphviz.patch
new file mode 100644
index 0000000..618f222
--- /dev/null
+++ b/libgnomedb3-graphviz.patch
@@ -0,0 +1,123 @@
+--- libgnomedb-3.1.2/libgnomedb-graph/gnome-db-canvas.c.orig 2007-09-01
14:28:14.000000000 +0200
++++ libgnomedb-3.1.2/libgnomedb-graph/gnome-db-canvas.c 2019-07-03
18:09:53.009452757 +0200
+@@ -26,6 +26,7 @@
+ #include "gnome-db-canvas-cursor.h"
+ #include <libgda/libgda.h>
+ #ifdef HAVE_GRAPHVIZ
++#include <math.h>
+ #include <stddef.h>
+ #include <gvc.h>
+ static GVC_t* gvc = NULL;
+@@ -774,13 +775,13 @@
+ if (!gvc)
+ gvc = gvContext ();
+
+- graph = agopen ("GnomedbCanvasLayout", AGDIGRAPHSTRICT);
+- agnodeattr (graph, "shape", "box");
+- agnodeattr (graph, "height", ".1");
+- agnodeattr (graph, "width", ".1");
+- agnodeattr (graph, "fixedsize", "true");
+- agnodeattr (graph, "pack", "true");
+- agnodeattr (graph, "packmode", "node");
++ graph = agopen ("GnomedbCanvasLayout", Agstrictdirected,
&AgDefaultDisc);
++ agset (graph, "shape", "box");
++ agset (graph, "height", ".1");
++ agset (graph, "width", ".1");
++ agset (graph, "fixedsize", "true");
++ agset (graph, "pack", "true");
++ agset (graph, "packmode", "node");
+
+ /* Graph nodes creation */
+ nodes_hash = g_hash_table_new (NULL, NULL);
+@@ -800,7 +801,7 @@
+ nodes_list = g_slist_prepend (nodes_list, nl);
+
+ tmp = g_strdup_printf ("%p", item);
+- node = agnode (graph, tmp);
++ node = agnode (graph, tmp, 0);
+ nl->node = node;
+ g_hash_table_insert (nodes_hash, item, node);
+
+@@ -834,7 +835,7 @@
+ to_node = (Agnode_t*) g_hash_table_lookup (nodes_hash,
to);
+ g_assert (from_node);
+ g_assert (to_node);
+- agedge (graph, from_node, to_node);
++ agedge (graph, from_node, to_node, "", 0);
+ }
+ }
+
+@@ -853,11 +854,11 @@
+
+ for (list = nodes_list; list; list = list->next) {
+ NodeLayout *nl = (NodeLayout*) list->data;
+- nl->end_x = ND_coord_i (nl->node).x - (nl->width / 2.);
+- nl->end_y = - ND_coord_i (nl->node).y - (nl->height / 2.);
++ nl->end_x = ND_coord (nl->node).x - (nl->width / 2.);
++ nl->end_y = - ND_coord (nl->node).y - (nl->height / 2.);
+ /*g_print ("After: Node %p: HxW: %.3f %.3f XxY = %d, %d\n",
nl->node,
+ ND_height (nl->node), ND_width (nl->node),
+- ND_coord_i (nl->node).x, - ND_coord_i (nl->node).y);*/
++ ND_coord (nl->node).x, - ND_coord (nl->node).y);*/
+ if (!animate)
+ gda_graph_item_set_position (nl->graph_item, nl->end_x,
nl->end_y);
+ }
+--- libgnomedb-3.1.2/libgnomedb-goo/gnome-db-goo.c.orig 2019-07-03
18:40:43.299428876 +0200
++++ libgnomedb-3.1.2/libgnomedb-goo/gnome-db-goo.c 2019-07-03
18:42:30.545514541 +0200
+@@ -853,13 +853,13 @@
+ if (!gvc)
+ gvc = gvContext ();
+
+- graph = agopen ("GnomedbCanvasLayout", AGDIGRAPHSTRICT);
+- agnodeattr (graph, "shape", "box");
+- agnodeattr (graph, "height", ".1");
+- agnodeattr (graph, "width", ".1");
+- agnodeattr (graph, "fixedsize", "true");
+- agnodeattr (graph, "pack", "true");
+- agnodeattr (graph, "packmode", "node");
++ graph = agopen ("GnomedbCanvasLayout", Agstrictdirected,
&AgDefaultDisc);
++ agset (graph, "shape", "box");
++ agset (graph, "height", ".1");
++ agset (graph, "width", ".1");
++ agset (graph, "fixedsize", "true");
++ agset (graph, "pack", "true");
++ agset (graph, "packmode", "node");
+
+ /* Graph nodes creation */
+ nodes_hash = g_hash_table_new (NULL, NULL);
+@@ -880,7 +880,7 @@
+ nodes_list = g_slist_prepend (nodes_list, nl);
+
+ tmp = g_strdup_printf ("%p", item);
+- node = agnode (graph, tmp);
++ node = agnode (graph, tmp, 0);
+ nl->node = node;
+ g_hash_table_insert (nodes_hash, item, node);
+
+@@ -914,7 +914,7 @@
+ from_node = (Agnode_t*) g_hash_table_lookup
(nodes_hash, from);
+ to_node = (Agnode_t*) g_hash_table_lookup (nodes_hash,
to);
+ if (from_node && to_node)
+- agedge (graph, from_node, to_node);
++ agedge (graph, from_node, to_node, "", 0);
+ }
+ }
+
+@@ -935,14 +935,14 @@
+
+ for (list = nodes_list; list; list = list->next) {
+ NodeLayout *nl = (NodeLayout*) list->data;
+- nl->end_x = ND_coord_i (nl->node).x - (nl->width / 2.);
+- nl->end_y = - ND_coord_i (nl->node).y - (nl->height / 2.);
++ nl->end_x = ND_coord (nl->node).x - (nl->width / 2.);
++ nl->end_y = - ND_coord (nl->node).y - (nl->height / 2.);
+ nl->dx = fabs (nl->end_x - nl->start_x);
+ nl->dy = fabs (nl->end_y - nl->start_y);
+ nl->stop = FALSE;
+ /*g_print ("After: Node %p: HxW: %.3f %.3f XxY = %d, %d\n",
nl->node,
+ ND_height (nl->node), ND_width (nl->node),
+- ND_coord_i (nl->node).x, - ND_coord_i (nl->node).y);*/
++ ND_coord (nl->node).x, - ND_coord (nl->node).y);*/
+ if (!animate)
+ gda_graph_item_set_position (nl->graph_item, nl->end_x,
nl->end_y);
+ }
diff --git a/libgnomedb3-gtkdoc.patch b/libgnomedb3-gtkdoc.patch
new file mode 100644
index 0000000..c0f0455
--- /dev/null
+++ b/libgnomedb3-gtkdoc.patch
@@ -0,0 +1,30 @@
+--- libgnomedb-3.1.2/gtk-doc.make.orig 2019-07-03 20:33:47.036011556 +0200
++++ libgnomedb-3.1.2/gtk-doc.make 2019-07-03 20:34:02.115929861 +0200
+@@ -69,7 +69,6 @@
+ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES)
$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo '*** Rebuilding template files ***'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+ touch tmpl-build.stamp
+
+ tmpl.stamp: tmpl-build.stamp
+@@ -97,7 +96,7 @@
+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE)
../$(DOC_MAIN_SGML_FILE)
+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES)
html )
+ @echo '-- Fixing Crossreferences'
+- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR)
$(FIXXREF_OPTIONS)
++ cd $(srcdir) && gtkdoc-fixxref --module $(DOC_MODULE) --module-dir=html
--html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ touch html-build.stamp
+ else
+ all-local:
+--- libgnomedb-3.1.2/libgnomedb/gnome-db-util.c.orig 2019-07-03
19:39:26.150343955 +0200
++++ libgnomedb-3.1.2/libgnomedb/gnome-db-util.c 2019-07-03
20:11:15.293334574 +0200
+@@ -3,7 +3,7 @@
+ *
+ * AUTHORS:
+ * Rodrigo Moya <rodr...@gnome-db.org>
+- * Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Carlos Perello Marin <car...@gnome-db.org>
+ * Vivien Malerba <male...@gnome-db.org>
+ *
+ * This Library is free software; you can redistribute it and/or
diff --git a/libgnomedb3-perl.patch b/libgnomedb3-perl.patch
new file mode 100644
index 0000000..4b9fc6c
--- /dev/null
+++ b/libgnomedb3-perl.patch
@@ -0,0 +1,47 @@
+--- libgnomedb-3.1.2/extra/demos/geninclude.pl.in.orig 2007-09-01
14:28:59.000000000 +0200
++++ libgnomedb-3.1.2/extra/demos/geninclude.pl.in 2019-07-03
18:56:49.234195958 +0200
+@@ -40,7 +40,7 @@
+ my $do_next = 0;
+
+ # parent detected
+- if (defined @parents) {
++ if (@parents) {
+ foreach $foo (@parents) {
+ if ($foo eq $parent_name) {
+ $do_next = 1;
+@@ -54,7 +54,7 @@
+
+ push @parents, $parent_name;
+
+- $tmp = (defined @child_arrays)?($#child_arrays + 1):0;
++ $tmp = (@child_arrays)?($#child_arrays + 1):0;
+ push @child_arrays, "child$tmp";
+
+ push @demos, {"title" => $parent_name, "file" => "NULL",
+@@ -62,7 +62,7 @@
+ }
+ }
+
+-if (defined @parents) {
++if (@parents) {
+ $i = 0;
+ for ($i = 0; $i <= $#parents; $i++) {
+ $first = 1;
+@@ -105,7 +105,7 @@
+ } @demos_old;
+
+ # sort the child arrays
+-if (defined @child_arrays) {
++if (@child_arrays) {
+ for ($i = 0; $i <= $#child_arrays; $i++) {
+ @foo_old = @{$child_arrays[$i]};
+
+@@ -133,7 +133,7 @@
+ print ", \n";
+ }
+
+- if (defined @parents) {
++ if (@parents) {
+ for ($i = 0; $i <= $#parents; $i++) {
+ if ($parents[$i] eq $href->{title}) {
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgnomedb3.git/commitdiff/f70986c965f84e4324bce5584e3010c784a53580
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
