Hello community, here is the log from the commit of package kopete for openSUSE:Factory checked in at 2018-04-25 09:55:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kopete (Old) and /work/SRC/openSUSE:Factory/.kopete.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kopete" Wed Apr 25 09:55:44 2018 rev:64 rq:599193 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kopete/kopete.changes 2017-11-16 14:27:37.511790742 +0100 +++ /work/SRC/openSUSE:Factory/.kopete.new/kopete.changes 2018-04-25 09:55:59.770630701 +0200 @@ -1,0 +2,28 @@ +Thu Apr 19 16:25:55 UTC 2018 - wba...@tmo.at + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * Mostly fix the installation of icons + * Desktop: remove duplicated X-DBUS-StartupType + +------------------------------------------------------------------- +Tue Apr 10 16:56:33 UTC 2018 - wba...@tmo.at + +- Add fix-build-with-gcc48.patch to make it build with gcc 4.8 on + Leap 42.3 + +------------------------------------------------------------------- +Sun Apr 08 09:20:01 CEST 2018 - lbeltr...@kde.org + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.08.3: + * Port to KF5 + * Too many changes to list here + +------------------------------------------------------------------- Old: ---- kopete-17.08.3.tar.xz New: ---- fix-build-with-gcc48.patch kopete-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kopete.spec ++++++ --- /var/tmp/diff_new_pack.piDpaK/_old 2018-04-25 09:56:01.646561890 +0200 +++ /var/tmp/diff_new_pack.piDpaK/_new 2018-04-25 09:56:01.650561744 +0200 @@ -1,7 +1,7 @@ # # spec file for package kopete # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,25 +15,50 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%bcond_without lang Name: kopete -Version: 17.08.3 +Version: 18.04.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Instant Messenger License: GPL-2.0+ Group: Productivity/Networking/Instant Messenger Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE +Patch: fix-build-with-gcc48.patch BuildRequires: alsa-devel +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Xml) +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5Contacts) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5DNSSD) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5Emoticons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IdentityManagement) +BuildRequires: cmake(KF5KCMUtils) +BuildRequires: cmake(KF5KHtml) +BuildRequires: cmake(KF5NotifyConfig) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5TextEditor) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5Libkleo) +BuildRequires: extra-cmake-modules BuildRequires: giflib-devel BuildRequires: libgadu-devel BuildRequires: libidn-devel BuildRequires: libjasper-devel -BuildRequires: libkdepimlibs4-devel -BuildRequires: libqca2-devel -BuildRequires: libqimageblitz-devel +BuildRequires: libqca-qt5-devel BuildRequires: libv4l-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel @@ -45,19 +70,15 @@ BuildRequires: pkgconfig BuildRequires: speex-devel BuildRequires: sqlite-devel +BuildRequires: phonon4qt5-devel BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libotr) >= 4.0.0 BuildRequires: pkgconfig(libsrtp) %if 0%{?is_opensuse} || !0%{?sle_version} BuildRequires: pkgconfig(ortp) >= 0.22 %endif -# binary compatibility doesn't really exist here -%requires_eq libmsn0_1 -Recommends: kdepim4-runtime -Recommends: kopete-protocol-facebook +BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{kde4_runtime_requires} -%{kde4_pimlibs_requires} %description Kopete is the KDE instant messenger and supports multiple protocols. @@ -66,30 +87,31 @@ Summary: Instant Messenger - Development Files Group: Productivity/Networking/Instant Messenger Requires: kopete >= %{version} -Requires: libkdepimlibs4-devel -Provides: kde4-kopete-devel = %{version} -Obsoletes: kde4-kopete-devel < %{version} -%{kde4_runtime_requires} %description devel Kopete is the KDE instant messenger and supports multiple protocols. +%if %{with_lang} +%lang_package +%endif + %prep %setup -q +%if 0%{?suse_version} < 1500 +%patch -p1 +%endif %build -%ifarch ppc ppc64 -export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" -%endif -export RPM_OPT_FLAGS="%{optflags} -fPIE" -export LDFLAGS="-pie" - %cmake_kde4 -d build -- -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/browser-plugins + %cmake_kf5 -d build %make_jobs %install - %kde4_makeinstall -C build - %suse_update_desktop_file kopete Network InstantMessaging - %kde_post_install +%kf5_makeinstall -C build +%suse_update_desktop_file org.kde.kopete Network InstantMessaging +%if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs +%endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -97,55 +119,47 @@ %files %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kde4_bindir}/kopete -%{_kde4_bindir}/kopete_latexconvert.sh -%{_kde4_bindir}/winpopup-* -%{_kde4_modulesdir}/kcm_kopete_*.so -%{_kde4_modulesdir}/kopete_*.so -%{_kde4_modulesdir}/libchattexteditpart.so -%{_kde4_libdir}/libkopete.so.* -%{_kde4_libdir}/libkopete*.so.* -%{_kde4_libdir}/libkyahoo.so.* -%{_kde4_libdir}/liboscar.so.* -%{_kde4_libdir}/libqgroupwise.so -%{_kde4_libdir}/browser-plugins/skypebuttons.so -%{_kde4_applicationsdir}/kopete.desktop -%{_kde4_datadir}/dbus-1/interfaces/ -%{_kde4_htmldir}/en/kopete/ -%{_kde4_iconsdir}/hicolor/*/apps/kopete*.* -%{_kde4_iconsdir}/oxygen/*/actions/* -%{_kde4_iconsdir}/oxygen/*/status/* -%{_kde4_appsdir}/kconf_update/ -%{_kde4_appsdir}/kopete/ -%{_kde4_configkcfgdir}/* -%{_kde4_servicesdir}/*.protocol -%{_kde4_servicesdir}/*.desktop -%{_kde4_servicetypesdir}/*.desktop -%{_kde4_datadir}/sounds/*.ogg -%{_kde4_appsdir}/kopete_contactnotes/ -%{_kde4_appsdir}/kopete_groupwise/ -%{_kde4_appsdir}/kopete_history/ -%{_kde4_appsdir}/kopete_history2/ -%{_kde4_appsdir}/kopete_jabber/ -%{_kde4_appsdir}/kopete_latex/ -%{_kde4_appsdir}/kopete_otr/ -%{_kde4_appsdir}/kopete_privacy/ -%{_kde4_appsdir}/kopete_skype/ -%{_kde4_appsdir}/kopete_statistics/ -%{_kde4_appsdir}/kopete_translator/ -%{_kde4_appsdir}/kopete_yahoo/ -%{_kde4_modulesdir}/plugins/accessible/ -%{_kde4_appsdir}/kopeterichtexteditpart/ -%{_kde4_servicesdir}/kconfiguredialog/ -%{_kde4_configdir}/kopeterc +%{_kf5_bindir}/kopete +%{_kf5_bindir}/winpopup-* +%{_kf5_plugindir}/kcm_kopete_*.so +%{_kf5_plugindir}/kopete_*.so +%{_kf5_plugindir}/chattexteditpart.so +%{_kf5_libdir}/libkopete.so.* +%{_kf5_libdir}/libkopete*.so.* +%{_kf5_libdir}/libkyahoo.so.* +%{_kf5_libdir}/liboscar.so.* +%{_kf5_libdir}/libqgroupwise.so +%{_kf5_applicationsdir}/org.kde.kopete.desktop +%{_kf5_sharedir}/dbus-1/interfaces/ +%{_kf5_htmldir}/en/kopete/ +%{_kf5_iconsdir}/hicolor/*/*/ +%{_kf5_iconsdir}/oxygen/*/*/ +%{_kf5_appsdir}/kconf_update/ +%{_kf5_kxmlguidir}/kopete*/ +%{_kf5_configkcfgdir}/ +%{_kf5_servicesdir}/*.protocol +%{_kf5_servicesdir}/*.desktop +%{_kf5_servicetypesdir}/*.desktop +%{_kf5_sharedir}/kopete/ +%{_kf5_sharedir}/sounds/*.ogg +%{_kf5_appsdir}/kopete_history/ +%{_kf5_plugindir}/plugins/ +%{_kf5_servicesdir}/kconfiguredialog/ +%{_kf5_configdir}/kopeterc +%{_kf5_debugdir}/kopete.categories %files devel %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kde4_includedir}/kopete/ -%{_kde4_libdir}/libkopete.so -%{_kde4_libdir}/libkopete*.so -%{_kde4_libdir}/libkyahoo.so -%{_kde4_libdir}/liboscar.so +%{_includedir}/kopete/ +%{_kf5_libdir}/libkopete.so +%{_kf5_libdir}/libkopete*.so +%{_kf5_libdir}/libkyahoo.so +%{_kf5_libdir}/liboscar.so + +%if %{with lang} +%files lang -f %{name}.lang +%license COPYING* +%endif %changelog ++++++ fix-build-with-gcc48.patch ++++++ >From 8574a9511deb1bf73fe37faae87652fe675654e7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <wba...@tmo.at> Date: Tue, 10 Apr 2018 18:36:15 +0200 Subject: [PATCH] Fix build with gcc 4.8 See https://bugreports.qt.io/browse/QTBUG-48988 --- plugins/privacy/privacypreferences.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/privacy/privacypreferences.cpp b/plugins/privacy/privacypreferences.cpp index ca0321c6f..bcadc7839 100644 --- a/plugins/privacy/privacypreferences.cpp +++ b/plugins/privacy/privacypreferences.cpp @@ -175,8 +175,8 @@ void PrivacyPreferences::slotBtnAddToWhiteListClicked() QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); okButton->setDefault(true); okButton->setShortcut(Qt::CTRL | Qt::Key_Return); - connect(buttonBox, &QDialogButtonBox::accepted, addDialog, &QDialog::accept); - connect(buttonBox, &QDialogButtonBox::rejected, addDialog, &QDialog::reject); + connect(buttonBox, &QDialogButtonBox::accepted, addDialog.data(), &QDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, addDialog.data(), &QDialog::reject); buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); @@ -208,8 +208,8 @@ void PrivacyPreferences::slotBtnAddToBlackListClicked() QVBoxLayout *mainLayout = new QVBoxLayout; okButton->setDefault(true); okButton->setShortcut(Qt::CTRL | Qt::Key_Return); - connect(buttonBox, &QDialogButtonBox::accepted, addDialog, &QDialog::accept); - connect(buttonBox, &QDialogButtonBox::rejected, addDialog, &QDialog::reject); + connect(buttonBox, &QDialogButtonBox::accepted, addDialog.data(), &QDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, addDialog.data(), &QDialog::reject); buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); QPointer <QWidget> box = new QWidget(addDialog); -- 2.13.6 ++++++ kopete-17.08.3.tar.xz -> kopete-18.04.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kopete/kopete-17.08.3.tar.xz /work/SRC/openSUSE:Factory/.kopete.new/kopete-18.04.0.tar.xz differ: char 25, line 1
