Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

snapcraft: Rebuild with new content pack to fix mixed libraries.

Browse Source 
BUG: 476503
This commit is contained in:
Scarlett Moore 2023-11-05 04:37:16 -07:00
parent d726df3fd6
commit 7e5d2b512a
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
snapcraft.yaml
View File

@ -42,10 +42,10 @@ 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
foo-install-cups:
interface: content
@ -66,6 +66,7 @@ layout:
environment:
QT_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/plugins:$SNAP/kf5/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/plugins:$SNAP/kf5/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/plugins/kf5"
SNAP_DESKTOP_RUNTIME: $SNAP/kf5
QTWEBENGINEPROCESS_PATH: "$SNAP/kf5/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/libexec/QtWebEngineProcess"
slots:
session-dbus-interface:
interface: dbus
@ -86,18 +87,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}
falkon:
after:
- kde-neon
@ -111,12 +112,9 @@ parts:
- libxcb-util-dev
- libxcb1-dev
- libssl-dev
- libkf5purpose-dev
- python3
- libpyside2-dev
stage-packages:
- libkf5purpose-bin
- libkf5purpose5
- cups-client
cmake-parameters:
- -DCMAKE_INSTALL_PREFIX=/usr
@ -124,7 +122,7 @@ parts:
- -DENABLE_TESTING=OFF
- -DBUILD_TESTING=OFF
- -DKDE_SKIP_TEST_SETTINGS=ON
- -DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current
- -DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\;/snap/kf5-5-111-qt-5-15-11-core22-sdk/current
build-environment: &id005
- *id001
- *id002