Hello community, here is the log from the commit of package kdesdk3 for openSUSE:Factory checked in at 2016-06-23 13:36:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk3 (Old) and /work/SRC/openSUSE:Factory/.kdesdk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesdk3" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk3/kdesdk3.changes 2014-12-01 14:01:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdesdk3.new/kdesdk3.changes 2016-06-23 13:36:54.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 21 00:44:39 UTC 2016 - [email protected] + +- add patch: kdesdk-3.5.10-gcc6.patch + * fix boo#985185 + * fix call of overloaded abs(u_int32_t) is ambiguous + +------------------------------------------------------------------- New: ---- kdesdk-3.5.10-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk3.spec ++++++ --- /var/tmp/diff_new_pack.bFcysy/_old 2016-06-23 13:36:56.000000000 +0200 +++ /var/tmp/diff_new_pack.bFcysy/_new 2016-06-23 13:36:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdesdk3 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,27 +16,29 @@ # -Name: kdesdk3 %define _mandir /opt/kde3/share/man -BuildRequires: db-devel -BuildRequires: flex -BuildRequires: kdebase3-devel -BuildRequires: libtool -%ifarch %ix86 ppc x86_64 ppc64 -BuildRequires: valgrind-devel -%endif -BuildRequires: fdupes +Name: kdesdk3 +Version: 3.5.10 +Release: 0 Summary: The KDE Software Development Kit License: GPL-2.0+ Group: System/GUI/KDE -Version: 3.5.10 -Release: 0 Url: http://www.kde.org/ -Requires: cvs -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdesdk-%{version}.tar.bz2 Patch0: 3_5_BRANCH.diff Patch1: kdesdk-3.5.10-fix-bashisms.patch +#PATCH-FIX-UPSTREAM fix call of overloaded abs(u_int32_t) is ambiguous +Patch2: kdesdk-3.5.10-gcc6.patch +BuildRequires: db-devel +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: kdebase3-devel +BuildRequires: libtool +Requires: cvs +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%ifarch %ix86 ppc x86_64 ppc64 +BuildRequires: valgrind-devel +%endif %description This is a collection of applications and tools used by KDE developers. @@ -81,10 +83,10 @@ poxml: translate DocBook files using translated PO files. %package devel -Requires: kdelibs3-devel -Requires: kdesdk3 Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ +Requires: kdelibs3-devel +Requires: kdesdk3 %description devel This package contains all necessary include files and libraries needed @@ -94,19 +96,20 @@ %setup -q -n kdesdk-%{version} %patch0 %patch1 -p1 +%patch2 -p1 # kmtrace does not work with glibc 2.3 anymore and valgrind is way better rm -rf kmtrace -. /etc/opt/kde3/common_options +. %{_sysconfdir}/opt/kde3/common_options update_admin %build -. /etc/opt/kde3/common_options -./configure $configkde --mandir=%_mandir -do_make %{?jobs:-j %jobs} +. %{_sysconfdir}/opt/kde3/common_options +./configure $configkde --mandir=%{_mandir} +do_make %{?_smp_mflags} %install -. /etc/opt/kde3/common_options -make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET +. %{_sysconfdir}/opt/kde3/common_options +make DESTDIR=%{buildroot} $INSTALL_TARGET chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/include/kapptemplate.common chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/do_make chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/config.sub @@ -139,14 +142,11 @@ %suse_update_desktop_file kompare Development RevisionControl %suse_update_desktop_file kcachegrind Development Profiling kde_post_install -%fdupes -s $RPM_BUILD_ROOT +%fdupes -s %{buildroot} %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig - %post translate -p /sbin/ldconfig - %postun translate -p /sbin/ldconfig %files @@ -190,21 +190,21 @@ /opt/kde3/bin/package_crystalsvg /opt/kde3/bin/png2mng.pl /opt/kde3/bin/svn* -/opt/kde3/%_lib/kde3/kabcformat_kdeaccounts.* -/opt/kde3/%_lib/kde3/kfile_cpp.* -/opt/kde3/%_lib/kde3/kfile_diff.* -/opt/kde3/%_lib/kde3/kfile_ts.* -/opt/kde3/%_lib/kde3/lib* -/opt/kde3/%_lib/kde3/plugins*/styles/scheck.* -/opt/kde3/%_lib/libc* -/opt/kde3/%_lib/kde3/cervisia.* -/opt/kde3/%_lib/kde3/cvsservice.* -/opt/kde3/%_lib/kde3/cvsaskpass.* -/opt/kde3/%_lib/libkdeinit_cervisia.* -/opt/kde3/%_lib/libkdeinit_cvs* -/opt/kde3/%_lib/libkompareinterface.* -/opt/kde3/%_lib/libkspy.* -/opt/kde3/%_lib/kde3/quithumbnail.* +/opt/kde3/%{_lib}/kde3/kabcformat_kdeaccounts.* +/opt/kde3/%{_lib}/kde3/kfile_cpp.* +/opt/kde3/%{_lib}/kde3/kfile_diff.* +/opt/kde3/%{_lib}/kde3/kfile_ts.* +/opt/kde3/%{_lib}/kde3/lib* +/opt/kde3/%{_lib}/kde3/plugins*/styles/scheck.* +/opt/kde3/%{_lib}/libc* +/opt/kde3/%{_lib}/kde3/cervisia.* +/opt/kde3/%{_lib}/kde3/cvsservice.* +/opt/kde3/%{_lib}/kde3/cvsaskpass.* +/opt/kde3/%{_lib}/libkdeinit_cervisia.* +/opt/kde3/%{_lib}/libkdeinit_cvs* +/opt/kde3/%{_lib}/libkompareinterface.* +/opt/kde3/%{_lib}/libkspy.* +/opt/kde3/%{_lib}/kde3/quithumbnail.* /opt/kde3/share/applications/kde/cervisia.desktop /opt/kde3/share/applications/kde/kompare.desktop /opt/kde3/share/applications/kde/umbrello.desktop @@ -242,10 +242,10 @@ /opt/kde3/bin/nonsvnlist /opt/kde3/bin/kunittest* /opt/kde3/include/kunittest/runnergui.h -/opt/kde3/%_lib/libkunittestgui.la -/opt/kde3/%_lib/libkunittestgui.so* +/opt/kde3/%{_lib}/libkunittestgui.la +/opt/kde3/%{_lib}/libkunittestgui.so* /opt/kde3/share/apps/katepart/syntax/kdesvn-buildrc.xml -%_mandir/*/* +%{_mandir}/*/* %files kdecvs %defattr(-,root,root) @@ -280,10 +280,10 @@ /opt/kde3/bin/swappo /opt/kde3/bin/transxx /opt/kde3/bin/xml2pot -/opt/kde3/%_lib/kde3/kbabel* -/opt/kde3/%_lib/kde3/kfile_po.* -/opt/kde3/%_lib/kde3/pothumbnail.* -/opt/kde3/%_lib/libkbabel* +/opt/kde3/%{_lib}/kde3/kbabel* +/opt/kde3/%{_lib}/kde3/kfile_po.* +/opt/kde3/%{_lib}/kde3/pothumbnail.* +/opt/kde3/%{_lib}/libkbabel* /opt/kde3/share/applications/kde/catalogmanager.desktop /opt/kde3/share/applications/kde/kbabel* /opt/kde3/share/apps/catalogmanager ++++++ kdesdk-3.5.10-gcc6.patch ++++++ Index: kdesdk-3.5.10/kbabel/kbabeldict/modules/dbsearchengine/database.cpp =================================================================== --- kdesdk-3.5.10.orig/kbabel/kbabeldict/modules/dbsearchengine/database.cpp +++ kdesdk-3.5.10/kbabel/kbabeldict/modules/dbsearchengine/database.cpp @@ -35,6 +35,7 @@ #include <resources.h> #include "database.h" #include <unistd.h> +#include <cmath> #include <qfile.h> @@ -1169,7 +1170,7 @@ DataBaseManager::addLocation (QString wo else { step = - (abs (d[loc] - location) * num) / totalrecord + 1; + (std::abs (d[loc] - location) * num) / totalrecord + 1; }
