[neon/neon-packaging/falkon/Neon/release] /: update snap
Jonathan Riddell
null at kde.org
Mon Apr 19 16:49:13 BST 2021
Git commit e679efdc0d15e230b2a5e1fe17535bf0a76c33b5 by Jonathan Riddell.
Committed on 19/04/2021 at 15:49.
Pushed by jriddell into branch 'Neon/release'.
update snap
D +0 -63 qwe-launcher/qwe-launch
M +8 -36 snapcraft.yaml
https://invent.kde.org/neon/neon-packaging/falkon/commit/e679efdc0d15e230b2a5e1fe17535bf0a76c33b5
diff --git a/qwe-launcher/qwe-launch b/qwe-launcher/qwe-launch
deleted file mode 100755
index 66dd07b..0000000
--- a/qwe-launcher/qwe-launch
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2017-2018 Harald Sitter <sitter at kde.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3 of
-# the License or any later version accepted by the membership of
-# KDE e.V. (or its successor approved by the membership of KDE
-# e.V.), which shall act as a proxy defined in Section 14 of
-# version 3 of the license.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-if [ "$SNAP_ARCH" == "amd64" ]; then
- ARCH='x86_64-linux-gnu'
-elif [ "$SNAP_ARCH" == "armhf" ]; then
- ARCH="arm-linux-gnueabihf"
-else
- ARCH="$SNAP_ARCH-linux-gnu"
-fi
-
-KF5=$SNAP/kf5
-APPDIR=$HOME/.AppDir
-
-# Really really really awkward hack.
-# QWE heavily relies on QLibraryInfo to get paths. Unfortunately QLI is
-# giving out hardcoded paths so /usr/share/qt5 etc. This is utterly useless to
-# us and the only way to override this is through qt.conf which is equally
-# garbage as the only third party location this is looked for in is appdir which
-# on Linux is (semi-relibably) where the bin is in. Since that is $SNAP/usr/bin
-# by default this doesn't do anything for us. We copy the pertinent bins
-# and create a qt.conf in the HOME to bypass this problem.
-# This is slow, excessive and terrible but unfortunately the best we can do for
-# now. kf5-snap-env might be able to put a qt.conf into usr/bin/ of the app.
-# Additionally we should put qt.confs into the kf5 snap itself in all libexec
-# paths as well as its usr/bin to make sure QLI also behaves correctly for apps
-# started there. Really annoying this -.-
-rm -rf $APPDIR
-mkdir -p $APPDIR
-cp -v $KF5/usr/lib/$ARCH/qt5/libexec/QtWebEngineProcess $APPDIR
-cp -v $SNAP/usr/bin/falkon $APPDIR
-# QWE forks QWEP from the app, to make sure QWEP also has correct data we'll
-# need to make sure it forks the correct QWEP.
-export QTWEBENGINEPROCESS_PATH=$APPDIR/QtWebEngineProcess
-export PATH=$APPDIR:$PATH # so we can exec the right falkon
-cat << EOF > $APPDIR/qt.conf
-[Paths]
-Data = $KF5/usr/share/qt5/
-Translations = $KF5/usr/share/qt5/translations
-EOF
-
-# Clean up legacy hack data.
-rm -rf $HOME/.QtWebEngineProcess
-rm -rf $HOME/.falkon/*.pak
-
-exec "$@"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 92d280f..ac608bf 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -7,31 +7,22 @@ base: core20
adopt-info: falkon
apps:
falkon:
+ extensions:
+ - kde-neon
common-id: org.kde.falkon.desktop
- command: kf5-launch falkon
+ command: usr/bin/falkon
plugs:
- - kde-frameworks-5-plug
- home
- - x11
- - opengl
- network
- network-bind
- - desktop
- - desktop-legacy
- audio-playback
- browser-support
- removable-media
slots:
session-dbus-interface:
interface: dbus
- name: org.kde.falkon.desktop
+ name: org.kde.Falkon
bus: session
-plugs:
- kde-frameworks-5-plug:
- content: kde-frameworks-5-qt-5-15-core20-all
- interface: content
- default-provider: kde-frameworks-5-qt-5-15-core20
- target: kf5
package-repositories:
- type: apt
components:
@@ -41,6 +32,9 @@ package-repositories:
key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
url: http://origin.archive.neon.kde.org/user
key-server: keyserver.ubuntu.com
+layout:
+ /usr/share/qt5:
+ bind: $SNAP/kf5/usr/share/qt5
parts:
patches:
source: debian/patches/
@@ -51,18 +45,12 @@ parts:
after: [patches]
parse-info: [usr/share/metainfo/org.kde.falkon.appdata.xml]
source: http://download.kde.org/stable/falkon/3.1/falkon-3.1.0.tar.xz
- build-snaps:
- - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
plugin: cmake
- build-environment:
- - CMAKE_BUILD_PARALLEL_LEVEL: "4"
build-packages:
- - build-essential
- - kdoctools5
+ - libkf5doctools-dev
- libxcb-util-dev
- libxcb1-dev
- libssl-dev
- - qt5-default
override-build: |-
cd $SNAPCRAFT_PART_SRC
patch -p1 < $SNAPCRAFT_STAGE/qt-5.14.diff
@@ -89,19 +77,3 @@ parts:
- "-usr/lib/aspell/*"
prime:
- "$exclusion"
- kde-frameworks-5-env:
- plugin: dump
- source: https://anongit.kde.org/snap-kf5-launcher.git
- filesets:
- exclusion:
- - "-usr/lib/*/cmake/*"
- - "-usr/include/*"
- - "-usr/share/ECM/*"
- - "-usr/share/doc/*"
- - "-usr/share/man/*"
- - "-usr/share/icons/breeze-dark*"
- - "-usr/bin/X11"
- - "-usr/lib/gcc/x86_64-linux-gnu/6.0.0"
- - "-usr/lib/aspell/*"
- prime:
- - "$exclusion"
More information about the Neon-commits
mailing list