Unity

Merge unity:yaru-build-dep into unity:master

  1. Git
  2. lp:unity
  3. yaru-build-dep
  4. Merge into master
Proposed by Dmitry Shachnev
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 84e712b1ecdbcfec5f6492303cf79fa70c3b4cc6
Merged at revision: dacc115523a565df371e0dbaf891a3f25d13faf0
Proposed branch: unity:yaru-build-dep
Merge into: unity:master
Diff against target: 12 lines (+1/-0)
1 file modified
debian/control (+1/-0)
Reviewer Review Type Date Requested Status
Alberts Muktupāvels (community) Approve
Unity Team Pending
Review via email: mp+361372@code.launchpad.net

Commit message

Build-depend on yaru-theme-icon to fix the test failure.

Description of the change

Build-depend on yaru-theme-icon to fix the test failure.

gtk+3.0 3.24.1-3ubuntu1 has this commit which changed gtk-icon-theme-name setting from ubuntu-mono-dark to Yaru, so without this build-dependency our tests cannot find application-default-icon icon.

https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gtk+3.0/commit/?id=d50a2dedaad927658a9cc002fc84f05f539ac43a

To post a comment you must log in.
Revision history for this message
Alberts Muktupāvels (muktupavels) :
review: Approve
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

With https://code.launchpad.net/~unity-team/unity/+git/unity/+merge/359970 and this the tests finally passed on all architectures.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

@mitya57

Hi, did you remember which tests are failing and why? It's happening for indicator-sound & other packages. But I rather avoid using a specific icon theme as build dependency for those packages. If possible I want to set that in tests itself or from debian/rules.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

> Hi, did you remember which tests are failing and why?

See this build log:

https://launchpadlibrarian.net/402875904/buildlog_ubuntu-disco-amd64.unity_7.5.0+19.04.20181223-0ubuntu1_BUILDING.txt.gz

Namely TestResultRenderer.TestDndIcon was failing.

> But I rather avoid using a specific icon theme as build dependency for those packages.

I needed some kind of quick fix to unblock other work on compiz/unity. If you create another fix that does not require that build-dependency, I would not mind at all.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/control b/debian/control
2index c3dc0cf..8dea716 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -57,6 +57,7 @@ Build-Depends: cmake,
6 systemd,
7 xserver-xorg-video-dummy,
8 xsltproc,
9+ yaru-theme-icon,
10 Standards-Version: 3.9.5
11 Homepage: https://launchpad.net/unity
12 # If you aren't a member of ~unity-team but need to upload packaging changes,

Subscribers

People subscribed via source and target branches

to all changes: