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-17 18:45:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old)
and /work/SRC/openSUSE:Factory/.kdiff3.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3"
Mon May 17 18:45:09 2021 rev:37 rq:893581 version:1.9.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2021-05-15
23:17:18.944471746 +0200
+++ /work/SRC/openSUSE:Factory/.kdiff3.new.2988/kdiff3.changes 2021-05-17
18:45:27.400587466 +0200
@@ -1,0 +2,6 @@
+Mon May 17 08:14:30 UTC 2021 - Wolfgang Bauer <wba...@tmo.at>
+
+- Update to 1.9.2
+ * Remove erroneous #ifdef (kde#436958)
+
+-------------------------------------------------------------------
Old:
----
kdiff3-1.9.1.tar.xz
New:
----
kdiff3-1.9.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdiff3.spec ++++++
--- /var/tmp/diff_new_pack.Oa1VmX/_old 2021-05-17 18:45:29.188579880 +0200
+++ /var/tmp/diff_new_pack.Oa1VmX/_new 2021-05-17 18:45:29.192579863 +0200
@@ -18,7 +18,7 @@
%bcond_without lang
Name: kdiff3
-Version: 1.9.1
+Version: 1.9.2
Release: 0
Summary: Code Comparison Utility
License: GPL-2.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Oa1VmX/_old 2021-05-17 18:45:29.220579744 +0200
+++ /var/tmp/diff_new_pack.Oa1VmX/_new 2021-05-17 18:45:29.220579744 +0200
@@ -1,8 +1,8 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">1.9.1</param>
+ <param name="version">1.9.2</param>
<param name="url">https://invent.kde.org/sdk/kdiff3</param>
- <param name="revision">refs/tags/1.9.1</param>
+ <param name="revision">refs/tags/1.9.2</param>
<param name="scm">git</param>
<param name="filename">kdiff3</param>
<param name="exclude">windows_installer</param>
++++++ kdiff3-1.9.1.tar.xz -> kdiff3-1.9.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdiff3-1.9.1/CMakeLists.txt
new/kdiff3-1.9.2/CMakeLists.txt
--- old/kdiff3-1.9.1/CMakeLists.txt 2021-05-13 22:27:28.000000000 +0200
+++ new/kdiff3-1.9.2/CMakeLists.txt 2021-05-17 02:34:48.000000000 +0200
@@ -32,7 +32,7 @@
include(ECMSetupVersion)
include(ECMAddTests)
-ecm_setup_version(1.9.1 VARIABLE_PREFIX KDIFF3 VERSION_HEADER
${CMAKE_BINARY_DIR}/src/version.h)
+ecm_setup_version(1.9.2 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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdiff3-1.9.1/README new/kdiff3-1.9.2/README
--- old/kdiff3-1.9.1/README 2021-05-13 22:27:28.000000000 +0200
+++ new/kdiff3-1.9.2/README 2021-05-17 02:34:48.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.1
+KDiff3-Version: 1.9.2
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.1/src/autotests/CMakeLists.txt
new/kdiff3-1.9.2/src/autotests/CMakeLists.txt
--- old/kdiff3-1.9.1/src/autotests/CMakeLists.txt 2021-05-13
22:27:28.000000000 +0200
+++ new/kdiff3-1.9.2/src/autotests/CMakeLists.txt 2021-05-17
02:34:48.000000000 +0200
@@ -8,6 +8,11 @@
)
add_definitions(-DAUTOTEST)
+ecm_add_test(connectiontest.cpp
+ TEST_NAME "connntiontest"
+ LINK_LIBRARIES Qt5::Test
+)
+
ecm_add_test(commentparser.cpp ../CommentParser.cpp
TEST_NAME "commentparser"
LINK_LIBRARIES Qt5::Test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdiff3-1.9.1/src/autotests/connectiontest.cpp
new/kdiff3-1.9.2/src/autotests/connectiontest.cpp
--- old/kdiff3-1.9.1/src/autotests/connectiontest.cpp 1970-01-01
01:00:00.000000000 +0100
+++ new/kdiff3-1.9.2/src/autotests/connectiontest.cpp 2021-05-17
02:34:48.000000000 +0200
@@ -0,0 +1,43 @@
+/*
+ KDiff3 - Text Diff And Merge Tool
+
+ SPDX-FileCopyrightText: 2020 Michael Reeves reeves...@gmail.com
+ SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#include "../defmac.h"
+
+#include <QTest>
+#include <QtTest/qtestcase.h>
+#include <qglobal.h>
+#include <qobjectdefs.h>
+
+class SigTest: public QObject
+{
+ Q_OBJECT
+ public:
+ bool fired = false;
+ Q_SIGNALS:
+ void signal();
+
+ public Q_SLOTS:
+ void slot() { fired=true;};
+};
+
+class ConnectionTest: public QObject
+{
+ Q_OBJECT;
+ private Q_SLOTS:
+ void testConnect()
+ {
+ SigTest s;
+
+ chk_connect(&s, &SigTest::signal, &s, &SigTest::slot);
+ Q_EMIT s.signal();
+ QVERIFY(s.fired);
+ }
+};
+
+QTEST_MAIN(ConnectionTest);
+
+#include "connectiontest.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdiff3-1.9.1/src/defmac.h
new/kdiff3-1.9.2/src/defmac.h
--- old/kdiff3-1.9.1/src/defmac.h 2021-05-13 22:27:28.000000000 +0200
+++ new/kdiff3-1.9.2/src/defmac.h 2021-05-17 02:34:48.000000000 +0200
@@ -13,10 +13,6 @@
#ifndef DEFMAC_H
#define DEFMAC_H
-#if defined(QT_NO_DEBUG)
-#undef NDEBUG
-#endif
-
#pragma once
#define DISABLE_DEFAULT_CONSTRUCT( ClassName ) \
@@ -37,7 +33,6 @@
ClassName & operator = ( ClassName && ) = delete; \
ClassName & operator = ( const ClassName & ) = delete;
-
#ifndef NDEBUG
#define QCONNECT_ASSERT(COND_) assert(COND_)
#else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdiff3-1.9.1/src/org.kde.kdiff3.appdata.xml
new/kdiff3-1.9.2/src/org.kde.kdiff3.appdata.xml
--- old/kdiff3-1.9.1/src/org.kde.kdiff3.appdata.xml 2021-05-13
22:27:28.000000000 +0200
+++ new/kdiff3-1.9.2/src/org.kde.kdiff3.appdata.xml 2021-05-17
02:34:48.000000000 +0200
@@ -307,6 +307,7 @@
<binary>kdiff3</binary>
</provides>
<releases>
+ <release version="1.9.2" date="2021-05-16"/>
<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"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdiff3-1.9.1/src/org.kde.kdiff3.desktop
new/kdiff3-1.9.2/src/org.kde.kdiff3.desktop
--- old/kdiff3-1.9.1/src/org.kde.kdiff3.desktop 2021-05-13 22:27:28.000000000
+0200
+++ new/kdiff3-1.9.2/src/org.kde.kdiff3.desktop 2021-05-17 02:34:48.000000000
+0200
@@ -87,7 +87,7 @@
GenericName[pl]=Interfejs dla Diff/Patch
GenericName[pt]=Interface do Diff/Patch
GenericName[pt_BR]=Interface do diff/patch
-GenericName[ro]=Interfa???? Diferen??iere/Peticire
+GenericName[ro]=Interfa???? diff/patch
GenericName[ru]=?????????????????????? ?????????????????? Diff/Patch
GenericName[sk]=Rozhranie Diff/Patch
GenericName[sl]=Za??elje za diff/patch
@@ -122,6 +122,7 @@
Comment[nn]=Eit program for samanlikning og fletting av filer og mapper
Comment[pl]=Narz??dzie do por??wnywania i scalania plik??w i katalog??w
Comment[pt_BR]=Uma ferramenta de compara????o e jun????o de arquivos e pastas
+Comment[ro]=Unealt?? de comparare ??i ??mbinare a fi??ierelor ??i dosarelor
Comment[sl]=Orodje za primerjavo in zdru??evanje datotek in map
Comment[sv]=Ett j??mf??relseverktyg f??r fil- och katalogj??mf??relser
Comment[uk]=???????????????????? ?????? ???????????????????? ????
????'?????????????? ???????????? ???? ??????
