Hello community, here is the log from the commit of package libyui for openSUSE:Factory checked in at 2013-06-28 16:04:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui (Old) and /work/SRC/openSUSE:Factory/.libyui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui/libyui.changes 2013-05-27 09:53:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui.new/libyui.changes 2013-06-28 16:04:49.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Jun 26 16:20:29 CEST 2013 - tgoettlicher@suse.de + +- Fixed build of libyui-qt-graph examples +- Version 3.0.8 + +------------------------------------------------------------------- +Mon Jun 24 16:17:06 CEST 2013 - anaselli@linux.it + +- fixed the use of -DGIT_VERSION=on +- Version 3.0.7 + +------------------------------------------------------------------- +Sat Jun 01 08:00:00 UTC 2013 - bjoern.esser@gmail.com + +- fix build with graphviz >= 2.30.0 +- Version 3.0.6 + +------------------------------------------------------------------- Old: ---- libyui-3.0.5.tar.bz2 New: ---- libyui-3.0.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-doc.spec ++++++ --- /var/tmp/diff_new_pack.jahipC/_old 2013-06-28 16:04:51.000000000 +0200 +++ /var/tmp/diff_new_pack.jahipC/_new 2013-06-28 16:04:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui (Version 3.0.5) +# spec file for package libyui (Version 3.0.8) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # Name: libyui-doc -Version: 3.0.5 +Version: 3.0.8 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-%{version}.tar.bz2 ++++++ libyui.spec ++++++ --- /var/tmp/diff_new_pack.jahipC/_old 2013-06-28 16:04:51.000000000 +0200 +++ /var/tmp/diff_new_pack.jahipC/_new 2013-06-28 16:04:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui (Version 3.0.5) +# spec file for package libyui (Version 3.0.8) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ # norootforbuild Name: libyui -Version: 3.0.5 +Version: 3.0.8 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-%{version}.tar.bz2 @@ -96,8 +96,8 @@ ./bootstrap.sh -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG $(getconf LFS_CFLAGS)" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG $(getconf LFS_CFLAGS)" mkdir build cd build ++++++ libyui-3.0.5.tar.bz2 -> libyui-3.0.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.5/ChangeLog new/libyui-3.0.8/ChangeLog --- old/libyui-3.0.5/ChangeLog 2013-05-16 13:22:54.000000000 +0200 +++ new/libyui-3.0.8/ChangeLog 2013-06-26 17:12:26.000000000 +0200 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Wed Jun 26 16:20:29 CEST 2013 - tgoettlicher@suse.de + +- Fixed build of libyui-qt-graph examples +- Version 3.0.8 + +------------------------------------------------------------------- +Mon Jun 24 16:17:06 CEST 2013 - anaselli@linux.it + +- fixed the use of -DGIT_VERSION=on +- Version 3.0.7 + +------------------------------------------------------------------- +Sat Jun 01 08:00:00 UTC 2013 - bjoern.esser@gmail.com + +- fix build with graphviz >= 2.30.0 +- Version 3.0.6 + +------------------------------------------------------------------- Wed May 15 15:05:00 UTC 2013 - bjoern.esser@gmail.com - respect compiler flags of system rpm config when building RELEASE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.5/PROJECTINFO.cmake new/libyui-3.0.8/PROJECTINFO.cmake --- old/libyui-3.0.5/PROJECTINFO.cmake 2013-05-16 13:22:54.000000000 +0200 +++ new/libyui-3.0.8/PROJECTINFO.cmake 2013-06-26 17:12:26.000000000 +0200 @@ -7,6 +7,7 @@ SET( SUBDIRS src examples ) SET( LIB_DEPS Boost ) SET( LIB_LINKER dl pthread ) +SET( EXTRA_INCLUDES ) # set include-dir which are not picked by CMake automagically here. SET( URL "http://github.com/libyui/" ) SET( SUMMARY "GUI-abstraction library" ) SET( DESCRIPTION "This is the user interface engine that provides the abstraction from\n" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.5/VERSION.cmake new/libyui-3.0.8/VERSION.cmake --- old/libyui-3.0.5/VERSION.cmake 2013-05-16 13:22:54.000000000 +0200 +++ new/libyui-3.0.8/VERSION.cmake 2013-06-26 17:12:26.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "3") SET( VERSION_MINOR "0" ) -SET( VERSION_PATCH "5" ) +SET( VERSION_PATCH "8" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.5/buildtools/LibyuiCommon.cmake new/libyui-3.0.8/buildtools/LibyuiCommon.cmake --- old/libyui-3.0.5/buildtools/LibyuiCommon.cmake 2013-05-16 13:22:54.000000000 +0200 +++ new/libyui-3.0.8/buildtools/LibyuiCommon.cmake 2013-06-26 17:12:26.000000000 +0200 @@ -10,7 +10,7 @@ EXEC_PROGRAM( "${GIT_EXECUTABLE}" ${CMAKE_CURRENT_SOURCE_DIR} - ARGS "describe" + ARGS "describe --tags" OUTPUT_VARIABLE GIT_VERSION ) STRING( REGEX MATCH "-g[0-9|a-f]+$" VERSION_SHA1 ${GIT_VERSION} ) @@ -44,7 +44,7 @@ OPTION( SKIP_LATEX "Shall I skip the generation of LaTeX PDF-docs?" OFF ) OPTION( ENABLE_STATIC "Shall I build a static library, too?" OFF ) OPTION( ENABLE_DEBUG "Shall I include Debug-Symbols in Release?" OFF ) - OPTION( ENABLE_EXAMPLES "Shall I compile the examples, too?" OFF ) + OPTION( ENABLE_EXAMPLES "Shall I compile the examples, too?" ON ) OPTION( ENABLE_WALL "Enable the -Wall compiler-flag?" ON ) OPTION( ENABLE_WERROR "Enable the -Werror compiler-flag?" ON ) OPTION( RESPECT_FLAGS "Shall I respect the system c/ldflags?" OFF ) @@ -680,7 +680,7 @@ IF( ENABLE_EXAMPLES ) GET_FILENAME_COMPONENT( EXAMPLE_EXEC "${EXAMPLE}" NAME_WE ) ADD_EXECUTABLE ( ${EXAMPLE_EXEC} "${EXAMPLE}" ) - TARGET_LINK_LIBRARIES( ${EXAMPLE_EXEC} ${BASELIB} ) + TARGET_LINK_LIBRARIES( ${EXAMPLE_EXEC} ${BASELIB} ${LIB_LINKER} ) ENDIF( ENABLE_EXAMPLES ) ENDFOREACH( EXAMPLE ${EXAMPLES_LIST} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.5/examples/ManyWidgets.cc new/libyui-3.0.8/examples/ManyWidgets.cc --- old/libyui-3.0.5/examples/ManyWidgets.cc 2013-05-16 13:22:54.000000000 +0200 +++ new/libyui-3.0.8/examples/ManyWidgets.cc 2013-06-26 17:12:26.000000000 +0200 @@ -208,6 +208,9 @@ buttonbox->setLayoutPolicy( YButtonBox::gnomeLayoutPolicy() ); auto quitButton = YUI::widgetFactory()->createPushButton( buttonbox, "Quit" ); + // get rid of unused variable warning + (void)label; + // event loop while ( true ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.5/libyui.spec.in new/libyui-3.0.8/libyui.spec.in --- old/libyui-3.0.5/libyui.spec.in 2013-05-16 13:22:54.000000000 +0200 +++ new/libyui-3.0.8/libyui.spec.in 2013-06-26 17:12:26.000000000 +0200 @@ -78,8 +78,8 @@ ./bootstrap.sh -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG $(getconf LFS_CFLAGS)" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG $(getconf LFS_CFLAGS)" mkdir build cd build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.5/src/YGraph.cc new/libyui-3.0.8/src/YGraph.cc --- old/libyui-3.0.5/src/YGraph.cc 2013-05-16 13:22:54.000000000 +0200 +++ new/libyui-3.0.8/src/YGraph.cc 2013-06-26 17:12:26.000000000 +0200 @@ -50,7 +50,7 @@ } -YGraph::YGraph( YWidget * parent, graph_t * graph ) +YGraph::YGraph( YWidget * parent, /* graph_t */ void * graph ) : YWidget( parent ) , priv( new YGraphPrivate( "", "" ) ) { @@ -88,7 +88,7 @@ void -YGraph::setGraph( graph_t * graph ) +YGraph::setGraph( /* graph_t */ void * graph ) { priv->filename.clear(); renderGraph( graph ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.5/src/YGraph.h new/libyui-3.0.8/src/YGraph.h --- old/libyui-3.0.5/src/YGraph.h 2013-05-16 13:22:54.000000000 +0200 +++ new/libyui-3.0.8/src/YGraph.h 2013-06-26 17:12:26.000000000 +0200 @@ -27,11 +27,15 @@ #include "YWidget.h" -extern "C" -{ - struct Agraph_t; - typedef struct Agraph_t graph_t; -} +/* + * Do not include graphviz/types.h here since it conflicts with ncurses + * headers. People should finally start to use C++ and namespaces! + * + * The previous workaround of inserting the graph_t definition here does not + * work with graphviz >= 2.30.0 since it depends on the define WITH_CGRAPH. + * + * For that reason a lot of functions simply take a void* instead of graph_t*. + */ class YGraphPrivate; @@ -55,7 +59,7 @@ * * Renders the graph. The graph must already contain layout information. **/ - YGraph( YWidget * parent, graph_t * graph ); + YGraph( YWidget * parent, /* graph_t */ void * graph ); public: @@ -129,7 +133,7 @@ * call this base class method in the new implementation. Most derived * classes only need to implement renderGraph(). **/ - virtual void setGraph( graph_t * graph ); + virtual void setGraph( /* graph_t */ void * graph ); /** * Return name of activated node. Activation can happen due to e.g. single @@ -148,7 +152,7 @@ /** * Render the graph. Derived classes are required to implement this. **/ - virtual void renderGraph( graph_t * graph ) = 0; + virtual void renderGraph( /* graph_t */ void * graph ) = 0; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.5/src/YOptionalWidgetFactory.cc new/libyui-3.0.8/src/YOptionalWidgetFactory.cc --- old/libyui-3.0.5/src/YOptionalWidgetFactory.cc 2013-05-16 13:22:54.000000000 +0200 +++ new/libyui-3.0.8/src/YOptionalWidgetFactory.cc 2013-06-26 17:12:26.000000000 +0200 @@ -264,7 +264,7 @@ YGraph * -YOptionalWidgetFactory::createGraph( YWidget * parent, graph_t * graph ) +YOptionalWidgetFactory::createGraph( YWidget * parent, /* graph_t */ void * graph ) { THROW_UNSUPPORTED( "YGraph" ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.5/src/YOptionalWidgetFactory.h new/libyui-3.0.8/src/YOptionalWidgetFactory.h --- old/libyui-3.0.5/src/YOptionalWidgetFactory.h 2013-05-16 13:22:54.000000000 +0200 +++ new/libyui-3.0.8/src/YOptionalWidgetFactory.h 2013-06-26 17:12:26.000000000 +0200 @@ -129,7 +129,7 @@ virtual bool hasGraph(); 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 ); virtual bool hasContextMenu(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org