Hello community, here is the log from the commit of package kdeutils3 for openSUSE:Factory checked in at 2016-06-23 13:36:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeutils3 (Old) and /work/SRC/openSUSE:Factory/.kdeutils3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeutils3" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeutils3/kdeutils3.changes 2015-03-03 11:15:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdeutils3.new/kdeutils3.changes 2016-06-23 13:36:48.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 21 00:37:47 UTC 2016 - [email protected] + +- add patch: kdeutils-3.5.10-gcc6.patch + * fix boo#985181 + * fix call of overloaded abs(unsigned int) is ambiguous + +------------------------------------------------------------------- New: ---- kdeutils-3.5.10-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeutils3.spec ++++++ --- /var/tmp/diff_new_pack.GPURM4/_old 2016-06-23 13:36:49.000000000 +0200 +++ /var/tmp/diff_new_pack.GPURM4/_new 2016-06-23 13:36:49.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdeutils3 # -# 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 @@ -17,11 +17,6 @@ Name: kdeutils3 -BuildRequires: gmp-devel -BuildRequires: kdebase3-devel -BuildRequires: net-snmp-devel -BuildRequires: pcsc-lite -BuildRequires: python-devel Version: 3.5.10 Release: 0 Summary: KDE Utility Programs @@ -45,7 +40,13 @@ Patch18: kdeutils-3.5.8-alt-ark-rar-password.patch Patch19: kdeutils-3.5.8-alt-ark-zip-password.patch Patch20: kdeutils-3.5.8-alt-create-password-zip-rar-7zip.patch - +#PATCH-FIX-UPSTREAM fix call of overloaded 'abs(unsigned int) is ambiguous +Patch21: kdeutils-3.5.10-gcc6.patch +BuildRequires: gmp-devel +BuildRequires: kdebase3-devel +BuildRequires: net-snmp-devel +BuildRequires: pcsc-lite +BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -124,6 +125,7 @@ pushd klaptopdaemon/linux %patch16 popd +%patch21 -p1 sed -i 1i\ '#define HAVE_STRLCAT' ksim/monitors/snmp/snmp.cpp sed -i 1i\ '#define HAVE_STRLCAT' ksim/monitors/snmp/value.cpp sed -i 1i\ '#define HAVE_STRLCAT' ksim/monitors/snmp/session.cpp @@ -132,11 +134,11 @@ rm -rf kfloppy doc/kfloppy %endif rm -rf klaptopdaemon -. /etc/opt/kde3/common_options +. %{_sysconfdir}/opt/kde3/common_options update_admin %build -. /etc/opt/kde3/common_options +. %{_sysconfdir}/opt/kde3/common_options DO_NOT_COMPILE=kdessh %if 0%{?suse_version} >= 1140 sed -i 's/2.6/2.7/g' ./configure @@ -145,7 +147,7 @@ make %{?_smp_mflags} %install -. /etc/opt/kde3/common_options +. %{_sysconfdir}/opt/kde3/common_options make DESTDIR=%{buildroot} $INSTALL_TARGET # remove unwanted files %suse_update_desktop_file KEdit Utility TextEditor @@ -173,15 +175,10 @@ kde_post_install %post extra -p /sbin/ldconfig - %postun extra -p /sbin/ldconfig - %post laptop -p /sbin/ldconfig - %postun laptop -p /sbin/ldconfig - %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files ++++++ kdeutils-3.5.10-gcc6.patch ++++++ Index: kdeutils-3.5.10/khexedit/lib/kbigbuffer.cpp =================================================================== --- kdeutils-3.5.10.orig/khexedit/lib/kbigbuffer.cpp +++ kdeutils-3.5.10/khexedit/lib/kbigbuffer.cpp @@ -17,6 +17,7 @@ // c specific #include <stdlib.h> +#include <cmath> // lib specific #include "kbigbuffer.h" @@ -170,7 +171,7 @@ bool KBigBuffer::ensurePageLoaded( unsig if( NoOfFreePages < 1 ) { // free the page which is the furthest away from the page we are loading - if( abs(FirstPage-PageIndex) > abs(LastPage-PageIndex) ) + if( std::abs(FirstPage-PageIndex) > std::abs(LastPage-PageIndex) ) while( !freePage(FirstPage++) ); else while( !freePage(LastPage--) );
