Unverified Commit bd8bb068 authored by Marcin Serwin's avatar Marcin Serwin
Browse files

solarus{,quest-editor,launcher}: 2.0.0 -> 2.0.1

This release is not tagged due to CI issues, see
<https://solarus-games.org/news/2025-07-23-solarus-2-0-1-release/#git-repository

>

Signed-off-by: default avatarMarcin Serwin <marcin@serwin.dev>
parent 47b56b60
Loading
Loading
Loading
Loading
+13 −13
Original line number Diff line number Diff line
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80b9aab..e56ca84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,8 +88,7 @@ include(FetchContent)
diff --git a/launcher/cmake/addDependencies.cmake b/launcher/cmake/addDependencies.cmake
index d2927668e..dc8309de2 100644
--- a/cmake/addDependencies.cmake
+++ b/cmake/addDependencies.cmake
@@ -20,8 +20,7 @@ include(FetchContent)
 
 # Qlementine Icons: an SVG icon library made for Qt.
 # Qlementine-Icons: an SVG icon library made for Qt.
 FetchContent_Declare(qlementine-icons
-  GIT_REPOSITORY "https://github.com/oclero/qlementine-icons.git"
-  GIT_TAG v1.8.0
+  SOURCE_DIR "@qlementine-icons-src@"
   EXCLUDE_FROM_ALL
 )
 FetchContent_MakeAvailable(qlementine-icons)
 set_target_properties(qlementine-icons
@@ -99,8 +98,7 @@ set_target_properties(qlementine-icons
@@ -34,8 +33,7 @@ set_target_properties(qlementine-icons
 
 # Qlementine: the QStyle library to have a modern look n' feel.
 FetchContent_Declare(qlementine
-  GIT_REPOSITORY "https://github.com/oclero/qlementine.git"
-  GIT_TAG v1.2.0
-  GIT_TAG v1.2.1
+  SOURCE_DIR "@qlementine-src@"
   EXCLUDE_FROM_ALL
 )
 FetchContent_MakeAvailable(qlementine)
 set_target_properties(qlementine
@@ -109,8 +107,7 @@ set_target_properties(qlementine
 )
@@ -48,8 +46,7 @@ set_target_properties(qlementine
 
 # QtAppInstanceManager: a library to manage multiple instances of a Qt application.
 FetchContent_Declare(QtAppInstanceManager
- GIT_REPOSITORY "https://github.com/oclero/qtappinstancemanager.git"
- GIT_TAG v1.3.0
+  SOURCE_DIR "@qtappinstancemanager-src@"
  EXCLUDE_FROM_ALL
 )
 FetchContent_MakeAvailable(QtAppInstanceManager)
 set_target_properties(QtAppInstanceManager
+2 −8
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitLab,
  replaceVars,
  cmake,
  ninja,
@@ -23,14 +22,9 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "solarus-launcher";
  version = "2.0.0";
  inherit (solarus) version;

  src = fetchFromGitLab {
    owner = "solarus-games";
    repo = "solarus-launcher";
    tag = "v${finalAttrs.version}";
    hash = "sha256-zBJnHzYJyhfzP1m6TgMkDLRA3EXC1oG8PC0Jq/fC2+Q=";
  };
  src = solarus.src + "/launcher";

  patches = [
    (replaceVars ./github-fetches.patch {
+7 −13
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitLab,
  replaceVars,
  qlementine,
  cmake,
  ninja,
@@ -21,18 +19,9 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "solarus-quest-editor";
  version = "2.0.0";
  inherit (solarus) version;

  src = fetchFromGitLab {
    owner = "solarus-games";
    repo = "solarus-quest-editor";
    tag = "v${finalAttrs.version}";
    hash = "sha256-GTslxValldReWGb3x67zRPrvQUuCO/HQSXOEQlJfAmw=";
  };

  patches = [
    (replaceVars ./qlementine-src.patch { qlementine-src = qlementine.src; })
  ];
  src = solarus.src + "/editor";

  strictDeps = true;
  nativeBuildInputs = [
@@ -57,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
    glm
  ];

  cmakeFlags = [
    (lib.cmakeBool "SOLARUS_USE_LOCAL_QLEMENTINE" true)
    (lib.cmakeFeature "SOLARUS_QLEMENTINE_LOCAL_PATH" "${qlementine.src}")
  ];

  meta = {
    description = "Editor for the Zelda-like ARPG game engine, Solarus";
    mainProgram = "solarus-editor";
+0 −13
Original line number Diff line number Diff line
diff --git a/cmake/AddDependencies.cmake b/cmake/AddDependencies.cmake
index 8272d14..054c079 100644
--- a/cmake/AddDependencies.cmake
+++ b/cmake/AddDependencies.cmake
@@ -51,7 +51,6 @@ endif()
 include(FetchContent)
 FetchContent_Declare(
   qlementine
-  GIT_REPOSITORY https://github.com/oclero/qlementine.git
-  GIT_TAG        v1.2.0
+  SOURCE_DIR "@qlementine-src@"
 )
 FetchContent_MakeAvailable(qlementine)
+3 −12
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitLab,
  fetchpatch,
  cmake,
  ninja,
  luajit,
@@ -22,23 +21,15 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "solarus";
  version = "2.0.0";
  version = "2.0.1";

  src = fetchFromGitLab {
    owner = "solarus-games";
    repo = "solarus";
    tag = "v${finalAttrs.version}";
    hash = "sha256-Kfg4pFZrEhsIU4RQlOox3hMpk2PXbOzrkwDElPGnDjA=";
    rev = "e70e3df7369d690615fc4c9b3f8dfa00066c5e87";
    hash = "sha256-NOHv4b+r2WnyHEVLtcox+8+3Q3TtSDHB7vpKSTDHVKM=";
  };

  patches = [
    # https://gitlab.com/solarus-games/solarus/-/merge_requests/1570
    (fetchpatch {
      url = "https://gitlab.com/solarus-games/solarus/-/commit/8e1eee51cbfa5acf2511b059739153065b0ba21d.patch";
      hash = "sha256-KevGavtUhpHRt85WLh9ApmZ8a+NeWB1zDDHKGT08yhQ=";
    })
  ];

  outputs = [
    "out"
    "lib"