Hello community,
here is the log from the commit of package libyui-qt-graph for openSUSE:Factory checked in at 2014-03-01 14:38:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-01-23 15:48:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libyui-qt-graph.new/libyui-qt-graph.changes 2014-03-01 14:38:08.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Feb 25 14:46:20 UTC 2014 - mvidner@suse.com
+
+- merged git and Factory state: the patch is now upstreamed:
+ 0001-use-cgraph-instead-of-graph-interfaces.patch
+- Ported to Qt5
+- 2.44.1
+
+-------------------------------------------------------------------
Old:
----
0001-use-cgraph-instead-of-graph-interfaces.patch
libyui-qt-graph-2.43.0.tar.bz2
New:
----
libyui-qt-graph-2.44.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-graph-doc.spec ++++++
--- /var/tmp/diff_new_pack.jkBcq8/_old 2014-03-01 14:38:09.000000000 +0100
+++ /var/tmp/diff_new_pack.jkBcq8/_new 2014-03-01 14:38:09.000000000 +0100
@@ -17,7 +17,7 @@
Name: libyui-qt-graph-doc
-Version: 2.43.0
+Version: 2.44.1
Release: 0
Source: libyui-qt-graph-%{version}.tar.bz2
++++++ libyui-qt-graph.spec ++++++
--- /var/tmp/diff_new_pack.jkBcq8/_old 2014-03-01 14:38:09.000000000 +0100
+++ /var/tmp/diff_new_pack.jkBcq8/_new 2014-03-01 14:38:09.000000000 +0100
@@ -17,15 +17,16 @@
Name: libyui-qt-graph
-Version: 2.43.0
+Version: 2.44.1
Release: 0
Source: libyui-qt-graph-%{version}.tar.bz2
-Patch: 0001-use-cgraph-instead-of-graph-interfaces.patch
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: graphviz-devel >= 2.26.0
-BuildRequires: libqt4-devel
+BuildRequires: libqt5-qtbase-devel
+BuildRequires: libqt5-qtsvg-devel
+BuildRequires: libqt5-qtx11extras-devel
BuildRequires: libyui-devel >= 3.0.4
%define libyui_qt_devel_version libyui-qt-devel >= 2.42.0
@@ -80,7 +81,6 @@
%prep
%setup -q -n libyui-qt-graph-%{version}
-%patch -p1
%build
++++++ libyui-qt-graph-2.43.0.tar.bz2 -> libyui-qt-graph-2.44.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/CMakeLists.txt new/libyui-qt-graph-2.44.1/CMakeLists.txt
--- old/libyui-qt-graph-2.43.0/CMakeLists.txt 2014-03-01 14:38:09.000000000 +0100
+++ new/libyui-qt-graph-2.44.1/CMakeLists.txt 2014-03-01 14:38:09.000000000 +0100
@@ -1 +1 @@
-symbolic link to /usr/share/libyui/buildtools/CMakeLists.common
+symbolic link to ../libyui-master/buildtools/CMakeLists.common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/ChangeLog new/libyui-qt-graph-2.44.1/ChangeLog
--- old/libyui-qt-graph-2.43.0/ChangeLog 2014-01-08 14:31:49.000000000 +0100
+++ new/libyui-qt-graph-2.44.1/ChangeLog 2014-02-25 16:08:58.000000000 +0100
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Tue Feb 25 14:46:20 UTC 2014 - mvidner@suse.com
+
+- merged git and Factory state: the patch is now upstreamed:
+ 0001-use-cgraph-instead-of-graph-interfaces.patch
+- Ported to Qt5
+- 2.44.1
+
+-------------------------------------------------------------------
+Mon Jan 13 16:48:36 CET 2014 - mvidner@suse.com
+
+- use cgraph interfaces if available, to fix building with
+ graphviz 2.30 (dvaleev)
+ 0001-use-cgraph-instead-of-graph-interfaces.patch
+
+-------------------------------------------------------------------
Wed Jan 8 13:34:40 CET 2014 - mvidner@suse.com
- adjusted to libyui so version 6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/PROJECTINFO.cmake new/libyui-qt-graph-2.44.1/PROJECTINFO.cmake
--- old/libyui-qt-graph-2.43.0/PROJECTINFO.cmake 2014-01-08 14:31:49.000000000 +0100
+++ new/libyui-qt-graph-2.44.1/PROJECTINFO.cmake 2014-02-21 15:14:45.000000000 +0100
@@ -6,7 +6,7 @@
SET( SUBDIRS src examples ) # set the subdirs where your code is located.
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( LIB_DEPS Qt5Core Qt5Gui Qt5Widgets ) # 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 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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/VERSION.cmake new/libyui-qt-graph-2.44.1/VERSION.cmake
--- old/libyui-qt-graph-2.43.0/VERSION.cmake 2014-01-08 14:31:49.000000000 +0100
+++ new/libyui-qt-graph-2.44.1/VERSION.cmake 2014-02-21 15:14:45.000000000 +0100
@@ -1,6 +1,6 @@
SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "43")
-SET(VERSION_PATCH "0")
+SET(VERSION_MINOR "44")
+SET(VERSION_PATCH "1")
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.43.0/examples/SimpleCreate.cc new/libyui-qt-graph-2.44.1/examples/SimpleCreate.cc
--- old/libyui-qt-graph-2.43.0/examples/SimpleCreate.cc 2014-01-08 14:31:49.000000000 +0100
+++ new/libyui-qt-graph-2.44.1/examples/SimpleCreate.cc 2014-02-21 15:14:45.000000000 +0100
@@ -45,6 +45,23 @@
GVC_t* gvc = gvContext();
+#ifdef WITH_CGRAPH
+ graph_t* graph = agopen(strdup("test"), Agdirected, 0);
+
+ node_t* node1 = agnode(graph, strdup("1"), 1);
+ node_t* node2 = agnode(graph, strdup("2"), 1);
+
+ agattr(graph, AGNODE, strdup("fillcolor"), strdup("gray"));
+ agset(node1, strdup("fillcolor"), strdup("red"));
+ agset(node2, strdup("fillcolor"), strdup("green"));
+
+ edge_t* edge1 = agedge(graph, node1, node2, NULL, 1);
+ edge_t* edge2 = agedge(graph, node2, node1, NULL, 1);
+
+ agattr(graph, AGEDGE, strdup("color"), strdup("black"));
+ agset(edge1, strdup("color"), strdup("red"));
+ agset(edge2, strdup("color"), strdup("green"));
+#else
graph_t* graph = agopen(strdup("test"), AGDIGRAPH);
node_t* node1 = agnode(graph, strdup("1"));
@@ -60,6 +77,7 @@
agedgeattr(graph, strdup("color"), strdup("black"));
agset(edge1, strdup("color"), strdup("red"));
agset(edge2, strdup("color"), strdup("green"));
+#endif
gvLayout(gvc, graph, "dot");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/libyui-qt-graph.spec.in new/libyui-qt-graph-2.44.1/libyui-qt-graph.spec.in
--- old/libyui-qt-graph-2.43.0/libyui-qt-graph.spec.in 2014-01-08 14:31:49.000000000 +0100
+++ new/libyui-qt-graph-2.44.1/libyui-qt-graph.spec.in 2014-02-24 11:13:55.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package @PROJECTNAME@ (Version @VERSION@)
+# spec file for package @PROJECTNAME@
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -11,46 +11,47 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-#
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-Name: @PROJECTNAME@
-Version: @VERSION@
-Release: 0
-License: LGPL-2.1 or LGPL-3.0
-Source: @PROJECTNAME@-%{version}.tar.bz2
-Group: System/Libraries
-BuildRequires: cmake >= 2.8
+Name: @PROJECTNAME@
+Version: @VERSION@
+Release: 0
+Source: @PROJECTNAME@-%{version}.tar.bz2
+
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: graphviz-devel >= 2.26.0
-BuildRequires: libqt4-devel
+BuildRequires: libqt5-qtbase-devel
+BuildRequires: libqt5-qtsvg-devel
+BuildRequires: libqt5-qtx11extras-devel
BuildRequires: libyui-devel >= 3.0.4
+%define libyui_qt_devel_version libyui-qt-devel >= 2.42.0
+BuildRequires: %{libyui_qt_devel_version}
-%define libyui_qt_devel_version libyui-qt-devel >= 2.42.0
-BuildRequires: %{libyui_qt_devel_version}
-
-URL: @URL@
-Summary: @SUMMARY@
+Url: @URL@
+Summary: @SUMMARY@
+License: LGPL-2.1 or LGPL-3.0
+Group: System/Libraries
%description
@DESCRIPTION@
%package -n @PROJECTNAME@@SONAME_MAJOR@
-Group: System/Libraries
-
-Requires: lib@BASELIB@@SONAME_MAJOR@
-Supplements: lib@BASELIB@-qt@SONAME_MAJOR@
-Provides: lib@BASELIB@-qt-graph = %{version}
-
-Provides: yast2-qt-graph = 2.42.0
-Obsoletes: yast2-qt-graph < 2.42.0
-
-URL: @URL@
-Summary: @SUMMARY@
+Requires: lib@BASELIB@@SONAME_MAJOR@
+Supplements: lib@BASELIB@-qt@SONAME_MAJOR@
+Provides: lib@BASELIB@-qt-graph = %{version}
+
+Provides: yast2-qt-graph = 2.42.0
+Obsoletes: yast2-qt-graph < 2.42.0
+
+Url: @URL@
+Summary: @SUMMARY@
+Group: System/Libraries
%description -n @PROJECTNAME@@SONAME_MAJOR@
@DESCRIPTION@
@@ -58,13 +59,12 @@
%package devel
-Group: Development/Languages/C and C++
-
-Requires: @PROJECTNAME@@SONAME_MAJOR@ = %{version}
-Requires: %{libyui_qt_devel_version}
+Requires: %{libyui_qt_devel_version}
+Requires: @PROJECTNAME@@SONAME_MAJOR@ = %{version}
-URL: @URL@
-Summary: @PROJECTNAME_UC@ header files
+Url: @URL@
+Summary: @PROJECTNAME_UC@ header files
+Group: Development/Languages/C and C++
%description devel
@DESCRIPTION@
@@ -76,7 +76,6 @@
%prep
%setup -q -n @PROJECTNAME@-%{version}
-
%build
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
@@ -89,21 +88,20 @@
%if %{?_with_debug:1}%{!?_with_debug:0}
cmake .. \
- -DPREFIX=%{_prefix} \
- -DDOC_DIR=%{_docdir} \
- -DLIB_DIR=%{_lib} \
- -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
+ -DPREFIX=%{_prefix} \
+ -DDOC_DIR=%{_docdir} \
+ -DLIB_DIR=%{_lib} \
+ -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
%else
cmake .. \
- -DPREFIX=%{_prefix} \
- -DDOC_DIR=%{_docdir} \
- -DLIB_DIR=%{_lib} \
- -DCMAKE_BUILD_TYPE=RELEASE
+ -DPREFIX=%{_prefix} \
+ -DDOC_DIR=%{_docdir} \
+ -DLIB_DIR=%{_lib} \
+ -DCMAKE_BUILD_TYPE=RELEASE
%endif
make %{?jobs:-j%jobs}
-
%install
cd build
make install DESTDIR="$RPM_BUILD_ROOT"
@@ -134,5 +132,4 @@
%{_libdir}/cmake/@PROJECTNAME@
%doc %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@/examples
-
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/src/CMakeLists.txt new/libyui-qt-graph-2.44.1/src/CMakeLists.txt
--- old/libyui-qt-graph-2.43.0/src/CMakeLists.txt 2014-01-08 14:31:49.000000000 +0100
+++ new/libyui-qt-graph-2.44.1/src/CMakeLists.txt 2014-02-21 15:14:45.000000000 +0100
@@ -1 +1,9 @@
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+set(CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH})
+
PROCESS_SOURCES()
+qt5_use_modules( ${TARGETLIB} Core Gui Widgets Svg X11Extras )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/src/QY2Graph.cc new/libyui-qt-graph-2.44.1/src/QY2Graph.cc
--- old/libyui-qt-graph-2.43.0/src/QY2Graph.cc 2014-01-08 14:31:49.000000000 +0100
+++ new/libyui-qt-graph-2.44.1/src/QY2Graph.cc 2014-02-21 15:14:45.000000000 +0100
@@ -108,7 +108,7 @@
void
QY2Graph::scaleView(qreal scaleFactor)
{
- qreal f = sqrt(matrix().det());
+ qreal f = sqrt(matrix().determinant());
if (scaleFactor * f > 8.0)
scaleFactor = 8.0 / f;
@@ -224,7 +224,11 @@
GVC_t* gvc = gvContext();
if (gvc != NULL)
{
+#ifdef WITH_CGRAPH
+ graph_t* graph = agread(fp, NULL);
+#else
graph_t* graph = agread(fp);
+#endif
if (graph != NULL)
{
if (gvLayout(gvc, graph, const_cast