Skip to content

Commit b6d3097

Browse files
JkktBkktJkktBkkt
committed
clementine: rebuild for abseil-cpp
1 parent 2e60c8f commit b6d3097

File tree

2 files changed

+194
-1
lines changed

2 files changed

+194
-1
lines changed

‎srcpkgs/clementine/patches/cmake-version.patch‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
From ec4eba532d6e4c3385180963ad0ae186e248d478 Mon Sep 17 00:00:00 2001
2+
From: Shen Long <[email protected]>
3+
Date: Mon, 7 Jul 2025 17:25:24 +0200
4+
Subject: [PATCH] Bump CMake minimum versions to >3.30
5+
6+
It helps working with CMake >4.0 and also is working on CMake 3.31.7.
7+
---
8+
3rdparty/libmygpo-qt5/CMakeLists.txt | 2 +-
9+
3rdparty/libprojectm/CMakeLists.txt | 10 +---------
10+
.../libprojectm/MilkdropPresetFactory/CMakeLists.txt | 2 +-
11+
3rdparty/libprojectm/Renderer/CMakeLists.txt | 2 +-
12+
3rdparty/qsqlite/CMakeLists.txt | 2 +-
13+
3rdparty/qtiocompressor/CMakeLists.txt | 2 +-
14+
3rdparty/qtsingleapplication/CMakeLists.txt | 2 +-
15+
3rdparty/qxt/CMakeLists.txt | 2 +-
16+
3rdparty/taglib/CMakeLists.txt | 2 +-
17+
3rdparty/utf8-cpp/CMakeLists.txt | 2 +-
18+
CMakeLists.txt | 4 +---
19+
cmake/ParseArguments.cmake | 2 +-
20+
cmake/Translations.cmake | 2 +-
21+
gst/moodbar/CMakeLists.txt | 2 +-
22+
tests/CMakeLists.txt | 2 +-
23+
15 files changed, 15 insertions(+), 25 deletions(-)
24+
25+
diff --git a/3rdparty/libmygpo-qt5/CMakeLists.txt b/3rdparty/libmygpo-qt5/CMakeLists.txt
26+
index a789728706..995cc77a85 100644
27+
--- a/3rdparty/libmygpo-qt5/CMakeLists.txt
28+
+++ b/3rdparty/libmygpo-qt5/CMakeLists.txt
29+
@@ -1,4 +1,4 @@
30+
-cmake_minimum_required( VERSION 3.0.0 FATAL_ERROR )
31+
+cmake_minimum_required( VERSION 3.10.0 FATAL_ERROR )
32+
33+
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
34+
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )
35+
diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt
36+
index a70f8a2b2e..275329c78d 100644
37+
--- a/3rdparty/libprojectm/CMakeLists.txt
38+
+++ b/3rdparty/libprojectm/CMakeLists.txt
39+
@@ -1,17 +1,9 @@
40+
PROJECT(projectM)
41+
-cmake_minimum_required(VERSION 3.0.0)
42+
+cmake_minimum_required(VERSION 3.10.0)
43+
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The projectM core library.")
44+
45+
include(CheckCXXCompilerFlag)
46+
47+
-cmake_policy(SET CMP0005 OLD)
48+
-
49+
-# This policy was only added in cmake 2.8.4
50+
-if (CMAKE_VERSION VERSION_GREATER "2.8.3")
51+
- cmake_policy(SET CMP0017 OLD)
52+
-endif (CMAKE_VERSION VERSION_GREATER "2.8.3")
53+
-
54+
-
55+
set(USE_DEVIL OFF)
56+
set(USE_FBO ON)
57+
set(USE_FTGL OFF)
58+
diff --git a/3rdparty/libprojectm/MilkdropPresetFactory/CMakeLists.txt b/3rdparty/libprojectm/MilkdropPresetFactory/CMakeLists.txt
59+
index 824d51faed..59f135aeee 100644
60+
--- a/3rdparty/libprojectm/MilkdropPresetFactory/CMakeLists.txt
61+
+++ b/3rdparty/libprojectm/MilkdropPresetFactory/CMakeLists.txt
62+
@@ -1,5 +1,5 @@
63+
PROJECT(MilkdropPresetFactory)
64+
-cmake_minimum_required(VERSION 3.0.0)
65+
+cmake_minimum_required(VERSION 3.10.0)
66+
67+
if(COMMAND cmake_policy)
68+
cmake_policy(SET CMP0003 NEW)
69+
diff --git a/3rdparty/libprojectm/Renderer/CMakeLists.txt b/3rdparty/libprojectm/Renderer/CMakeLists.txt
70+
index 40bfe2c20d..b5f7ea0967 100644
71+
--- a/3rdparty/libprojectm/Renderer/CMakeLists.txt
72+
+++ b/3rdparty/libprojectm/Renderer/CMakeLists.txt
73+
@@ -1,5 +1,5 @@
74+
PROJECT(Renderer)
75+
-cmake_minimum_required(VERSION 3.0.0)
76+
+cmake_minimum_required(VERSION 3.10.0)
77+
78+
if(COMMAND cmake_policy)
79+
cmake_policy(SET CMP0003 NEW)
80+
diff --git a/3rdparty/qsqlite/CMakeLists.txt b/3rdparty/qsqlite/CMakeLists.txt
81+
index 0f1fba525c..f790710a59 100644
82+
--- a/3rdparty/qsqlite/CMakeLists.txt
83+
+++ b/3rdparty/qsqlite/CMakeLists.txt
84+
@@ -1,4 +1,4 @@
85+
-cmake_minimum_required(VERSION 3.0.0)
86+
+cmake_minimum_required(VERSION 3.10.0)
87+
88+
add_definitions(-DQT_STATICPLUGIN)
89+
90+
diff --git a/3rdparty/qtiocompressor/CMakeLists.txt b/3rdparty/qtiocompressor/CMakeLists.txt
91+
index 98d6445f85..2b434da7e7 100644
92+
--- a/3rdparty/qtiocompressor/CMakeLists.txt
93+
+++ b/3rdparty/qtiocompressor/CMakeLists.txt
94+
@@ -1,4 +1,4 @@
95+
-cmake_minimum_required(VERSION 3.0.0)
96+
+cmake_minimum_required(VERSION 3.10.0)
97+
98+
set(IOCOMPRESSOR-SOURCES
99+
qtiocompressor.cpp
100+
diff --git a/3rdparty/qtsingleapplication/CMakeLists.txt b/3rdparty/qtsingleapplication/CMakeLists.txt
101+
index c405256f9a..c9ee4afe6c 100644
102+
--- a/3rdparty/qtsingleapplication/CMakeLists.txt
103+
+++ b/3rdparty/qtsingleapplication/CMakeLists.txt
104+
@@ -1,4 +1,4 @@
105+
-cmake_minimum_required(VERSION 3.0.0)
106+
+cmake_minimum_required(VERSION 3.10.0)
107+
108+
set(SINGLEAPP-SOURCES
109+
qtlocalpeer.cpp
110+
diff --git a/3rdparty/qxt/CMakeLists.txt b/3rdparty/qxt/CMakeLists.txt
111+
index b3348c4b86..7d60902379 100644
112+
--- a/3rdparty/qxt/CMakeLists.txt
113+
+++ b/3rdparty/qxt/CMakeLists.txt
114+
@@ -1,4 +1,4 @@
115+
-cmake_minimum_required(VERSION 3.0.0)
116+
+cmake_minimum_required(VERSION 3.10.0)
117+
set(CMAKE_CXX_STANDARD 11)
118+
119+
set(QXT-SOURCES
120+
diff --git a/3rdparty/taglib/CMakeLists.txt b/3rdparty/taglib/CMakeLists.txt
121+
index 39ffb95340..1d74b6135c 100644
122+
--- a/3rdparty/taglib/CMakeLists.txt
123+
+++ b/3rdparty/taglib/CMakeLists.txt
124+
@@ -1,4 +1,4 @@
125+
-cmake_minimum_required(VERSION 3.0.0)
126+
+cmake_minimum_required(VERSION 3.10.0)
127+
set(CMAKE_CXX_STANDARD 11)
128+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-virtual-dtor")
129+
130+
diff --git a/3rdparty/utf8-cpp/CMakeLists.txt b/3rdparty/utf8-cpp/CMakeLists.txt
131+
index 14e7fcdc2a..f3ea1ae9a7 100644
132+
--- a/3rdparty/utf8-cpp/CMakeLists.txt
133+
+++ b/3rdparty/utf8-cpp/CMakeLists.txt
134+
@@ -1,2 +1,2 @@
135+
-cmake_minimum_required(VERSION 3.0.0)
136+
+cmake_minimum_required(VERSION 3.10.0)
137+
set(CMAKE_CXX_STANDARD 11)
138+
diff --git a/CMakeLists.txt b/CMakeLists.txt
139+
index 48b55f4c55..f9076d9b49 100644
140+
--- a/CMakeLists.txt
141+
+++ b/CMakeLists.txt
142+
@@ -1,8 +1,6 @@
143+
-cmake_minimum_required(VERSION 3.13.0)
144+
+cmake_minimum_required(VERSION 3.30.0)
145+
project(clementine)
146+
147+
-cmake_policy(SET CMP0053 OLD)
148+
-
149+
include(CheckCXXCompilerFlag)
150+
include(FindPkgConfig)
151+
include(cmake/C++11Compat.cmake)
152+
diff --git a/cmake/ParseArguments.cmake b/cmake/ParseArguments.cmake
153+
index fd5f9987ec..19ca67ab1c 100644
154+
--- a/cmake/ParseArguments.cmake
155+
+++ b/cmake/ParseArguments.cmake
156+
@@ -1,6 +1,6 @@
157+
# From http://www.cmake.org/Wiki/CMakeMacroParseArguments
158+
159+
-cmake_minimum_required(VERSION 3.0.0)
160+
+cmake_minimum_required(VERSION 3.10.0)
161+
162+
MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
163+
SET(DEFAULT_ARGS)
164+
diff --git a/cmake/Translations.cmake b/cmake/Translations.cmake
165+
index a16bcc3901..fbee765107 100644
166+
--- a/cmake/Translations.cmake
167+
+++ b/cmake/Translations.cmake
168+
@@ -1,4 +1,4 @@
169+
-cmake_minimum_required(VERSION 3.0.0)
170+
+cmake_minimum_required(VERSION 3.10.0)
171+
172+
set (XGETTEXT_OPTIONS --qt --keyword=tr:1,2c --keyword=tr --flag=tr:1:pass-c-format --flag=tr:1:pass-qt-format
173+
--keyword=trUtf8 --flag=tr:1:pass-c-format --flag=tr:1:pass-qt-format
174+
diff --git a/gst/moodbar/CMakeLists.txt b/gst/moodbar/CMakeLists.txt
175+
index 0bb87e8844..dfe9bc9830 100644
176+
--- a/gst/moodbar/CMakeLists.txt
177+
+++ b/gst/moodbar/CMakeLists.txt
178+
@@ -1,4 +1,4 @@
179+
-cmake_minimum_required(VERSION 3.0.0)
180+
+cmake_minimum_required(VERSION 3.10.0)
181+
182+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
183+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall")
184+
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
185+
index 81031b072e..b7ada3ae79 100644
186+
--- a/tests/CMakeLists.txt
187+
+++ b/tests/CMakeLists.txt
188+
@@ -1,4 +1,4 @@
189+
-cmake_minimum_required(VERSION 3.0.0)
190+
+cmake_minimum_required(VERSION 3.10.0)
191+
192+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-c++11-narrowing")
193+

‎srcpkgs/clementine/template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'clementine'
22
pkgname=clementine
33
version=1.4.1
4-
revision=2
4+
revision=3
55
_fullver=${version}-35-g400085808
66
build_style=cmake
77
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON

0 commit comments

Comments
 (0)