openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package exiv2 (Revision f66854ab0db9f21171ad41b3aef10d82)

Currently displaying revision f66854ab0db9f21171ad41b3aef10d82 , Show latest

--- exiv2.changes.orig
+++ exiv2.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Jun 21 07:48:56 UTC 2023 - Michal Kubecek <mkubecek@suse.cz>
+
+- drop old C++ standard hack (patched line dropped in 0.28)
+- use g++-11 for Leap 15 builds (fix for failed std::filesystem
+  check)
+
+-------------------------------------------------------------------
 Mon Jun 19 20:06:02 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
 - update to 0.28.0:
--- exiv2.spec.orig
+++ exiv2.spec
@@ -29,7 +29,11 @@ Source1:        baselibs.conf
 Patch0:         exiv2-build-date.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
+%if 0%{?suse_version} < 1600
+BuildRequires:  gcc11-c++
+%else
 BuildRequires:  gcc-c++
+%endif
 BuildRequires:  gettext-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libexpat-devel
@@ -101,11 +105,11 @@ documentation in HTML format.
 
 %prep
 %autosetup -p1
-# Upstream will switch to C++11 with 0.28.0, but googletest requires C++11
-# See https://github.com/Exiv2/exiv2/issues/1163
-sed -i -e 's/CXX_STANDARD 98/CXX_STANDARD 11/' cmake/mainSetup.cmake
 
 %build
+%if 0%{?suse_version} < 1600
+export CXX='g++-11'
+%endif
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 export CXXFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
 export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"

Places

File project.diff of Package exiv2 (Revision f66854ab0db9f21171ad41b3aef10d82)

Places