Merge ~hellsworth/+git/libreoffice-snap:add-yaru-icons-lp-1902092 into ~libreoffice/+git/libreoffice-snap:7.0

Proposed by Heather Ellsworth
Status: Merged
Merge reported by: Heather Ellsworth
Merged at revision: 452c947b92d859067b737ab5e65c418935838627
Proposed branch: ~hellsworth/+git/libreoffice-snap:add-yaru-icons-lp-1902092
Merge into: ~libreoffice/+git/libreoffice-snap:7.0
Diff against target: 39 lines (+16/-1)
1 file modified
snapcraft.yaml (+16/-1)
Reviewer Review Type Date Requested Status
Heather Ellsworth (community) Approve
Review via email: mp+396356@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Heather Ellsworth (hellsworth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index f1eed03..bc5b8c5 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -37,6 +37,7 @@ parts:
6 - gstreamer
7 - gtk3-locales
8 - desktop-settings-packages
9+ - yaru-icons
10 plugin: autotools
11 source: http://download.documentfoundation.org/libreoffice/src/7.0.3/libreoffice-7.0.3.1.tar.xz
12 configflags:
13@@ -397,6 +398,20 @@ parts:
14 set -eux
15 glib-compile-schemas usr/share/glib-2.0/schemas
16
17+ yaru-icons:
18+ plugin: nil
19+ source: https://github.com/ubuntu/libreoffice-style-yaru-fullcolor.git
20+ override-build: |
21+ set -eux
22+ ./generate-oxt.sh
23+ if [ ! -f images_yaru.zip ]; then
24+ echo "Yaru icons are missing!";
25+ exit 1;
26+ fi
27+ mkdir -p $SNAPCRAFT_PART_INSTALL/lib/libreoffice/share/config/
28+ cp $SNAPCRAFT_PART_BUILD/oxt/iconsets/images_yaru.zip $SNAPCRAFT_PART_INSTALL/lib/libreoffice/share/config/
29+ cp $SNAPCRAFT_PART_BUILD/oxt/iconsets/images_yaru_svg.zip $SNAPCRAFT_PART_INSTALL/lib/libreoffice/share/config/
30+
31 cleanup:
32 after: [ desktop-settings-build ]
33 plugin: nil
34@@ -481,4 +496,4 @@ apps:
35 environment: *environment
36 plugs:
37 - desktop
38- - network
39+ network

Subscribers

People subscribed via source and target branches

to status/vote changes: