Skip to content

Commit 9ac225b

Browse files
committed
Merge #276: snap: Drop desktop-launch
2357600 snap: Drop `desktop-launch` (Hennadii Stepanov) Pull request description: Since commit f2ec087, which replaced building dynamically linked binaries with downloading statically linked release binaries, there's no longer a need to prepare the environment (e.g. Qt plugin paths). We now only need to ensure required shared libraries are present at runtime. This PR removes the `desktop-launch` helper, facilitating the update to v30.0 with Qt 6. ACKs for top commit: maflcko: review-only ACK 2357600 Tree-SHA512: df14f57cf5c49613cb53dc79e009f0c8bed55465a6a114e2220c66cf73192e044f6369c40b21eb489a8033a73225d8ee9842deee178dacea6d62b6de6e6c7a75
2 parents 1c03d60 + 2357600 commit 9ac225b

File tree

1 file changed

+20
-35
lines changed

1 file changed

+20
-35
lines changed

snap/snapcraft.yaml

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ apps:
2222
# https://docs.snapcraft.io/environment-variables/7983
2323
HOME: $SNAP_USER_COMMON
2424
qt:
25-
command: bin/desktop-launch bitcoin-qt
25+
command: bin/bitcoin-qt
2626
plugs: [home, removable-media, network, network-bind, desktop, x11, unity7]
2727
environment:
2828
HOME: $SNAP_USER_COMMON
29-
DISABLE_WAYLAND: 1
3029
cli:
3130
command: bin/bitcoin-cli
3231
plugs: [home, removable-media, network]
@@ -47,39 +46,9 @@ apps:
4746
HOME: $SNAP_USER_COMMON
4847

4948
parts:
50-
# Needed to supply desktop-launch
51-
# Paste from https://github.com/ubuntu/snapcraft-desktop-helpers/blob/master/snapcraft.yaml
52-
# Boilerplate seems to be required according to https://bugs.launchpad.net/snapcraft/+bug/1800057
53-
desktop-qt5:
54-
source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
55-
source-depth: 1
56-
source-subdir: qt
57-
source-commit: ec861254c2a1d2447b2c589446e6cdf04c75c260
58-
plugin: make
59-
make-parameters: ["FLAVOR=qt5"]
60-
build-packages:
61-
- build-essential
62-
- qtbase5-dev
63-
- dpkg-dev
64-
stage-packages:
65-
- libxkbcommon0
66-
- ttf-ubuntu-font-family
67-
- dmz-cursor-theme
68-
- light-themes
69-
- adwaita-icon-theme
70-
- gnome-themes-standard
71-
- shared-mime-info
72-
- libqt5gui5
73-
- libgdk-pixbuf2.0-0
74-
- libqt5svg5 # for loading icon themes which are svg
75-
- try: [appmenu-qt5] # not available on core18
76-
- locales-all
77-
- xdg-user-dirs
78-
- fcitx-frontend-qt5
79-
8049
bitcoin-core:
8150
plugin: nil
82-
override-build: |
51+
override-build: |
8352
env | grep SNAP
8453
wget https://bitcoincore.org/bin/bitcoin-core-${SNAPCRAFT_PROJECT_VERSION}/SHA256SUMS
8554
wget https://bitcoincore.org/bin/bitcoin-core-${SNAPCRAFT_PROJECT_VERSION}/bitcoin-${SNAPCRAFT_PROJECT_VERSION}.tar.gz
@@ -100,5 +69,21 @@ parts:
10069
install -m 0644 -D -t $SNAPCRAFT_PART_INSTALL/share/pixmaps bitcoin128.png
10170
build-packages:
10271
- wget
103-
after:
104-
- desktop-qt5
72+
stage-packages:
73+
- libxcb1
74+
- libxkbcommon0
75+
- libxkbcommon-x11-0
76+
- libfontconfig1
77+
- libfreetype6
78+
- libxcb-icccm4
79+
- libxcb-image0
80+
- libxcb-shm0
81+
- libxcb-keysyms1
82+
- libxcb-randr0
83+
- libxcb-render-util0
84+
- libxcb-render0
85+
- libxcb-shape0
86+
- libxcb-sync1
87+
- libxcb-xfixes0
88+
- libxcb-xinerama0
89+
- libxcb-xkb1

0 commit comments

Comments
 (0)