diff --git a/snapcraft.yaml b/snapcraft.yaml index dcfe67527a..033e5e8b97 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,4 +1,7 @@ -# Security rebuild 2 + +# SPDX-FileCopyrightText: 2023 Scarlett Moore +# +# SPDX-License-Identifier: CC0-1.0 --- name: dolphin confinement: strict @@ -42,13 +45,17 @@ plugs: interface: content target: $SNAP/data-dir/sounds default-provider: gtk-common-themes - kf5-5-110-qt-5-15-11-core22: - content: kf5-5-110-qt-5-15-11-core22-all + kf5-5-111-qt-5-15-11-core22: + content: kf5-5-111-qt-5-15-11-core22-all interface: content - default-provider: kf5-5-110-qt-5-15-11-core22 + default-provider: kf5-5-111-qt-5-15-11-core22 target: $SNAP/kf5 environment: SNAP_DESKTOP_RUNTIME: $SNAP/kf5 + HOME: $SNAP_REAL_HOME + XDG_CACHE_HOME: $SNAP_USER_COMMON/.cache + XDG_CONFIG_HOME: $SNAP_USER_COMMON/.config + XDG_DATA_HOME: $SNAP_USER_COMMON/.local/share hooks: configure: plugs: @@ -78,18 +85,18 @@ parts: source-type: local plugin: make make-parameters: - - PLATFORM_PLUG=kf5-5-110-qt-5-15-11-core22 + - PLATFORM_PLUG=kf5-5-111-qt-5-15-11-core22 build-snaps: - - kf5-5-110-qt-5-15-11-core22-sdk + - kf5-5-111-qt-5-15-11-core22-sdk build-environment: - &id001 - PATH: /snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/bin${PATH:+:$PATH} + PATH: /snap/kf5-5-111-qt-5-15-11-core22-sdk/current/usr/bin${PATH:+:$PATH} - &id002 - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS} + XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kf5-5-111-qt-5-15-11-core22-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS} - &id003 - XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME} + XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kf5-5-111-qt-5-15-11-core22-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME} - &id004 - CRAFT_CMAKE_ARGS: -DCMAKE_FIND_ROOT_PATH=/snap/kf5-5-110-qt-5-15-11-core22-sdk/current${CRAFT_CMAKE_ARGS:+:$CRAFT_CMAKE_ARGS} + CRAFT_CMAKE_ARGS: -DCMAKE_FIND_ROOT_PATH=/snap/kf5-5-111-qt-5-15-11-core22-sdk/current${CRAFT_CMAKE_ARGS:+:$CRAFT_CMAKE_ARGS} baloo-widgets: after: - kde-neon @@ -104,7 +111,7 @@ parts: - -DENABLE_TESTING=OFF - -DBUILD_TESTING=OFF - -DKDE_SKIP_TEST_SETTINGS=ON - - "-DCMAKE_FIND_ROOT_PATH=/usr\\;$CRAFT_STAGE\\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current" + - "-DCMAKE_FIND_ROOT_PATH=/usr\\;$CRAFT_STAGE\\;/snap/kf5-5-111-qt-5-15-11-core22-sdk/current" prime: - "-usr/lib/*/cmake/*" - "-usr/include/*" @@ -136,7 +143,7 @@ parts: - -DENABLE_TESTING=OFF - -DBUILD_TESTING=OFF - -DKDE_SKIP_TEST_SETTINGS=ON - - "-DCMAKE_FIND_ROOT_PATH=/usr\\;$CRAFT_STAGE\\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current" + - "-DCMAKE_FIND_ROOT_PATH=/usr\\;$CRAFT_STAGE\\;/snap/kf5-5-111-qt-5-15-11-core22-sdk/current" prime: - "-usr/lib/*/cmake/*" - "-usr/include/*" @@ -168,6 +175,8 @@ parts: - libkuserfeedbackwidgets1 - kio - kio-extras + stage-snaps: + - khelpcenter source: . source-type: local cmake-parameters: @@ -176,14 +185,13 @@ parts: - -DENABLE_TESTING=OFF - -DBUILD_TESTING=OFF - -DKDE_SKIP_TEST_SETTINGS=ON - - "-DCMAKE_FIND_ROOT_PATH=/usr\\;$CRAFT_STAGE\\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current" + - "-DCMAKE_FIND_ROOT_PATH=/usr\\;$CRAFT_STAGE\\;/snap/kf5-5-111-qt-5-15-11-core22-sdk/current" parse-info: - usr/share/metainfo/org.kde.dolphin.appdata.xml prime: - "-usr/lib/*/cmake/*" - "-usr/include/*" - "-usr/share/ECM/*" - - "-usr/share/doc/*" - "-usr/share/man/*" - "-usr/share/icons/breeze-dark*" - "-usr/bin/X11"