Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdiff3 for openSUSE:Factory checked in at 2021-05-15 23:16:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old) and /work/SRC/openSUSE:Factory/.kdiff3.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3" Sat May 15 23:16:19 2021 rev:36 rq:893302 version:1.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2021-05-03 22:08:34.176388862 +0200 +++ /work/SRC/openSUSE:Factory/.kdiff3.new.2988/kdiff3.changes 2021-05-15 23:17:18.944471746 +0200 @@ -1,0 +2,14 @@ +Sat May 15 11:24:25 UTC 2021 - Wolfgang Bauer <wba...@tmo.at> + +- Update to 1.9.1 + * Hotfix for possible display problems (kde#436958) + * Add default shortcut for "Go to [Previous/Next] Unsolved + Conflict" (kde#436003) + * Port away from KIconThemes + +------------------------------------------------------------------- +Wed May 5 06:11:10 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update URL. + +------------------------------------------------------------------- Old: ---- kdiff3-1.9.0.tar.xz New: ---- kdiff3-1.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.5cns0D/_old 2021-05-15 23:17:19.544469403 +0200 +++ /var/tmp/diff_new_pack.5cns0D/_new 2021-05-15 23:17:19.548469387 +0200 @@ -18,12 +18,12 @@ %bcond_without lang Name: kdiff3 -Version: 1.9.0 +Version: 1.9.1 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later Group: Development/Tools/Version Control -URL: http://kdiff3.sourceforge.net/ +URL: https://apps.kde.org/kdiff3 Source0: %{name}-%{version}.tar.xz Source1: kdiff3-lang.tar.xz BuildRequires: boost-devel @@ -36,7 +36,6 @@ BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5DocTools) BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF5WidgetsAddons) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.5cns0D/_old 2021-05-15 23:17:19.572469293 +0200 +++ /var/tmp/diff_new_pack.5cns0D/_new 2021-05-15 23:17:19.572469293 +0200 @@ -1,11 +1,10 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">1.9.0</param> + <param name="version">1.9.1</param> <param name="url">https://invent.kde.org/sdk/kdiff3</param> - <param name="revision">refs/tags/1.9.0</param> + <param name="revision">refs/tags/1.9.1</param> <param name="scm">git</param> <param name="filename">kdiff3</param> - <!-- This folder will be dropped in the next release --> <param name="exclude">windows_installer</param> </service> <service name="recompress" mode="disabled"> ++++++ kdiff3-1.9.0.tar.xz -> kdiff3-1.9.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/.gitlab-ci.yml new/kdiff3-1.9.1/.gitlab-ci.yml --- old/kdiff3-1.9.0/.gitlab-ci.yml 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/.gitlab-ci.yml 2021-05-13 22:27:28.000000000 +0200 @@ -4,3 +4,9 @@ - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-extragear-linux.yml # - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-extragear-freebsd.yml # - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-extragear-windows.yml +linux kf5-qt5 qt5.15: + extends: .linux + only: + - master + - merge_requests + - /^([1-9][0-9]*|[0-9])\.[0-9]+$/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/CMakeLists.txt new/kdiff3-1.9.1/CMakeLists.txt --- old/kdiff3-1.9.0/CMakeLists.txt 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/CMakeLists.txt 2021-05-13 22:27:28.000000000 +0200 @@ -32,7 +32,7 @@ include(ECMSetupVersion) include(ECMAddTests) -ecm_setup_version(1.9.0 VARIABLE_PREFIX KDIFF3 VERSION_HEADER ${CMAKE_BINARY_DIR}/src/version.h) +ecm_setup_version(1.9.1 VARIABLE_PREFIX KDIFF3 VERSION_HEADER ${CMAKE_BINARY_DIR}/src/version.h) # Some older versions on boost contain a bug that prevents compiling gcc offers a built-in workaround # but that isn't enough to ship as clang has no such workaround. 1.65 is known to be affected. @@ -59,7 +59,6 @@ I18n CoreAddons Crash - IconThemes OPTIONAL_COMPONENTS DocTools ) @@ -69,7 +68,7 @@ option(ENABLE_AUTO "Enable kdiff3's '--auto' flag" ON) option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version >=3.6" OFF) -set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::IconThemes ) +set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons ) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") #Adjust clang specific warnings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/ChangeLog new/kdiff3-1.9.1/ChangeLog --- old/kdiff3-1.9.0/ChangeLog 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/ChangeLog 2021-05-13 22:27:28.000000000 +0200 @@ -1,4 +1,8 @@ -Version 1.9 - 2021- +Version 1.9.1 - 2021-5-13 +=========================== +*Hotfix for Bug 436958 + +Version 1.9 - 2021-4-28 =========================== *Rewrite of SourceData::FileData::preprocess now only loops through file contents once. *Major rework of event handling diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/README new/kdiff3-1.9.1/README --- old/kdiff3-1.9.0/README 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/README 2021-05-13 22:27:28.000000000 +0200 @@ -3,7 +3,7 @@ Author: Joachim Eibl (joachim.eibl at gmx.de) Port to KF5/Qt5 by Michael Reeves (reeves...@gmail.com) -KDiff3-Version: 1.9.0 +KDiff3-Version: 1.9.1 Now requires Qt 5.8 or later and KF5 5.37+. Legacy 0.9.98 and earlier builds are not supported. MacOS X build is 64-bit only unfortunately I can't test build locally. The Konqueror specific plug-in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/PixMapUtils.cpp new/kdiff3-1.9.1/src/PixMapUtils.cpp --- old/kdiff3-1.9.0/src/PixMapUtils.cpp 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/PixMapUtils.cpp 2021-05-13 22:27:28.000000000 +0200 @@ -1,17 +1,19 @@ /* * KDiff3 - Text Diff And Merge Tool - * + * * SPDX-FileCopyrightText: 2002-2011 Joachim Eibl, joachim.eibl at gmx.de * SPDX-FileCopyrightText: 2018-2020 Michael Reeves reeves...@gmail.com * SPDX-License-Identifier: GPL-2.0-or-later */ -#include <QPixmap> -#include <KIconLoader> -#include <QPainter> - #include "MergeFileInfos.h" +#include <QApplication> +#include <QIcon> +#include <QPainter> +#include <QPixmap> +#include <QStyle> + namespace PixMapUtils { namespace{ @@ -86,7 +88,8 @@ { #include "xpm/file.xpm" #include "xpm/folder.xpm" - s_pm_dir = new QPixmap(KIconLoader::global()->loadIcon("folder", KIconLoader::Small)); + const int smallIcon = qApp->style()->pixelMetric(QStyle::PM_SmallIconSize); + s_pm_dir = new QPixmap(QIcon::fromTheme(QStringLiteral("folder")).pixmap(smallIcon)); if(s_pm_dir->size() != QSize(16, 16)) { delete s_pm_dir; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/defmac.h new/kdiff3-1.9.1/src/defmac.h --- old/kdiff3-1.9.0/src/defmac.h 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/defmac.h 2021-05-13 22:27:28.000000000 +0200 @@ -13,6 +13,10 @@ #ifndef DEFMAC_H #define DEFMAC_H +#if defined(QT_NO_DEBUG) +#undef NDEBUG +#endif + #pragma once #define DISABLE_DEFAULT_CONSTRUCT( ClassName ) \ @@ -35,7 +39,7 @@ #ifndef NDEBUG -#define QCONNECT_ASSERT(COND_) Q_ASSERT(COND_) +#define QCONNECT_ASSERT(COND_) assert(COND_) #else #define QCONNECT_ASSERT(COND_) COND_ #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/difftextwindow.cpp new/kdiff3-1.9.1/src/difftextwindow.cpp --- old/kdiff3-1.9.0/src/difftextwindow.cpp 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/difftextwindow.cpp 2021-05-13 22:27:28.000000000 +0200 @@ -876,9 +876,12 @@ QTextOption textOption; #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) textOption.setTabStop(QFontMetricsF(m_pDiffTextWindow->font()).width(' ') * m_pOptions->m_tabSize); +#elif QT_VERSION < QT_VERSION_CHECK(5, 12, 0) + textOption.setTabStopDistance(QFontMetricsF(font()).width(' ') * m_pOptions->m_tabSize); #else - textOption.setTabStopDistance(QFontMetricsF(m_pDiffTextWindow->font()).width(' ') * m_pOptions->m_tabSize); + textOption.setTabStopDistance(QFontMetricsF(m_pDiffTextWindow->font()).horizontalAdvance(' ') * m_pOptions->m_tabSize); #endif + if(m_pOptions->m_bShowWhiteSpaceCharacters) textOption.setFlags(QTextOption::ShowTabsAndSpaces); if(m_pOptions->m_bRightToLeftLanguage) @@ -1865,7 +1868,7 @@ d->m_pDiffTextWindow = new DiffTextWindow(this, pOptions, winIdx); d->m_pDiffTextWindow->setSourceData(psd); QVBoxLayout* pVTopLayout = new QVBoxLayout(const_cast<QWidget*>(d->getTopLineWidget())); - pVTopLayout->setMargin(2); + pVTopLayout->setContentsMargins(2, 2, 2, 2); pVTopLayout->setSpacing(0); QHBoxLayout* pHL = new QHBoxLayout(); QHBoxLayout* pHL2 = new QHBoxLayout(); @@ -1873,7 +1876,7 @@ pVTopLayout->addLayout(pHL2); // Upper line: - pHL->setMargin(0); + pHL->setContentsMargins(0, 0, 0, 0); pHL->setSpacing(2); pHL->addWidget(const_cast<QLabel*>(d->getLabel()), 0); @@ -1882,7 +1885,7 @@ pHL->addWidget(d->m_pTopLine, 0); // Lower line - pHL2->setMargin(0); + pHL2->setContentsMargins(0, 0, 0, 0); pHL2->setSpacing(2); pHL2->addWidget(d->m_pTopLine, 0); d->m_pEncoding = new EncodingLabel(i18n("Encoding:"), psd, pOptions); @@ -1894,7 +1897,7 @@ pHL2->addWidget(d->m_pLineEndStyle); QVBoxLayout* pVL = new QVBoxLayout(this); - pVL->setMargin(0); + pVL->setContentsMargins(0, 0, 0, 0); pVL->setSpacing(0); pVL->addWidget(const_cast<QWidget*>(d->getTopLineWidget()), 0); pVL->addWidget(d->m_pDiffTextWindow, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/directorymergewindow.cpp new/kdiff3-1.9.1/src/directorymergewindow.cpp --- old/kdiff3-1.9.0/src/directorymergewindow.cpp 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/directorymergewindow.cpp 2021-05-13 22:27:28.000000000 +0200 @@ -2697,7 +2697,7 @@ : QFrame(pParent) { QVBoxLayout* topLayout = new QVBoxLayout(this); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); QGridLayout* grid = new QGridLayout(); topLayout->addLayout(grid); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/directorymergewindow.h new/kdiff3-1.9.1/src/directorymergewindow.h --- old/kdiff3-1.9.0/src/directorymergewindow.h 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/directorymergewindow.h 2021-05-13 22:27:28.000000000 +0200 @@ -20,7 +20,6 @@ #include <map> class Options; -class KIconLoader; class StatusInfo; class DirectoryMergeInfo; class OneDirectoryInfo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/kdiff3.cpp new/kdiff3-1.9.1/src/kdiff3.cpp --- old/kdiff3-1.9.0/src/kdiff3.cpp 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/kdiff3.cpp 2021-05-13 22:27:28.000000000 +0200 @@ -58,7 +58,6 @@ #include <KMessageBox> #include <KStandardAction> #include <KActionCollection> -#include <KIconLoader> #include <KToggleAction> #include <KToolBar> @@ -616,9 +615,9 @@ mGoPrevConflict->setToolTip(mGoPrevConflict->text() + omitsWhitespace); mGoNextConflict = GuiUtils::createAction<QAction>(i18n("Go to Next Conflict"), QIcon(QPixmap(down2arrow)), i18n("Next\nConflict"), QKeySequence(Qt::CTRL + Qt::Key_PageDown), this, &KDiff3App::slotGoNextConflict, ac, "go_next_conflict"); mGoNextConflict->setToolTip(mGoNextConflict->text() + omitsWhitespace); - mGoPrevUnsolvedConflict = GuiUtils::createAction<QAction>(i18n("Go to Previous Unsolved Conflict"), QIcon(QPixmap(prevunsolved)), i18n("Prev\nUnsolved"), this, &KDiff3App::slotGoPrevUnsolvedConflict, ac, "go_prev_unsolved_conflict"); + mGoPrevUnsolvedConflict = GuiUtils::createAction<QAction>(i18n("Go to Previous Unsolved Conflict"), QIcon(QPixmap(prevunsolved)), i18n("Prev\nUnsolved"), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp), this, &KDiff3App::slotGoPrevUnsolvedConflict, ac, "go_prev_unsolved_conflict"); mGoPrevUnsolvedConflict->setToolTip(mGoPrevUnsolvedConflict->text() + includeWhitespace); - mGoNextUnsolvedConflict = GuiUtils::createAction<QAction>(i18n("Go to Next Unsolved Conflict"), QIcon(QPixmap(nextunsolved)), i18n("Next\nUnsolved"), this, &KDiff3App::slotGoNextUnsolvedConflict, ac, "go_next_unsolved_conflict"); + mGoNextUnsolvedConflict = GuiUtils::createAction<QAction>(i18n("Go to Next Unsolved Conflict"), QIcon(QPixmap(nextunsolved)), i18n("Next\nUnsolved"), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown), this, &KDiff3App::slotGoNextUnsolvedConflict, ac, "go_next_unsolved_conflict"); mGoNextUnsolvedConflict->setToolTip(mGoNextUnsolvedConflict->text() + includeWhitespace); chooseA = GuiUtils::createAction<KToggleAction>(i18n("Select Line(s) From A"), QIcon(QPixmap(iconA)), i18n("Choose\nA"), QKeySequence(Qt::CTRL + Qt::Key_1), this, &KDiff3App::slotChooseA, ac, "merge_choose_a"); chooseB = GuiUtils::createAction<KToggleAction>(i18n("Select Line(s) From B"), QIcon(QPixmap(iconB)), i18n("Choose\nB"), QKeySequence(Qt::CTRL + Qt::Key_2), this, &KDiff3App::slotChooseB, ac, "merge_choose_b"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/mergeresultwindow.cpp new/kdiff3-1.9.1/src/mergeresultwindow.cpp --- old/kdiff3-1.9.0/src/mergeresultwindow.cpp 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/mergeresultwindow.cpp 2021-05-13 22:27:28.000000000 +0200 @@ -1699,9 +1699,12 @@ QTextOption textOption; #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) textOption.setTabStop(QFontMetricsF(font()).width(' ') * m_pOptions->m_tabSize); -#else +#elif QT_VERSION < QT_VERSION_CHECK(5, 12, 0) textOption.setTabStopDistance(QFontMetricsF(font()).width(' ') * m_pOptions->m_tabSize); +#else + textOption.setTabStopDistance(QFontMetricsF(font()).horizontalAdvance(' ') * m_pOptions->m_tabSize); #endif + if(m_pOptions->m_bShowWhiteSpaceCharacters) { textOption.setFlags(QTextOption::ShowTabsAndSpaces); @@ -3070,7 +3073,7 @@ setAutoFillBackground(true); QHBoxLayout* pHLayout = new QHBoxLayout(this); - pHLayout->setMargin(2); + pHLayout->setContentsMargins(2, 2, 2, 2); pHLayout->setSpacing(2); m_pLabel = new QLabel(i18n("Output:")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/optiondialog.cpp new/kdiff3-1.9.1/src/optiondialog.cpp --- old/kdiff3-1.9.0/src/optiondialog.cpp 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/optiondialog.cpp 2021-05-13 22:27:28.000000000 +0200 @@ -559,7 +559,7 @@ addPage(pageItem); QVBoxLayout* topLayout = new QVBoxLayout(page); - topLayout->setMargin(5); + topLayout->setContentsMargins(5, 5, 5, 5); //requires QT 5.2 or later. static const QFont defaultFont = QFontDatabase::systemFont(QFontDatabase::FixedFont); @@ -598,7 +598,7 @@ addPage(pageItem); QVBoxLayout* scrollLayout = new QVBoxLayout(); - scrollLayout->setMargin(2); + scrollLayout->setContentsMargins(2, 2, 2, 2); scrollLayout->addWidget(pageFrame); QScopedPointer<Ui::ScrollArea> scrollArea(new Ui::ScrollArea()); @@ -606,7 +606,7 @@ QWidget* page = pageFrame->findChild<QWidget*>("contents"); QVBoxLayout* topLayout = new QVBoxLayout(page); - topLayout->setMargin(5); + topLayout->setContentsMargins(5, 5, 5, 5); QGridLayout* gbox = new QGridLayout(); gbox->setColumnStretch(1, 5); @@ -766,7 +766,7 @@ addPage(pageItem); QVBoxLayout* scrollLayout = new QVBoxLayout(); - scrollLayout->setMargin(2); + scrollLayout->setContentsMargins(2, 2, 2, 2); scrollLayout->addWidget(pageFrame); QScopedPointer<Ui::ScrollArea> scrollArea(new Ui::ScrollArea()); @@ -775,7 +775,7 @@ QWidget* page = pageFrame->findChild<QWidget*>("contents"); QVBoxLayout* topLayout = new QVBoxLayout(page); - topLayout->setMargin(5); + topLayout->setContentsMargins(5, 5, 5, 5); QGridLayout* gbox = new QGridLayout(); gbox->setColumnStretch(1, 5); @@ -841,7 +841,7 @@ addPage(pageItem); QVBoxLayout* scrollLayout = new QVBoxLayout(); - scrollLayout->setMargin(2); + scrollLayout->setContentsMargins(2, 2, 2, 2); scrollLayout->addWidget(pageFrame); QScopedPointer<Ui::ScrollArea> scrollArea(new Ui::ScrollArea()); @@ -850,7 +850,7 @@ QWidget* page = pageFrame->findChild<QWidget*>("contents"); QVBoxLayout* topLayout = new QVBoxLayout(page); - topLayout->setMargin(5); + topLayout->setContentsMargins(5, 5, 5, 5); QGridLayout* gbox = new QGridLayout(); gbox->setColumnStretch(1, 5); @@ -936,7 +936,7 @@ addPage(pageItem); QVBoxLayout* scrollLayout = new QVBoxLayout(); - scrollLayout->setMargin(2); + scrollLayout->setContentsMargins(2, 2, 2, 2); scrollLayout->addWidget(pageFrame); QScopedPointer<Ui::ScrollArea> scrollArea(new Ui::ScrollArea()); @@ -945,7 +945,7 @@ QWidget* page = pageFrame->findChild<QWidget*>("contents"); QVBoxLayout* topLayout = new QVBoxLayout(page); - topLayout->setMargin(5); + topLayout->setContentsMargins(5, 5, 5, 5); QGridLayout* gbox = new QGridLayout(); gbox->setColumnStretch(1, 5); @@ -1127,7 +1127,7 @@ addPage(pageItem); QVBoxLayout* scrollLayout = new QVBoxLayout(); - scrollLayout->setMargin(2); + scrollLayout->setContentsMargins(2, 2, 2, 2); scrollLayout->addWidget(pageFrame); QScopedPointer<Ui::ScrollArea> scrollArea(new Ui::ScrollArea()); @@ -1135,7 +1135,7 @@ QWidget* page = pageFrame->findChild<QWidget*>("contents"); QVBoxLayout* topLayout = new QVBoxLayout(page); - topLayout->setMargin(5); + topLayout->setContentsMargins(5, 5, 5, 5); QGridLayout* gbox = new QGridLayout(); gbox->setColumnStretch(1, 5); @@ -1326,7 +1326,7 @@ addPage(pageItem); QVBoxLayout* scrollLayout = new QVBoxLayout(); - scrollLayout->setMargin(2); + scrollLayout->setContentsMargins(2, 2, 2, 2); scrollLayout->addWidget(pageFrame); QScopedPointer<Ui::ScrollArea> scrollArea(new Ui::ScrollArea()); @@ -1335,7 +1335,7 @@ QWidget* page = pageFrame->findChild<QWidget*>("contents"); QVBoxLayout* topLayout = new QVBoxLayout(page); - topLayout->setMargin(5); + topLayout->setContentsMargins(5, 5, 5, 5); QGridLayout* gbox = new QGridLayout(); gbox->setColumnStretch(1, 5); @@ -1438,7 +1438,7 @@ addPage(pageItem); QVBoxLayout* scrollLayout = new QVBoxLayout(); - scrollLayout->setMargin(2); + scrollLayout->setContentsMargins(2, 2, 2, 2); scrollLayout->addWidget(pageFrame); QScopedPointer<Ui::ScrollArea> scrollArea(new Ui::ScrollArea()); @@ -1446,7 +1446,7 @@ QWidget* page = pageFrame->findChild<QWidget*>("contents"); QVBoxLayout* topLayout = new QVBoxLayout(page); - topLayout->setMargin(5); + topLayout->setContentsMargins(5, 5, 5, 5); QGridLayout* gbox = new QGridLayout(); gbox->setColumnStretch(2, 5); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/org.kde.kdiff3.appdata.xml new/kdiff3-1.9.1/src/org.kde.kdiff3.appdata.xml --- old/kdiff3-1.9.0/src/org.kde.kdiff3.appdata.xml 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/org.kde.kdiff3.appdata.xml 2021-05-13 22:27:28.000000000 +0200 @@ -307,6 +307,7 @@ <binary>kdiff3</binary> </provides> <releases> + <release version="1.9.1" date="2021-05-13"/> <release version="1.9.0" date="2021-04-29"/> <release version="1.8.5" date="2021-01-10"/> <release version="1.8.4" date="2020-08-25"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/pdiff.cpp new/kdiff3-1.9.1/src/pdiff.cpp --- old/kdiff3-1.9.0/src/pdiff.cpp 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/pdiff.cpp 2021-05-13 22:27:28.000000000 +0200 @@ -555,7 +555,7 @@ m_pMainSplitter->addWidget(m_pMainWidget); m_pMainWidget->setObjectName("MainWidget"); QVBoxLayout* pVLayout = new QVBoxLayout(m_pMainWidget); - pVLayout->setMargin(0); + pVLayout->setContentsMargins(0, 0, 0, 0); pVLayout->setSpacing(0); QSplitter* pVSplitter = new QSplitter(); @@ -567,7 +567,7 @@ QWidget* pDiffWindowFrame = new QWidget(); // Contains diff windows, overview and vert scrollbar pDiffWindowFrame->setObjectName("DiffWindowFrame"); QHBoxLayout* pDiffHLayout = new QHBoxLayout(pDiffWindowFrame); - pDiffHLayout->setMargin(0); + pDiffHLayout->setContentsMargins(0, 0, 0, 0); pDiffHLayout->setSpacing(0); pVSplitter->addWidget(pDiffWindowFrame); @@ -608,7 +608,7 @@ m_pMergeWindowFrame->setObjectName("MergeWindowFrame"); pVSplitter->addWidget(m_pMergeWindowFrame); QHBoxLayout* pMergeHLayout = new QHBoxLayout(m_pMergeWindowFrame); - pMergeHLayout->setMargin(0); + pMergeHLayout->setContentsMargins(0, 0, 0, 0); pMergeHLayout->setSpacing(0); QVBoxLayout* pMergeVLayout = new QVBoxLayout(); pMergeHLayout->addLayout(pMergeVLayout, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/progress.cpp new/kdiff3-1.9.1/src/progress.cpp --- old/kdiff3-1.9.0/src/progress.cpp 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/progress.cpp 2021-05-13 22:27:28.000000000 +0200 @@ -63,7 +63,7 @@ { m_pStatusBarWidget = new QWidget; QHBoxLayout* pStatusBarLayout = new QHBoxLayout(m_pStatusBarWidget); - pStatusBarLayout->setMargin(0); + pStatusBarLayout->setContentsMargins(0, 0, 0, 0); pStatusBarLayout->setSpacing(3); m_pStatusProgressBar = new QProgressBar; m_pStatusProgressBar->setRange(0, 1000); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiff3-1.9.0/src/smalldialogs.cpp new/kdiff3-1.9.1/src/smalldialogs.cpp --- old/kdiff3-1.9.0/src/smalldialogs.cpp 2021-04-28 19:41:21.000000000 +0200 +++ new/kdiff3-1.9.1/src/smalldialogs.cpp 2021-05-13 22:27:28.000000000 +0200 @@ -317,7 +317,7 @@ : QDialog(pParent) { QGridLayout* layout = new QGridLayout(this); - layout->setMargin(5); + layout->setContentsMargins(5, 5, 5, 5); layout->setSpacing(5); int line = 0; @@ -382,7 +382,7 @@ setWindowTitle(i18n("Regular Expression Tester")); QGridLayout* pGrid = new QGridLayout(this); pGrid->setSpacing(5); - pGrid->setMargin(5); + pGrid->setContentsMargins(5, 5, 5, 5); QLabel* l = new QLabel(i18n("Auto merge regular expression:"), this); pGrid->addWidget(l, line, 0); ++++++ kdiff3-lang.tar.xz ++++++ ++++ 46495 lines of diff (skipped)
