Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2018-10-04 18:59:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4" Thu Oct 4 18:59:58 2018 rev:304 rq:639466 version:4.14.38 Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2017-12-11 18:55:06.538545486 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2018-10-04 18:59:58.403298952 +0200 @@ -1,0 +2,18 @@ +Mon Oct 1 12:03:07 UTC 2018 - Christophe Giboudeaux <christo...@krop.fr> + +- Add 0001-Fix-the-smbclient-4.9-check.patch to fix the libsmbclient + symbols check in kdebase4-runtime. +- Run spec-cleaner. + +------------------------------------------------------------------- +Sat Dec 16 13:17:50 UTC 2017 - fab...@ritter-vogt.de + +- Do not build against QCA + +------------------------------------------------------------------- +Tue Dec 12 15:34:02 UTC 2017 - wba...@tmo.at + +- Add 0001-Make-kssl-compile-against-OpenSSL-1.1.0.patch (backported + from KF5's kdelibs4support) to allow building with openSSL 1.1.0 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2017-12-21 11:24:30.049717111 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2018-10-04 18:59:58.535298813 +0200 @@ -1,0 +2,7 @@ +Mon Oct 1 12:03:07 UTC 2018 - Christophe Giboudeaux <christo...@krop.fr> + +- Add 0001-Fix-the-smbclient-4.9-check.patch to fix the libsmbclient + symbols check in kdebase4-runtime. +- Run spec-cleaner. + +------------------------------------------------------------------- New: ---- 0001-Fix-the-smbclient-4.9-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.nj1Q4J/_old 2018-10-04 18:59:59.483297822 +0200 +++ /var/tmp/diff_new_pack.nj1Q4J/_new 2018-10-04 18:59:59.487297819 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdelibs4-apidocs # -# 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,9 +20,9 @@ Version: 4.14.38 Release: 0 Summary: KDE 4 API documentation -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE -Url: http://www.kde.org +URL: http://www.kde.org Source0: kdelibs-%{version}.tar.xz Source1: baselibs.conf Source2: hidden.desktop @@ -37,7 +37,6 @@ BuildRequires: libqt4-devel-doc BuildRequires: xz Requires: kde4-filesystem -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %define debug_package_requires %{name} = %{version}-%{release} libqt4-debuginfo @@ -60,11 +59,7 @@ %fdupes %{buildroot}%{_kde4_htmldir}/en/kdelibs4-apidocs %kde_post_install -%clean - rm -rf %{buildroot} - %files -%defattr(-,root,root,-) %{_kde4_htmldir}/en/kdelibs4-apidocs/ %changelog ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.nj1Q4J/_old 2018-10-04 18:59:59.499297806 +0200 +++ /var/tmp/diff_new_pack.nj1Q4J/_new 2018-10-04 18:59:59.503297802 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdelibs4 # -# 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 @@ -12,16 +12,51 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # a hack for building apidoc, currently unused and unneeded (rev.312) %bcond_with gendoxygen - Name: kdelibs4 Version: 4.14.38 Release: 0 +Summary: KDE Base Libraries +License: LGPL-2.1-or-later +Group: System/GUI/KDE +URL: http://www.kde.org +Source0: kdelibs-%{version}.tar.xz +Source1: baselibs.conf +Source2: hidden.desktop +Source3: ycp.xml +Source4: kde4rc +Patch1: default-useragent.diff +Patch2: add-suse-translations.diff +Patch3: clever-menu.diff +Patch4: kdesu-settings.diff +Patch5: desktop-translations.diff +Patch6: kjs-mark-register-stack.diff +Patch7: flash-player-non-oss.diff +Patch8: plasma-libs.diff +Patch9: ignore-inline-menu.diff +Patch10: ksuseinstall.diff +# PATCH-FIX-OPENSUSE exclude-qtuitools-symbols-from-public-libraries.patch -- We are using -Bsymbolic-functions link flags in kde4 macros, +# this patch exlcudes qtuitools symbols from libs that link to qtuitools, as otherwise users of +# those libs are crashing(bnc#819437, kde#303576, kde#231077, qtbug#437) +Patch11: exclude-qtuitools-symbols-from-public-libraries.patch +# PATCH-FIX-OPENSUSE 0001-Ommit-Solid-s-qDebug-and-qWarning-messages.patch -- we don't need verbosity here +Patch12: 0001-Ommit-Solid-s-qDebug-and-qWarning-messages.patch +# PATCH-FIX-OPENSUSE 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch -- Nepomuk is only used in a private header, browserrun_p.h, +# thus it is not needed as KParts public dependancy, makes it possible to drop libsoprano-devel from libkde4-devel Requires +Patch15: 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch +# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors spotted by GCC6. +Patch17: gcc6-fix-errors.patch +# PATCH-FIX-OPENSUSE +Patch18: Skip-qtwebkit-parts.patch +# PATCH-FIX-OPENSUSE +Patch19: 0001-Make-kssl-compile-against-OpenSSL-1.1.0.patch +# PATCH-FIX-OPENSUSE 0001-Fix-the-smbclient-4.9-check.patch -- Fix a CMake test failure in kdebase4-runtime when using Samba 4.9 +Patch20: 0001-Fix-the-smbclient-4.9-check.patch BuildRequires: OpenEXR-devel BuildRequires: automoc4 BuildRequires: avahi-compat-mDNSResponder-devel @@ -50,61 +85,25 @@ BuildRequires: libxslt-devel BuildRequires: pcre-devel BuildRequires: phonon-devel +BuildRequires: pkgconfig BuildRequires: shared-mime-info BuildRequires: update-desktop-files BuildRequires: utempter-devel BuildRequires: xz BuildRequires: xz-devel BuildRequires: pkgconfig(bzip2) -Summary: KDE Base Libraries -License: LGPL-2.1+ -Group: System/GUI/KDE -Url: http://www.kde.org -Source0: kdelibs-%{version}.tar.xz -Source1: baselibs.conf -Source2: hidden.desktop -Source3: ycp.xml -Source4: kde4rc -Patch1: default-useragent.diff -Patch2: add-suse-translations.diff -Patch3: clever-menu.diff -Patch4: kdesu-settings.diff -Patch5: desktop-translations.diff -Patch6: kjs-mark-register-stack.diff -Patch7: flash-player-non-oss.diff -Patch8: plasma-libs.diff -Patch9: ignore-inline-menu.diff -Patch10: ksuseinstall.diff -# PATCH-FIX-OPENSUSE exclude-qtuitools-symbols-from-public-libraries.patch -- We are using -Bsymbolic-functions link flags in kde4 macros, -# this patch exlcudes qtuitools symbols from libs that link to qtuitools, as otherwise users of -# those libs are crashing(bnc#819437, kde#303576, kde#231077, qtbug#437) -Patch11: exclude-qtuitools-symbols-from-public-libraries.patch -# PATCH-FIX-OPENSUSE 0001-Ommit-Solid-s-qDebug-and-qWarning-messages.patch -- we don't need verbosity here -Patch12: 0001-Ommit-Solid-s-qDebug-and-qWarning-messages.patch -# PATCH-FIX-OPENSUSE 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch -- Nepomuk is only used in a private header, browserrun_p.h, -# thus it is not needed as KParts public dependancy, makes it possible to drop libsoprano-devel from libkde4-devel Requires -Patch15: 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch -# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors spotted by GCC6. -Patch17: gcc6-fix-errors.patch -# PATCH-FIX-OPENSUSE -Patch18: Skip-qtwebkit-parts.patch -# PATCH-FIX-OPENSUSE -Patch19: 0001-Make-kssl-compile-against-OpenSSL-1.1.0.patch -PreReq: permissions -Requires: libattica0_4 >= %( echo `rpm -q --queryformat '%%{VERSION}' libattica-devel`) -Recommends: media-player-info +Requires: %{name}-branding = %{_kde_branding_version} Requires: kdelibs4-core = %{version} Requires: libkde4 = %{version} Requires: udisks2 Requires: upower +Requires: libattica0_4 >= %( echo `rpm -q --queryformat '%%{VERSION}' libattica-devel`) +%requires_ge libqt4-x11 +%requires_ge shared-mime-info +Requires(pre): permissions Requires(post): shared-mime-info Requires(postun): shared-mime-info - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%requires_ge shared-mime-info -%requires_ge libqt4-x11 - -Requires: %{name}-branding = %{_kde_branding_version} +Recommends: media-player-info %description This package contains the basic packages of the K Desktop Environment. @@ -115,12 +114,11 @@ %package branding-upstream Summary: KDE Base Libraries -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE -Provides: %{name}-branding = %{_kde_branding_version} - Supplements: packageand(kdelibs4:branding-upstream) -Conflicts: otherproviders(%{name}-branding) +Conflicts: %{name}-branding +Provides: %{name}-branding = %{_kde_branding_version} %description branding-upstream This package contains the basic packages for a K Desktop Environment @@ -148,6 +146,7 @@ %patch17 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build EXTRA_FLAGS="-DLIB_INSTALL_DIR=%{_kde4_libdir} \ @@ -162,10 +161,10 @@ -DKIO_NO_SOPRANO=ON \ -DKIO_NO_STRIGI=TRUE \ -DKDE_DEFAULT_HOME=.kde4 -DSYSCONF_INSTALL_DIR=%{_sysconfdir}" - %cmake_kde4 -d build -- -DKDE_DISTRIBUTION_TEXT="%distribution" $EXTRA_FLAGS + %cmake_kde4 -d build -- -DKDE_DISTRIBUTION_TEXT="%{distribution}" $EXTRA_FLAGS %make_jobs mkdir man1 - for f in %kde_auto_man + for f in %{kde_auto_man} do o="man1/$f.1" # no pipe: abort on fail help2man>"$o" "bin/$f.shell" @@ -217,29 +216,28 @@ %verify_permissions -e %{_kde4_libexecdir}/start_kdeinit %package doc +%define regcat %{_bindir}/sgml-register-catalog Summary: Documentation for KDE Base Libraries -License: LGPL-2.1+ and GFDL-1.2+ +License: LGPL-2.1-or-later AND GFDL-1.2-or-later Group: System/GUI/KDE -%define regcat /usr/bin/sgml-register-catalog -PreReq: %{regcat} -PreReq: /usr/bin/edit-xml-catalog -PreReq: /usr/bin/xmlcatalog -PreReq: awk -PreReq: grep -PreReq: sed Requires: sgml-skel +Requires(pre): %{_bindir}/edit-xml-catalog +Requires(pre): %{_bindir}/xmlcatalog +Requires(pre): %{regcat} +Requires(pre): awk +Requires(pre): grep +Requires(pre): sed %description doc This package contains the core environment and templates for the KDE help system. %files doc -%defattr(-,root,root) %doc %lang(en) %{_kde4_htmldir}/en/kioslave %{_kde4_appsdir}/ksgmltools2 %{_kde4_bindir}/meinproc4 %{_kde4_bindir}/meinproc4_simple -%doc COPYING.LIB COPYING.DOC +%license COPYING.LIB COPYING.DOC %doc %{_kde4_mandir}/man1/meinproc4.1.gz %if %{with gendoxygen} @@ -249,7 +247,7 @@ %package -n libkdecore4 Summary: KDE Core Libraries -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE %requires_ge libqt4 @@ -259,19 +257,18 @@ This package is absolutely necessary for using KDE applications. %post -n libkdecore4 -p /sbin/ldconfig - %postun -n libkdecore4 -p /sbin/ldconfig %files -n libkdecore4 -%defattr(-,root,root) -%doc COPYING COPYING.DOC COPYING.LIB README +%license COPYING COPYING.DOC COPYING.LIB +%doc README %{_kde4_libdir}/libkdecore.so.* %{_kde4_libdir}/libkdefakes.so.* %{_kde4_libdir}/libkpty.so.* %package -n kdelibs4-core Summary: KDE Base Libraries -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE Requires: kde4-filesystem >= 4.14 Requires: libkdecore4 = %{version} @@ -285,8 +282,7 @@ applications. %files -n kdelibs4-core -f filelists/kdecore -%defattr(-,root,root) -%doc COPYING.LIB +%license COPYING.LIB %{_kde4_configdir}/kdebug.areas %{_kde4_configdir}/kdebugrc %config %{_kde4_sysconfdir}/dbus-1/system.d/org.kde.auth.conf @@ -305,7 +301,7 @@ %package -n libkdecore4-devel Summary: KDE Core Libraries: Build Environment -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/KDE Requires: automoc4 Requires: cmake @@ -318,15 +314,15 @@ to develop non-graphical KDE applications. %files -n libkdecore4-devel -f filelists/kdecore.devel -%defattr(-,root,root) -%doc COPYING.LIB README +%license COPYING.LIB +%doc README %{_kde4_bindir}/kconfig_compiler %{_kde4_includedir}/kdemacros.h %doc %{_kde4_mandir}/man1/kconfig_compiler.1.gz %package -n libkde4 Summary: KDE Base Libraries -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE %requires_ge libqt4-x11 @@ -338,17 +334,14 @@ applications. %post -n libkde4 -p /sbin/ldconfig - %postun -n libkde4 -p /sbin/ldconfig %files branding-upstream -%defattr(-,root,root) -%doc COPYING.LIB +%license COPYING.LIB %{_kde4_appsdir}/kdeui/about %files -n libkde4 -%defattr(-,root,root) -%doc COPYING.LIB +%license COPYING.LIB %{_datadir}/locale/all_languages %{_kde4_libdir}/libkcmutils.so.* %{_kde4_libdir}/libkde3support.so.* @@ -384,7 +377,7 @@ %package -n libkde4-devel Summary: KDE Base Libraries: Build Environment -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/KDE Requires: docbook-xsl-stylesheets Requires: kdelibs4 = %{version} @@ -399,7 +392,6 @@ to develop KDE applications. %files -n libkde4-devel -f filelists/exclude -%defattr(-,root,root) %exclude %{_kde4_includedir}/ksuseinstall* %exclude %{_kde4_includedir}/kdemacros.h %exclude %{_kde4_libdir}/libkdeinit4_*.so @@ -411,10 +403,10 @@ %{_kde4_libdir}/cmake %{_kde4_libdir}/kde4/plugins/script/libkrossqtsplugin.so -%doc COPYING.LIB README +%license COPYING.LIB +%doc README %files -f filelists/exclude -%defattr(-,root,root) %verify(not mode caps) %attr(4755,root,root) %{_kde4_libexecdir}/start_kdeinit %{_kde4_configdir}/* %config %{_kde4_sysconfdir}/xdg/menus/applications.menu.kde4 @@ -479,8 +471,8 @@ Group: Development/Libraries/KDE Requires: yast2-packager >= 2.19.7 Requires: zypper -Recommends: ptools %requires_ge libqt4-x11 +Recommends: ptools %description -n libksuseinstall1 This library implements private API to install additional packages for KDE. @@ -496,15 +488,12 @@ This library implements private API to install additional packages for KDE. %post -n libksuseinstall1 -p /sbin/ldconfig - %postun -n libksuseinstall1 -p /sbin/ldconfig %files -n libksuseinstall1 -%defattr(-,root,root) %{_kde4_libdir}/libksuseinstall.so.* %files -n libksuseinstall-devel -%defattr(-,root,root) %{_kde4_includedir}/ksuseinstall.h %{_kde4_includedir}/ksuseinstall_export.h %{_kde4_libdir}/libksuseinstall.so ++++++ 0001-Fix-the-smbclient-4.9-check.patch ++++++ >From 8c949e2ef4f37bfe1f60c8bc91bc880d61fcb4ab Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Mon, 1 Oct 2018 13:50:02 +0200 Subject: [PATCH] Fix the samba 5.9 detection. When using the check_symbol_exists function from CMake, it tries to compile a temporary file using a C compiler and the kdelibs C_FLAGS. This fails due to the '-std=iso9899:1990' flag. To avoid changing the ancient KDE4 build system, check_symbol_exists is replaced by check_cxx_symbol_exists. This way, the kdelibs CXX flags are used and the symbol check succeeds. --- cmake/modules/FindSamba.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/FindSamba.cmake b/cmake/modules/FindSamba.cmake index 9240fcb..617593b 100644 --- a/cmake/modules/FindSamba.cmake +++ b/cmake/modules/FindSamba.cmake @@ -29,13 +29,13 @@ find_library(SAMBA_LIBRARIES NAMES smbclient HINTS ${PC_SAMBA_LIBDIR}) if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES) set(SAMBA_FOUND TRUE) # check whether libsmbclient has smbc_set_context() - include(CheckSymbolExists) + include(CheckCXXSymbolExists) include(MacroPushRequiredVars) macro_push_required_vars() set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SAMBA_LIBRARIES}) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${SAMBA_INCLUDE_DIR}) - check_symbol_exists(smbc_set_context "libsmbclient.h" SAMBA_HAVE_SMBC_SET_CONTEXT) - check_symbol_exists(smbc_option_set "libsmbclient.h" SAMBA_HAVE_SMBC_OPTION_SET) + check_cxx_symbol_exists(smbc_set_context "libsmbclient.h" SAMBA_HAVE_SMBC_SET_CONTEXT) + check_cxx_symbol_exists(smbc_option_set "libsmbclient.h" SAMBA_HAVE_SMBC_OPTION_SET) macro_pop_required_vars() # fail if smbc_set_context() was required but hasn't been found if (SAMBA_REQUIRE_SMBC_SET_CONTEXT AND NOT SAMBA_HAVE_SMBC_SET_CONTEXT) -- 2.19.0
