kubuntu-packaging

Merge ~panfaust/kubuntu-packaging/+git/kjs:work into ~kubuntu-packagers/kubuntu-packaging/+git/kjs:kubuntu_yakkety_archive

  1. Git
  2. lp:~panfaust/kubuntu-packaging/+git/kjs
  3. work
  4. Merge into kubuntu_yakkety_archive
Proposed by Jose Manuel Santamaria Lema
Status: Merged
Merged at revision: 25ebe8ca56599d44582616bdbfae9e7a61ec680d
Proposed branch: ~panfaust/kubuntu-packaging/+git/kjs:work
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kjs:kubuntu_yakkety_archive
Diff against target: 48 lines (+12/-6)
3 files modified
debian/changelog (+6/-0)
debian/libkf5js5.symbols (+3/-3)
debian/libkf5jsapi5.symbols (+3/-3)
Reviewer Review Type Date Requested Status
Scarlett Gately Moore Approve
Review via email: mp+305889@code.launchpad.net

Commit message

Merge ~panfaust/kubuntu-packaging/+git/kjs:work into ~kubuntu-packagers/kubuntu-packaging/+git/kjs:kubuntu_yakkety_archive

Description of the change

Mark some optional symbols as such to fix FTBFS for armhf

To post a comment you must log in.
Revision history for this message
Scarlett Gately Moore (scarlettmoore) :
review: Approve
Revision history for this message
Scarlett Gately Moore (scarlettmoore) :
review: Approve

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 5b08fe0..1634721 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+kjs (5.24.0-0ubuntu3) UNRELEASED; urgency=medium
7+
8+ * Mark some optional symbols to fix a build failure in armfh.
9+
10+ -- José Manuel Santamaría Lema <panfaust@gmail.com> Fri, 16 Sep 2016 00:53:45 +0200
11+
12 kjs (5.24.0-0ubuntu2) yakkety; urgency=medium
13
14 [ José Manuel Santamaría Lema ]
15diff --git a/debian/libkf5js5.symbols b/debian/libkf5js5.symbols
16index bc538f9..38b159b 100644
17--- a/debian/libkf5js5.symbols
18+++ b/debian/libkf5js5.symbols
19@@ -193,9 +193,9 @@ libKF5JS.so.5 libkf5js5 #MINVER#
20 _ZN3KJS7CStringaSERKS0_@Base 4.96.0
21 _ZN3KJS7JSValue15toInt32SlowCaseEdRb@Base 4.96.0
22 _ZN3KJS7JSValue16toUInt32SlowCaseEdRb@Base 4.96.0
23- _ZN3KJS7JSValueD0Ev@Base 4.96.0
24- _ZN3KJS7JSValueD1Ev@Base 4.96.0
25- _ZN3KJS7JSValueD2Ev@Base 4.96.0
26+ (optional)_ZN3KJS7JSValueD0Ev@Base 4.96.0
27+ (optional)_ZN3KJS7JSValueD1Ev@Base 4.96.0
28+ (optional)_ZN3KJS7JSValueD2Ev@Base 4.96.0
29 _ZN3KJS7Package10loadSymbolEPNS_9ExecStateEPNS_8JSObjectERKNS_10IdentifierE@Base 4.96.0
30 _ZN3KJS7Package14loadAllSymbolsEPNS_9ExecStateEPNS_8JSObjectE@Base 4.96.0
31 _ZN3KJS7Package14loadSubPackageERKNS_10IdentifierEPNS_7UStringE@Base 4.96.0
32diff --git a/debian/libkf5jsapi5.symbols b/debian/libkf5jsapi5.symbols
33index 1c2c4f7..b689797 100644
34--- a/debian/libkf5jsapi5.symbols
35+++ b/debian/libkf5jsapi5.symbols
36@@ -37,9 +37,9 @@ libKF5JSApi.so.5 libkf5jsapi5 #MINVER#
37 _ZN15KJSGlobalObjectC1Ev@Base 4.96.0
38 _ZN15KJSGlobalObjectC2Ev@Base 4.96.0
39 (arch=!armel !armhf)_ZN3KJS6JSCell4markEv@Base 5.0.0
40- _ZN3KJS7JSValueD0Ev@Base 4.96.0
41- _ZN3KJS7JSValueD1Ev@Base 4.96.0
42- _ZN3KJS7JSValueD2Ev@Base 4.96.0
43+ (optional)_ZN3KJS7JSValueD0Ev@Base 4.96.0
44+ (optional)_ZN3KJS7JSValueD1Ev@Base 4.96.0
45+ (optional)_ZN3KJS7JSValueD2Ev@Base 4.96.0
46 _ZN7KJSDateC1EP10KJSContextRK9QDateTime@Base 4.96.0
47 _ZN7KJSDateC2EP10KJSContextRK9QDateTime@Base 4.96.0
48 _ZN7KJSNullC1Ev@Base 4.96.0

Subscribers

People subscribed via source and target branches