From 7f7af54f0d6f7b31b85900df63ee4d1ef5b99657 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Tue, 24 Jan 2023 07:09:14 +0300 Subject: [PATCH] clementine. --- multimedia/sound/clementine/actions.py | 25 ++++----- .../sound/clementine/files/no_git.patch | 54 +++++++++++++++++++ multimedia/sound/clementine/pspec.xml | 16 ++++-- 3 files changed, 77 insertions(+), 18 deletions(-) create mode 100644 multimedia/sound/clementine/files/no_git.patch diff --git a/multimedia/sound/clementine/actions.py b/multimedia/sound/clementine/actions.py index 880587c90c..04381b0706 100644 --- a/multimedia/sound/clementine/actions.py +++ b/multimedia/sound/clementine/actions.py @@ -4,26 +4,23 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import shelltools -from pisi.actionsapi import cmaketools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get +from pisi.actionsapi import mesontools, cmaketools, pisitools -j = "-DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DUSE_SYSTEM_TAGLIB=ON \ - -DENABLE_VK=ON \ - " +j = ''.join([ + ' -DCMAKE_INSTALL_PREFIX=/usr', + ' -DCMAKE_BUILD_TYPE=RelWithDebInfo', + ' -DUSE_SYSTEM_TAGLIB=ON', + ' -DUSE_SYSTEM_PROJECTM=ON', + ' -B_build -G Ninja -L ' + ]) def setup(): - #shelltools.system("sed -i 's|Exec=clementine %U|Exec=clementine|g' dist/clementine.desktop") cmaketools.configure(j) def build(): - cmaketools.make() + mesontools.build("-C _build") def install(): - cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) - - pisitools.dodoc("Changelog", "COPYING", "README*") + mesontools.install("-C _build") + pisitools.dodoc("README-TURKISH.md", "README.md") diff --git a/multimedia/sound/clementine/files/no_git.patch b/multimedia/sound/clementine/files/no_git.patch new file mode 100644 index 0000000000..23bc70552e --- /dev/null +++ b/multimedia/sound/clementine/files/no_git.patch @@ -0,0 +1,54 @@ +diff --git a/cmake/Version.cmake b/cmake/Version.cmake +index ee99f6a..271f0fc 100644 +--- a/cmake/Version.cmake ++++ b/cmake/Version.cmake +@@ -119,48 +119,7 @@ else(CLEMENTINE_VERSION_PRERELEASE) + endif(CLEMENTINE_VERSION_PRERELEASE) + + # Add git revision +-if(FORCE_GIT_REVISION) +- set(GIT_REV ${FORCE_GIT_REVISION}) +- set(GIT_INFO_RESULT 0) +-else(FORCE_GIT_REVISION) +- find_program(GIT_EXECUTABLE git) +- message(STATUS "Found git: ${GIT_EXECUTABLE}") +- +- if(NOT GIT_EXECUTABLE-NOTFOUND) +- execute_process(COMMAND ${GIT_EXECUTABLE} describe +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- RESULT_VARIABLE GIT_INFO_RESULT +- OUTPUT_VARIABLE GIT_REV +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- if(NOT ${GIT_INFO_RESULT} EQUAL 0) +- message(SEND_ERROR "git describe failed with code ${GIT_INFO_RESULT}: ${GIT_REV}") +- endif() +- endif() +-endif() +- +-string(REGEX REPLACE "^(.+)-([0-9]+)-(g[a-f0-9]+)$" "\\1;\\2;\\3" +- GIT_PARTS ${GIT_REV}) +- +-if(NOT GIT_PARTS) +- message(FATAL_ERROR "Failed to parse git revision string '${GIT_REV}'") +-endif(NOT GIT_PARTS) +- +-list(LENGTH GIT_PARTS GIT_PARTS_LENGTH) +-if(GIT_PARTS_LENGTH EQUAL 3) +- list(GET GIT_PARTS 0 GIT_TAGNAME) +- list(GET GIT_PARTS 1 GIT_COMMITCOUNT) +- list(GET GIT_PARTS 2 GIT_SHA1) +- set(HAS_GIT_REVISION ON) +-endif(GIT_PARTS_LENGTH EQUAL 3) +- +-if(INCLUDE_GIT_REVISION AND HAS_GIT_REVISION) +- set(CLEMENTINE_VERSION_DISPLAY "${GIT_REV}") +- set(CLEMENTINE_VERSION_DEB "${GIT_REV}") +- set(CLEMENTINE_VERSION_RPM_V "${GIT_TAGNAME}") +- set(CLEMENTINE_VERSION_RPM_R "2.${GIT_COMMITCOUNT}.${GIT_SHA1}") +- set(CLEMENTINE_VERSION_SPARKLE "${GIT_REV}") +- set(CLEMENTINE_VERSION_PLIST "4096.${GIT_TAGNAME}.2.${GIT_COMMITCOUNT}") +-endif(INCLUDE_GIT_REVISION AND HAS_GIT_REVISION) ++#null + + if(0) + message(STATUS "Display: ${CLEMENTINE_VERSION_DISPLAY}") diff --git a/multimedia/sound/clementine/pspec.xml b/multimedia/sound/clementine/pspec.xml index 6cf6cf7bee..0cd161a930 100644 --- a/multimedia/sound/clementine/pspec.xml +++ b/multimedia/sound/clementine/pspec.xml @@ -8,16 +8,16 @@ PisiLinux Community admins@pisilinux.org - GPLv2 - GPLv3 + GPL-3 app:gui Clementine is a modern music player and library organizer Clementine is a modern music player and library organiser. Clementine is a port of Amarok 1.4, with some features rewritten to take advantage of Qt5. - - https://github.com/clementine-player/Clementine/releases/download/1.4.0rc1-814-g2b340da79/clementine-1.4.0rc1-814-g2b340da79.tar.xz + + https://github.com/clementine-player/Clementine/releases/download/1.4.0rc1-871-g982d8fbb6/clementine-1.4.0rc1-871-g982d8fbb6.tar.xz cmake + ninja ccache gst-libav glew-devel @@ -74,6 +74,7 @@ + no_git.patch @@ -119,6 +120,13 @@ + + 2023-01-24 + 1.4.0_rc1.871 + Version bump and protobuf rebuild. + fury + uglyside@yandex.ru + 2022-07-08 1.4.0_rc1.814