Jose Manuel Santamaria Lema has proposed merging 
~panfaust/kubuntu-packaging/+git/khtml:gcc6 into 
~kubuntu-packagers/kubuntu-packaging/+git/khtml:kubuntu_yakkety_archive.

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~panfaust/kubuntu-packaging/+git/khtml/+merge/302691

After GCC 6 becoming the default, khtml 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
-- 
Your team Kubuntu Packagers is requested to review the proposed merge of 
~panfaust/kubuntu-packaging/+git/khtml:gcc6 into 
~kubuntu-packagers/kubuntu-packaging/+git/khtml:kubuntu_yakkety_archive.
diff --git a/debian/changelog b/debian/changelog
index 9cc5359..32ebd53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+khtml (5.24.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Mark as optional some symbols leaked from KJS in order to avoid
+    build failures with GCC 6.
+
+ -- José Manuel Santamaría Lema <[email protected]>  Thu, 11 Aug 2016 17:50:27 +0200
+
 khtml (5.24.0-0ubuntu1) yakkety; urgency=medium
 
   [ Philip Muškovac ]
diff --git a/debian/libkf5khtml5.symbols b/debian/libkf5khtml5.symbols
index 2ee6f02..2294905 100644
--- a/debian/libkf5khtml5.symbols
+++ b/debian/libkf5khtml5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 5.18.0 amd64
+# SymbolsHelper-Confirmed: 5.24.0 amd64
 libKF5KHtml.so.5 libkf5khtml5 #MINVER#
  _ZN10KSSLKeyGen10setKeySizeEi@Base 4.96.0
  _ZN10KSSLKeyGen11generateCSRERK7QStringS2_ii@Base 4.96.0
@@ -1836,9 +1836,9 @@ libKF5KHtml.so.5 libkf5khtml5 #MINVER#
  _ZN3DOMeqERKNS_9DOMStringEPKc@Base 4.96.0
  _ZN3DOMeqERKNS_9DOMStringERK7QString@Base 4.96.0
  _ZN3DOMeqERKNS_9DOMStringES2_@Base 4.96.0
- _ZN3KJS14ScopeChainLink5derefEv@Base 4.96.0
+ (optional=gccinternal)_ZN3KJS14ScopeChainLink5derefEv@Base 4.96.0
  (optional=external|arch=!armel !armhf)_ZN3KJS6JSCell4markEv@Base 4.96.0
- _ZN3KJS7JSValue9getObjectEv@Base 4.96.0
+ (optional=gccinternal)_ZN3KJS7JSValue9getObjectEv@Base 4.96.0
  _ZN3KJS7JSValueD0Ev@Base 4.96.0
  _ZN3KJS7JSValueD1Ev@Base 4.96.0
  _ZN3KJS7JSValueD2Ev@Base 4.96.0
@@ -2872,7 +2872,7 @@ libKF5KHtml.so.5 libkf5khtml5 #MINVER#
  _ZNK3KJS10Identifier9domStringEv@Base 4.96.0
  _ZNK3KJS7JSValue4typeEv@Base 4.96.0
  _ZNK3KJS7JSValue7toInt32EPNS_9ExecStateE@Base 4.96.0
- _ZNK3KJS7JSValue8isObjectEv@Base 4.96.0
+ (optional=gccinternal)_ZNK3KJS7JSValue8isObjectEv@Base 4.96.0
  _ZNK3KJS7JSValue8toNumberEPNS_9ExecStateE@Base 4.96.0
  _ZNK3KJS7JSValue8toStringEPNS_9ExecStateE@Base 4.96.0
  _ZNK3KJS7JSValue9getNumberERd@Base 5.13.0
-- 
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel

Reply via email to