Hello community, here is the log from the commit of package libgda for openSUSE:Factory checked in at 2013-05-16 11:08:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgda (Old) and /work/SRC/openSUSE:Factory/.libgda.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgda" Changes: -------- --- /work/SRC/openSUSE:Factory/libgda/libgda.changes 2013-01-07 15:29:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libgda.new/libgda.changes 2013-05-16 11:08:07.000000000 +0200 @@ -1,0 +2,20 @@ +Sat Mar 16 18:35:49 UTC 2013 - [email protected] + +- Update to version 5.1.2: + + Many small corrections, some uncovered by CoverityScan. + + Misc code cleanups, avoid using deprecated functions. + + MySQL improvements. + + Vala bindings improvements and corrections. + + Data export improvements + + Upgraded SQLite to 3.7.14.1 and SqlCipher to 2.1.1. + + Have blobs work on Windows. + + Bugs fixed: bgo#691099, bgo#691069, bgo#669801, bgo#687235, + bgo#684895, bgo#684583, bgo#684141, bgo#683162. + + Updated translations. +- Drop libgda-introspect.patch: fixed upstream. +- Add libgda-old-graphviz.patch: re-add support for older graphviz + versions (< 2.30). +- Add libgda-no-return-in-nonvoid.patch: Fix missing return values + in non-void functions. + +------------------------------------------------------------------- Old: ---- libgda-5.1.1.tar.xz libgda-introspect.patch New: ---- libgda-5.1.2.tar.xz libgda-no-return-in-nonvoid.patch libgda-old-graphviz.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgda.spec ++++++ --- /var/tmp/diff_new_pack.CMezXn/_old 2013-05-16 11:08:08.000000000 +0200 +++ /var/tmp/diff_new_pack.CMezXn/_new 2013-05-16 11:08:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgda # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libgda -Version: 5.1.1 +Version: 5.1.2 Release: 0 # FIXME: add bdb sql BuildRequires when available # FIXME: check if bgo#684583 is fixed. If fixed, remove the CFLAGS mangling in build section. @@ -28,8 +28,10 @@ Source: http://download.gnome.org/sources/libgda/5.1/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM libgda-javadetection-biarch.patch bgo#673560 -- Prepare getsp to be sed'ed for biarch Patch1: libgda-javadetection-biarch.patch -# PATCH-FIX-UPSTREAM libgda-introspect.patch bgo#682743 [email protected] -- Fix introspection, taken from git. -Patch2: libgda-introspect.patch +# PATCH-FIX-UPSTREAM libgda-old-graphviz.patch [email protected] -- Allow compiling even with old Graphviz API, taken from git. +Patch2: libgda-old-graphviz.patch +# PATCH-FIX-UPSTREAM libgda-no-return-in-nonvoid.patch [email protected] -- Fix missing return values in non-void functions. Already fixed upstream. +Patch3: libgda-no-return-in-nonvoid.patch BuildRequires: db-devel BuildRequires: fdupes %ifnarch s390 s390x @@ -363,6 +365,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Patch1 introdcues a --ARCH-- field in getsp, which needs to be replace prior to compilation ++++++ libgda-5.1.1.tar.xz -> libgda-5.1.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libgda/libgda-5.1.1.tar.xz /work/SRC/openSUSE:Factory/.libgda.new/libgda-5.1.2.tar.xz differ: char 25, line 1 ++++++ libgda-no-return-in-nonvoid.patch ++++++ Index: libgda-5.1.2/libgda-ui/gdaui-data-entry.c =================================================================== --- libgda-5.1.2.orig/libgda-ui/gdaui-data-entry.c +++ libgda-5.1.2/libgda-ui/gdaui-data-entry.c @@ -289,7 +289,7 @@ gdaui_data_entry_validate (GdauiDataEntr g_return_val_if_fail (GDAUI_IS_DATA_ENTRY (de), FALSE); if (GDAUI_DATA_ENTRY_GET_IFACE (de)->validate) - (GDAUI_DATA_ENTRY_GET_IFACE (de)->validate) (de, error); + return (GDAUI_DATA_ENTRY_GET_IFACE (de)->validate) (de, error); else return TRUE; } Index: libgda-5.1.2/libgda-ui/gdaui-tree-store.c =================================================================== --- libgda-5.1.2.orig/libgda-ui/gdaui-tree-store.c +++ libgda-5.1.2/libgda-ui/gdaui-tree-store.c @@ -536,7 +536,7 @@ gdaui_tree_store_get_node (GdauiTreeStor gboolean gdaui_tree_store_get_iter (GdauiTreeStore *store, GtkTreeIter *iter, GdaTreeNode *node) { - gdaui_tree_store_get_iter_from_node (store, iter, node); + return gdaui_tree_store_get_iter_from_node (store, iter, node); } ++++++ libgda-old-graphviz.patch ++++++ >From 071bd53b80621cf2bf3cea9ef2a97c5b3fc56ee6 Mon Sep 17 00:00:00 2001 From: Vivien Malerba <[email protected]> Date: Tue, 30 Apr 2013 18:51:04 +0000 Subject: Allow compiling even with old Graphviz API cf changes made in commit #cc5d429567e21ec62bf61b7e3b54348af11965b9 --- Index: libgda-5.1.2/configure.ac =================================================================== --- libgda-5.1.2.orig/configure.ac +++ libgda-5.1.2/configure.ac @@ -250,6 +250,25 @@ then AC_MSG_ERROR([Graphviz support requested but not found.]) fi have_graphviz=no]) + if test "x$have_graphviz" = "xyes" + then + dnl test if new API is supported + AC_MSG_CHECKING([whether Graphviz's new API is supported]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ +#include <gvc.h> +int main() { + Agraph_t *graph; + graph = agopen ("BrowserCanvasLayout", Agdirected, NULL); + return 0; +} +])], + graphviz_new_api=yes, graphviz_new_api=no) + + AC_MSG_RESULT($graphviz_new_api) + if test "$graphviz_new_api" = "yes"; then + AC_DEFINE(GRAPHVIZ_NEW_API,[1],[define if Graphviz's new API is available]) + fi + fi fi fi Index: libgda-5.1.2/tools/browser/canvas/browser-canvas.c =================================================================== --- libgda-5.1.2.orig/tools/browser/canvas/browser-canvas.c +++ libgda-5.1.2/tools/browser/canvas/browser-canvas.c @@ -851,6 +851,7 @@ browser_canvas_perform_auto_layout (Brow if (!gvc) gvc = gvContext (); +#ifdef GRAPHVIZ_NEW_API graph = agopen ("BrowserCanvasLayout", Agdirected, NULL); agnode (graph, "shape", "box"); agset (graph, "height", ".1"); @@ -858,6 +859,15 @@ browser_canvas_perform_auto_layout (Brow agset (graph, "fixedsize", "true"); agset (graph, "pack", "true"); agset (graph, "packmode", "node"); +#else + graph = agopen ("BrowserCanvasLayout", AGRAPH); + agnodeattr (graph, "shape", "box"); + agnodeattr (graph, "height", ".1"); + agnodeattr (graph, "width", ".1"); + agnodeattr (graph, "fixedsize", "true"); + agnodeattr (graph, "pack", "true"); + agnodeattr (graph, "packmode", "node"); +#endif if (class->get_layout_items) @@ -885,7 +895,11 @@ browser_canvas_perform_auto_layout (Brow nodes_list = g_slist_prepend (nodes_list, nl); tmp = g_strdup_printf ("%p", item); +#ifdef GRAPHVIZ_NEW_API node = agnode (graph, tmp, 0); +#else + node = agnode (graph, tmp); +#endif nl->node = node; g_hash_table_insert (nodes_hash, item, node); @@ -928,8 +942,13 @@ browser_canvas_perform_auto_layout (Brow Agnode_t *from_node, *to_node; 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, "", 0); + if (from_node && to_node) { +#ifdef GRAPHVIZ_NEW_API + agedge (graph, from_node, to_node, "", 0); +#else + agedge (graph, from_node, to_node); +#endif + } } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
