Skip to content

Commit 80d2d4b

Browse files
Upgrade snap core 18 to 22
- The current source code can no longer be built with core 18 - Bittorrent-tracker-editor must use GTK2 - The new newer Ubuntu snap system is now more focused on Gnome with GTK3. - Some previous features no longer work for GTK2. Some improvisation is needed to get it working again. - i386 is no longer supported in newer Ubuntu - Can't get the theme to work anymore. Need to spend more time to make it better
1 parent ad43862 commit 80d2d4b

File tree

1 file changed

+25
-46
lines changed

1 file changed

+25
-46
lines changed

snap/snapcraft.yaml

Lines changed: 25 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: bittorrent-tracker-editor
22
version: '1.33.0'
3-
base: core18
3+
base: core22
44
summary: Software for add or remove tracker from torrent files.
55
description: |
66
Features:
@@ -18,13 +18,12 @@ confinement: strict
1818

1919
architectures:
2020
- build-on: amd64
21-
- build-on: i386
2221
- build-on: arm64
2322
- build-on: armhf
2423

2524
apps:
2625
bittorrent-tracker-editor:
27-
command: desktop-launch $SNAP/app/trackereditor
26+
command: app/trackereditor
2827
environment:
2928
# Fallback to XWayland if running in a Wayland session.
3029
DISABLE_WAYLAND: 1
@@ -51,59 +50,39 @@ parts:
5150
override-build: |
5251
snapcraftctl build
5352
lazbuild --build-mode=Release --widgetset=gtk2 source/project/tracker_editor/trackereditor.lpi
54-
mkdir $SNAPCRAFT_PART_INSTALL/app
55-
mv enduser/trackereditor $SNAPCRAFT_PART_INSTALL/app
56-
stage-packages:
57-
- libcanberra-gtk-module
58-
- openssl
59-
- libgail-common
60-
- libatk-adaptor
61-
- overlay-scrollbar-gtk2
62-
after:
63-
- desktop-gtk2
64-
65-
# This part installs the `desktop-launch` script which initialises desktop
66-
# features such as fonts, themes and the XDG environment. It also installs
67-
# the GTK2 runtime libraries.
68-
#
69-
# It is copied straight from the snapcraft desktop helpers project. Please
70-
# periodically check the source for updates and copy the changes.
71-
# https://github.com/ubuntu/snapcraft-desktop-helpers/blob/master/snapcraft.yaml
72-
#
73-
desktop-gtk2:
74-
source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
75-
source-subdir: gtk
76-
plugin: make
77-
make-parameters: ["FLAVOR=gtk2"]
53+
mkdir $CRAFT_PART_INSTALL/app
54+
mv enduser/trackereditor $CRAFT_PART_INSTALL/app
7855
build-packages:
7956
- libgtk2.0-dev
8057
stage-packages:
81-
- libxkbcommon0 # XKB_CONFIG_ROOT
82-
- ttf-ubuntu-font-family
83-
- dmz-cursor-theme
84-
- light-themes
85-
- adwaita-icon-theme
86-
- gnome-themes-standard
87-
- shared-mime-info
8858
- libgtk2.0-0
89-
- libgdk-pixbuf2.0-0
90-
- libglib2.0-bin
91-
- libgtk2.0-bin
92-
- unity-gtk2-module
93-
- libappindicator1
94-
- locales-all
95-
- ibus-gtk
96-
- libibus-1.0-5
59+
- openssl
60+
61+
# This part removes all the files in this snap which already exist in
62+
# connected content and base snaps. Since these files will be available
63+
# at runtime from the content and base snaps, they do not need to be
64+
# included in this snap itself.
65+
#
66+
# More info: https://forum.snapcraft.io/t/reducing-the-size-of-desktop-snaps/17280#heading--cleanup-part
67+
#
68+
cleanup:
69+
after: # Make this part run last; list all your other parts here
70+
- bittorrent-tracker-editor
71+
plugin: nil
72+
build-snaps: # List all content-snaps and base snaps you're using here
73+
- core22
74+
- gtk-common-themes
75+
override-prime: |
76+
set -eux
77+
for snap in "core22" "gtk-common-themes"; do # List all content-snaps and base snaps you're using here
78+
cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
79+
done
9780
9881
plugs:
9982
gtk-2-engines:
10083
interface: content
10184
target: $SNAP/lib/gtk-2.0
10285
default-provider: gtk2-common-themes
103-
gtk-2-themes:
104-
interface: content
105-
target: $SNAP/data-dir/themes
106-
default-provider: gtk-common-themes
10786
icon-themes:
10887
interface: content
10988
target: $SNAP/data-dir/icons

0 commit comments

Comments
 (0)