Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2014-03-18 16:01:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2014-02-20 07:59:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2014-03-18 16:01:54.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Mar 13 20:06:10 UTC 2014 - [email protected] + +- Update to 4.12.90 + * KDE 4.13 Beta 2 release + * See http://www.kde.org/announcements/announce-4.13-beta2.php + +------------------------------------------------------------------- +Fri Mar 7 09:55:47 UTC 2014 - [email protected] + +- Update to 4.12.80 + * KDE 4.13 Beta 1 release + * See http://www.kde.org/announcements/announce-4.13-beta1.php + +- Added openSUSE patches make-strigi-optional.patch and + 0001-Ommit-Solid-s-qDebug-and-qWarning-messages.patch + +------------------------------------------------------------------- @@ -6,0 +24,10 @@ + +- Drop upstreamed patch + * 0001-Fix-display-of-interlaced-GIF-images-with-giflib-v5.patch + +------------------------------------------------------------------- +Tue Jan 21 10:10:35 UTC 2014 - [email protected] + +- Added 0001-Fix-display-of-interlaced-GIF-images-with-giflib-v5.patch: + With giflib v5 GIF images don't need to be deinterlaced manually, + fixes display of interlaced GIF images in KHTML on 13.1 (kde#330148) --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2014-02-20 07:59:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2014-03-18 16:01:54.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Mar 13 20:06:10 UTC 2014 - [email protected] + +- Update to 4.12.90 + * KDE 4.13 Beta 2 release + * See http://www.kde.org/announcements/announce-4.13-beta2.php + +------------------------------------------------------------------- +Fri Mar 7 09:55:47 UTC 2014 - [email protected] + +- Update to 4.12.80 + * KDE 4.13 Beta 1 release + * See http://www.kde.org/announcements/announce-4.13-beta1.php + +- Added openSUSE patches make-strigi-optional.patch and + 0001-Ommit-Solid-s-qDebug-and-qWarning-messages.patch + +------------------------------------------------------------------- Old: ---- kdelibs-4.12.2.tar.xz New: ---- 0001-Ommit-Solid-s-qDebug-and-qWarning-messages.patch kdelibs-4.12.90.tar.xz make-strigi-optional.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.QvSRPg/_old 2014-03-18 16:01:55.000000000 +0100 +++ /var/tmp/diff_new_pack.QvSRPg/_new 2014-03-18 16:01:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdelibs4-apidocs -Version: 4.12.2 +Version: 4.12.90 Release: 0 Summary: KDE 4 API documentation License: LGPL-2.1+ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.QvSRPg/_old 2014-03-18 16:01:55.000000000 +0100 +++ /var/tmp/diff_new_pack.QvSRPg/_new 2014-03-18 16:01:55.000000000 +0100 @@ -20,7 +20,7 @@ %bcond_with gendoxygen Name: kdelibs4 -Version: 4.12.2 +Version: 4.12.90 Release: 0 BuildRequires: OpenEXR-devel BuildRequires: automoc4 @@ -48,15 +48,11 @@ BuildRequires: libpolkit-qt-1-devel BuildRequires: libqca2-devel >= 2.0.0 BuildRequires: libqt4-devel >= 4.8.0 -BuildRequires: libsoprano-devel >= 2.7.56 BuildRequires: libudev-devel BuildRequires: libxslt-devel BuildRequires: pcre-devel BuildRequires: phonon-devel -BuildRequires: shared-desktop-ontologies-devel >= 0.10.0 BuildRequires: shared-mime-info -BuildRequires: strigi -BuildRequires: strigi-devel >= 0.6.3 BuildRequires: update-desktop-files BuildRequires: utempter-devel BuildRequires: xz @@ -85,10 +81,12 @@ # 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 make-strigi-optional.patch -- kill, kill, kill!! +Patch13: make-strigi-optional.patch PreReq: permissions Requires: libattica0_4 >= %( echo `rpm -q --queryformat '%{VERSION}' libattica-devel`) -Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) -Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Recommends: media-player-info Requires: kdelibs4-core = %{version} Requires: libkde4 = %{version} @@ -98,9 +96,7 @@ Requires(postun): shared-mime-info BuildRoot: %{_tmppath}/%{name}-%{version}-build -%requires_ge libstrigi0 %requires_ge shared-mime-info -%requires_ge shared-desktop-ontologies %requires_ge libqt4-x11 %if 0%{?opensuse_bs} @@ -131,7 +127,7 @@ # KDE 292715 292723 292725 292764 292765 # kconfig_compiler pending upstream <URL: http://lists.kde.org/?l=kde-doc-english&m=132791095310563&w=2 > -%define kde_auto_man nepomuk-rcgen kde4-config kunittestmodrunner kfilemetadatareader meinproc4 +%define kde_auto_man kde4-config kunittestmodrunner meinproc4 %prep %setup -q -n kdelibs-%{version} @@ -146,6 +142,8 @@ %patch9 %patch10 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %build EXTRA_FLAGS="-DLIB_INSTALL_DIR=%{_kde4_libdir} \ @@ -157,6 +155,9 @@ -DTEMPLATES_INSTALL_DIR=%{_kde4_sharedir}/templates \ -DHTML_INSTALL_DIR=%{_kde4_htmldir} \ -DWITH_SOLID_UDISKS2=TRUE \ + -DKIO_NO_STRIGI=ON \ + -DKIO_NO_SOPRANO=ON \ + -DKIO_NO_NEPOMUK=ON \ -DKDE_DEFAULT_HOME=.kde4 -DSYSCONF_INSTALL_DIR=%{_sysconfdir}" %cmake_kde4 -d build -- -DKDE_DISTRIBUTION_TEXT="%distribution" $EXTRA_FLAGS %make_jobs @@ -373,9 +374,6 @@ %{_kde4_libdir}/libkunitconversion.so.* %{_kde4_libdir}/libkunittest.so.* %{_kde4_libdir}/libkutils.so.* -%{_kde4_libdir}/libnepomuk.so.* -%{_kde4_libdir}/libnepomukquery.so.* -%{_kde4_libdir}/libnepomukutils.so.* %{_kde4_libdir}/libplasma.so.* %{_kde4_libdir}/libsolid.so.* %{_kde4_libdir}/libthreadweaver.so.* @@ -399,12 +397,9 @@ Requires: libkde4 = %{version} Requires: libkdecore4-devel = %{version} Requires: libpolkit-qt-1-devel -Requires: libsoprano-devel Requires: libxslt-devel Requires: pcre-devel Requires: phonon-devel -Requires: shared-desktop-ontologies-devel >= 0.10 -Requires: strigi-devel Requires: update-desktop-files Requires: pkgconfig(libxml-2.0) ++++++ 0001-Ommit-Solid-s-qDebug-and-qWarning-messages.patch ++++++ >From 8b938adede60ee52693a2ad9c7344132d3cc4f8c Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <[email protected]> Date: Wed, 11 Dec 2013 04:16:52 +0100 Subject: [PATCH 1/1] Ommit Solid's qDebug and qWarning messages --- cmake/modules/FindKDE4Internal.cmake | 2 +- solid/solid/CMakeLists.txt | 3 ++- solid/solid/backends/hal/halstorageaccess.cpp | 2 ++ solid/solid/backends/udisks/udisksstorageaccess.cpp | 3 ++- solid/solid/backends/udisks2/udisksstorageaccess.cpp | 3 ++- solid/solid/backends/upower/upowermanager.cpp | 2 ++ 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake index 784f18e..d2d426e 100644 --- a/cmake/modules/FindKDE4Internal.cmake +++ b/cmake/modules/FindKDE4Internal.cmake @@ -1305,7 +1305,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) endif(NOT _compile_result) else(_basic_compile_result) message("${_compile_output_var}") - message(FATAL_ERROR "Unable to compile a basic Qt application. Qt has not been found correctly.") + message(STATUS "Unable to compile a basic Qt application. Qt has not been found correctly.") endif(_basic_compile_result) if (GCC_IS_NEWER_THAN_4_2) diff --git a/solid/solid/CMakeLists.txt b/solid/solid/CMakeLists.txt index ab5bfd4..06d1656 100644 --- a/solid/solid/CMakeLists.txt +++ b/solid/solid/CMakeLists.txt @@ -272,6 +272,7 @@ if(NOT WIN32 AND NOT APPLE) ) message(STATUS "Building Solid UPower backend." ) + add_definitions(-DQT_NO_DEBUG_OUTPUT) set(solid_LIB_SRCS ${solid_LIB_SRCS} backends/upower/upowermanager.cpp backends/upower/upowerdevice.cpp @@ -286,7 +287,7 @@ if(NOT WIN32 AND NOT APPLE) if ( WITH_SOLID_UDISKS2 ) message(STATUS "Building Solid UDisks2 backend." ) - add_definitions(-DWITH_SOLID_UDISKS2) + add_definitions(-DWITH_SOLID_UDISKS2 -DQT_NO_DEBUG_OUTPUT) set(solid_LIB_SRCS ${solid_LIB_SRCS} backends/udisks2/udisksmanager.cpp backends/udisks2/udisksdevice.cpp diff --git a/solid/solid/backends/hal/halstorageaccess.cpp b/solid/solid/backends/hal/halstorageaccess.cpp index c92358d..ba61a2f 100644 --- a/solid/solid/backends/hal/halstorageaccess.cpp +++ b/solid/solid/backends/hal/halstorageaccess.cpp @@ -340,9 +340,11 @@ bool StorageAccess::requestPassphrase() returnService, m_lastReturnObject, wId, appId); m_passphraseRequested = reply.isValid(); +#ifndef QT_NO_DEBUG_STREAM if (!m_passphraseRequested) { qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error(); } +#endif return m_passphraseRequested; } diff --git a/solid/solid/backends/udisks/udisksstorageaccess.cpp b/solid/solid/backends/udisks/udisksstorageaccess.cpp index 63470ec..88310da 100644 --- a/solid/solid/backends/udisks/udisksstorageaccess.cpp +++ b/solid/solid/backends/udisks/udisksstorageaccess.cpp @@ -339,9 +339,10 @@ bool UDisksStorageAccess::requestPassphrase() QDBusReply<void> reply = soliduiserver.call("showPassphraseDialog", udi, returnService, m_lastReturnObject, wId, appId); m_passphraseRequested = reply.isValid(); +#ifndef QT_NO_DEBUG_STREAM if (!m_passphraseRequested) qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error(); - +#endif return m_passphraseRequested; } diff --git a/solid/solid/backends/udisks2/udisksstorageaccess.cpp b/solid/solid/backends/udisks2/udisksstorageaccess.cpp index 6958459..b1cede9 100644 --- a/solid/solid/backends/udisks2/udisksstorageaccess.cpp +++ b/solid/solid/backends/udisks2/udisksstorageaccess.cpp @@ -341,9 +341,10 @@ bool StorageAccess::requestPassphrase() QDBusReply<void> reply = soliduiserver.call("showPassphraseDialog", udi, returnService, m_lastReturnObject, wId, appId); m_passphraseRequested = reply.isValid(); +#ifndef QT_NO_DEBUG_STREAM if (!m_passphraseRequested) qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error(); - +#endif return m_passphraseRequested; } diff --git a/solid/solid/backends/upower/upowermanager.cpp b/solid/solid/backends/upower/upowermanager.cpp index 1bfd37a..70739d7 100644 --- a/solid/solid/backends/upower/upowermanager.cpp +++ b/solid/solid/backends/upower/upowermanager.cpp @@ -142,7 +142,9 @@ QStringList UPowerManager::allDevices() QDBusReply<QList<QDBusObjectPath> > reply = m_manager.call("EnumerateDevices"); if (!reply.isValid()) { +#ifndef QT_NO_DEBUG_STREAM qWarning() << Q_FUNC_INFO << " error: " << reply.error().name(); +#endif return QStringList(); } -- 1.8.5 ++++++ kdelibs-4.12.2.tar.xz -> kdelibs-4.12.90.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdelibs4/kdelibs-4.12.2.tar.xz /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs-4.12.90.tar.xz differ: char 26, line 1 ++++++ make-strigi-optional.patch ++++++ diff -Naur kdelibs-4.11.2.orig/CMakeLists.txt kdelibs-4.11.2/CMakeLists.txt --- kdelibs-4.11.2.orig/CMakeLists.txt 2013-09-26 22:01:41.396214518 +0200 +++ kdelibs-4.11.2/CMakeLists.txt 2014-01-25 01:15:49.536201825 +0100 @@ -85,7 +85,7 @@ set (STRIGI_TYPE "OPTIONAL") set (STRIGI_EXTRA_TEXT "") else (WIN32) - set (STRIGI_TYPE "REQUIRED") + set (STRIGI_TYPE "OPTIONAL") set (STRIGI_EXTRA_TEXT "Required by some critical kioslaves") endif (WIN32) set_package_properties(Strigi PROPERTIES DESCRIPTION "Desktop indexing and search support" diff -Naur kdelibs-4.11.2.orig/kio/kio/kfilemetainfo.cpp kdelibs-4.11.2/kio/kio/kfilemetainfo.cpp --- kdelibs-4.11.2.orig/kio/kio/kfilemetainfo.cpp 2013-06-28 19:03:41.365391370 +0200 +++ kdelibs-4.11.2/kio/kio/kfilemetainfo.cpp 2014-01-25 01:11:58.524089874 +0100 @@ -421,9 +421,10 @@ { } -const KFileMetaInfo& KFileMetaInfo::operator= ( KFileMetaInfo const & kfmi ) +KFileMetaInfo &KFileMetaInfo::operator= ( KFileMetaInfo const &kfmi ) { - return kfmi; + d = kfmi.d; + return *this; } KFileMetaInfo::~KFileMetaInfo() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
