Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdiff3 for openSUSE:Factory checked in at 2026-09-17 15:20:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old) and /work/SRC/openSUSE:Factory/.kdiff3.new.383539 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3" Thu Sep 17 15:20:31 2026 rev:62 rq:1378365 version:1.12.6 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2026-07-26 11:32:22.482775557 +0200 +++ /work/SRC/openSUSE:Factory/.kdiff3.new.383539/kdiff3.changes 2026-09-17 15:22:03.116604871 +0200 @@ -1,0 +2,6 @@ +Sat Sep 12 14:00:20 UTC 2026 - Carsten Ziepke <[email protected]> + +- Update to 1.12.6 + * No changelog provided upstream besides the tag hotfix release + +------------------------------------------------------------------- Old: ---- kdiff3-1.12.5.tar.xz kdiff3-1.12.5.tar.xz.sig New: ---- kdiff3-1.12.6.tar.xz kdiff3-1.12.6.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.mMwdVS/_old 2026-09-17 15:22:03.914638343 +0200 +++ /var/tmp/diff_new_pack.mMwdVS/_new 2026-09-17 15:22:03.916638427 +0200 @@ -21,7 +21,7 @@ %bcond_without released Name: kdiff3 -Version: 1.12.5 +Version: 1.12.6 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later ++++++ kdiff3-1.12.5.tar.xz -> kdiff3-1.12.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.12.5/CMakeLists.txt new/kdiff3-1.12.6/CMakeLists.txt --- old/kdiff3-1.12.5/CMakeLists.txt 2026-07-17 03:07:03.000000000 +0200 +++ new/kdiff3-1.12.6/CMakeLists.txt 2026-07-22 03:42:26.000000000 +0200 @@ -6,7 +6,7 @@ #CMP0077 is defined in 3.13 or later cmake_minimum_required(VERSION 3.22...3.30) -project(kdiff3 VERSION 1.12.5) +project(kdiff3 VERSION 1.12.6) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.2) message(WARNING "gcc < 9.2 is not recomended support is best effort-only.") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.12.5/po/cs/diff_ext.po new/kdiff3-1.12.6/po/cs/diff_ext.po --- old/kdiff3-1.12.5/po/cs/diff_ext.po 2026-07-17 03:07:03.000000000 +0200 +++ new/kdiff3-1.12.6/po/cs/diff_ext.po 2026-07-22 03:42:26.000000000 +0200 @@ -1,21 +1,22 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Vit Pelcak <[email protected]>, 2018, 2021, 2023. +# SPDX-FileCopyrightText: 2026 Libor Filípek <[email protected]> # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2025-11-17 14:42+0000\n" -"PO-Revision-Date: 2023-06-13 09:48+0200\n" -"Last-Translator: Vit Pelcak <[email protected]>\n" +"PO-Revision-Date: 2026-07-20 19:05+0200\n" +"Last-Translator: Libor Filípek <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 23.04.2\n" +"X-Generator: Lokalize 26.04.3\n" #: diff_ext.cpp:211 #, kde-format @@ -75,6 +76,7 @@ #, kde-format msgid "Diff-Ext Copyright ©2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" +"Diff-Ext Autorská práva ©2003–2006, Sergey Zorin. Všechna práva vyhrazena.\n" #: diff_ext.cpp:324 #, kde-format @@ -84,17 +86,17 @@ #: diff_ext.cpp:324 #, kde-format msgid "Some extensions for KDiff3 ©2006-2013 by Joachim Eibl.\n" -msgstr "" +msgstr "Některá rozšíření pro KDiff3 ©2006–2013 Joachim Eibl.\n" #: diff_ext.cpp:324 #, kde-format msgid "Ported to Qt5/Kf5 by Michael Reeves\n" -msgstr "" +msgstr "Portování na Qt5/Kf5 Michael Reeves\n" #: diff_ext.cpp:324 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"; -msgstr "" +msgstr "Domovská stránka projektu Diff-Ext: http://diff-ext.sourceforge.net\n"; #: diff_ext.cpp:324 #, kde-format @@ -123,6 +125,7 @@ #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "" +"Nepodařilo se spustit KDiff3. Zkuste prosím znovu provést instalaci KDiff3." #: diff_ext.cpp:419 #, kde-format @@ -132,7 +135,7 @@ #: diff_ext.cpp:420 #, kde-format msgid "CommandLine" -msgstr "" +msgstr "Příkazová řádka" #: diff_ext.cpp:421 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.12.5/po/cs/kdiff3.po new/kdiff3-1.12.6/po/cs/kdiff3.po --- old/kdiff3-1.12.5/po/cs/kdiff3.po 2026-07-17 03:07:03.000000000 +0200 +++ new/kdiff3-1.12.6/po/cs/kdiff3.po 2026-07-22 03:42:26.000000000 +0200 @@ -3,31 +3,32 @@ # SPDX-FileCopyrightText: 2010, 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020, 2023, 2024 Vít Pelčák <[email protected]> # Tomáš Chvátal <[email protected]>, 2012, 2013. # Vit Pelcak <[email protected]>, 2021, 2022, 2023. +# SPDX-FileCopyrightText: 2026 Libor Filípek <[email protected]> # msgid "" msgstr "" "Project-Id-Version: trunk_kdiff3\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2026-07-16 02:42+0000\n" -"PO-Revision-Date: 2024-09-27 11:46+0200\n" -"Last-Translator: Vit Pelcak <[email protected]>\n" +"PO-Revision-Date: 2026-07-20 19:03+0200\n" +"Last-Translator: Libor Filípek <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 24.08.1\n" +"X-Generator: Lokalize 26.04.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Zdeněk Pech" +msgstr "Zdeněk Pech,Libor Filípek" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected]" +msgstr "[email protected],[email protected]" #: DefaultFileAccessJobHandler.cpp:56 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.12.5/po/cs/kdiff3fileitemactionplugin.po new/kdiff3-1.12.6/po/cs/kdiff3fileitemactionplugin.po --- old/kdiff3-1.12.5/po/cs/kdiff3fileitemactionplugin.po 2026-07-17 03:07:03.000000000 +0200 +++ new/kdiff3-1.12.6/po/cs/kdiff3fileitemactionplugin.po 2026-07-22 03:42:26.000000000 +0200 @@ -1,20 +1,21 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Vít Pelčák <[email protected]>, 2011, 2013, 2018, 2020, 2023. +# SPDX-FileCopyrightText: 2026 Libor Filípek <[email protected]> # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2025-11-17 14:42+0000\n" -"PO-Revision-Date: 2023-06-13 09:48+0200\n" -"Last-Translator: Vit Pelcak <[email protected]>\n" +"PO-Revision-Date: 2026-07-20 18:57+0200\n" +"Last-Translator: Libor Filípek <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 23.04.2\n" +"X-Generator: Lokalize 26.04.3\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: kdiff3fileitemaction.cpp:81 @@ -81,6 +82,7 @@ #, kde-format msgid "KDiff3 File Item Action Plugin: Copyright ©2011 Joachim Eibl\n" msgstr "" +"Modul KDiff3 pro akce s položkami souboru: Copyright ©2011 Joachim Eibl\n" #: kdiff3fileitemaction.cpp:274 #, kde-format @@ -95,8 +97,18 @@ "destination.\n" "Same also applies to folder comparison and merge." msgstr "" +"Použití rozšíření kontextového menu:\n" +"Pro jednoduché porovnání dvou vybraných souborů zvolte možnost \"Porovnat" +"\".\n" +"Pokud se druhý soubor nachází jinde, \"uložte\" první soubor pro pozdější " +"použití. Objeví se v podmenu \"Porovnat s...\". Poté u druhého souboru " +"použijte možnost \"Porovnat s\".\n" +"Pro trojcestné sloučení nejprve \"uložte\" základní soubor, poté větev, " +"kterou chcete sloučit, a u druhé větve, která bude použita jako cíl, vyberte " +"možnost \"Trojcestné sloučení se základem\".\n" +"Totéž platí i pro porovnání a sloučení složek." #: kdiff3fileitemaction.cpp:282 #, kde-format msgid "About KDiff3 File Item Action Plugin" -msgstr "" +msgstr "O modulu KDiff3 pro akce s položkami souborů" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.12.5/src/SourceData.cpp new/kdiff3-1.12.6/src/SourceData.cpp --- old/kdiff3-1.12.5/src/SourceData.cpp 2026-07-17 03:07:04.000000000 +0200 +++ new/kdiff3-1.12.6/src/SourceData.cpp 2026-07-22 03:42:26.000000000 +0200 @@ -176,7 +176,6 @@ LineType SourceData::getSizeLines() const { - assert(m_normalData.m_pBuf != nullptr); return SafeInt<LineType>(m_normalData.lineCount()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.12.5/src/SourceData.h new/kdiff3-1.12.6/src/SourceData.h --- old/kdiff3-1.12.5/src/SourceData.h 2026-07-17 03:07:04.000000000 +0200 +++ new/kdiff3-1.12.6/src/SourceData.h 2026-07-22 03:42:26.000000000 +0200 @@ -89,7 +89,7 @@ friend SourceData; bool mHasBOM = false; - std::unique_ptr<char[]> m_pBuf; //TODO: Phase out needlessly wastes memory and time by keeping second copy of file data. + std::unique_ptr<char[]> m_pBuf; // TODO: Phase out needlessly wastes memory and time by keeping second copy of file data. quint64 mDataSize = 0; qint64 mLineCount = 0; // Number of lines in m_pBuf1 and size of m_v1, m_dv12 and m_dv13 QSharedPointer<QString> m_unicodeBuf=QSharedPointer<QString>::create();
