diff options
Diffstat (limited to 'kde-apps')
| -rw-r--r-- | kde-apps/Manifest.gz | bin | 37061 -> 37064 bytes | |||
| -rw-r--r-- | kde-apps/marble/Manifest | 3 | ||||
| -rw-r--r-- | kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch | 29 | ||||
| -rw-r--r-- | kde-apps/marble/marble-23.04.3.ebuild | 2 |
4 files changed, 33 insertions, 1 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz Binary files differindex f2f0a15ad399..f066459a77ea 100644 --- a/kde-apps/Manifest.gz +++ b/kde-apps/Manifest.gz diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index b92aa9eff858..b65f05ca3586 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,3 +1,4 @@ +AUX marble-23.04.3-cxx17-for-protobuf-23.patch 1103 BLAKE2B b9b17dcea5d31835d1806d4121d9b62b2a314e8c61f0b692fcfc88a3598c2f03b52e8baabe29406a81e621dd71edc4b4384577ef027155c33a85d8b13b6087e0 SHA512 9a3604a66885b8b9c92b7acb18c0db7a24fd6b2b7b751a1c622f2405a0212cbeddb7e6482336321d42675b3091373a37e4b1447b0f84452f7b7c23318148afad DIST marble-23.04.3.tar.xz 53762636 BLAKE2B 2ed2061e91efc01ea627377783ed674ff938d5925dccf14d08ba49519460a8dd456654975e144d213274313015c8239fa9af6b99309626704ad4ae7ebf53fa9b SHA512 e92b4e42c78a4b9c7cdcce04d077fcdf1aaf54ce235ceb6fb4b74ddcc348b03f53f96d0666ebf681602cd95abed18697dda55f63b63f9f9cafe4568da625a06b -EBUILD marble-23.04.3.ebuild 2670 BLAKE2B 19304d0f6905f7d7cb4aefdb5885c54b6378c5dc01ea2c4b4f3c9311d92bcc18940f0e568c89b2f14adbe64f51c530db00a3bf05f96fae561753d72fa02068c2 SHA512 cc2ae4238e6d8cde3975f63a15c894bf6eb8b74d230142bd2405734e32160e83326532e81ce5c9129de28f002bbbdf8feaa16f241410336b3b08ed41e3059165 +EBUILD marble-23.04.3.ebuild 2755 BLAKE2B 87a11b11c96e7aa1b0d6c421b195a604b6a2673602cd305640f8ce9b5855fbe67a9f31b93cd273b70c8ebb8c239a72d8e0f0740e3843179f01b73da3ef4b40ba SHA512 3d52079be5f20538d25874b41281bfdb27baa4ae0fc5ac790378efc06c28eb6fff0f15ecd7215ce46f82bd04be1832ff0afc94138087873b511e7bab1679c496 MISC metadata.xml 910 BLAKE2B a37a5cc007ea6af8f319dcc827d85bea57ed7cfd6daae76ef19b1f35f89a86df08ecd767f86655c769f86350310c2972be8841e8a594916e33baa8069f462bc6 SHA512 47bc8f365cddd40247b4c4ecdd7932bcd7a833d1c0ff46fe4d9c6722ee063d11bbede81623e8b9a572691330b868c2cdebdd8f1785c95418af6b64c73af0396f diff --git a/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch b/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch new file mode 100644 index 000000000000..b03f800bf19d --- /dev/null +++ b/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch @@ -0,0 +1,29 @@ +From dea7bb66fb0b89990c2ca69606d51f02af6c4cf1 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Tue, 11 Jul 2023 23:31:01 +0200 +Subject: [PATCH] Require C++17 + +Newer protobuf will fail to compile without C++17 +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c6d0e47ac0..b779501047 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,9 +32,9 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL + 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") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + endif() + # Default to hidden visibility for symbols + set(CMAKE_C_VISIBILITY_PRESET hidden) +-- +GitLab + diff --git a/kde-apps/marble/marble-23.04.3.ebuild b/kde-apps/marble/marble-23.04.3.ebuild index a79dff3c4856..3aeec198fe42 100644 --- a/kde-apps/marble/marble-23.04.3.ebuild +++ b/kde-apps/marble/marble-23.04.3.ebuild @@ -64,6 +64,8 @@ BDEPEND=" aprs? ( dev-lang/perl ) " +PATCHES=( "${FILESDIR}/${P}-cxx17-for-protobuf-23.patch" ) # bug 909081, in 23.08.0 + src_prepare() { ecm_src_prepare |