Merge ~marcustomlinson/gnome-mahjongg:master into gnome-mahjongg:master

Proposed by Marcus Tomlinson on 2019-09-10
Status: Merged
Merge reported by: Ken VanDine
Merged at revision: f402b65f62eb7aa9fbae1b6de124fa6d1744eddf
Proposed branch: ~marcustomlinson/gnome-mahjongg:master
Merge into: gnome-mahjongg:master
Diff against target: 17 lines (+2/-2)
1 file modified
snap/snapcraft.yaml (+2/-2)
Reviewer Review Type Date Requested Status
Ken VanDine 2019-09-10 Approve on 2019-09-10
Review via email:

Commit message

Switch from png to svg icon

To post a comment you must log in.
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index 72c2121..09ae41f 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -66,10 +66,10 @@ parts:
6 source: .
7 source-type: git
8 override-build: |
9- sed -i.bak -e 's|=org.gnome.Mahjongg$|=${SNAP}/meta/gui/org.gnome.Mahjongg.png|g' data/
10+ sed -i.bak -e 's|=org.gnome.Mahjongg$|=${SNAP}/meta/gui/org.gnome.Mahjongg.svg|g' data/
11 snapcraftctl build
12 mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
13- cp ../src/data/icons/hicolor/48x48/org.gnome.Mahjongg.png $SNAPCRAFT_PART_INSTALL/meta/gui/
14+ cp ../src/data/icons/hicolor/scalable/org.gnome.Mahjongg.svg $SNAPCRAFT_PART_INSTALL/meta/gui/
15 cp ../install/snap/gnome-mahjongg/current/usr/share/applications/org.gnome.Mahjongg.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/
16 plugin: meson
17 meson-parameters: [--prefix=/snap/gnome-mahjongg/current/usr]


People subscribed via source and target branches

to all changes: