CVS commit: pkgsrc/misc/marble

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov  3 00:06:48 UTC 2023

Modified Files:
        pkgsrc/misc/marble: distinfo
Added Files:
        pkgsrc/misc/marble/patches: patch-CMakeLists.txt

Log Message:
marble: do not let package override C++ version

Fixes build with latest protobuf/abseil.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/misc/marble/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/marble/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/marble/distinfo
diff -u pkgsrc/misc/marble/distinfo:1.22 pkgsrc/misc/marble/distinfo:1.23
--- pkgsrc/misc/marble/distinfo:1.22    Thu Aug  3 04:30:20 2023
+++ pkgsrc/misc/marble/distinfo Fri Nov  3 00:06:48 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.22 2023/08/03 04:30:20 markd Exp $
+$NetBSD: distinfo,v 1.23 2023/11/03 00:06:48 wiz Exp $
 
 BLAKE2s (marble-23.04.3.tar.xz) = f19674f0b9459b45f2da275b54bea088c43613522784c0a523c9cead8b46d17e
 SHA512 (marble-23.04.3.tar.xz) = e92b4e42c78a4b9c7cdcce04d077fcdf1aaf54ce235ceb6fb4b74ddcc348b03f53f96d0666ebf681602cd95abed18697dda55f63b63f9f9cafe4568da625a06b
 Size (marble-23.04.3.tar.xz) = 53762636 bytes
+SHA1 (patch-CMakeLists.txt) = 6562cfca57dd5dd4597d2dba403f7f701191aaff
 SHA1 (patch-src_lib_astro_astrolib.cpp) = 541b39516af740b0ff8e485e9e4e8a339ca5d7f4
 SHA1 (patch-src_lib_astro_astrolib.h) = 4123af9f32a35400e05943598e7dceff84899928
 SHA1 (patch-src_lib_astro_solarsystem.cpp) = 1e00e5edf7ac5b38a1d4d29ccf4847470b6f4906

Added files:

Index: pkgsrc/misc/marble/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/misc/marble/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Fri Nov  3 00:06:48 2023
+++ pkgsrc/misc/marble/patches/patch-CMakeLists.txt     Fri Nov  3 00:06:48 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2023/11/03 00:06:48 wiz Exp $
+
+Due to some dependencies, we need more than c++0x, but this is last on the command line.
+
+--- CMakeLists.txt.orig        2023-07-04 04:50:29.000000000 +0000
++++ CMakeLists.txt
+@@ -31,11 +31,6 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "G
+     # compilers (in particular, MSVC 2010 does not support C99)
+     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -std=iso9899:1990")
+ endif()
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+-endif()
+ # Default to hidden visibility for symbols
+ set(CMAKE_C_VISIBILITY_PRESET hidden)
+ set(CMAKE_CXX_VISIBILITY_PRESET hidden)