Merge ~panfaust/kubuntu-packaging/+git/kjsembed:gcc6 into ~kubuntu-packagers/kubuntu-packaging/+git/kjsembed:kubuntu_yakkety_archive

Proposed by Jose Manuel Santamaria Lema on 2016-08-11
Status: Merged
Merged at revision: c60aeb4a85d0693dfea60a5f7ea5ec6994673059
Proposed branch: ~panfaust/kubuntu-packaging/+git/kjsembed:gcc6
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kjsembed:kubuntu_yakkety_archive
Diff against target: 28 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/libkf5jsembed5.symbols (+1/-1)
Reviewer Review Type Date Requested Status
Simon Quigley 2016-08-11 Abstain on 2016-08-21
Philip Muškovac 2016-08-21 Pending
Review via email: mp+302705@code.launchpad.net

Description of the Change

After GCC 6 becoming the default, kjsembed is failing to build due to missing symbols. This merge request provides the agreed solution:
https://irclogs.ubuntu.com/2016/08/10/%23kubuntu-devel.html#t12:34

To post a comment you must log in.
Simon Quigley (tsimonq2) wrote :

Thanks! Seems like the agreed solution.

review: Approve
Simon Quigley (tsimonq2) wrote :

As discussed on IRC, *I* am not comfortable merging into kubuntu_yakkety_archive quite yet with this change. Requesting a review from yofel.

review: Resubmit
Simon Quigley (tsimonq2) wrote :

Argh I can't get Launchpad right!

review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 445a109..db45f62 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+kjsembed (5.24.0-0ubuntu2) UNRELEASED; urgency=medium
7+
8+ * Mark as optional an inline symbol leaked from KJS in order to avoid
9+ build failures with gcc 6.
10+
11+ -- José Manuel Santamaría Lema <panfaust@gmail.com> Thu, 11 Aug 2016 19:21:07 +0200
12+
13 kjsembed (5.24.0-0ubuntu1) yakkety; urgency=medium
14
15 [ Philip Muškovac ]
16diff --git a/debian/libkf5jsembed5.symbols b/debian/libkf5jsembed5.symbols
17index e354fd2..9a6b184 100644
18--- a/debian/libkf5jsembed5.symbols
19+++ b/debian/libkf5jsembed5.symbols
20@@ -177,7 +177,7 @@ libKF5JsEmbed.so.5 libkf5jsembed5 #MINVER#
21 _ZN8KJSEmbed9SvgWidgetC2EPN3KJS9ExecStateEP10QSvgWidget@Base 4.96.0
22 _ZNK3KJS10Identifier7qstringEv@Base 4.96.0
23 _ZNK3KJS7JSValue4typeEv@Base 5.24.0
24- _ZNK3KJS7JSValue8toStringEPNS_9ExecStateE@Base 5.24.0
25+ (optional=gccinternal)_ZNK3KJS7JSValue8toStringEPNS_9ExecStateE@Base 5.24.0
26 _ZNK3KJS7UString7qstringEv@Base 4.96.0
27 _ZNK3KJS8JSObject11toPrimitiveEPNS_9ExecStateENS_6JSTypeE@Base 4.96.0
28 _ZNK8KJSEmbed13ObjectBinding4typeEv@Base 4.96.0

Subscribers

People subscribed via source and target branches