commit libyui-qt-graph for openSUSE:Factory
Hello community, here is the log from the commit of package libyui-qt-graph for openSUSE:Factory checked in at 2013-06-28 16:05:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt-graph (Old) and /work/SRC/openSUSE:Factory/.libyui-qt-graph.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt-graph" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt-graph/libyui-qt-graph.changes 2013-06-05 12:53:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-qt-graph.new/libyui-qt-graph.changes 2013-06-28 16:05:23.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 26 16:15:19 CEST 2013 - tgoettlicher@suse.de + +- fixed libgvc dependency (bnc #825751) +- Version 2.42.7 + +------------------------------------------------------------------- Old: ---- libyui-qt-graph-2.42.6.tar.bz2 New: ---- libyui-qt-graph-2.42.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-graph-doc.spec ++++++ --- /var/tmp/diff_new_pack.bXYUdU/_old 2013-06-28 16:05:24.000000000 +0200 +++ /var/tmp/diff_new_pack.bXYUdU/_new 2013-06-28 16:05:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui-qt-graph (Version 2.42.6) +# spec file for package libyui-qt-graph (Version 2.42.7) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # Name: libyui-qt-graph-doc -Version: 2.42.6 +Version: 2.42.7 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-qt-graph-%{version}.tar.bz2 ++++++ libyui-qt-graph.spec ++++++ --- /var/tmp/diff_new_pack.bXYUdU/_old 2013-06-28 16:05:24.000000000 +0200 +++ /var/tmp/diff_new_pack.bXYUdU/_new 2013-06-28 16:05:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui-qt-graph (Version 2.42.6) +# spec file for package libyui-qt-graph (Version 2.42.7) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # Name: libyui-qt-graph -Version: 2.42.6 +Version: 2.42.7 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-qt-graph-%{version}.tar.bz2 ++++++ libyui-qt-graph-2.42.6.tar.bz2 -> libyui-qt-graph-2.42.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/ChangeLog new/libyui-qt-graph-2.42.7/ChangeLog --- old/libyui-qt-graph-2.42.6/ChangeLog 2013-05-21 10:11:47.000000000 +0200 +++ new/libyui-qt-graph-2.42.7/ChangeLog 2013-06-26 17:51:10.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 26 16:15:19 CEST 2013 - tgoettlicher@suse.de + +- fixed libgvc dependency (bnc #825751) +- Version 2.42.7 + +------------------------------------------------------------------- Sat May 18 14:30:00 UTC 2013 - bjoern.esser@gmail.com - fix build on graphviz >= 2.30.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/Libyui-qt-graphLibgvc.cmake new/libyui-qt-graph-2.42.7/Libyui-qt-graphLibgvc.cmake --- old/libyui-qt-graph-2.42.6/Libyui-qt-graphLibgvc.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-graph-2.42.7/Libyui-qt-graphLibgvc.cmake 2013-06-26 17:51:10.000000000 +0200 @@ -0,0 +1,11 @@ +# find the correct libraries depending on libgvc's version + +MACRO( SET_LIBGVS_LIBS ) + EXEC_PROGRAM(/usr/bin/pkg-config ARGS \"libgvc\" \"--libs\" OUTPUT_VARIABLE _tmp) + STRING(REPLACE " \n" "" _tmp "${_tmp}") + STRING(REPLACE "-l" "" _tmp "${_tmp}") + SEPARATE_ARGUMENTS(_tmp) + SET( LIB_LINKER ${_tmp} ) +ENDMACRO( SET_LIBGVS_LIBS ) + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/PROJECTINFO.cmake new/libyui-qt-graph-2.42.7/PROJECTINFO.cmake --- old/libyui-qt-graph-2.42.6/PROJECTINFO.cmake 2013-05-21 10:11:47.000000000 +0200 +++ new/libyui-qt-graph-2.42.7/PROJECTINFO.cmake 2013-06-26 17:51:10.000000000 +0200 @@ -8,7 +8,7 @@ SET( PLUGINNAME qt-graph ) # define the your plugin's name, e.g. {gtk, ncurses-pkg, qt-graph} SET( LIB_DEPS Qt ) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line SET( INTERNAL_DEPS Libyui Libyui-qt ) # include libyui or it's plugins (if needed), too! -SET( LIB_LINKER gvc cgraph cdt) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too! +#SET( LIB_LINKER gvc graph cdt) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too! SET( EXTRA_INCLUDES /usr/include/graphviz ) # set include-dir which are not picked by CMake automagically here. SET( PROGSUBDIR ) # define your programm's name if the plugin is made for it, only. e.g. "YaST2" for {gtk,ncurses,qt}-pkg. @@ -17,3 +17,8 @@ SET( SUMMARY "Libyui - Qt Graph Widget" ) SET( DESCRIPTION "This package contains the Qt graph \ncomponent for libYUI.\n" ) + +INCLUDE( "${CMAKE_SOURCE_DIR}/Libyui-qt-graphLibgvc.cmake" ) +SET_LIBGVS_LIBS() + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/SOURCECONF.cmake new/libyui-qt-graph-2.42.7/SOURCECONF.cmake --- old/libyui-qt-graph-2.42.6/SOURCECONF.cmake 2013-05-21 10:11:47.000000000 +0200 +++ new/libyui-qt-graph-2.42.7/SOURCECONF.cmake 2013-06-26 17:51:10.000000000 +0200 @@ -17,5 +17,6 @@ SET( EXAMPLES_LIST ##### Here go the examples SimpleCreate.cc + SimpleLoad.cc ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/VERSION.cmake new/libyui-qt-graph-2.42.7/VERSION.cmake --- old/libyui-qt-graph-2.42.6/VERSION.cmake 2013-05-21 10:11:47.000000000 +0200 +++ new/libyui-qt-graph-2.42.7/VERSION.cmake 2013-06-26 17:51:10.000000000 +0200 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "42") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/examples/.gitignore new/libyui-qt-graph-2.42.7/examples/.gitignore --- old/libyui-qt-graph-2.42.6/examples/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-graph-2.42.7/examples/.gitignore 2013-06-26 17:51:10.000000000 +0200 @@ -0,0 +1,2 @@ +SimpleCreate +SimpleLoad diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/examples/SimpleCreate.cc new/libyui-qt-graph-2.42.7/examples/SimpleCreate.cc --- old/libyui-qt-graph-2.42.6/examples/SimpleCreate.cc 2013-05-21 10:11:47.000000000 +0200 +++ new/libyui-qt-graph-2.42.7/examples/SimpleCreate.cc 2013-06-26 17:51:10.000000000 +0200 @@ -19,21 +19,22 @@ * find current contact information at www.novell.com. */ -// g++ -I/usr/include/YaST2/yui -I/usr/include/graphviz -lyui -lgvc -lgraph -lcdt SimpleCreate.cc -o SimpleCreate +// g++ SimpleCreate.cc -o SimpleCreate -Wall -O2 -lyui -lgvc -lgraph -lcdt // Trivial example creating a graph using graphviz functions. -#include <gvc.h> +#include <string.h> +#include <graphviz/gvc.h> -#include "YUI.h" -#include "YWidgetFactory.h" -#include "YOptionalWidgetFactory.h" -#include "YDialog.h" -#include "YLayoutBox.h" -#include "YGraph.h" -#include "YPushButton.h" -#include "YEvent.h" +#include "yui/YUI.h" +#include "yui/YWidgetFactory.h" +#include "yui/YOptionalWidgetFactory.h" +#include "yui/YDialog.h" +#include "yui/YLayoutBox.h" +#include "yui/YGraph.h" +#include "yui/YPushButton.h" +#include "yui/YEvent.h" int @@ -44,14 +45,22 @@ GVC_t* gvc = gvContext(); - graph_t* graph = agopen("test", AGDIGRAPH); + graph_t* graph = agopen(strdup("test"), AGDIGRAPH); - node_t* node1 = agnode(graph, "1"); - node_t* node2 = agnode(graph, "2"); + node_t* node1 = agnode(graph, strdup("1")); + node_t* node2 = agnode(graph, strdup("2")); + + agnodeattr(graph, strdup("fillcolor"), strdup("gray")); + agset(node1, strdup("fillcolor"), strdup("red")); + agset(node2, strdup("fillcolor"), strdup("green")); edge_t* edge1 = agedge(graph, node1, node2); edge_t* edge2 = agedge(graph, node2, node1); + agedgeattr(graph, strdup("color"), strdup("black")); + agset(edge1, strdup("color"), strdup("red")); + agset(edge2, strdup("color"), strdup("green")); + gvLayout(gvc, graph, "dot"); YUI::optionalWidgetFactory()->createGraph(vbox, graph); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/examples/SimpleLoad.cc new/libyui-qt-graph-2.42.7/examples/SimpleLoad.cc --- old/libyui-qt-graph-2.42.6/examples/SimpleLoad.cc 2013-05-21 10:11:47.000000000 +0200 +++ new/libyui-qt-graph-2.42.7/examples/SimpleLoad.cc 2013-06-26 17:51:10.000000000 +0200 @@ -19,21 +19,21 @@ * find current contact information at www.novell.com. */ -// g++ -I/usr/include/YaST2/yui -lyui SimpleLoad.cc -o SimpleLoad +// g++ SimpleLoad.cc -o SimpleLoad -Wall -O2 -lyui // Trivial example loading a graph from a file. #include <iostream> -#include "YUI.h" -#include "YWidgetFactory.h" -#include "YOptionalWidgetFactory.h" -#include "YDialog.h" -#include "YLayoutBox.h" -#include "YGraph.h" -#include "YPushButton.h" -#include "YEvent.h" +#include "yui/YUI.h" +#include "yui/YWidgetFactory.h" +#include "yui/YOptionalWidgetFactory.h" +#include "yui/YDialog.h" +#include "yui/YLayoutBox.h" +#include "yui/YGraph.h" +#include "yui/YPushButton.h" +#include "yui/YEvent.h" int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/src/YQGraph.cc new/libyui-qt-graph-2.42.7/src/YQGraph.cc --- old/libyui-qt-graph-2.42.6/src/YQGraph.cc 2013-05-21 10:11:47.000000000 +0200 +++ new/libyui-qt-graph-2.42.7/src/YQGraph.cc 2013-06-26 17:51:10.000000000 +0200 @@ -48,9 +48,9 @@ } -YQGraph::YQGraph(YWidget* parent, graph_t* graph) - : QY2Graph(graph, (QWidget*) parent->widgetRep()), - YGraph(parent, graph) +YQGraph::YQGraph(YWidget* parent, /* graph_t */ void* graph) + : QY2Graph((graph_t*)graph, (QWidget*) parent->widgetRep()), + YGraph(parent, (graph_t*) graph) { setWidgetRep(this); @@ -85,9 +85,9 @@ void -YQGraph::renderGraph(graph_t* graph) +YQGraph::renderGraph(/* graph_t */ void* graph) { - QY2Graph::renderGraph(graph); + QY2Graph::renderGraph((graph_t*)graph); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/src/YQGraph.h new/libyui-qt-graph-2.42.7/src/YQGraph.h --- old/libyui-qt-graph-2.42.6/src/YQGraph.h 2013-05-21 10:11:47.000000000 +0200 +++ new/libyui-qt-graph-2.42.7/src/YQGraph.h 2013-06-26 17:51:10.000000000 +0200 @@ -41,7 +41,7 @@ YQGraph(YWidget* parent, const std::string& filename, const std::string& layoutAlgorithm); - YQGraph(YWidget* parent, graph_t* graph); + YQGraph(YWidget* parent, /* graph_t */ void* graph); virtual ~YQGraph(); @@ -68,7 +68,7 @@ void renderGraph(const std::string& filename, const std::string& layoutAlgorithm); - void renderGraph(graph_t* graph); + void renderGraph(/* graph_t */ void* graph); std::string activatedNode() const { return lastActivatedNode; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/src/YQGraphPluginImpl.cc new/libyui-qt-graph-2.42.7/src/YQGraphPluginImpl.cc --- old/libyui-qt-graph-2.42.6/src/YQGraphPluginImpl.cc 2013-05-21 10:11:47.000000000 +0200 +++ new/libyui-qt-graph-2.42.7/src/YQGraphPluginImpl.cc 2013-06-26 17:51:10.000000000 +0200 @@ -60,7 +60,7 @@ } -YGraph * YQGraphPluginImpl::createGraph( YWidget * parent, graph_t * graph ) +YGraph * YQGraphPluginImpl::createGraph( YWidget * parent, /* graph_t */ void * graph ) { /* if ( error() ) return 0; */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.42.6/src/YQGraphPluginImpl.h new/libyui-qt-graph-2.42.7/src/YQGraphPluginImpl.h --- old/libyui-qt-graph-2.42.6/src/YQGraphPluginImpl.h 2013-05-21 10:11:47.000000000 +0200 +++ new/libyui-qt-graph-2.42.7/src/YQGraphPluginImpl.h 2013-06-26 17:51:10.000000000 +0200 @@ -28,6 +28,8 @@ #ifndef YQGraphPluginImpl_h #define YQGraphPluginImpl_h +#include <graphviz/types.h> + #include "YQGraphPluginIf.h" class YQGraphPluginImpl : public YQGraphPluginIf @@ -40,7 +42,7 @@ virtual YGraph * createGraph( YWidget * parent, const std::string & filename, const std::string & layoutAlgorithm ); - virtual YGraph * createGraph( YWidget * parent, graph_t * graph ); + virtual YGraph * createGraph( YWidget * parent, /* graph_t */ void * graph ); }; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠hilbert.suse.de