[neon/neon-packaging/falkon/Neon/release] /: update for new snap
Jonathan Riddell
null at kde.org
Wed Feb 10 14:33:10 GMT 2021
Git commit 5cd3191fb3e4c822e38c5aba36954e794625dd40 by Jonathan Riddell.
Committed on 10/02/2021 at 14:33.
Pushed by jriddell into branch 'Neon/release'.
update for new snap
D +0 -50 snap/gui/icon.svg
D +0 -69 snap/gui/org.kde.Falkon.desktop
M +25 -12 snapcraft.yaml
https://invent.kde.org/neon/neon-packaging/falkon/commit/5cd3191fb3e4c822e38c5aba36954e794625dd40
diff --git a/snap/gui/icon.svg b/snap/gui/icon.svg
deleted file mode 100644
index dade22c..0000000
--- a/snap/gui/icon.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128px" height="128px" viewBox="0 0 128 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
- <title>Icon-128</title>
- <desc>Created with Sketch.</desc>
- <defs>
- <linearGradient x1="148.794275%" y1="-26.5643443%" x2="-21.1415871%" y2="99.3029307%" id="linearGradient-1">
- <stop stop-color="#D446FF" offset="0%"></stop>
- <stop stop-color="#A0D8FF" offset="100%"></stop>
- </linearGradient>
- <linearGradient x1="41.8083357%" y1="20.866645%" x2="95.5956597%" y2="-8.31097281%" id="linearGradient-2">
- <stop stop-color="#FFFFFF" offset="0%"></stop>
- <stop stop-color="#DADADA" offset="100%"></stop>
- </linearGradient>
- <linearGradient x1="52.2801818%" y1="70.5577815%" x2="2.53678786%" y2="8.97706744%" id="linearGradient-3">
- <stop stop-color="#FFFFFF" offset="0%"></stop>
- <stop stop-color="#DADADA" offset="100%"></stop>
- </linearGradient>
- <linearGradient x1="98.684398%" y1="12.9995489%" x2="35.2678133%" y2="40.863838%" id="linearGradient-4">
- <stop stop-color="#D0D0D0" offset="0%"></stop>
- <stop stop-color="#FFFFFF" offset="100%"></stop>
- </linearGradient>
- <linearGradient x1="34.2841787%" y1="31.6476155%" x2="-40.2132134%" y2="123.398162%" id="linearGradient-5">
- <stop stop-color="#FFDC68" offset="0%"></stop>
- <stop stop-color="#CE4300" offset="100%"></stop>
- </linearGradient>
- <linearGradient x1="95.7086811%" y1="2.33776624%" x2="-10.5474304%" y2="34.7418529%" id="linearGradient-6">
- <stop stop-color="#FFDC68" offset="0%"></stop>
- <stop stop-color="#CE4300" offset="100%"></stop>
- </linearGradient>
- <linearGradient x1="55.2222258%" y1="39.6484627%" x2="-63.5655829%" y2="222.055577%" id="linearGradient-7">
- <stop stop-color="#FFDC68" offset="0%"></stop>
- <stop stop-color="#CE4300" offset="100%"></stop>
- </linearGradient>
- </defs>
- <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <g id="Icon-128">
- <g id="Group-2-Copy" transform="translate(0.605678, 1.413249)">
- <ellipse id="ellipse4650-0-7-2-3-4-4" stroke="#A3A3A3" stroke-width="0.557663734" fill="url(#linearGradient-1)" fill-rule="nonzero" cx="63.6290019" cy="62.531089" rx="63.6097878" ry="62.458775"></ellipse>
- <path d="M22.2404038,123.591854 C22.2404038,123.591854 42.118723,54.0331205 119.497852,62.8779003 C119.497852,62.8779003 70.3205552,33.6848555 22.5795432,73.0413426 C8.48012114,105.700321 22.2404038,123.591854 22.2404038,123.591854 Z" id="path4652-2-7-9-7-2-7" fill="url(#linearGradient-2)"></path>
- <path d="M28.158405,114.79361 C28.158405,114.79361 48.8999369,64.7867155 104.26559,63.9078965 C62.1798763,74.1607975 104.334637,110.509042 104.334637,110.509042 C104.334637,110.509042 71.0440782,140.672888 28.158405,114.79361 Z" id="path4654-1-7-7-4-4-6" fill="url(#linearGradient-3)"></path>
- <path d="M16.610241,76.4594877 C16.610241,76.4594877 58.0382082,30.888742 119.90398,62.373976 C118.799203,53.8122297 111.480268,44.145706 98.3614183,41.3838334 C95.4614713,40.0029073 74.1950991,7.13670662 28.4862587,26.0555104 C42.5480681,27.150395 48.5816934,29.1201009 48.9240631,30.6125527 C24.606183,26.4332517 17.3978246,61.0403937 16.610241,76.4594877 Z" id="path4656-5-6-43-8-0-8" fill="url(#linearGradient-4)"></path>
- <path d="M76.024853,37.8021552 C76.024853,37.8021552 86.6240606,34.0061678 88.0044215,45.2955659 C77.5531205,46.2815899 76.024853,37.8021552 76.024853,37.8021552 Z" id="path4658-6-9-5-0-2-9" fill="#202020"></path>
- <path d="M21.9626397,123.818135 C21.9626397,123.818135 40.0833413,64.7076341 100.667256,62.4206738 C100.667256,62.4206738 51.5059886,53.4510032 16.7850397,108.451977 C16.592535,116.233307 21.9626397,123.818135 21.9626397,123.818135 Z" id="path4660-5-1-6-0-7-6" fill="url(#linearGradient-5)"></path>
- <path d="M28.5370953,26.0612442 C28.5370953,26.0612442 43.6479192,26.9400833 49.0428972,30.6506498 C51.2954549,30.1872454 53.2080656,28.6449666 53.5331937,26.5444341 C51.6002524,25.7444744 33.9076644,24.3036063 28.5370953,26.0612442 Z" id="path4662-0-1-1-1-2-3" fill="url(#linearGradient-6)"></path>
- <path d="M16.7464984,76.5380845 C16.7464984,76.5380845 35.6647773,53.8154599 73.8572719,51.1008505 C73.8572719,51.1008505 21.8654284,53.4505792 17.5007697,68.1317148 C16.2873338,71.6619912 16.7464984,76.5380845 16.7464984,76.5380845 Z" id="path4442-5-0-9-4-6-0-96" fill="url(#linearGradient-7)"></path>
- </g>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/snap/gui/org.kde.Falkon.desktop b/snap/gui/org.kde.Falkon.desktop
deleted file mode 100644
index bd271ab..0000000
--- a/snap/gui/org.kde.Falkon.desktop
+++ /dev/null
@@ -1,69 +0,0 @@
-[Desktop Entry]
-Name=Falkon
-Name[ca]=Falkon
-Name[ca at valencia]=Falkon
-Name[nl]=Falkon
-Name[pt]=Falkon
-Name[sk]=Falkon
-Name[sv]=Falkon
-Name[uk]=Falkon
-Name[x-test]=xxFalkonxx
-Type=Application
-Icon=/snap/falkon/current/usr/share/icons/hicolor/scalable/apps/falkon.svg
-Categories=Network;WebBrowser;
-Comment=A fast and secure web browser
-Comment[ca]=Un navegador web ràpid i segur
-Comment[ca at valencia]=Un navegador web ràpid i segur
-Comment[nl]=Een snelle en veilige webbrowser
-Comment[pt]=Um navegador Web rápido e seguro
-Comment[sv]=En snabb och säker webbläsare
-Comment[uk]=Проста і безпечна програма для перегляду інтернету
-Comment[x-test]=xxA fast and secure web browserxx
-GenericName=Web Browser
-GenericName[ca]=Navegador web
-GenericName[ca at valencia]=Navegador web
-GenericName[nl]=Webbrowser
-GenericName[pt]=Navegador Web
-GenericName[sk]=Webový prehliadač
-GenericName[sv]=Webbläsare
-GenericName[uk]=Переглядач інтернету
-GenericName[x-test]=xxWeb Browserxx
-GenericName[zh_CN]=网页浏览器
-Exec=falkon %u
-MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;application/x-mimearchive;
-Terminal=false
-Actions=NewTab;NewWindow;PrivateBrowsing;
-
-[Desktop Action NewTab]
-Name=Open new tab
-Name[ca]=Obre una pestanya nova
-Name[ca at valencia]=Obri una pestanya nova
-Name[nl]=Nieuw tabblad openen
-Name[pt]=Abrir uma nova página
-Name[sk]=Otvoriť novú záložku
-Name[sv]=Öppna ny flik
-Name[uk]=Відкрити нову вкладку
-Name[x-test]=xxOpen new tabxx
-Exec=falkon --new-tab
-
-[Desktop Action NewWindow]
-Name=Open new window
-Name[ca]=Obre una finestra nova
-Name[ca at valencia]=Obri una finestra nova
-Name[nl]=Nieuw venster openen
-Name[pt]=Abrir uma nova janela
-Name[sv]=Öppna nytt fönster
-Name[uk]=Відкрити нове вікно
-Name[x-test]=xxOpen new windowxx
-Exec=falkon --new-window
-
-[Desktop Action PrivateBrowsing]
-Name=Start private browsing
-Name[ca]=Inicia la navegació privada
-Name[ca at valencia]=Inicia la navegació privada
-Name[nl]=Privébrowsing starten
-Name[pt]=Iniciar a navegação privada
-Name[sv]=Starta privat webbläsning
-Name[uk]=Конфіденційний перегляд
-Name[x-test]=xxStart private browsingxx
-Exec=falkon --private-browsing
diff --git a/snapcraft.yaml b/snapcraft.yaml
index f8f5771..e48a300 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -3,7 +3,7 @@ name: falkon
version: 3.1.0
confinement: strict
grade: stable
-base: core18
+base: core20
adopt-info: falkon
apps:
falkon:
@@ -20,26 +20,30 @@ apps:
- unity7
- pulseaudio
- browser-support
+ - removable-media
+slots:
+ session-dbus-interface:
+ interface: dbus
+ name: org.kde.falkon.desktop
+ bus: session
plugs:
kde-frameworks-5-plug:
- content: kde-frameworks-5-qt-5-14-core18-all
+ content: kde-frameworks-5-qt-5-15-core20-all
interface: content
- default-provider: kde-frameworks-5-qt-5-14-core18
+ default-provider: kde-frameworks-5-qt-5-15-core20/latest/candidate
target: kf5
parts:
- kde-frameworks-5-env:
+ patches:
+ source: debian/patches/
plugin: dump
- prime:
- - kf5-launch
- - kf5-portal-launch
- - kf5
- source: https://anongit.kde.org/snap-kf5-launcher.git
+ prime: [-*]
+ stage: [qt-5.14.diff, qt-5.15.diff]
falkon:
+ 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-14-core18-sdk
- after: []
+ - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
plugin: cmake
build-packages:
- build-essential
@@ -48,10 +52,19 @@ parts:
- libxcb1-dev
- libssl-dev
- qt5-default
- configflags:
+ override-build: |-
+ cd $SNAPCRAFT_PART_SRC
+ patch -p1 < $SNAPCRAFT_STAGE/qt-5.14.diff
+ patch -p1 < $SNAPCRAFT_STAGE/qt-5.15.diff
+ snapcraftctl build
+ cmake-parameters:
- "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
- "-DCMAKE_INSTALL_PREFIX=/usr"
- "-DCMAKE_BUILD_TYPE=Release"
- "-DENABLE_TESTING=OFF"
- "-DBUILD_TESTING=OFF"
- "-DKDE_SKIP_TEST_SETTINGS=ON"
+ - "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
+ kde-frameworks-5-env:
+ plugin: dump
+ source: https://anongit.kde.org/snap-kf5-launcher.git
More information about the Neon-commits
mailing list