audio/clementine: Version bump to 1.4.1

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 99 insertions, 10 deletions

diff --git a/audio/clementine/clementine.SlackBuild b/audio/clementine/clementine.SlackBuild
index 986e5091e0af..1efd3418291e 100644
--- a/audio/clementine/clementine.SlackBuild
+++ b/audio/clementine/clementine.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for clementine
 
 # Copyright 2010  David Woodfall <dave@slackbuilds.org>
-# Copyright 2023  Jeremy Hansen <jebrhansen+SBo@gmail.com>
+# Copyright 2023-2024  Jeremy Hansen <jebrhansen+SBo@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,8 +29,8 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=clementine
 SRCNAM=Clementine
-VERSION=${VERSION:-1.4.0rc2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.4.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -53,16 +53,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -80,6 +76,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Prevent forced git revision detection
+patch -p1 < $CWD/make-git-rev-detection-optional.patch
+sed -i 's|INCLUDE_GIT_REVISION ON|INCLUDE_GIT_REVISION OFF|' cmake/Version.cmake
+
+# Correct the displayed version
+sed -i 's|PATCH 0|PATCH 1|' cmake/Version.cmake
+sed -i 's|set(CLEMENTINE_VERSION_PRERELEASE|#&|' cmake/Version.cmake
+
 export LDFLAGS="-Wl,--copy-dt-needed-entries"
 mkdir build
 cd build
diff --git a/audio/clementine/clementine.info b/audio/clementine/clementine.info
index a7747c09db73..e92089756aeb 100644
--- a/audio/clementine/clementine.info
+++ b/audio/clementine/clementine.info
@@ -1,8 +1,8 @@
 PRGNAM="clementine"
-VERSION="1.4.0rc2"
+VERSION="1.4.1"
 HOMEPAGE="http://www.clementine-player.org"
-DOWNLOAD="https://github.com/clementine-player/Clementine/archive/refs/tags/1.4.0rc2/Clementine-1.4.0rc2.tar.gz"
-MD5SUM="9a13e3e5e200d3b2f5db35adecef274b"
+DOWNLOAD="https://github.com/clementine-player/Clementine/archive/refs/tags/1.4.1/Clementine-1.4.1.tar.gz"
+MD5SUM="5953489512c177241cd6387a742b4de5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="chromaprint protobuf3"
diff --git a/audio/clementine/make-git-rev-detection-optional.patch b/audio/clementine/make-git-rev-detection-optional.patch
new file mode 100644
index 000000000000..f5f55c06de87
--- /dev/null
+++ b/audio/clementine/make-git-rev-detection-optional.patch
@@ -0,0 +1,85 @@
+From b6276044940361b2da09b41a878e507374a85377 Mon Sep 17 00:00:00 2001
+From: Jeremy Hansen <bassmadrigal@users.noreply.github.com>
+Date: Wed, 30 Oct 2024 16:55:51 -0700
+Subject: [PATCH] Make git revision detection optional
+
+Potentially fixes clementine-player/Clementine#7355
+---
+ cmake/Version.cmake | 58 +++++++++++++++++++++++----------------------
+ 1 file changed, 30 insertions(+), 28 deletions(-)
+
+diff --git a/cmake/Version.cmake b/cmake/Version.cmake
+index ee99f6abce..8fdb523544 100644
+--- a/cmake/Version.cmake
++++ b/cmake/Version.cmake
+@@ -119,39 +119,41 @@ 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}")
++if(INCLUDE_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()
+-endif()
+ 
+-string(REGEX REPLACE "^(.+)-([0-9]+)-(g[a-f0-9]+)$" "\\1;\\2;\\3"
+-       GIT_PARTS ${GIT_REV})
++  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)
++  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)
++  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)
++endif()
+ 
+ if(INCLUDE_GIT_REVISION AND HAS_GIT_REVISION)
+   set(CLEMENTINE_VERSION_DISPLAY "${GIT_REV}")
+