From bcf28c575deb09377194e8131ad1eccf92a5b715 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 26 Mar 2023 00:52:05 +0900 Subject: [PATCH] spotify-qt: Bump to 3.10 --- x11-packages/spotify-qt/CMakeLists.txt.patch | 14 ++++++++++++-- x11-packages/spotify-qt/build.sh | 4 ++-- x11-packages/spotify-qt/lib-CMakeLists.txt.patch | 11 +++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 x11-packages/spotify-qt/lib-CMakeLists.txt.patch diff --git a/x11-packages/spotify-qt/CMakeLists.txt.patch b/x11-packages/spotify-qt/CMakeLists.txt.patch index 3456ac632e..9b01fbe793 100644 --- a/x11-packages/spotify-qt/CMakeLists.txt.patch +++ b/x11-packages/spotify-qt/CMakeLists.txt.patch @@ -1,11 +1,21 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt +@@ -6,9 +6,6 @@ + set(CMAKE_AUTOMOC ON) + set(CMAKE_AUTORCC ON) + +-# C++11 +-set(CMAKE_CXX_STANDARD 11) +-set(CMAKE_CXX_STANDARD_REQUIRED ON) + + # Optional D-Bus support + option(USE_DBUS "Use D-Bus integration" ON) @@ -76,7 +76,7 @@ endif () # Create main executable -if (ANDROID) +if (FALSE) - add_library(spotify-qt SHARED ${SRC_FILES} res.qrc) + add_library(spotify-qt SHARED res.qrc) elseif (MSVC) - add_executable(spotify-qt WIN32 ${SRC_FILES} ${LIB_SRC} res.qrc + add_executable(spotify-qt WIN32 res.qrc diff --git a/x11-packages/spotify-qt/build.sh b/x11-packages/spotify-qt/build.sh index d642256570..028ba99e07 100644 --- a/x11-packages/spotify-qt/build.sh +++ b/x11-packages/spotify-qt/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/kraxarn/spotify-qt TERMUX_PKG_DESCRIPTION="Lightweight Spotify client using Qt" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.9 +TERMUX_PKG_VERSION=3.10 TERMUX_PKG_SRCURL=https://github.com/kraxarn/spotify-qt/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=db1bc50fe4f31fc021db722eb85e59db543a104255a0a07f2e923d7a69195e42 +TERMUX_PKG_SHA256=66191fc75f8571f40be16582caded2e6e3181434cbab5e85d3e9613c97ecb44f TERMUX_PKG_DEPENDS="libc++, qt5-qtbase, qt5-qtsvg" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" diff --git a/x11-packages/spotify-qt/lib-CMakeLists.txt.patch b/x11-packages/spotify-qt/lib-CMakeLists.txt.patch new file mode 100644 index 0000000000..a42bc39c68 --- /dev/null +++ b/x11-packages/spotify-qt/lib-CMakeLists.txt.patch @@ -0,0 +1,11 @@ +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -1,8 +1,6 @@ + cmake_minimum_required(VERSION 3.5) + project(spotify-qt-lib LANGUAGES CXX VERSION 0.8) + +-set(CMAKE_CXX_STANDARD 11) +-set(CMAKE_CXX_STANDARD_REQUIRED ON) + + # Optional Qt implementations + if (LIB_QT_IMPL)