Hello community, here is the log from the commit of package avogadrolibs for openSUSE:Factory checked in at 2018-06-04 13:22:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avogadrolibs (Old) and /work/SRC/openSUSE:Factory/.avogadrolibs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avogadrolibs" Mon Jun 4 13:22:30 2018 rev:3 rq:613816 version:0.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/avogadrolibs/avogadrolibs.changes 2017-11-07 10:04:58.539113586 +0100 +++ /work/SRC/openSUSE:Factory/.avogadrolibs.new/avogadrolibs.changes 2018-06-04 13:23:22.510763740 +0200 @@ -1,0 +2,5 @@ +Sun Jun 3 18:02:51 UTC 2018 - [email protected] + +- Add Fix-build-with-Qt-511.patch to fix build with Qt 5.11. + +------------------------------------------------------------------- New: ---- Fix-build-with-Qt-511.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avogadrolibs.spec ++++++ --- /var/tmp/diff_new_pack.QCLdIY/_old 2018-06-04 13:23:24.154703542 +0200 +++ /var/tmp/diff_new_pack.QCLdIY/_new 2018-06-04 13:23:24.154703542 +0200 @@ -1,7 +1,7 @@ # # spec file for package avogadrolibs # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -23,16 +23,18 @@ # License note: There are GPL plugins in the source, but they are neither built nor installed by the package License: BSD-3-Clause Group: Productivity/Scientific/Other -Url: http://www.openchemistry.org/projects/avogadro2 +URL: http://www.openchemistry.org/projects/avogadro2 Source: https://sourceforge.net/projects/avogadro/files/avogadro2/%{version}/%{name}-%{version}.tar.gz #PATCH-FIX-OPENSUSE -- 0002-create-soversion-libs.patch [email protected] -- Make the libs versioned -Patch1: 0002-create-soversion-libs.patch +Patch0: 0002-create-soversion-libs.patch #PATCH-FIX-OPENSUSE -- fix-linking-issues.patch [email protected] -- Ensure that the qtplugins are linked properly -Patch2: fix-linking-issues.patch +Patch1: fix-linking-issues.patch #PATCH-FIX-OPENSUSE -- use-system-libjsoncpp.patch [email protected] -- Use the system libjsoncpp -Patch3: use-system-libjsoncpp.patch +Patch2: use-system-libjsoncpp.patch #PATCH-FIX-UPSTREAM fix-gcc-version-check.patch -Patch4: fix-gcc-version-check.patch +Patch3: fix-gcc-version-check.patch +# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch +Patch4: Fix-build-with-Qt-511.patch BuildRequires: cmake BuildRequires: eigen3-devel BuildRequires: fdupes @@ -77,11 +79,8 @@ Avogadros libraries. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%autosetup -p1 + # Remove unnecessary bits # This file is part of the standard cmake install rm cmake/GenerateExportHeader.cmake @@ -119,12 +118,16 @@ %files %doc %{_defaultdocdir}/%{name} +%license COPYING +%doc README.md %{_libdir}/avogadro2/ %files -n libavogadrolibs-suse0 +%license COPYING %{_libdir}/libAvogadro*.so.suse0* %files devel +%license COPYING %{_includedir}/avogadro/ %{_libdir}/cmake/avogadrolibs/ %{_libdir}/libAvogadro*.so ++++++ Fix-build-with-Qt-511.patch ++++++ commit 03dd55beb878b5e15d891535a3c8b7ffa6133c92 Author: Andreas Sturmlechner <[email protected]> Date: Tue Apr 17 11:31:22 2018 +0200 Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) diff --git a/avogadro/molequeue/CMakeLists.txt b/avogadro/molequeue/CMakeLists.txt index 987763b..38d872c 100644 --- a/avogadro/molequeue/CMakeLists.txt +++ b/avogadro/molequeue/CMakeLists.txt @@ -42,6 +42,5 @@ qt5_wrap_ui(UI_SOURCES ${UIS}) list(APPEND SOURCES ${UI_SOURCES}) avogadro_add_library(AvogadroMoleQueue ${HEADERS} ${SOURCES}) -qt5_use_modules(AvogadroMoleQueue Widgets Network) set_target_properties(AvogadroMoleQueue PROPERTIES AUTOMOC TRUE) -target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient) +target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient Qt5::Widgets Qt5::Network) diff --git a/avogadro/qtgui/CMakeLists.txt b/avogadro/qtgui/CMakeLists.txt index 550ae42..586dac4 100644 --- a/avogadro/qtgui/CMakeLists.txt +++ b/avogadro/qtgui/CMakeLists.txt @@ -89,5 +89,4 @@ qt5_add_resources(RC_SOURCES ${RCS}) list(APPEND SOURCES ${RC_SOURCES}) avogadro_add_library(AvogadroQtGui ${HEADERS} ${SOURCES}) -qt5_use_modules(AvogadroQtGui Widgets) -target_link_libraries(AvogadroQtGui AvogadroIO) +target_link_libraries(AvogadroQtGui AvogadroIO Qt5::Widgets) diff --git a/avogadro/qtopengl/CMakeLists.txt b/avogadro/qtopengl/CMakeLists.txt index ca53fbf..102c74a 100644 --- a/avogadro/qtopengl/CMakeLists.txt +++ b/avogadro/qtopengl/CMakeLists.txt @@ -16,5 +16,4 @@ set(SOURCES ) avogadro_add_library(AvogadroQtOpenGL ${HEADERS} ${SOURCES}) -qt5_use_modules(AvogadroQtOpenGL OpenGL) -target_link_libraries(AvogadroQtOpenGL AvogadroRendering AvogadroQtGui) +target_link_libraries(AvogadroQtOpenGL AvogadroRendering AvogadroQtGui Qt5::OpenGL) diff --git a/avogadro/vtk/CMakeLists.txt b/avogadro/vtk/CMakeLists.txt index 50ca215..733bdab 100644 --- a/avogadro/vtk/CMakeLists.txt +++ b/avogadro/vtk/CMakeLists.txt @@ -30,8 +30,7 @@ set(SOURCES ) avogadro_add_library(AvogadroVtk ${HEADERS} ${SOURCES}) -qt5_use_modules(AvogadroVtk OpenGL) set_target_properties(AvogadroVtk PROPERTIES AUTOMOC TRUE) target_link_libraries(AvogadroVtk AvogadroRendering AvogadroQtGui vtkRenderingOpenGL vtkGUISupportQtOpenGL vtkRenderingVolumeOpenGL - vtkRenderingFreeType) + vtkRenderingFreeType Qt5::OpenGL) diff --git a/tests/qtgui/CMakeLists.txt b/tests/qtgui/CMakeLists.txt index 77d2697..15f00b5 100644 --- a/tests/qtgui/CMakeLists.txt +++ b/tests/qtgui/CMakeLists.txt @@ -50,9 +50,8 @@ endforeach() # Add a single executable for all of our tests. add_executable(AvogadroQtGuiTests ${testSrcs}) -qt5_use_modules(AvogadroQtGuiTests Widgets Test) target_link_libraries(AvogadroQtGuiTests AvogadroQtGui AvogadroMoleQueue - MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB}) + MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB} Qt5::Widgets Qt5::Test) # Now add all of the tests, using the gtest_filter argument so that only those # cases are run in each test invocation. diff --git a/tests/qtopengl/CMakeLists.txt b/tests/qtopengl/CMakeLists.txt index 6490488..21c96a9 100644 --- a/tests/qtopengl/CMakeLists.txt +++ b/tests/qtopengl/CMakeLists.txt @@ -44,13 +44,12 @@ create_test_sourcelist(testDriver qtopengltests.cpp ${testSrcs}) add_executable(AvogadroQtOpenGLTests ${testDriver}) -qt5_use_modules(AvogadroQtOpenGLTests OpenGL) - target_link_libraries(AvogadroQtOpenGLTests AvogadroQtOpenGL vtkImagingCore vtkIOImage - vtkRenderingQt) + vtkRenderingQt + Qt5::OpenGL) foreach(test ${tests}) string(TOLOWER ${test} testname)
