Hello community, here is the log from the commit of package OpenSceneGraph for openSUSE:Factory checked in at 2019-07-11 13:14:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenSceneGraph (Old) and /work/SRC/openSUSE:Factory/.OpenSceneGraph.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenSceneGraph" Thu Jul 11 13:14:30 2019 rev:10 rq:713161 version:3.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenSceneGraph/OpenSceneGraph.changes 2019-04-04 12:07:35.157430237 +0200 +++ /work/SRC/openSUSE:Factory/.OpenSceneGraph.new.4615/OpenSceneGraph.changes 2019-07-11 13:14:30.530846076 +0200 @@ -1,0 +2,6 @@ +Tue Jul 2 18:40:00 UTC 2019 - Stefan Brüns <[email protected]> + +- Fix failing builds with CMake 3.14 and later + Add fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch + +------------------------------------------------------------------- New: ---- fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenSceneGraph.spec ++++++ --- /var/tmp/diff_new_pack.ok54xA/_old 2019-07-11 13:14:31.270845770 +0200 +++ /var/tmp/diff_new_pack.ok54xA/_new 2019-07-11 13:14:31.270845770 +0200 @@ -1,7 +1,7 @@ # # spec file for package OpenSceneGraph # -# Copyright (c) 2018 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 @@ -38,6 +38,8 @@ Url: http://openscenegraph.org/projects/osg Source0: https://github.com/openscenegraph/%{name}/archive/%{name}-%{version}.tar.gz Source99: %{name}-rpmlintrc +# https://github.com/openscenegraph/OpenSceneGraph/issues/779 +Patch0: fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch BuildRequires: cmake BuildRequires: curl-devel BuildRequires: fltk-devel @@ -182,6 +184,7 @@ %prep %setup -q -n %{name}-%{name}-%{version} +%patch0 -p1 for file in *.md *.txt ChangeLog; do sed -i "s/\r//g" "$file" done ++++++ fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch ++++++ >From f21f269302d8796fa794b6231cb116cc51eb92ab Mon Sep 17 00:00:00 2001 From: StefanBruens <[email protected]> Date: Tue, 2 Jul 2019 20:37:02 +0200 Subject: [PATCH] Fix wxWidgets COMPONENTS specification, deprecated usage broken with CMake 3.14 Current FindWxWidgets.cmake allows to specify OPTIONAL components, unfortunately this broke the (deprecated) use of wxWidgets_USE_LIBS. Fixes: #779 --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 567f0fb7b48..427e0393a3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -789,9 +789,7 @@ IF(BUILD_OSG_EXAMPLES AND NOT ANDROID) FIND_PACKAGE(FLTK) FIND_PACKAGE(FOX) - - SET(wxWidgets_USE_LIBS base core gl net) - FIND_PACKAGE(wxWidgets) + FIND_PACKAGE(wxWidgets COMPONENTS base core gl net) ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
