[mixxx/f32] Fix default resource folder for loading skins

commit ab36a915a5db5d54e2d438b543d97d3eec09e7f4 Author: Uwe Klotz <uklotz(a)mixxx.org&gt; Date: Wed Nov 11 09:01:22 2020 +0100 Fix default resource folder for loading skins github_3284_unix_share_path.patch | 38 ++++++++++++++++++++++++++++++++++++++ mixxx.spec | 6 +++++- 2 files changed, 43 insertions(+), 1 deletion(-) --- diff --git a/github_3284_unix_share_path.patch b/github_3284_unix_share_path.patch new file mode 100644 index 0000000..1e15c69 --- /dev/null +++ b/github_3284_unix_share_path.patch @@ -0,0 +1,38 @@ +From 6e8fb9f8283711b78b5bf6b214a342f0a8defaad Mon Sep 17 00:00:00 2001 +From: Uwe Klotz <uklotz(a)mixxx.org&gt; +Date: Tue, 10 Nov 2020 19:12:34 +0100 +Subject: [PATCH] Set UNIX_SHARE_PATH to absolute path including install prefix + +Partially reverts and fixes commit: +1122ae87ef9a085ed705a6a8761c6c7ad0f5dce3 + +https://mixxx.zulipchat.com/#narrow/stream/109171-development/topic/CMake.20installation.20directories +--- + CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a98c7be5b85..4481a75e371 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1038,8 +1038,10 @@ elseif(UNIX) + target_compile_definitions(mixxx-lib PUBLIC __APPLE__) + else() + target_compile_definitions(mixxx-lib PRIVATE __UNIX__) ++ # UNIX_SHARE_PATH must be set to the absolute path ++ # including the install prefix! + target_compile_definitions( +- mixxx-lib PUBLIC UNIX_SHARE_PATH="${MIXXX_INSTALL_DATADIR}") ++ mixxx-lib PUBLIC UNIX_SHARE_PATH="${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DATADIR}") + if(CMAKE_SYSTEM_NAME STREQUAL Linux) + target_compile_definitions(mixxx-lib PUBLIC __LINUX__) + elseif(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$") +@@ -1061,7 +1063,7 @@ if (APPLE) + set(MACOS_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION}") + set(MACOS_BUNDLE_SHORTVERSION "${CMAKE_PROJECT_VERSION}") + set(MACOS_BUNDLE_MINOSVERSION "10.11.0") +- ++ + set_target_properties(mixxx PROPERTIES + MACOSX_BUNDLE true + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos_bundle.plist.in" diff --git a/mixxx.spec b/mixxx.spec index 92b1c02..a616361 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -24,12 +24,13 @@ Name: mixxx Version: 2.3.0 -Release: 0.11%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist} +Release: 0.12%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist} Summary: Mixxx is open source software for DJ'ing License: GPLv2+ URL: http://www.mixxx.org Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{sources}.... Source1: https://github.com/ibsh/libKeyFinder/archive/v2.2.2.zip#/libKeyFinder_v2.... +Patch0: github_3284_unix_share_path.patch # Build Tools BuildRequires: desktop-file-utils @@ -186,6 +187,9 @@ appstream-util \ %changelog +* Wed Nov 11 08:59:48 CET 2020 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.3.0-0.12.beta.20201110git6b0fb69 +- Fix default folder for loading resources + * Tue Nov 10 11:35:54 CET 2020 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.3.0-0.11.beta.20201110git6b0fb69 - New upstream snapshot 2.3.0-beta - Fix ALSA real-time scheduling