From 34578d30108f9c0b6e693a67a99786ae4b4d9848 Mon Sep 17 00:00:00 2001 From: Jonathan Esk-Riddell Date: Wed, 2 Mar 2022 16:54:30 +0000 Subject: [PATCH] kde extension: new content snap for core20 --- .../internal/project_loader/_extensions/kde_neon.py | 8 ++++---- .../unit/project_loader/extensions/test_kde_neon.py | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/snapcraft/internal/project_loader/_extensions/kde_neon.py b/snapcraft/internal/project_loader/_extensions/kde_neon.py index f19e16b0e4..65f665868e 100644 --- a/snapcraft/internal/project_loader/_extensions/kde_neon.py +++ b/snapcraft/internal/project_loader/_extensions/kde_neon.py @@ -31,10 +31,10 @@ build_snaps=["kde-frameworks-5-core18-sdk/latest/stable"], ), core20=_ExtensionInfo( - cmake_args="-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-qt-5-15-3-core20-sdk/current", - content="kde-frameworks-5-qt-5-15-3-core20-all", - provider="kde-frameworks-5-qt-5-15-3-core20", - build_snaps=["kde-frameworks-5-qt-5-15-3-core20-sdk/latest/stable"], + cmake_args="-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-91-qt-5-15-3-core20-sdk/current", + content="kde-frameworks-5-91-qt-5-15-3-core20-all", + provider="kde-frameworks-5-91-qt-5-15-3-core20", + build_snaps=["kde-frameworks-5-91-qt-5-15-3-core20-sdk/latest/stable"], ), ) diff --git a/tests/unit/project_loader/extensions/test_kde_neon.py b/tests/unit/project_loader/extensions/test_kde_neon.py index 4fcc0b9789..85e1197c81 100644 --- a/tests/unit/project_loader/extensions/test_kde_neon.py +++ b/tests/unit/project_loader/extensions/test_kde_neon.py @@ -91,9 +91,9 @@ def test_extension_core20(): "interface": "content", "target": "$SNAP/data-dir/icons", }, - "kde-frameworks-5-qt-5-15-3-core20": { - "content": "kde-frameworks-5-qt-5-15-3-core20-all", - "default-provider": "kde-frameworks-5-qt-5-15-3-core20", + "kde-frameworks-5-91-qt-5-15-3-core20": { + "content": "kde-frameworks-5-91-qt-5-15-3-core20-all", + "default-provider": "kde-frameworks-5-91-qt-5-15-3-core20", "interface": "content", "target": "$SNAP/kf5", }, @@ -111,15 +111,15 @@ def test_extension_core20(): assert kde_neon_extension.part_snippet == { "build-environment": [ { - "SNAPCRAFT_CMAKE_ARGS": "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-qt-5-15-3-core20-sdk/current" + "SNAPCRAFT_CMAKE_ARGS": "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-91-qt-5-15-3-core20-sdk/current" } ] } assert kde_neon_extension.parts == { "kde-neon-extension": { "build-packages": ["g++"], - "build-snaps": ["kde-frameworks-5-qt-5-15-3-core20-sdk/latest/stable"], - "make-parameters": ["PLATFORM_PLUG=kde-frameworks-5-qt-5-15-3-core20"], + "build-snaps": ["kde-frameworks-5-91-qt-5-15-3-core20-sdk/latest/stable"], + "make-parameters": ["PLATFORM_PLUG=kde-frameworks-5-91-qt-5-15-3-core20"], "plugin": "make", "source": "$SNAPCRAFT_EXTENSIONS_DIR/desktop", "source-subdir": "kde-neon",