Diff below upgrades clementine to 1.4.0rc2 which brings a whole year worth of
updates (Apr 21-May 22).
It works fine on amd64, nevertheless it doesn't upgrade if previous version is
still installed failing with message "Can't install clementine-1.4.0rc2 because
of conflicts (clementine-1.4.0rc1pl550p2)"
Which incantation do I need to apply to make this work?
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/clementine/Makefile,v
retrieving revision 1.54
diff -u -p -u -r1.54 Makefile
--- Makefile 28 May 2022 06:19:58 -0000 1.54
+++ Makefile 26 Jan 2023 23:56:39 -0000
@@ -2,9 +2,8 @@ COMMENT = music player
GH_ACCOUNT = clementine-player
GH_PROJECT = Clementine
-GH_TAGNAME = 1.4.0rc1-550-g72c1f91c0
-REVISION = 2
-PKGNAME = clementine-${GH_TAGNAME:C/-550.*/pl550/}
+GH_TAGNAME = 1.4.0rc2
+PKGNAME = clementine-${GH_TAGNAME}
CATEGORIES = audio x11
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/clementine/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo 30 Apr 2021 22:46:24 -0000 1.7
+++ distinfo 26 Jan 2023 23:56:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (Clementine-1.4.0rc1-550-g72c1f91c0.tar.gz) =
isjv0Q7XfhsmQS5sGSceIDM45f5WwFQCBYjl1qBLjGM=
-SIZE (Clementine-1.4.0rc1-550-g72c1f91c0.tar.gz) = 9040909
+SHA256 (Clementine-1.4.0rc2.tar.gz) =
I5Xv3vATqmXsi4Uh1Um/dtveT5M4Z745U/MVUxAerWM=
+SIZE (Clementine-1.4.0rc2.tar.gz) = 9073685
Index: patches/patch-ext_libclementine-common_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/audio/clementine/patches/patch-ext_libclementine-common_CMakeLists_txt,v
retrieving revision 1.8
diff -u -p -u -r1.8 patch-ext_libclementine-common_CMakeLists_txt
--- patches/patch-ext_libclementine-common_CMakeLists_txt 11 Mar 2022
18:20:06 -0000 1.8
+++ patches/patch-ext_libclementine-common_CMakeLists_txt 26 Jan 2023
23:56:39 -0000
@@ -13,7 +13,7 @@ Index: ext/libclementine-common/CMakeLis
set(SOURCES
core/closure.cpp
-@@ -39,3 +39,11 @@ target_link_libraries(libclementine-common
+@@ -39,6 +39,14 @@ target_link_libraries(libclementine-common
${TAGLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
)
@@ -25,3 +25,6 @@ Index: ext/libclementine-common/CMakeLis
+ include_directories(${Backtrace_INCLUDE_DIRS})
+ target_link_libraries(libclementine-common ${Backtrace_LIBRARIES})
+endif(Backtrace_FOUND)
+
+ find_package(Backtrace)
+ configure_file(core/conf_backtrace.h.in conf_backtrace.h)
Index: patches/patch-ext_libclementine-common_core_logging_cpp
===================================================================
RCS file:
/cvs/ports/audio/clementine/patches/patch-ext_libclementine-common_core_logging_cpp,v
retrieving revision 1.7
diff -u -p -u -r1.7 patch-ext_libclementine-common_core_logging_cpp
--- patches/patch-ext_libclementine-common_core_logging_cpp 11 Mar 2022
18:20:06 -0000 1.7
+++ patches/patch-ext_libclementine-common_core_logging_cpp 26 Jan 2023
23:56:39 -0000
@@ -2,31 +2,7 @@ Use shiny CMake FindBacktrace module.
Index: ext/libclementine-common/core/logging.cpp
--- ext/libclementine-common/core/logging.cpp.orig
+++ ext/libclementine-common/core/logging.cpp
-@@ -18,12 +18,11 @@
- // it is used by the Spotify blob which links against libspotify and is not
GPL
- // compatible.
-
-+#include <config.h>
-+
- #include <cxxabi.h>
-
- #include <QtGlobal>
--#ifdef Q_OS_UNIX
--#include <execinfo.h>
--#endif
-
- #include <glib.h>
-
-@@ -315,7 +314,7 @@ QString DemangleSymbol(const QString& symbol) {
- }
-
- void DumpStackTrace() {
--#ifdef Q_OS_UNIX
-+#if Backtrace_FOUND
- void* callstack[128];
- int callstack_size =
- backtrace(reinterpret_cast<void**>(&callstack), sizeof(callstack));
-@@ -328,7 +327,7 @@ void DumpStackTrace() {
+@@ -336,7 +336,7 @@ void DumpStackTrace() {
}
free(symbols);
#else
Index: patches/patch-src_core_utilities_cpp
===================================================================
RCS file: /cvs/ports/audio/clementine/patches/patch-src_core_utilities_cpp,v
retrieving revision 1.7
diff -u -p -u -r1.7 patch-src_core_utilities_cpp
--- patches/patch-src_core_utilities_cpp 11 Mar 2022 18:20:06 -0000
1.7
+++ patches/patch-src_core_utilities_cpp 26 Jan 2023 23:56:39 -0000
@@ -3,7 +3,7 @@
Index: src/core/utilities.cpp
--- src/core/utilities.cpp.orig
+++ src/core/utilities.cpp
-@@ -67,6 +67,14 @@
+@@ -71,6 +71,14 @@
#ifdef Q_OS_DARWIN
#include <sys/resource.h>
#endif
@@ -18,7 +18,7 @@ Index: src/core/utilities.cpp
#ifdef Q_OS_DARWIN
#include <QProcess>
-@@ -697,9 +705,25 @@ bool IsLaptop() {
+@@ -705,9 +713,25 @@ bool IsLaptop() {
}
}
return false;
Index: patches/patch-src_ripper_ripper_h
===================================================================
RCS file: /cvs/ports/audio/clementine/patches/patch-src_ripper_ripper_h,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-src_ripper_ripper_h
--- patches/patch-src_ripper_ripper_h 11 Mar 2022 18:20:06 -0000 1.3
+++ patches/patch-src_ripper_ripper_h 26 Jan 2023 23:56:39 -0000
@@ -1,7 +1,7 @@
Index: src/ripper/ripper.h
--- src/ripper/ripper.h.orig
+++ src/ripper/ripper.h
-@@ -18,10 +18,10 @@
+@@ -18,11 +18,11 @@
#ifndef SRC_RIPPER_RIPPER_H_
#define SRC_RIPPER_RIPPER_H_
@@ -9,6 +9,7 @@ Index: src/ripper/ripper.h
-
#include <QMutex>
#include <QObject>
+ #include <QTimer>
+
+#include <cdio/cdio.h>
Index: patches/patch-tests_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/clementine/patches/patch-tests_CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-tests_CMakeLists_txt
--- patches/patch-tests_CMakeLists_txt 11 Mar 2022 18:20:06 -0000 1.4
+++ patches/patch-tests_CMakeLists_txt 26 Jan 2023 23:56:39 -0000
@@ -4,7 +4,7 @@ Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
+++ tests/CMakeLists.txt
@@ -1,6 +1,6 @@
- cmake_minimum_required(VERSION 2.8.11)
+ cmake_minimum_required(VERSION 3.0.0)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-c++11-narrowing")
+set(CMAKE_CXX_FLAGS "-fpermissive -Wno-c++11-narrowing -${CMAKE_CXX_FLAGS}")
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/clementine/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST
--- pkg/PLIST 11 Mar 2022 18:20:06 -0000 1.5
+++ pkg/PLIST 26 Jan 2023 23:56:40 -0000
@@ -1,6 +1,6 @@
@bin bin/clementine
@bin bin/clementine-tagreader
-share/applications/clementine.desktop
+share/applications/org.clementine_player.Clementine.desktop
share/clementine/
share/clementine/projectm-presets/
share/clementine/projectm-presets/Aderrasi - Agitator.milk
@@ -574,15 +574,15 @@ share/clementine/projectm-presets/nil -
share/clementine/projectm-presets/project.tga
share/clementine/projectm-presets/shifter - escape the worm - Eo.S. + Phat -
Before_It_Eats_Your_Brain_Mix_v2.milk
share/clementine/projectm-presets/shifter - escape the worm - Eo.S. + Phat
5362.milk
-share/icons/hicolor/128x128/apps/clementine.png
-share/icons/hicolor/64x64/apps/clementine.png
-share/icons/hicolor/scalable/apps/clementine.svg
+share/icons/hicolor/128x128/apps/org.clementine_player.Clementine.png
+share/icons/hicolor/64x64/apps/org.clementine_player.Clementine.png
+share/icons/hicolor/scalable/apps/org.clementine_player.Clementine.svg
share/kservices5/
share/kservices5/clementine-feed.protocol
share/kservices5/clementine-itms.protocol
share/kservices5/clementine-itpc.protocol
share/kservices5/clementine-zune.protocol
share/metainfo/
-share/metainfo/clementine.appdata.xml
+share/metainfo/org.clementine_player.Clementine.appdata.xml
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
