Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libyui-qt-graph for openSUSE:Factory
checked in at 2021-02-26 21:58:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt-graph (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt-graph.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt-graph"
Fri Feb 26 21:58:21 2021 rev:32 rq:872586 version:4.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt-graph/libyui-qt-graph-doc.changes
2019-12-14 12:04:30.695392227 +0100
+++
/work/SRC/openSUSE:Factory/.libyui-qt-graph.new.2378/libyui-qt-graph-doc.changes
2021-02-26 21:58:23.427764912 +0100
@@ -1,0 +2,7 @@
+Mon Feb 1 14:59:14 UTC 2021 - Stefan Hundhammer <shundham...@suse.com>
+
+- New CMake build environment (bsc#1181653)
+- Bumped SO version to 15
+- 4.0.0
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/libyui-qt-graph/libyui-qt-graph.changes
2020-10-18 16:21:32.116493868 +0200
+++
/work/SRC/openSUSE:Factory/.libyui-qt-graph.new.2378/libyui-qt-graph.changes
2021-02-26 21:58:23.595765060 +0100
@@ -1,0 +2,13 @@
+Mon Feb 15 15:24:07 UTC 2021 - Stefan Hundhammer <shundham...@suse.com>
+
+- Require libyui-qt (bsc#1181653)
+- 4.0.1
+
+-------------------------------------------------------------------
+Mon Feb 1 14:59:13 UTC 2021 - Stefan Hundhammer <shundham...@suse.com>
+
+- New CMake build environment (bsc#1181653)
+- Bumped SO version to 15
+- 4.0.0
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-graph-2.46.6.tar.bz2
New:
----
libyui-qt-graph-4.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-graph-doc.spec ++++++
--- /var/tmp/diff_new_pack.sqIZug/_old 2021-02-26 21:58:24.091765495 +0100
+++ /var/tmp/diff_new_pack.sqIZug/_new 2021-02-26 21:58:24.091765495 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libyui-qt-graph-doc
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,63 +17,55 @@
%define parent libyui-qt-graph
-%define so_version 14
+%define so_version 15
Name: %{parent}-doc
-Version: 2.46.6
-Release: 0
-Source: %{parent}-%{version}.tar.bz2
+# DO NOT manually bump the version here; instead, use rake version:bump
+Version: 4.0.1
+Release: 0
BuildArch: noarch
-BuildRequires: cmake >= 2.8
+BuildRequires: cmake >= 3.10
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
-BuildRequires: graphviz-gnome
+BuildRequires: graphviz
BuildRequires: libyui-devel >= 3.9.0
-BuildRequires: texlive-latex
-URL: http://github.com/libyui/
Summary: Libyui-qt-graph documentation
License: LGPL-2.1-only OR LGPL-3.0-only
-Group: Documentation/HTML
+URL: http://github.com/libyui/
+Source: %{parent}-%{version}.tar.bz2
%description
-This package contains the Qt graph
-component for libYUI.
-
+This package contains the Qt graph component for libyui.
-This package provides the documentation. (HTML & PDF)
+This package provides HTML class documentation.
%prep
-
%setup -n %{parent}-%{version}
%build
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-
-./bootstrap.sh %{_prefix}
-
mkdir build
cd build
+
cmake .. \
- -DDOC_DIR=%{_docdir} \
- -DDOCS_ONLY=ON
+ -DBUILD_DOC=on \
+ -DBUILD_SRC=off \
+ -DDOC_DESTDIR=$RPM_BUILD_ROOT
-make %{?jobs:-j%jobs} docs
+# No "make doc" here: This would only duplicate the doxygen call
%install
-cd build
-make install DESTDIR="$RPM_BUILD_ROOT"
-%fdupes -s $RPM_BUILD_ROOT/%_docdir/%{parent}%{so_version}
+cd build
+make install-doc
+# This implicitly includes "make doc" unconditionally
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+%fdupes -s %{buildroot}/%{_docdir}/%{parent}%{so_version}
%files
%defattr(-,root,root)
++++++ libyui-qt-graph.spec ++++++
--- /var/tmp/diff_new_pack.sqIZug/_old 2021-02-26 21:58:24.107765509 +0100
+++ /var/tmp/diff_new_pack.sqIZug/_new 2021-02-26 21:58:24.111765513 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libyui-qt-graph
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,69 +17,68 @@
Name: libyui-qt-graph
-Version: 2.46.6
+
+# DO NOT manually bump the version here; instead, use rake version:bump
+Version: 4.0.1
Release: 0
-Source: %{name}-%{version}.tar.bz2
-%define so_version 14
+%define so_version 15
+%define libyui_devel_version libyui-devel >= 3.9.0
+%define libyui_qt_devel_version libyui-qt-devel >= 2.52.0
%define bin_name %{name}%{so_version}
-BuildRequires: cmake >= 2.8
+BuildRequires: cmake >= 3.10
BuildRequires: gcc-c++
BuildRequires: graphviz-devel >= 2.26.0
-BuildRequires: libqt5-qtbase-devel
-BuildRequires: libqt5-qtsvg-devel
-BuildRequires: libqt5-qtx11extras-devel
-BuildRequires: libyui-devel >= 3.9.0
-%define libyui_qt_devel_version libyui-qt-devel >= 2.52.0
+# Used here and in src/CMakeLists.txt
+BuildRequires: pkg-config
+
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5X11Extras)
+
+BuildRequires: %{libyui_devel_version}
BuildRequires: %{libyui_qt_devel_version}
-URL: http://github.com/libyui/
Summary: Libyui - Qt Graph Widget
License: LGPL-2.1-only OR LGPL-3.0-only
-Group: System/Libraries
+URL: http://github.com/libyui/
+Source: %{name}-%{version}.tar.bz2
%description
-This package contains the Qt graph
-component for libYUI.
+This package contains the Qt graph component for libyui.
%package -n %{bin_name}
-
+Summary: Libyui - Qt graph widget
Requires: libyui%{so_version}
+Requires: libyui-qt%{so_version}
Supplements: libyui-qt%{so_version}
Provides: %{name} = %{version}
Provides: yast2-qt-graph = 2.46.0
Obsoletes: yast2-qt-graph < 2.46.0
-URL: http://github.com/libyui/
-Summary: Libyui - Qt Graph Widget
-Group: System/Libraries
-
%description -n %{bin_name}
-This package contains the Qt graph
-component for libYUI.
+This package contains the Qt graph component for libyui.
+This is a special widget to visualize graphs such as the
+storage device hierarchy (disks, partitions, subvolumes
+etc.). and similar graphviz-generated graphs.
%package devel
-
+Summary: Libyui - Header files for the Qt graph widget
Requires: %{bin_name} = %{version}
Requires: %{libyui_qt_devel_version}
-URL: http://github.com/libyui/
-Summary: Libyui-qt-graph header files
-Group: Development/Languages/C and C++
-
%description devel
-This package contains the Qt graph
-component for libYUI.
-
-
-This can be used independently of YaST for generic (C++) applications.
-This package has very few dependencies.
+This package contains the header files for the Qt graph component
+for libyui.
%prep
@@ -90,39 +89,31 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-./bootstrap.sh %{_prefix}
-
mkdir build
cd build
%if %{?_with_debug:1}%{!?_with_debug:0}
-cmake .. \
- -DYPREFIX=%{_prefix} \
- -DDOC_DIR=%{_docdir} \
- -DLIB_DIR=%{_lib} \
- -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
+CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO"
%else
+CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELEASE"
+%endif
+
cmake .. \
- -DYPREFIX=%{_prefix} \
-DDOC_DIR=%{_docdir} \
-DLIB_DIR=%{_lib} \
- -DCMAKE_BUILD_TYPE=RELEASE
-%endif
+ -DBUILD_EXAMPLES=on \
+ $CMAKE_OPTS
make %{?jobs:-j%jobs}
%install
cd build
make install DESTDIR="$RPM_BUILD_ROOT"
-install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/
install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui
+install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/
install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
%post -n %{bin_name} -p /sbin/ldconfig
-
%postun -n %{bin_name} -p /sbin/ldconfig
%files -n %{bin_name}
@@ -134,11 +125,9 @@
%files devel
%defattr(-,root,root)
-%dir %{_docdir}/%{bin_name}
%{_libdir}/yui/lib*.so
-%{_prefix}/include/yui
-%{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/cmake/%{name}
+%{_includedir}/yui/qt-graph
+%dir %{_docdir}/%{bin_name}
%doc %{_docdir}/%{bin_name}/examples
%changelog
++++++ libyui-qt-graph-2.46.6.tar.bz2 -> libyui-qt-graph-4.0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/CMakeLists.txt
new/libyui-qt-graph-4.0.1/CMakeLists.txt
--- old/libyui-qt-graph-2.46.6/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/libyui-qt-graph-4.0.1/CMakeLists.txt 2021-02-15 16:42:21.000000000
+0100
@@ -0,0 +1,66 @@
+# CMakeLists.txt for libyui-qt-graph
+#
+# Usage:
+#
+# mkdir build
+# cd build
+# cmake ..
+#
+# make
+# sudo make install
+#
+# Restart with a clean build environment:
+# rm -rf build
+#
+# Show the complete compiler commands with all arguments:
+# make VERBOSE=1
+
+cmake_minimum_required( VERSION 3.10 )
+project( libyui-qt-graph )
+
+# Options usage:
+#
+# cmake -DBUILD_DOC=on -DBUILD_EXAMPLES=off ..
+
+option( BUILD_SRC "Build in src/ subdirectory" on )
+option( BUILD_EXAMPLES "Build C++ -based libyui examples" off )
+option( BUILD_DOC "Build class documentation" off )
+option( WERROR "Treat all compiler warnings as errors" on )
+
+# Non-boolean options
+set( DOC_DESTDIR "" CACHE STRING "Destination directory prefix for installing
docs" )
+
+#----------------------------------------------------------------------
+
+
+# As of now, no support for /usr/local instead of /usr. But CMake DESTDIR
works.
+set( CMAKE_INSTALL_PREFIX /usr )
+
+set( CMAKE_INSTALL_MESSAGE LAZY ) # Suppress "up-to-date" messages during
"make install"
+
+
+# Initialize compiler flags for all targets in all subdirectories
+add_compile_options( "-Wall" )
+add_compile_options( "-Os" ) # Optimize for size (overrides CMake's -O3 in
RELEASE builds)
+
+if ( WERROR )
+ add_compile_options( "-Werror" )
+endif()
+
+
+#
+# Descend into subdirectories
+#
+
+if ( BUILD_SRC )
+ add_subdirectory( src )
+endif()
+
+if ( BUILD_EXAMPLES )
+ add_subdirectory( examples )
+endif()
+
+if ( BUILD_DOC )
+ # Notice that this is only built upon "make doc" and installed upon "make
install-doc"
+ add_subdirectory( doc )
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/Libyui-qt-graphLibgvc.cmake
new/libyui-qt-graph-4.0.1/Libyui-qt-graphLibgvc.cmake
--- old/libyui-qt-graph-2.46.6/Libyui-qt-graphLibgvc.cmake 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/Libyui-qt-graphLibgvc.cmake 1970-01-01
01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-# find the correct libraries depending on libgvc's version
-
-MACRO( SET_LIBGVS_LIBS )
- EXECUTE_PROCESS(COMMAND /usr/bin/pkg-config --libs libgvc
- RESULT_VARIABLE _exit
- OUTPUT_VARIABLE _tmp
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- IF(${_exit} GREATER 0 AND NOT ${DOCS_ONLY})
- MESSAGE(FATAL_ERROR "Install graphviz-devel")
- ENDIF()
- 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.46.6/MAINTAINER
new/libyui-qt-graph-4.0.1/MAINTAINER
--- old/libyui-qt-graph-2.46.6/MAINTAINER 2020-10-09 16:52:30.000000000
+0200
+++ new/libyui-qt-graph-4.0.1/MAINTAINER 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-Arvin Schnell <aschn...@suse.de>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/Makefile.cvs
new/libyui-qt-graph-4.0.1/Makefile.cvs
--- old/libyui-qt-graph-2.46.6/Makefile.cvs 2020-10-09 16:52:30.000000000
+0200
+++ new/libyui-qt-graph-4.0.1/Makefile.cvs 1970-01-01 01:00:00.000000000
+0100
@@ -1,25 +0,0 @@
-#
-# Makefile.cvs
-#
-
-all: configure
-
-configure: clean
- ./bootstrap.sh ; \
- mkdir build ; \
- cd build ; \
- cmake .. \
- -DENABLE_WERROR=OFF \
- -DCMAKE_BUILD_TYPE=RELEASE
-
-install: configure
- cd build ; \
- make && make install
-
-reconf:
- cd build ; \
- cmake rebuild_cache
-
-clean:
- rm -rf build \
- CMakeLists.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/Makefile.repo
new/libyui-qt-graph-4.0.1/Makefile.repo
--- old/libyui-qt-graph-2.46.6/Makefile.repo 1970-01-01 01:00:00.000000000
+0100
+++ new/libyui-qt-graph-4.0.1/Makefile.repo 2021-02-15 16:42:21.000000000
+0100
@@ -0,0 +1,63 @@
+#
+# Makefile.repo for libyui-qt-graph
+#
+
+# Local Variables:
+# mode: Makefile
+# End:
+
+
+all: clean configure build-hint
+
+build-hint:
+ @echo ""
+ @echo "To build:"
+ @echo ""
+ @echo " cd build"
+ @echo " make"
+ @echo ""
+
+configure:
+ mkdir build; \
+ cd build; \
+ cmake ..
+
+build: clean configure
+ cd build; \
+ make -j $$(nproc)
+
+# This needs root privileges, of course
+install: configure
+ cd build; \
+ make -j $$(nproc) && make install
+
+clean:
+ rm -rf build
+
+package:
+ rake package
+
+doc:
+ test -d build || mkdir build
+ cd build; \
+ cmake -DBUILD_DOC=on .. ; \
+ make doc
+
+install-doc: doc
+ cd build; \
+ make install-doc
+
+version-bump:
+ rake version:bump
+
+# Just an alias
+bump-version: version-bump
+
+
+# Enforce rebuilding some targets unconditionally, even if a file or directory
+# with that name exists; otherwise the timestamp of that file or directory
+# would be checked.
+#
+# We need this because we have a subdirectory doc/, a subdirectory package/
+# and possibly a subdirectory build/ here.
+.PHONY: doc package build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/PROJECTINFO.cmake
new/libyui-qt-graph-4.0.1/PROJECTINFO.cmake
--- old/libyui-qt-graph-2.46.6/PROJECTINFO.cmake 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/PROJECTINFO.cmake 1970-01-01 01:00:00.000000000
+0100
@@ -1,24 +0,0 @@
-##### PROJECTINFO for CMake
-
-SET( BASELIB "yui" ) # don't change this
-
-##### MAKE ALL NEEDED CHANGES HERE #####
-
-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 Qt5Core Qt5Gui Qt5Widgets Qt5Svg Qt5X11Extras ) #
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.
-SET( PROGSUBDIR ) # define your programm's name
if the plugin is made for it, only. e.g. "YaST2" for {gtk,ncurses,qt}-pkg.
-
-
-SET( URL "http://github.com/libyui/"; )
-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.46.6/RPMINFO.cmake
new/libyui-qt-graph-4.0.1/RPMINFO.cmake
--- old/libyui-qt-graph-2.46.6/RPMINFO.cmake 2020-10-09 16:52:30.000000000
+0200
+++ new/libyui-qt-graph-4.0.1/RPMINFO.cmake 1970-01-01 01:00:00.000000000
+0100
@@ -1,36 +0,0 @@
-##### RPMINFO for CMake
-#####
-##### THIS IS THE INFO REQUIRED FOR SPEC-FILE GENERATION
-
-SET( SPEC_Url "http://github.com/libyui-qt-graph/"; )
# the URL of the project
-
-SET( SPEC_Summary "Libyui - graph widget for the Qt UI" ) # some
brief summary
-
-SET( SPEC_Description
- "This is the graph widget plugin provided for the libyui Qt UI\n" )
# the description to be used, end each line with "\n" for line-breaks
-
-SET( SPEC_BuildRequires "cmake >= 2.8" "gcc-c++" "doxygen"
"libqt4-devel"
- "libyui-devel"
- "libyui-qt-devel >= 2.21.6"
- "libzypp-devel >= 11.4.0"
-) # the
BuildRequires every single pkg wrapped with "" and speparated with spaces
-
-SET( SPEC_Requires "" )
# the Requires every single pkg wrapped with ""
and speparated with spaces
-
-SET( SPEC_Provides "yast2-qt-graph = 2.21.25" ) # the Provides
every single pkg wrapped with "" and speparated with spaces
-
-SET( SPEC_Obsoletes "yast2-qt-graph < 2.21.25" ) # the Obsoletes
every single pkg wrapped with "" and speparated with spaces
-
-SET( SPEC_Conflicts "" )
# the Conflicts every single pkg wrapped with
"" and speparated with spaces
-
-SET( SPEC_Docs "" ) # for docs that
should be in the main-pkg
-
-SET( SPEC_DEVEL_Requires "@PROJECTNAME@@@varpfx@SONAME_MAJOR@ =
%{version}"
- "libyui-qt-devel >= 2.21.6"
-) # the Requires for the -devel pkg every single pkg wrapped with "" and
speparated with spaces
-
-#SET( SPEC_DEVEL_Provides "pkgconfig(@PROJECTNAME@) = %{version}"
-# "yast2_ui_pkg"
-#) # the Provides for the -devel pkg
-
-SET( SPEC_DEVEL_Docs "" )
# for docs that should be in the devel-pkg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/Rakefile
new/libyui-qt-graph-4.0.1/Rakefile
--- old/libyui-qt-graph-2.46.6/Rakefile 2020-10-09 16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/Rakefile 2021-02-15 16:42:21.000000000 +0100
@@ -1,8 +1,16 @@
#--
-# Copyright (C) 2015 SUSE LLC
+# Copyright (c) 2015-2019 SUSE LLC
+# Copyright (c) 2020-2021 SUSE LLC
#
# make continuous integration using rubygem-libyui-rake.
#
# MIT license
#++
require "libyui/rake"
+
+Libyui::Tasks.configuration do |conf|
+ include Libyui::Tasks::Helpers
+
+ conf.skip_license_check << /^Makefile\.repo$/
+ conf.skip_license_check << /CMakeLists\.txt$/
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/SOURCECONF.cmake
new/libyui-qt-graph-4.0.1/SOURCECONF.cmake
--- old/libyui-qt-graph-2.46.6/SOURCECONF.cmake 2020-10-09 16:52:30.000000000
+0200
+++ new/libyui-qt-graph-4.0.1/SOURCECONF.cmake 1970-01-01 01:00:00.000000000
+0100
@@ -1,22 +0,0 @@
-SET( ${TARGETLIB}_SOURCES
- ##### Here go the source files
- QY2Graph.cc
- YQGraph.cc
- YQGraphPlugin.cc
- YQGraphPluginImpl.cc
-)
-
-SET( ${TARGETLIB}_HEADERS
- ##### Here go the headers
- QY2Graph.h
- YQGraph.h
- YQGraphPlugin.h
- YQGraphPluginImpl.h
-)
-
-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.46.6/VERSION.cmake
new/libyui-qt-graph-4.0.1/VERSION.cmake
--- old/libyui-qt-graph-2.46.6/VERSION.cmake 2020-10-09 16:52:30.000000000
+0200
+++ new/libyui-qt-graph-4.0.1/VERSION.cmake 2021-02-15 16:42:21.000000000
+0100
@@ -1,11 +1,9 @@
-SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "46")
-SET(VERSION_PATCH "6")
+SET( VERSION_MAJOR "4")
+SET( VERSION_MINOR "0" )
+SET( VERSION_PATCH "1" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
-##### This is need for the libyui core ONLY.
-##### These will be overridden from exports in LibyuiConfig.cmake
-SET( SONAME_MAJOR "0" )
+SET( SONAME_MAJOR "15" )
SET( SONAME_MINOR "0" )
SET( SONAME_PATCH "0" )
SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/bootstrap.sh
new/libyui-qt-graph-4.0.1/bootstrap.sh
--- old/libyui-qt-graph-2.46.6/bootstrap.sh 2020-10-09 16:52:30.000000000
+0200
+++ new/libyui-qt-graph-4.0.1/bootstrap.sh 1970-01-01 01:00:00.000000000
+0100
@@ -1,26 +0,0 @@
-#!/bin/sh
-set -e
-
-prefix="/usr"
-
-if [ ! -z $1 ]
-then
- prefix="$1"
-fi
-
-cmake_common="$prefix/share/libyui/buildtools/CMakeLists.common"
-cmake_target="./CMakeLists.txt"
-
-echo "checking for $cmake_common..."
-
-if [ -f "$cmake_common" ]
-then
- ln -fs "$cmake_common" "$cmake_target"
- echo "OK: linked to `pwd`/$cmake_target."
-else
- echo " Use must have libyui(-devel) >= 3.0.4 installed"
- echo " in \"$prefix\" first !!!"
- exit 1
-fi
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/doc/CMakeLists.txt
new/libyui-qt-graph-4.0.1/doc/CMakeLists.txt
--- old/libyui-qt-graph-2.46.6/doc/CMakeLists.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-graph-4.0.1/doc/CMakeLists.txt 2021-02-15
16:42:21.000000000 +0100
@@ -0,0 +1,42 @@
+# CMakeLists.txt for libyui-qt-graph/doc
+
+include( ../VERSION.cmake )
+
+find_package( Doxygen REQUIRED dot )
+
+
+set( PKG_NAME libyui-qt-graph${SONAME_MAJOR} )
+set( DOC_INSTALL_DIR ${DOC_DESTDIR}/usr/share/doc/packages/${PKG_NAME} )
+
+
+#
+# Doxygen-generated autodocs
+#
+
+if ( DOXYGEN_FOUND )
+
+ set( DOXYGEN_GENERATE_TREEVIEW yes ) # Enable views tree HTML frame
+ set( DOXYGEN_QUIET yes ) # Less verbose output
+ set( DOXYGEN_WARN_LOGFILE doxygen-warnings.log )
+ # See build/CMakeDoxyfile.in for more supported variables
+
+ doxygen_add_docs( doc ../src )
+
+else()
+ message( WARNING "Missing doxygen package" )
+endif()
+
+
+# Define a new custom make target "install-doc".
+# Notice that we can't use DESTDIR here since CMake only sets that
+# for "make install", not for this custom "make install-doc".
+# https://gist.github.com/shundhammer/12b6343309544a5920f51cd0063eeecf
+
+add_custom_target( install-doc
+ DEPENDS doc
+
+ COMMAND mkdir -m 755 -p ${DOC_INSTALL_DIR}/html
+ COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/html ${DOC_INSTALL_DIR}
+
+ COMMENT "Installing documentation to ${DOC_INSTALL_DIR}" )
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/examples/CMakeLists.txt
new/libyui-qt-graph-4.0.1/examples/CMakeLists.txt
--- old/libyui-qt-graph-2.46.6/examples/CMakeLists.txt 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/examples/CMakeLists.txt 2021-02-15
16:42:21.000000000 +0100
@@ -1 +1,42 @@
-PROCESS_EXAMPLES()
+# CMakeLists.txt for libyui-qt-graph/examples
+
+include( ../VERSION.cmake )
+include( FindPkgConfig ) # pkg_check_modules()
+
+set( PKG_NAME libyui-qt-graph${SONAME_MAJOR} )
+set( EXAMPLES_INSTALL_DIR
${DESTDIR}/usr/share/doc/packages/${PKG_NAME}/examples )
+
+
+# Check for the libgvc (from the libgraphviz package) via pkg-config;
+# this sets LIBGVC_LIBRARIES (and more).
+pkg_check_modules( LIBGVC REQUIRED libgvc )
+
+
+set( EXAMPLES_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include )
+
+# Symlink ../../libyui/src to build/examples/include/yui
+# so the headers there can be included as <yui/YFoo.h>
+add_custom_target( examples-include-dir
+ COMMAND rm -rf ${EXAMPLES_INCLUDE_DIR}
+ COMMAND mkdir ${EXAMPLES_INCLUDE_DIR}
+ COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui/src
${EXAMPLES_INCLUDE_DIR}/yui )
+
+
+# Build a simple example named EXAMPLE from one source file EXAMPLE.cc
+# and install the source to the package's doc directory
+#
+function( add_example EXAMPLE )
+ add_executable( ${EXAMPLE} ${EXAMPLE}.cc )
+ target_link_libraries( ${EXAMPLE} yui ${LIBGVC_LIBRARIES} )
+ add_dependencies( ${EXAMPLE} libyui-qt-graph examples-include-dir )
+
+ # Prefer the headers in ../../libyui/src over those in /usr/include
+ target_include_directories( ${EXAMPLE} BEFORE PUBLIC ${EXAMPLES_INCLUDE_DIR}
)
+
+ install( FILES ${EXAMPLE}.cc DESTINATION ${EXAMPLES_INSTALL_DIR} )
+endfunction()
+
+#----------------------------------------------------------------------
+
+add_example( SimpleCreate )
+add_example( SimpleLoad )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/examples/SimpleCreate.cc
new/libyui-qt-graph-4.0.1/examples/SimpleCreate.cc
--- old/libyui-qt-graph-2.46.6/examples/SimpleCreate.cc 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/examples/SimpleCreate.cc 2021-02-15
16:42:21.000000000 +0100
@@ -21,14 +21,14 @@
#include <string.h>
#include <graphviz/gvc.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"
+#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.46.6/examples/SimpleLoad.cc
new/libyui-qt-graph-4.0.1/examples/SimpleLoad.cc
--- old/libyui-qt-graph-2.46.6/examples/SimpleLoad.cc 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/examples/SimpleLoad.cc 2021-02-15
16:42:21.000000000 +0100
@@ -20,14 +20,14 @@
#include <iostream>
-#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"
+#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.46.6/package/libyui-qt-graph-doc.changes
new/libyui-qt-graph-4.0.1/package/libyui-qt-graph-doc.changes
--- old/libyui-qt-graph-2.46.6/package/libyui-qt-graph-doc.changes
2020-10-09 16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/package/libyui-qt-graph-doc.changes
2021-02-15 16:42:21.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Feb 1 14:59:14 UTC 2021 - Stefan Hundhammer <shundham...@suse.com>
+
+- New CMake build environment (bsc#1181653)
+- Bumped SO version to 15
+- 4.0.0
+
+-------------------------------------------------------------------
Wed Dec 11 10:28:02 UTC 2019 - Rodion Iafarov <riafa...@suse.com>
- Increase SO version to 11 (bsc#1132247)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libyui-qt-graph-2.46.6/package/libyui-qt-graph-doc.spec
new/libyui-qt-graph-4.0.1/package/libyui-qt-graph-doc.spec
--- old/libyui-qt-graph-2.46.6/package/libyui-qt-graph-doc.spec 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/package/libyui-qt-graph-doc.spec 2021-02-15
16:42:21.000000000 +0100
@@ -1,7 +1,8 @@
#
# spec file for package libyui-qt-graph-doc
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014-2019 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2020-2021 SUSE LLC, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,64 +17,59 @@
#
-%define parent libyui-qt-graph
-%define so_version 14
+%define parent libyui-qt-graph
+%define so_version 15
Name: %{parent}-doc
-Version: 2.46.6
-Release: 0
-Source: %{parent}-%{version}.tar.bz2
+# DO NOT manually bump the version here; instead, use rake version:bump
+Version: 4.0.1
+Release: 0
BuildArch: noarch
-BuildRequires: cmake >= 2.8
+BuildRequires: cmake >= 3.10
BuildRequires: doxygen
+BuildRequires: graphviz
BuildRequires: fdupes
BuildRequires: gcc-c++
-BuildRequires: graphviz-gnome
BuildRequires: libyui-devel >= 3.9.0
-BuildRequires: texlive-latex
-Url: http://github.com/libyui/
Summary: Libyui-qt-graph documentation
+Url: http://github.com/libyui/
License: LGPL-2.1 or LGPL-3.0
-Group: Documentation/HTML
+Source: %{parent}-%{version}.tar.bz2
%description
-This package contains the Qt graph
-component for libYUI.
-
+This package contains the Qt graph component for libyui.
-This package provides the documentation. (HTML & PDF)
+This package provides HTML class documentation.
%prep
-
%setup -n %{parent}-%{version}
-%build
-
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-./bootstrap.sh %{_prefix}
+%build
mkdir build
cd build
+
cmake .. \
- -DDOC_DIR=%{_docdir} \
- -DDOCS_ONLY=ON
+ -DBUILD_DOC=on \
+ -DBUILD_SRC=off \
+ -DDOC_DESTDIR=$RPM_BUILD_ROOT
+
+# No "make doc" here: This would only duplicate the doxygen call
-make %{?jobs:-j%jobs} docs
%install
+
cd build
-make install DESTDIR="$RPM_BUILD_ROOT"
+make install-doc
+# This implicitly includes "make doc" unconditionally
-%fdupes -s $RPM_BUILD_ROOT/%_docdir/%{parent}%{so_version}
+%fdupes -s %{buildroot}/%{_docdir}/%{parent}%{so_version}
-%clean
-rm -rf "$RPM_BUILD_ROOT"
%files
%defattr(-,root,root)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libyui-qt-graph-2.46.6/package/libyui-qt-graph.changes
new/libyui-qt-graph-4.0.1/package/libyui-qt-graph.changes
--- old/libyui-qt-graph-2.46.6/package/libyui-qt-graph.changes 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/package/libyui-qt-graph.changes 2021-02-15
16:42:21.000000000 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Mon Feb 15 15:24:07 UTC 2021 - Stefan Hundhammer <shundham...@suse.com>
+
+- Require libyui-qt (bsc#1181653)
+- 4.0.1
+
+-------------------------------------------------------------------
+Mon Feb 1 14:59:13 UTC 2021 - Stefan Hundhammer <shundham...@suse.com>
+
+- New CMake build environment (bsc#1181653)
+- Bumped SO version to 15
+- 4.0.0
+
+-------------------------------------------------------------------
Fri Oct 9 13:16:59 UTC 2020 - Jos?? Iv??n L??pez Gonz??lez <jlo...@suse.com>
- Use new parent lib SO version libyui.so.14 (bsc#1176402).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/package/libyui-qt-graph.spec
new/libyui-qt-graph-4.0.1/package/libyui-qt-graph.spec
--- old/libyui-qt-graph-2.46.6/package/libyui-qt-graph.spec 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/package/libyui-qt-graph.spec 2021-02-15
16:42:21.000000000 +0100
@@ -1,7 +1,8 @@
#
# spec file for package libyui-qt-graph
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014-2019 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2020-2021 SUSE LLC, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,114 +18,111 @@
Name: libyui-qt-graph
-Version: 2.46.6
+
+# DO NOT manually bump the version here; instead, use rake version:bump
+Version: 4.0.1
Release: 0
-Source: %{name}-%{version}.tar.bz2
-%define so_version 14
-%define bin_name %{name}%{so_version}
+%define so_version 15
+%define libyui_devel_version libyui-devel >= 3.9.0
+%define libyui_qt_devel_version libyui-qt-devel >= 2.52.0
+%define bin_name %{name}%{so_version}
-BuildRequires: cmake >= 2.8
+BuildRequires: cmake >= 3.10
BuildRequires: gcc-c++
BuildRequires: graphviz-devel >= 2.26.0
-BuildRequires: libqt5-qtbase-devel
-BuildRequires: libqt5-qtsvg-devel
-BuildRequires: libqt5-qtx11extras-devel
-BuildRequires: libyui-devel >= 3.9.0
-%define libyui_qt_devel_version libyui-qt-devel >= 2.52.0
+# Used here and in src/CMakeLists.txt
+BuildRequires: pkg-config
+
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: pkgconfig(Qt5Svg)
+
BuildRequires: %{libyui_qt_devel_version}
+BuildRequires: %{libyui_devel_version}
-Url: http://github.com/libyui/
Summary: Libyui - Qt Graph Widget
License: LGPL-2.1 or LGPL-3.0
-Group: System/Libraries
+Url: http://github.com/libyui/
+Source: %{name}-%{version}.tar.bz2
%description
-This package contains the Qt graph
-component for libYUI.
+This package contains the Qt graph component for libyui.
%package -n %{bin_name}
-
+Summary: Libyui - Qt graph widget
Requires: libyui%{so_version}
+Requires: libyui-qt%{so_version}
Supplements: libyui-qt%{so_version}
Provides: %{name} = %{version}
Provides: yast2-qt-graph = 2.46.0
Obsoletes: yast2-qt-graph < 2.46.0
-Url: http://github.com/libyui/
-Summary: Libyui - Qt Graph Widget
-Group: System/Libraries
%description -n %{bin_name}
-This package contains the Qt graph
-component for libYUI.
+This package contains the Qt graph component for libyui.
+This is a special widget to visualize graphs such as the
+storage device hierarchy (disks, partitions, subvolumes
+etc.). and similar graphviz-generated graphs.
%package devel
-
-Requires: %{libyui_qt_devel_version}
+Summary: Libyui - Header files for the Qt graph widget
Requires: %{bin_name} = %{version}
+Requires: %{libyui_qt_devel_version}
-Url: http://github.com/libyui/
-Summary: Libyui-qt-graph header files
-Group: Development/Languages/C and C++
%description devel
-This package contains the Qt graph
-component for libYUI.
-
-
-This can be used independently of YaST for generic (C++) applications.
-This package has very few dependencies.
+This package contains the header files for the Qt graph component
+for libyui.
%prep
%setup -q -n %{name}-%{version}
+
%build
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-./bootstrap.sh %{_prefix}
-
mkdir build
cd build
%if %{?_with_debug:1}%{!?_with_debug:0}
-cmake .. \
- -DYPREFIX=%{_prefix} \
- -DDOC_DIR=%{_docdir} \
- -DLIB_DIR=%{_lib} \
- -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
+CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO"
%else
-cmake .. \
- -DYPREFIX=%{_prefix} \
- -DDOC_DIR=%{_docdir} \
- -DLIB_DIR=%{_lib} \
- -DCMAKE_BUILD_TYPE=RELEASE
+CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELEASE"
%endif
+cmake .. \
+ -DDOC_DIR=%{_docdir} \
+ -DLIB_DIR=%{_lib} \
+ -DBUILD_EXAMPLES=on \
+ $CMAKE_OPTS
+
make %{?jobs:-j%jobs}
+
%install
cd build
make install DESTDIR="$RPM_BUILD_ROOT"
-install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/
install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui
+install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/
install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/
-%clean
-rm -rf "$RPM_BUILD_ROOT"
%post -n %{bin_name} -p /sbin/ldconfig
-
%postun -n %{bin_name} -p /sbin/ldconfig
+
%files -n %{bin_name}
%defattr(-,root,root)
%dir %{_libdir}/yui
@@ -132,13 +130,12 @@
%doc %dir %{_docdir}/%{bin_name}
%license %{_docdir}/%{bin_name}/COPYING*
+
%files devel
%defattr(-,root,root)
-%dir %{_docdir}/%{bin_name}
%{_libdir}/yui/lib*.so
-%{_prefix}/include/yui
-%{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/cmake/%{name}
+%{_includedir}/yui/qt-graph
+%dir %{_docdir}/%{bin_name}
%doc %{_docdir}/%{bin_name}/examples
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/CMakeLists.txt
new/libyui-qt-graph-4.0.1/src/CMakeLists.txt
--- old/libyui-qt-graph-2.46.6/src/CMakeLists.txt 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/src/CMakeLists.txt 2021-02-15
16:42:21.000000000 +0100
@@ -1,11 +1,137 @@
-# 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()
-target_link_libraries(
- ${TARGETLIB} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg Qt5::X11Extras
+# CMakeLists.txt for libyui-qt-pkg/src
+
+include( ../VERSION.cmake )
+include( GNUInstallDirs ) # set CMAKE_INSTALL_INCLUDEDIR, ..._LIBDIR
+include( FindPkgConfig ) # pkg_check_modules()
+
+# Check for Qt
+find_package( Qt5 COMPONENTS Widgets REQUIRED )
+set( CMAKE_AUTOMOC on ) # Automatically handle "moc" preprocessor (Q_OBJECTs)
+
+# Check for libgvc (from the libgraphviz package) via pkg-config;
+# this sets LIBGVC_LIBRARIES (and more).
+pkg_check_modules( LIBGVC REQUIRED libgvc )
+message( "-- Graphviz libs: ${LIBGVC_LIBRARIES}" )
+
+
+#
+# libyui plugin specific
+#
+
+set( TARGETLIB libyui-qt-graph )
+set( TARGETLIB_BASE yui-qt-graph )
+
+set( HEADERS_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/yui/qt-graph )
+set( PLUGIN_DIR ${CMAKE_INSTALL_LIBDIR}/yui ) # /usr/lib64/yui
+
+# if DESTDIR is set, CMAKE_INSTALL_INCLUDEDIR already contains it
+# during "make install" (but not for other make targets!):
+#
+# sudo make install DESTDIR=/work/foo
+# or
+# DESTDIR=/work/foo sudo make install
+#
+# -> the include files are installed to /work/foo/usr/include/...
+# We need that for RPM builds to install everything to $RPM_BUILD_ROOT.
+
+
+set( SOURCES
+ YQGraph.cc
+ YQGraphPlugin.cc
+ YQGraphPluginImpl.cc
+ QY2Graph.cc
)
+
+
+set( HEADERS
+ YQGraph.h
+ YQGraphPlugin.h
+ YQGraphPluginImpl.h
+ QY2Graph.h
+ )
+
+
+
+# Add shared lib to be built
+add_library( ${TARGETLIB} SHARED
+ ${SOURCES}
+ ${HEADERS}
+ )
+
+
+#
+# Include directories and compile options
+#
+
+set( LOCAL_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include )
+
+# Create an include dir with some symlinks to include headers from sibling
projects:
+# build/src/include/yui/qt -> ../../libyui-qt/src
+# build/src/include/yui/yui -> ../../libyui/src
+add_custom_target( local-include-dir
+ COMMAND rm -rf ${LOCAL_INCLUDE_DIR}
+ COMMAND mkdir -p ${LOCAL_INCLUDE_DIR}/yui
+ COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui/src
${LOCAL_INCLUDE_DIR}/yui/yui
+ COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui-qt/src
${LOCAL_INCLUDE_DIR}/yui/qt )
+
+add_dependencies( ${TARGETLIB} local-include-dir )
+
+# <yui/qt/YQFoo.h> from build/src/include/yui/qt -> ../../libyui-qt/src
+target_include_directories( ${TARGETLIB} BEFORE PUBLIC ${LOCAL_INCLUDE_DIR} )
+
+# <yui/YFoo.h> from build/src/include/yui/yui -> ../../libyui/src
+target_include_directories( ${TARGETLIB} BEFORE PUBLIC
${LOCAL_INCLUDE_DIR}/yui )
+
+
+# Make the version from ../VERSION.cmake available as a #define
+target_compile_definitions( ${TARGETLIB} PUBLIC VERSION="${VERSION}" )
+
+# Add more compile options to this target in addition to those
+# added in the toplevel CMakeLists.txt.
+#
+# Notice that CMake will automatically add -fPIC etc. where needed,
+# like for this shared lib.
+### target_compile_options( ${TARGETLIB} PUBLIC "-Dfoo" )
+
+# Show the complete compiler commands with all arguments:
+# make VERBOSE=1
+
+# Add more compile options to an individual source file:
+### set_source_files_properties( YUI.cc PROPERTIES COMPILE_OPTIONS "-Dfoo" )
+
+
+#
+# Linking
+#
+
+# Find yui during a combined build
+target_link_directories( ${TARGETLIB} BEFORE PUBLIC ../../libyui/build/src )
+
+
+# Libraries that are needed to build this shared lib
+#
+# If in doubt what is really needed, check with "ldd -u" which libs are unused.
+target_link_libraries( ${TARGETLIB}
+ yui
+ ${LIBGVC_LIBRARIES}
+ Qt5::Core
+ Qt5::Gui
+ Qt5::Widgets
+ )
+
+
+#
https://cmake.org/cmake/help/latest/manual/cmake-properties.7.html#target-properties
+set_target_properties( ${TARGETLIB} PROPERTIES
+ VERSION ${SONAME} # From ../VERSION.cmake
+ SOVERSION ${SONAME_MAJOR} # From ../VERSION.cmake
+ OUTPUT_NAME ${TARGETLIB_BASE}
+ )
+
+
+#
+# Install
+#
+
+# Install the headers first so the message about the lib does not scroll away
+install( FILES ${HEADERS} DESTINATION ${HEADERS_INSTALL_DIR} )
+install( TARGETS ${TARGETLIB} LIBRARY DESTINATION ${PLUGIN_DIR} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraph.cc
new/libyui-qt-graph-4.0.1/src/YQGraph.cc
--- old/libyui-qt-graph-2.46.6/src/YQGraph.cc 2020-10-09 16:52:30.000000000
+0200
+++ new/libyui-qt-graph-4.0.1/src/YQGraph.cc 2021-02-15 16:42:21.000000000
+0100
@@ -20,16 +20,16 @@
#define YUILogComponent "qt-graph"
-#include "YUILog.h"
+#include <yui/YUILog.h>
-#include "YQGraph.h"
+#include <yui/YEvent.h>
+#include <yui/qt/YQUI.h>
+#include <yui/qt/YQApplication.h>
+#include <yui/qt/YQDialog.h>
+#include <yui/qt/YQi18n.h>
+#include <yui/qt/utf8.h>
-#include "YQDialog.h"
-#include "YQApplication.h"
-#include "utf8.h"
-#include "YQUI.h"
-#include "YEvent.h"
-#include "YQi18n.h"
+#include "YQGraph.h"
YQGraph::YQGraph(YWidget* parent, const string& filename, const string&
layoutAlgorithm)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraph.h
new/libyui-qt-graph-4.0.1/src/YQGraph.h
--- old/libyui-qt-graph-2.46.6/src/YQGraph.h 2020-10-09 16:52:30.000000000
+0200
+++ new/libyui-qt-graph-4.0.1/src/YQGraph.h 2021-02-15 16:42:21.000000000
+0100
@@ -22,7 +22,7 @@
#ifndef YQGraph_h
#define YQGraph_h
-#include <YGraph.h>
+#include <yui/YGraph.h>
#include "QY2Graph.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraphPlugin.cc
new/libyui-qt-graph-4.0.1/src/YQGraphPlugin.cc
--- old/libyui-qt-graph-2.46.6/src/YQGraphPlugin.cc 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/src/YQGraphPlugin.cc 2021-02-15
16:42:21.000000000 +0100
@@ -19,11 +19,13 @@
*/
-#include "YQGraphPlugin.h"
#define YUILogComponent "qt-ui"
-#include "YUILog.h"
+#include <yui/YUILog.h>
+#include <yui/YUIException.h>
+
+#include "YQGraphPlugin.h"
#include "YQGraph.h"
-#include "YUIException.h"
+
#define PLUGIN_BASE_NAME "qt_graph"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraphPlugin.h
new/libyui-qt-graph-4.0.1/src/YQGraphPlugin.h
--- old/libyui-qt-graph-2.46.6/src/YQGraphPlugin.h 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/src/YQGraphPlugin.h 2021-02-15
16:42:21.000000000 +0100
@@ -22,7 +22,7 @@
#ifndef YQGraphPlugin_h
#define YQGraphPlugin_h
-#include <YGraphPlugin.h>
+#include <yui/YGraphPlugin.h>
#include "YQGraph.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraphPluginImpl.cc
new/libyui-qt-graph-4.0.1/src/YQGraphPluginImpl.cc
--- old/libyui-qt-graph-2.46.6/src/YQGraphPluginImpl.cc 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/src/YQGraphPluginImpl.cc 2021-02-15
16:42:21.000000000 +0100
@@ -23,7 +23,7 @@
#include "YQGraph.h"
#define YUILogComponent "qt-graph"
-#include <YUILog.h>
+#include <yui/YUILog.h>
///////////////////////////////////////////////////////////////////
//
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraphPluginImpl.h
new/libyui-qt-graph-4.0.1/src/YQGraphPluginImpl.h
--- old/libyui-qt-graph-2.46.6/src/YQGraphPluginImpl.h 2020-10-09
16:52:30.000000000 +0200
+++ new/libyui-qt-graph-4.0.1/src/YQGraphPluginImpl.h 2021-02-15
16:42:21.000000000 +0100
@@ -24,7 +24,8 @@
#include <graphviz/types.h>
-#include "YQGraphPluginIf.h"
+#include <yui/qt/YQGraphPluginIf.h>
+
class YQGraphPluginImpl : public YQGraphPluginIf
{
