Hello community,
here is the log from the commit of package OpenSceneGraph34 for
openSUSE:Factory checked in at 2019-07-11 13:14:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/OpenSceneGraph34 (Old)
and /work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenSceneGraph34"
Thu Jul 11 13:14:32 2019 rev:2 rq:713162 version:3.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/OpenSceneGraph34/OpenSceneGraph34.changes
2018-07-24 17:25:32.923542206 +0200
+++
/work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.4615/OpenSceneGraph34.changes
2019-07-11 13:14:33.478844860 +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:
------------------
++++++ OpenSceneGraph34.spec ++++++
--- /var/tmp/diff_new_pack.BPcFy3/_old 2019-07-11 13:14:34.282844529 +0200
+++ /var/tmp/diff_new_pack.BPcFy3/_new 2019-07-11 13:14:34.290844526 +0200
@@ -1,7 +1,7 @@
#
# spec file for package OpenSceneGraph34
#
-# 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
@@ -12,7 +12,7 @@
# 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/
#
@@ -42,6 +42,8 @@
Patch0: 8e26ebd23ef9_Fixed_coverity_detected_defect_OOB_read.patch
# PATCH-FIX-UPSTREAM 01c712e85195_Explicit_signed_char_declarations.patch --
compilation fix for e.g. ARM, PPC
Patch1: 01c712e85195_Explicit_signed_char_declarations.patch
+# PATCH-FIX-UPSTREAM
https://github.com/openscenegraph/OpenSceneGraph/issues/779
+Patch2: fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch
BuildRequires: cmake
BuildRequires: curl-devel
BuildRequires: fltk-devel
@@ -114,6 +116,7 @@
Requires: freeglut-devel
Requires: giflib-devel
Requires: libOpenSceneGraph%{_osg_so_nr} = %{version}
+Requires: libOpenThreads%{_opt_so_nr}-devel = %{version}
Requires: libjpeg-devel
Requires: libpng-devel
Requires: pkgconfig(freetype2)
@@ -122,7 +125,6 @@
Requires: pkgconfig(openal)
Requires: pkgconfig(poppler-glib)
Requires: pkgconfig(xrandr)
-Requires: libOpenThreads%{_opt_so_nr}-devel = %{version}
Conflicts: libOpenSceneGraph1-devel
Provides: libOpenSceneGraph-devel = %{version}
# library is versioned, but headers conflict
@@ -201,6 +203,7 @@
%setup -q -n %{sname}-%{sname}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for file in *.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(GLUT)
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)
