Hello community, here is the log from the commit of package SoQt for openSUSE:Factory checked in at 2019-06-12 13:10:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SoQt (Old) and /work/SRC/openSUSE:Factory/.SoQt.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SoQt" Wed Jun 12 13:10:57 2019 rev:2 rq:702770 version:1.6~pre.2047 Changes: -------- --- /work/SRC/openSUSE:Factory/SoQt/SoQt.changes 2017-01-22 00:12:28.972606790 +0100 +++ /work/SRC/openSUSE:Factory/.SoQt.new.4811/SoQt.changes 2019-06-12 13:11:00.429023800 +0200 @@ -1,0 +2,30 @@ +Mon May 13 15:22:18 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Drop invalid requires of doc sub package + +------------------------------------------------------------------- +Mon May 13 07:41:16 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Run spec-cleaner +- Install the license file +- Add 0001-Use-a-Find-module-to-find-older-Coin-versions.patch + This will allow using the stable Coin package to build the SoQt + snapshot. +- Drop fix-cmake-install.patch + +------------------------------------------------------------------- +Mon May 6 08:17:28 UTC 2019 - Adrian Schröter <adr...@suse.de> + +- update to current snapshot +- fix URL, old coin3d.org site has been shut down +- using cmake build system now + +------------------------------------------------------------------- +Tue Oct 9 19:15:20 UTC 2018 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Cleanup spec file: + - move soqt-default.cfg to devel package, it is only used by soqt-config + - make doc subpackage noarch + - use %_docdir + +------------------------------------------------------------------- Old: ---- SoQt-1.5.0.tar.gz New: ---- 0001-Use-a-Find-module-to-find-older-Coin-versions.patch _service soqt-1.6~pre.2047.obscpio soqt.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SoQt.spec ++++++ --- /var/tmp/diff_new_pack.E9Nnar/_old 2019-06-12 13:11:03.057021045 +0200 +++ /var/tmp/diff_new_pack.E9Nnar/_new 2019-06-12 13:11:03.057021045 +0200 @@ -1,7 +1,7 @@ # # spec file for package SoQt # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,27 +12,31 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define sover 20 - +%define realver 1.6.0 Name: SoQt -Version: 1.5.0 +Version: 1.6~pre.2047 Release: 0 Summary: A library which provides the glue between Coin and Qt -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Libraries/C and C++ -Url: http://www.coin3d.org/lib/soqt -Source: https://bitbucket.org/Coin3D/coin/downloads/SoQt-%{version}.tar.gz +URL: https://bitbucket.org/Coin3D/coin/wiki/Home +Source: soqt-%{version}.tar.xz Patch0: SoQt-man3.patch +#PATCH-FIX-OPENSUSE 0001-Use-a-Find-module-to-find-older-Coin-versions.patch -- use a SoQt snapshot with a stable Coin package +Patch1: 0001-Use-a-Find-module-to-find-older-Coin-versions.patch BuildRequires: Coin-devel +BuildRequires: c++_compiler +BuildRequires: cmake BuildRequires: doxygen -BuildRequires: Coin-devel -BuildRequires: doxygen -BuildRequires: libqt4-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fdupes +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5OpenGL) +BuildRequires: cmake(Qt5Widgets) %description The core rendering library Coin is a multiplatform high-level 3D graphics @@ -45,13 +49,13 @@ %package devel Summary: Development files for SoQt Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} Requires: Coin-devel Requires: Mesa-devel -Requires: glib2-devel Requires: libSoQt%{sover} Requires: libpng-devel -Requires: libqt4-devel +Requires: cmake(Qt5Gui) +Requires: cmake(Qt5OpenGL) +Requires: cmake(Qt5Widgets) %description devel By using the combination of Coin, Qt and SoQt for your 3D applications, you @@ -62,9 +66,9 @@ the resulting large gains in productivity. %package doc -Summary: A library which provides the glue between Coin and Qt -Group: Documentation/Other -Requires: %{name} = %{version} +Summary: API documentation for SoQt +Group: Documentation/HTML +BuildArch: noarch %description doc By using the combination of Coin, Qt and SoQt for your 3D applications, you @@ -87,53 +91,50 @@ the resulting large gains in productivity. %prep -%setup -q +%setup -q -n soqt-%{version} %patch0 +%patch1 -p1 %build -%configure \ - --libdir=%{_libdir} \ - --disable-msvc \ - --enable-html \ - --enable-man \ - --htmldir=%{_defaultdocdir}/SoQt/html \ - --enable-exceptions \ - --with-x - +# using the cmake macro leads to compile errors +mkdir my_build +cd my_build +cmake .. \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \ + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ + -DCMAKE_PREFIX_PATH=%{_datadir}/cmake/Modules \ + -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules \ + -DCMAKE_INSTALL_DOCDIR:PATH=%{_defaultdocdir}/%{name} \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \ + -DCoin_DOC_DIR=%{_docdir}/Coin make %{?_smp_mflags} %install -%{makeinstall} -rm %{buildroot}%{_libdir}/libSoQt.la +cd my_build +%make_install -%post -n libSoQt%{sover} -p /sbin/ldconfig +%fdupes %{buildroot}%{_prefix} +%post -n libSoQt%{sover} -p /sbin/ldconfig %postun -n libSoQt%{sover} -p /sbin/ldconfig -%files -%defattr(-,root,root,0755) -%dir %{_datadir}/Coin -%dir %{_datadir}/Coin/conf -%{_datadir}/Coin/conf/soqt-default.cfg - %files -n libSoQt%{sover} -%defattr(-,root,root,-) +%license COPYING +%doc AUTHORS README %{_libdir}/libSoQt.so.* %files doc -%defattr(-,root,root,0755) -%dir %{_datadir}/doc/packages/SoQt -%{_datadir}/doc/packages/SoQt/* +%{_docdir}/SoQt %files devel -%defattr(-,root,root,0755) -%{_bindir}/soqt-config %dir %{_includedir}/Inventor/Qt %{_includedir}/Inventor/Qt/* -%{_libdir}/pkgconfig/SoQt.pc +%{_datadir}/SoQt %{_libdir}/libSoQt.so -%{_datadir}/aclocal/soqt.m4 -%doc %{_mandir}/man1/soqt-config.1.gz -%doc %{_mandir}/man3/*.gz +%{_libdir}/cmake/%{name}-%{realver}/ +%{_libdir}/pkgconfig %changelog ++++++ 0001-Use-a-Find-module-to-find-older-Coin-versions.patch ++++++ >From e0cf6fc5aec294367d3d0fead95ab84bcc488d9b Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Mon, 13 May 2019 12:05:49 +0200 Subject: [PATCH] Use a Find module to find older Coin versions. We want to use a SoQt snapshot to replace the Qt4 dependency but keep the current stable Coin version. As the current Coin version doesn't provide a CMake config file, we'll use a FindCoin.cmake module. --- CMakeLists.txt | 4 ++- FindCoin.cmake | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 FindCoin.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a01e59..7960b72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.0) +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}) + set(gui qt) set(Gui Qt) set(GUI QT) @@ -94,7 +96,7 @@ cmake_dependent_option(SO${GUI}_BUILD_MAC_FRAMEWORK "Build framework instead of find_package(OpenGL REQUIRED) # Coin is typically installed as Inventor.framework on APPLE -find_package(Coin NAMES Inventor Coin REQUIRED) +find_package(Coin MODULE REQUIRED) if(SO${GUI}_USE_QT5) find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets QUIET) diff --git a/FindCoin.cmake b/FindCoin.cmake new file mode 100644 index 0000000..3c6762a --- /dev/null +++ b/FindCoin.cmake @@ -0,0 +1,88 @@ +#.rst: +# FindCoin +# --------- +# +# Try to find the Coin library. +# This module is temporary and only meant to find older Coin versions when using +# GIT snapshots for SoQt. +# +# This will define the following variables: +# +# ``Coin_FOUND`` +# Coin was found. +# +# ``Coin_VERSION`` +# The version of Coin. +# +# ``Coin_INCLUDE_DIRS`` +# This should be passed to target_include_directories() if +# the target is not used for linking. +# +# ``Coin_LIBRARIES`` +# The Coin library. +# This can be passed to target_link_libraries() instead of +# the ``Coin::Coin`` target +# +# If ``Coin_FOUND`` is TRUE, the following imported target +# will be available: +# +# ``Coin::Coin`` +# The Coin library +# +#============================================================================= +# Copyright 2019 Christophe Giboudeaux <christo...@krop.fr> +# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= +find_package(PkgConfig QUIET) +pkg_check_modules(PC_Coin Coin) + +find_path(Coin_INCLUDE_DIRS + NAMES Inventor/So.h + HINTS ${PC_Coin_INCLUDEDIR} +) + +find_library(Coin_LIBRARIES + NAMES Coin + HINTS ${PC_Coin_LIBDIR} +) + +set(Coin_VERSION "${PC_Coin_VERSION}") + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args(Coin + FOUND_VAR Coin_FOUND + REQUIRED_VARS Coin_LIBRARIES Coin_INCLUDE_DIRS + VERSION_VAR Coin_VERSION +) +if(Coin_FOUND AND NOT TARGET Coin::Coin) + add_library(Coin::Coin UNKNOWN IMPORTED) + set_target_properties(Coin::Coin PROPERTIES + IMPORTED_LOCATION "${Coin_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${Coin_INCLUDE_DIRS}") +endif() + +mark_as_advanced(Coin_LIBRARIES Coin_INCLUDE_DIRS Coin_VERSION) -- 2.21.0 ++++++ _service ++++++ <services> <service name="obs_scm" mode="disabled"> <param name="url">https://bitbucket.org/Coin3D/soqt</param> <param name="scm">hg</param> <param name="versionprefix">1.6~pre</param> </service> <service mode="disabled" name="set_version" /> <service mode="buildtime" name="tar" /> <service mode="buildtime" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> </services> ++++++ soqt.obsinfo ++++++ name: soqt version: 1.6~pre.2047 mtime: 1553108392
