Hello community, here is the log from the commit of package kdelibs3 for openSUSE:Factory checked in at 2017-06-12 15:34:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs3 (Old) and /work/SRC/openSUSE:Factory/.kdelibs3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs3" Mon Jun 12 15:34:36 2017 rev:89 rq:502827 version:3.5.10 Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs3/kdelibs3.changes 2016-06-23 13:36:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs3.new/kdelibs3.changes 2017-06-12 15:34:38.233697005 +0200 @@ -1,0 +2,11 @@ +Fri Jun 02 15:54:12 CEST 2017 - [email protected] + +- Updated kdelibs-3.5.10-gcc6.patch to fix build with gcc7 (boo#1041235) + +------------------------------------------------------------------- +Wed May 31 02:50:21 UTC 2017 - [email protected] + +- Add reproducible.patch to sort input files to make build reproducible + also for packages like ksimus that call our update_admin (boo#1041090) + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.qv7hG9/_old 2017-06-12 15:34:42.933034203 +0200 +++ /var/tmp/diff_new_pack.qv7hG9/_new 2017-06-12 15:34:42.933034203 +0200 @@ -210,6 +210,7 @@ Patch233: kdelibs-3.5.10-CVE-2013-2074.patch Patch234: fix-perl-no-defined-array.diff Patch235: kdelibs-3.5.10-gcc6.patch +Patch236: reproducible.patch %description This package contains kdelibs, one of the basic packages of the K @@ -420,6 +421,7 @@ %patch232 -p1 %patch234 -p1 %patch235 -p1 +%patch236 -p1 # disable a debug feature sed -i 's|#define KICONLOADER_CHECKS||g' kdecore/kiconloader.cpp ++++++ kdelibs-3.5.10-gcc6.patch ++++++ --- /var/tmp/diff_new_pack.qv7hG9/_old 2017-06-12 15:34:43.268986819 +0200 +++ /var/tmp/diff_new_pack.qv7hG9/_new 2017-06-12 15:34:43.268986819 +0200 @@ -26,7 +26,8 @@ kdDebug(13020)<<"updatePreviousNotEmptyLine: updating line:"<<(blk->startLine()+current_line)<<endl; QMemArray<uint> foldingList=textLine->foldingListArray(); - while ( (foldingList.size()>0) && ( abs(foldingList[foldingList.size()-2])==1)) { -+ while ( (foldingList.size()>0) && ( std::abs(foldingList[foldingList.size()-2])==1)) { ++ while ( (foldingList.size()>0) && ( std::abs((long)foldingList[foldingList.size()-2])==1)) { foldingList.resize(foldingList.size()-2,QGArray::SpeedOptim); } addIndentBasedFoldingInformation(foldingList,addindent,deindent); + ++++++ reproducible.patch ++++++ Index: kdelibs-3.5.10/admin/ltmain.sh =================================================================== --- kdelibs-3.5.10.orig/admin/ltmain.sh +++ kdelibs-3.5.10/admin/ltmain.sh @@ -3719,7 +3719,7 @@ EOF done fi - libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | LC_ALL=C sort | $NL2SP` done fi fi @@ -4013,7 +4013,7 @@ EOF done fi - reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | LC_ALL=C sort | $NL2SP` done fi fi @@ -5043,7 +5043,7 @@ fi\ done fi - oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` + oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | LC_ALL=C sort | $NL2SP` done fi Index: kdelibs-3.5.10/admin/am_edit =================================================================== --- kdelibs-3.5.10.orig/admin/am_edit +++ kdelibs-3.5.10/admin/am_edit @@ -1168,7 +1168,7 @@ sub handle_TOPLEVEL() my $pofiles = ""; my @restfiles = (); opendir (THISDIR, "."); - foreach $entry (readdir(THISDIR)) { + foreach $entry (sort(readdir(THISDIR))) { next if (-d $entry); next if ($entry eq "CVS" || $entry =~ /^\./ || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/ || $entry =~ /.gmo$/); @@ -1209,7 +1209,7 @@ sub tag_SUBDIRS () my $subdirs = "."; opendir (THISDIR, "."); - foreach $entry (readdir(THISDIR)) { + foreach $entry (sort(readdir(THISDIR))) { next if ($entry eq "CVS" || $entry =~ /^\./); if (-d $entry && -f $entry . "/Makefile.am") { $subdirs .= " $entry"; @@ -1490,7 +1490,7 @@ sub tag_ICON() my @files = (); opendir (THISDIR, "."); - foreach $entry (readdir(THISDIR)) { + foreach $entry (sort(readdir(THISDIR))) { next if ($entry eq "CVS" || $entry =~ /^\./ || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/); next if (! -f $entry); if ( $iconauto ) @@ -1732,7 +1732,7 @@ sub tag_POFILES () if ($tmp =~ /^\s*AUTO\s*$/) { opendir (THISDIR, "."); - $pofiles = join(" ", grep(/\.po$/, readdir(THISDIR))); + $pofiles = join(" ", grep(/\.po$/, sort(readdir(THISDIR)))); closedir (THISDIR); print STDOUT "pofiles found = $pofiles\n" if ($verbose); if (-f "charset" && -f "kdelibs/kdelibs.po") { @@ -1905,7 +1905,7 @@ sub tag_NMCHECK () { sub tag_DIST () { my %foundfiles = (); opendir (THISDIR, "."); - foreach $entry (readdir(THISDIR)) { + foreach $entry (sort(readdir(THISDIR))) { next if ($entry eq "CVS" || $entry =~ /^\./ || $entry eq "Makefile" || $entry =~ /~$/ || $entry =~ /^\#.*\#$/); next if (! -f $entry); next if ($entry =~ /\.moc/ || $entry =~ /\.moc.$cppExt$/ || $entry =~ /\.lo$/ || $entry =~ /\.la$/ || $entry =~ /\.o/); @@ -1933,7 +1933,7 @@ sub tag_DIST () { } my $KDE_DIST = ""; - foreach $file (keys %foundfiles) { + foreach $file (sort(keys %foundfiles)) { if ($foundfiles{$file} == 1) { $KDE_DIST .= "$file "; } @@ -1978,7 +1978,7 @@ sub tag_DOCFILES () if ($tmp !~ / - /) { opendir (THISDIR, "."); - foreach $entry (readdir(THISDIR)) { + foreach $entry (sort(readdir(THISDIR))) { next if ($entry eq "CVS" || $entry =~ /^\./ || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/ || $entry eq "core" || $entry eq "index.cache.bz2"); next if (! -f $entry); $files .= "$entry "; @@ -2094,7 +2094,7 @@ sub findMocCandidates () { my @list = (); opendir (SRCDIR, "$dir"); - @hFiles = grep { /.+\.$hExt$/o && !/^\./ } readdir(SRCDIR); + @hFiles = grep { /.+\.$hExt$/o && !/^\./ } sort(readdir(SRCDIR)); closedir SRCDIR; foreach $hf (@hFiles) { @@ -2176,7 +2176,7 @@ sub checkMocCandidates () opendir(THISDIR, ".") || return; @cppFiles = grep { /.+\.$cppExt$/o && !/.+\.moc\.$cppExt$/o && !/.+\.all_$cppExt\.$cppExt$/o - && !/^\./ } readdir(THISDIR); + && !/^\./ } sort(readdir(THISDIR)); closedir THISDIR; return unless (@cppFiles); my $files = join (" ", @cppFiles);
