Add noinline_deprecated_slots.diff to avoid ABI break and update symbols.

4 files changed, 65 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index c0d9d53..769dfbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kio (5.26.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add noinline_deprecated_slots.diff to avoid ABI break. Also re-add the
+    corresponding symbols to the symbols file.
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Mon, 26 Sep 2016 20:56:52 +0200
+
 kio (5.26.0-0ubuntu1) yakkety; urgency=medium
 
   [ Rik Mills ]
diff --git a/debian/libkf5kiowidgets5.symbols b/debian/libkf5kiowidgets5.symbols
index 6c8a26a..c7ff129 100644
--- a/debian/libkf5kiowidgets5.symbols
+++ b/debian/libkf5kiowidgets5.symbols
@@ -251,6 +251,7 @@ libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
  _ZN17KPropertiesDialog10showDialogERK4QUrlP7QWidgetb@Base 4.96.0
  _ZN17KPropertiesDialog10showDialogERK5QListI4QUrlEP7QWidgetb@Base 5.10.0
  _ZN17KPropertiesDialog10showDialogERK9KFileItemP7QWidgetb@Base 4.96.0
+ _ZN17KPropertiesDialog10slotCancelEv@Base 5.24.0+p16.10+git20160723.0748
  _ZN17KPropertiesDialog11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.96.0
  _ZN17KPropertiesDialog11qt_metacastEPKc@Base 4.96.0
  _ZN17KPropertiesDialog12insertPluginEP23KPropertiesDialogPlugin@Base 4.96.0
@@ -268,6 +269,7 @@ libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
  _ZN17KPropertiesDialog6rejectEv@Base 5.24.0+p16.10+git20160723.0748
  _ZN17KPropertiesDialog6renameERK7QString@Base 4.96.0
  _ZN17KPropertiesDialog6saveAsERK4QUrlRS0_@Base 4.96.0
+ _ZN17KPropertiesDialog6slotOkEv@Base 5.24.0+p16.10+git20160723.0748
  _ZN17KPropertiesDialog7appliedEv@Base 4.96.0
  _ZN17KPropertiesDialog8canceledEv@Base 4.96.0
  _ZN17KPropertiesDialog9updateUrlERK4QUrl@Base 4.96.0
diff --git a/debian/patches/noinline_deprecated_slots.diff b/debian/patches/noinline_deprecated_slots.diff
new file mode 100644
index 0000000..0ff19ff
--- /dev/null
+++ b/debian/patches/noinline_deprecated_slots.diff
@@ -0,0 +1,55 @@
+Author: José Manuel Santamaría Lema <panfaust@gmail.com>
+Forwarded: https://git.reviewboard.kde.org/r/129032/
+Description: This patch moves the implementation of a couple of deprecated
+ methods from the *.h to the *.cpp file to avoid breaking the ABI of the
+ library without an soname change. See:
+ https://community.kde.org/Policies/Binary_Compatibility_Issues_With_C%2B%2B#The_Do.27s_and_Don.27ts
+ "You cannot...
+ [...]
+ For existing functions of any type:
+ [...]
+ inline it (this includes moving a member function's body to the class
+ definition, even without the inline keyword)."
+--- a/src/widgets/kpropertiesdialog.h
++++ b/src/widgets/kpropertiesdialog.h
+@@ -341,12 +341,12 @@ public Q_SLOTS:
+      * Called when the user presses 'Ok'.
+      * @deprecated since 5.25, use accept()
+      */
+-    KIOWIDGETS_DEPRECATED virtual void slotOk() { accept(); }
++    KIOWIDGETS_DEPRECATED virtual void slotOk();
+     /**
+      * Called when the user presses 'Cancel'.
+      * @deprecated since 5.25, use reject()
+      */
+-    KIOWIDGETS_DEPRECATED virtual void slotCancel() { reject(); }
++    KIOWIDGETS_DEPRECATED virtual void slotCancel();
+ 
+     /**
+      * Called when the user presses 'Ok'.
+--- a/src/widgets/kpropertiesdialog.cpp
++++ b/src/widgets/kpropertiesdialog.cpp
+@@ -500,6 +500,11 @@ bool KPropertiesDialog::canDisplay(const
+             KPreviewPropsPlugin::supports( _items )*/;
+ }
+ 
++void KPropertiesDialog::slotOk()
++{
++    accept();
++}
++
+ void KPropertiesDialog::accept()
+ {
+     QList<KPropertiesDialogPlugin *>::const_iterator pageListIt;
+@@ -543,6 +548,11 @@ void KPropertiesDialog::accept()
+     } // else, keep dialog open for user to fix the problem.
+ }
+ 
++void KPropertiesDialog::slotCancel()
++{
++    reject();
++}
++
+ void KPropertiesDialog::reject()
+ {
+     emit canceled();
diff --git a/debian/patches/series b/debian/patches/series
index 498808c..b130f0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ report_error_removing_dirs
 wait_for_a_bit_longer
 kubuntu_kdelibs4-docs-path.diff
 fix_kfreebsd_build
+noinline_deprecated_slots.diff