commit trojita for openSUSE:Factory
Hello community,
here is the log from the commit of package trojita for openSUSE:Factory checked
in at 2020-06-05 20:19:28
Comparing /work/SRC/openSUSE:Factory/trojita (Old)
and /work/SRC/openSUSE:Factory/.trojita.new.3606 (New)
Package is "trojita"
Fri Jun 5 20:19:28 2020 rev:12 rq:811543 version:0.7
Changes:
--- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2020-03-29
14:28:05.470171002 +0200
+++ /work/SRC/openSUSE:Factory/.trojita.new.3606/trojita.changes
2020-06-05 20:24:51.092728629 +0200
@@ -1,0 +2,6 @@
+Thu Jun 4 15:05:22 UTC 2020 - Christophe Giboudeaux
+
+- Add upstream patch:
+ * 0001-Fix-build-with-Qt-5.15.0.patch
+
+---
New:
0001-Fix-build-with-Qt-5.15.0.patch
Other differences:
--
++ trojita.spec ++
--- /var/tmp/diff_new_pack.s74dcE/_old 2020-06-05 20:24:52.448731049 +0200
+++ /var/tmp/diff_new_pack.s74dcE/_new 2020-06-05 20:24:52.452731057 +0200
@@ -39,6 +39,8 @@
Patch1: tests-Fix-build-with-Qt-5.13.patch
# PATCH-FIX-UPSTREAM
Patch2: 0001-Support-both-vanilla-gpgme-and-KDE-Frameworks-gpgmep.patch
+# PATCH-FIX-UPSTREAM
+Patch3: 0001-Fix-build-with-Qt-5.15.0.patch
BuildRequires: cmake >= 2.8.11
BuildRequires: git
BuildRequires: libgpgmepp-devel >= 1.8.0
@@ -72,8 +74,7 @@
* Plays well with the rest of the ecosystem. We don't like reinventing
wheels, but when the existing wheels quite don't fit the tracks, we're not
afraid of making them work.
%prep
-%setup -q
-%autopatch -p1
+%autosetup -p1
%build
export CXXFLAGS="%{optflags} -fPIC"
++ 0001-Fix-build-with-Qt-5.15.0.patch ++
>From cebd7ed5e66c479a7e10edf2eb7cb4a868433c9c Mon Sep 17 00:00:00 2001
From: Heiko Becker
Date: Tue, 24 Mar 2020 13:14:43 +0100
Subject: [PATCH] Fix build with Qt 5.15.0
QPainterPath is no longer included via qtransform.h (since
5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
Change-Id: Ibb59e769bba8514d86aa886afee26a2395d458ef
---
src/Gui/Window.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp
index 48a5b6f..5834637 100644
--- a/src/Gui/Window.cpp
+++ b/src/Gui/Window.cpp
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
#include
--
2.26.2
commit trojita for openSUSE:Factory
Hello community,
here is the log from the commit of package trojita for openSUSE:Factory checked
in at 2020-03-29 14:27:59
Comparing /work/SRC/openSUSE:Factory/trojita (Old)
and /work/SRC/openSUSE:Factory/.trojita.new.3160 (New)
Package is "trojita"
Sun Mar 29 14:27:59 2020 rev:11 rq:789378 version:0.7
Changes:
--- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2019-07-04
15:42:46.586062800 +0200
+++ /work/SRC/openSUSE:Factory/.trojita.new.3160/trojita.changes
2020-03-29 14:28:05.470171002 +0200
@@ -1,0 +2,7 @@
+Sat Mar 28 20:00:54 UTC 2020 - Christophe Giboudeaux
+
+- Add patch to use gpgme instead of the obsolete gpgmepp:
+ * 0001-Support-both-vanilla-gpgme-and-KDE-Frameworks-gpgmep.patch
+- Spec cleanup.
+
+---
New:
0001-Support-both-vanilla-gpgme-and-KDE-Frameworks-gpgmep.patch
Other differences:
--
++ trojita.spec ++
--- /var/tmp/diff_new_pack.bVXitY/_old 2020-03-29 14:28:06.786171675 +0200
+++ /var/tmp/diff_new_pack.bVXitY/_new 2020-03-29 14:28:06.790171678 +0200
@@ -1,7 +1,7 @@
#
# spec file for package trojita
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -21,8 +21,6 @@
Version:0.7
Release:0
Summary:Qt5 IMAP e-mail client
-License:(GPL-2.0 or GPL-3.0) and BSD-3-Clause and LGPL-2.0 and
(LGPL-2.1 or GPL-3.0) and LGPL-2.1+ and GPL-2.0
-Group: Productivity/Networking/Email/Clients
# Almost everything: dual-licensed under the GPLv2 or GPLv3
# (with KDE e.V. provision for relicensing)
# src/XtConnect: BSD
@@ -30,16 +28,21 @@
# Nokia imports: LGPLv2.1 or GPLv3
# src/Imap/Parser/3rdparty/rfccodecs.cpp: LGPLv2+
# src/qwwsmtpclient/: GPLv2
-Url:http://trojita.flaska.net/
+License:(GPL-2.0-only OR GPL-3.0-only) AND BSD-3-Clause AND
LGPL-2.0-only AND (LGPL-2.1-only OR GPL-3.0-only) AND LGPL-2.1-or-later AND
GPL-2.0-only
+Group: Productivity/Networking/Email/Clients
+URL:http://trojita.flaska.net/
Source:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.xz
Source1:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.xz.asc
# PATCH-FIX-OPENSUSE
-Patch: Skip-QtWebKit-tests.patch
+Patch0: Skip-QtWebKit-tests.patch
# PATCH-FIX-UPSTREAM
Patch1: tests-Fix-build-with-Qt-5.13.patch
-BuildRequires: cmake >= 2.8.7
+# PATCH-FIX-UPSTREAM
+Patch2: 0001-Support-both-vanilla-gpgme-and-KDE-Frameworks-gpgmep.patch
+BuildRequires: cmake >= 2.8.11
BuildRequires: git
-BuildRequires: gpgmepp5-devel
+BuildRequires: libgpgmepp-devel >= 1.8.0
+BuildRequires: libqgpgme-devel
BuildRequires: libqt5-linguist-devel >= 5.2.0
BuildRequires: libqt5-sql-sqlite
BuildRequires: pkgconfig
@@ -47,18 +50,17 @@
BuildRequires: ragel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-Xvfb
-BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
-BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Network) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
-BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
+BuildRequires: cmake(Qt5Core) >= 5.2.0
+BuildRequires: cmake(Qt5DBus) >= 5.2.0
+BuildRequires: cmake(Qt5Gui) >= 5.2.0
+BuildRequires: cmake(Qt5Network) >= 5.2.0
+BuildRequires: cmake(Qt5Sql) >= 5.2.0
+BuildRequires: cmake(Qt5Svg) >= 5.2.0
+BuildRequires: cmake(Qt5Test) >= 5.2.0
+BuildRequires: cmake(Qt5WebKitWidgets) >= 5.2.0
+BuildRequires: cmake(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(xkeyboard-config)
BuildRequires: pkgconfig(zlib)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Trojita is a Qt IMAP e-mail client which:
@@ -81,12 +83,14 @@
-DWITH_QT5=ON \
-DWITH_ZLIB=ON \
-DWITH_RAGEL=OFF \
- -DWITH_SHARED_PLUGINS=ON
-make %{?_smp_mflags}
+-DWITH_SHARED_PLUGINS=ON \
+-DWITH_GPGMEPP=ON \
+-DWITH_KF5_GPGMEPP=OFF
+
+%cmake_build
%install
-cd build
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%cmake_install
commit trojita for openSUSE:Factory
Hello community,
here is the log from the commit of package trojita for openSUSE:Factory checked
in at 2019-07-04 15:42:46
Comparing /work/SRC/openSUSE:Factory/trojita (Old)
and /work/SRC/openSUSE:Factory/.trojita.new.4615 (New)
Package is "trojita"
Thu Jul 4 15:42:46 2019 rev:10 rq:713040 version:0.7
Changes:
--- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2018-03-28
10:33:22.864730495 +0200
+++ /work/SRC/openSUSE:Factory/.trojita.new.4615/trojita.changes
2019-07-04 15:42:46.586062800 +0200
@@ -1,0 +2,5 @@
+Tue Jul 2 08:49:49 UTC 2019 - wba...@tmo.at
+
+- Add tests-Fix-build-with-Qt-5.13.patch to fix build with Qt 5.13
+
+---
New:
tests-Fix-build-with-Qt-5.13.patch
Other differences:
--
++ trojita.spec ++
--- /var/tmp/diff_new_pack.wk6ubP/_old 2019-07-04 15:42:47.302063919 +0200
+++ /var/tmp/diff_new_pack.wk6ubP/_new 2019-07-04 15:42:47.306063925 +0200
@@ -35,6 +35,8 @@
Source1:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.xz.asc
# PATCH-FIX-OPENSUSE
Patch: Skip-QtWebKit-tests.patch
+# PATCH-FIX-UPSTREAM
+Patch1: tests-Fix-build-with-Qt-5.13.patch
BuildRequires: cmake >= 2.8.7
BuildRequires: git
BuildRequires: gpgmepp5-devel
@@ -69,7 +71,7 @@
%prep
%setup -q
-%patch -p1
+%autopatch -p1
%build
export CXXFLAGS="%{optflags} -fPIC"
++ tests-Fix-build-with-Qt-5.13.patch ++
>From 39772585033c1c0aff96f297e93de7be53f9b114 Mon Sep 17 00:00:00 2001
From: Heiko Becker
Date: Sat, 23 Mar 2019 01:17:11 +0100
Subject: tests: Fix build with Qt 5.13
QTest::toString(QModelIndex) was added in
7ef0b575b38d267bd3dc14ff46935d556562ff00 and thus causes a build
error with Qt 5.13 because it's redefined here.
Change-Id: I015800e49cf8d0e87f3541642406396f150d0eeb
---
tests/Imap/test_Imap_BodyParts.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/Imap/test_Imap_BodyParts.cpp
b/tests/Imap/test_Imap_BodyParts.cpp
index f1c577f..b6e0421 100644
--- a/tests/Imap/test_Imap_BodyParts.cpp
+++ b/tests/Imap/test_Imap_BodyParts.cpp
@@ -51,6 +51,7 @@ struct Data {
Q_DECLARE_METATYPE(QList)
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
namespace QTest {
template <>
char *toString(const QModelIndex )
@@ -60,6 +61,7 @@ char *toString(const QModelIndex )
return qstrdup(buf.toUtf8().constData());
}
}
+#endif
using namespace Imap::Mailbox;
--
cgit v1.1
commit trojita for openSUSE:Factory
Hello community,
here is the log from the commit of package trojita for openSUSE:Factory checked
in at 2018-03-28 10:33:21
Comparing /work/SRC/openSUSE:Factory/trojita (Old)
and /work/SRC/openSUSE:Factory/.trojita.new (New)
Package is "trojita"
Wed Mar 28 10:33:21 2018 rev:9 rq:591601 version:0.7
Changes:
--- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2016-07-18
21:25:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.trojita.new/trojita.changes 2018-03-28
10:33:22.864730495 +0200
@@ -1,0 +2,7 @@
+Tue Mar 27 09:28:15 UTC 2018 - wba...@tmo.at
+
+- Add Skip-QtWebKit-tests.patch to fix build on Tumbleweed and Leap
+ 15, the tests fail currently with the latest QtWebKit 5.212
+ alpha2 but trojita works fine
+
+---
New:
Skip-QtWebKit-tests.patch
Other differences:
--
++ trojita.spec ++
--- /var/tmp/diff_new_pack.4rVYGX/_old 2018-03-28 10:33:23.584704600 +0200
+++ /var/tmp/diff_new_pack.4rVYGX/_new 2018-03-28 10:33:23.588704455 +0200
@@ -33,6 +33,8 @@
Url:http://trojita.flaska.net/
Source:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.xz
Source1:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.xz.asc
+# PATCH-FIX-OPENSUSE
+Patch: Skip-QtWebKit-tests.patch
BuildRequires: cmake >= 2.8.7
BuildRequires: git
BuildRequires: gpgmepp5-devel
@@ -67,6 +69,7 @@
%prep
%setup -q
+%patch -p1
%build
export CXXFLAGS="%{optflags} -fPIC"
++ Skip-QtWebKit-tests.patch ++
>From 14879cc510e819ea43d3e09ede679bc309188327 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer
Date: Tue, 27 Mar 2018 11:23:37 +0200
Subject: [PATCH] tests: Skip QtWebKit tests
Based on upstream commit 73a7b085, but disable the QtWebKit tests
unconditionally to fix build in Tumbleweed and Leap 15.
Those tests fail currently with the latest QtWebKit 5.212 alpha2.
---
tests/Composer/test_Html_formatting.cpp | 11 +++
1 file changed, 11 insertions(+)
diff --git a/tests/Composer/test_Html_formatting.cpp
b/tests/Composer/test_Html_formatting.cpp
index 4653a26a..7359214f 100644
--- a/tests/Composer/test_Html_formatting.cpp
+++ b/tests/Composer/test_Html_formatting.cpp
@@ -31,6 +31,9 @@
#include "Composer/SenderIdentitiesModel.h"
#include "Composer/SubjectMangling.h"
+#define SKIP_WEBKIT_TESTS
+
+
Q_DECLARE_METATYPE(QList)
static QString visualizeWhitespace(QString s)
@@ -303,6 +306,9 @@ void HtmlFormattingTest::testPlainTextFormattingViaPaste()
if (expandedFlowed.isEmpty())
expandedFlowed = formattedFlowed;
+#ifdef SKIP_WEBKIT_TESTS
+QSKIP("ASAN build -- QtWebKit is known to be broken, skipping");
+#else
{
WebRenderingTester tester;
LONG_STR_QCOMPARE(visualizeWhitespace(tester.asPlainText(source,
UiUtils::FlowedFormat::FLOWED)),
@@ -320,6 +326,7 @@ void HtmlFormattingTest::testPlainTextFormattingViaPaste()
LONG_STR_QCOMPARE(visualizeWhitespace(tester.asPlainText(source,
UiUtils::FlowedFormat::FLOWED,
WebRenderingTester::RenderExpandEverythingCollapsed)),
visualizeWhitespace(expandedFlowed));
}
+#endif
}
void HtmlFormattingTest::testPlainTextFormattingViaPaste_data()
@@ -584,6 +591,9 @@ void
HtmlFormattingTest::testPlainTextFormattingViaPasteDelSp()
QFETCH(QString, expandedFlowed);
QFETCH(QString, expandedFlowedDelSp);
+#ifdef SKIP_WEBKIT_TESTS
+QSKIP("ASAN build -- QtWebKit is known to be broken, skipping");
+#else
{
WebRenderingTester tester;
LONG_STR_QCOMPARE(visualizeWhitespace(tester.asPlainText(source,
UiUtils::FlowedFormat::FLOWED,
WebRenderingTester::RenderExpandEverythingCollapsed)),
@@ -594,6 +604,7 @@ void
HtmlFormattingTest::testPlainTextFormattingViaPasteDelSp()
LONG_STR_QCOMPARE(visualizeWhitespace(tester.asPlainText(source,
UiUtils::FlowedFormat::FLOWED_DELSP,
WebRenderingTester::RenderExpandEverythingCollapsed)),
visualizeWhitespace(expandedFlowedDelSp));
}
+#endif
}
--
2.13.6
commit trojita for openSUSE:Factory
Hello community,
here is the log from the commit of package trojita for openSUSE:Factory checked
in at 2016-07-18 21:24:21
Comparing /work/SRC/openSUSE:Factory/trojita (Old)
and /work/SRC/openSUSE:Factory/.trojita.new (New)
Package is "trojita"
Changes:
--- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2015-12-09
22:35:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.trojita.new/trojita.changes 2016-07-18
21:25:08.0 +0200
@@ -1,0 +2,27 @@
+Fri Jul 15 18:12:41 UTC 2016 - hrvoje.sen...@gmail.com
+
+- Disable ragel to fix Tumbleweed compilation
+- Enable qtkeychain-qt5-devel and gpgmepp5-devel BuildRequires
+
+---
+Tue Jun 21 07:21:14 UTC 2016 - tchva...@suse.com
+
+- Version update to 0.7:
+ * various bugfixes
+ * Support for encryption
+
+---
+Wed Jun 1 15:14:35 UTC 2016 - tchva...@suse.com
+
+- Version update to latest release 0.6, merged all patches:
+ * fix-missing-includes.patch
+ * fix-qt5_5-test-regression.patch
+ * libqt5_6.patch
+
+---
+Wed Jun 1 15:11:36 UTC 2016 - tchva...@suse.com
+
+- Add patch to build on qt 5.6:
+ * libqt5_6.patch
+
+---
Old:
fix-missing-includes.patch
fix-qt5_5-test-regression.patch
trojita-0.5.tar.bz2
trojita-0.5.tar.bz2.asc
New:
trojita-0.7.tar.xz
trojita-0.7.tar.xz.asc
Other differences:
--
++ trojita.spec ++
--- /var/tmp/diff_new_pack.DCei95/_old 2016-07-18 21:25:09.0 +0200
+++ /var/tmp/diff_new_pack.DCei95/_new 2016-07-18 21:25:09.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package trojita
#
-# Copyright (c) 2015 SUSE LINUX 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
@@ -18,7 +18,7 @@
%define X_display ":98"
Name: trojita
-Version:0.5
+Version:0.7
Release:0
Summary:Qt5 IMAP e-mail client
License:(GPL-2.0 or GPL-3.0) and BSD-3-Clause and LGPL-2.0 and
(LGPL-2.1 or GPL-3.0) and LGPL-2.1+ and GPL-2.0
@@ -31,29 +31,28 @@
# src/Imap/Parser/3rdparty/rfccodecs.cpp: LGPLv2+
# src/qwwsmtpclient/: GPLv2
Url:http://trojita.flaska.net/
-Source:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.bz2
-Source1:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.bz2.asc
-# PATCH-FIX-UPSTREAM fix-missing-includes.patch -- Fix undefined QObject with
newer qt5. Fixed already upstream.
-Patch0: fix-missing-includes.patch
-# PATCH-FIX-UPSTREAM fix-qt5_5-test-regression.patch -- Remove test failing
because of regression in qt5 https://bugs.kde.org/show_bug.cgi?id=345739
-Patch1: fix-qt5_5-test-regression.patch
+Source:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.xz
+Source1:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.xz.asc
BuildRequires: cmake >= 2.8.7
BuildRequires: git
+BuildRequires: gpgmepp5-devel
BuildRequires: libqt5-linguist-devel >= 5.2.0
-# both pkgconfig(Qt5Test) and libqt5-sql-sqlite are needed on buildtime for
tests!
BuildRequires: libqt5-sql-sqlite
+BuildRequires: pkgconfig
+BuildRequires: qtkeychain-qt5-devel
BuildRequires: ragel
BuildRequires: update-desktop-files
-BuildRequires: xkeyboard-config
BuildRequires: xorg-x11-Xvfb
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0
BuildRequires: pkgconfig(Qt5Network) >= 5.2.0
BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0
+BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
+BuildRequires: pkgconfig(xkeyboard-config)
BuildRequires: pkgconfig(zlib)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -68,10 +67,6 @@
%prep
%setup -q
-%patch0 -p1
-%if 0%{?is_opensuse}
-%patch1 -p1
-%endif
%build
export CXXFLAGS="%{optflags} -fPIC"
@@ -80,13 +75,13 @@
-DWITH_TESTS=ON \
-DWITH_QT5=ON \
-DWITH_ZLIB=ON \
- -DWITH_RAGEL=ON \
+ -DWITH_RAGEL=OFF \
-DWITH_SHARED_PLUGINS=ON
make %{?_smp_mflags}
%install
cd build
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
commit trojita for openSUSE:Factory
Hello community,
here is the log from the commit of package trojita for openSUSE:Factory checked
in at 2015-12-09 19:51:21
Comparing /work/SRC/openSUSE:Factory/trojita (Old)
and /work/SRC/openSUSE:Factory/.trojita.new (New)
Package is "trojita"
Changes:
--- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2015-02-24
13:07:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.trojita.new/trojita.changes 2015-12-09
22:35:26.0 +0100
@@ -1,0 +2,8 @@
+Thu Dec 3 23:42:43 UTC 2015 - r...@fthiessen.de
+
+- Added fix-missing-includes.patch for fixing missing includes
+ when using qt5.
+- Added fix-qt5_5-test-regression.patch to circumvent a regression
+ in qt5 5.5
+
+---
New:
fix-missing-includes.patch
fix-qt5_5-test-regression.patch
Other differences:
--
++ trojita.spec ++
--- /var/tmp/diff_new_pack.67H2oi/_old 2015-12-09 22:35:27.0 +0100
+++ /var/tmp/diff_new_pack.67H2oi/_new 2015-12-09 22:35:27.0 +0100
@@ -33,9 +33,15 @@
Url:http://trojita.flaska.net/
Source:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.bz2
Source1:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.bz2.asc
+# PATCH-FIX-UPSTREAM fix-missing-includes.patch -- Fix undefined QObject with
newer qt5. Fixed already upstream.
+Patch0: fix-missing-includes.patch
+# PATCH-FIX-UPSTREAM fix-qt5_5-test-regression.patch -- Remove test failing
because of regression in qt5 https://bugs.kde.org/show_bug.cgi?id=345739
+Patch1: fix-qt5_5-test-regression.patch
BuildRequires: cmake >= 2.8.7
BuildRequires: git
BuildRequires: libqt5-linguist-devel >= 5.2.0
+# both pkgconfig(Qt5Test) and libqt5-sql-sqlite are needed on buildtime for
tests!
+BuildRequires: libqt5-sql-sqlite
BuildRequires: ragel
BuildRequires: update-desktop-files
BuildRequires: xkeyboard-config
@@ -45,13 +51,10 @@
BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0
BuildRequires: pkgconfig(Qt5Network) >= 5.2.0
BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0
-# both pkgconfig(Qt5Test) and libqt5-sql-sqlite are needed on buildtime for
tests!
-BuildRequires: libqt5-sql-sqlite
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(zlib)
-Requires: libqt5-sql-sqlite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -65,6 +68,10 @@
%prep
%setup -q
+%patch0 -p1
+%if 0%{?is_opensuse}
+%patch1 -p1
+%endif
%build
export CXXFLAGS="%{optflags} -fPIC"
++ fix-missing-includes.patch ++
diff -Nur trojita-0.5/src/AbookAddressbook/AbookAddressbook.h
trojita-0.5-new/src/AbookAddressbook/AbookAddressbook.h
--- trojita-0.5/src/AbookAddressbook/AbookAddressbook.h 2015-02-23
00:49:04.0 +0100
+++ trojita-0.5-new/src/AbookAddressbook/AbookAddressbook.h 2015-12-03
22:39:02.168007129 +0100
@@ -25,6 +25,7 @@
#ifndef ABOOK_ADDRESSBOOK
#define ABOOK_ADDRESSBOOK
+#include
#include
#include "Gui/AbstractAddressbook.h"
diff -Nur trojita-0.5/src/Imap/Model/MailboxMetadata.cpp
trojita-0.5-new/src/Imap/Model/MailboxMetadata.cpp
--- trojita-0.5/src/Imap/Model/MailboxMetadata.cpp 2015-02-23
00:49:04.0 +0100
+++ trojita-0.5-new/src/Imap/Model/MailboxMetadata.cpp 2015-12-03
23:02:47.644010305 +0100
@@ -20,6 +20,7 @@
along with this program. If not, see
commit trojita for openSUSE:Factory
Hello community,
here is the log from the commit of package trojita for openSUSE:Factory checked
in at 2015-02-24 13:02:52
Comparing /work/SRC/openSUSE:Factory/trojita (Old)
and /work/SRC/openSUSE:Factory/.trojita.new (New)
Package is trojita
Changes:
--- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2014-12-01
14:00:54.0 +0100
+++ /work/SRC/openSUSE:Factory/.trojita.new/trojita.changes 2015-02-24
13:07:13.0 +0100
@@ -1,0 +2,35 @@
+Mon Feb 23 18:11:24 UTC 2015 - hrvoje.sen...@gmail.com
+
+- Update to 0.5
+ * Trojitá can now be invoked with a mailto: URL (RFC 6068) on the
+command line for composing a new email.
+ * Messages can be forwarded as attachments (support for inline
+forwarding is planned).
+ * Passwords can be remembered in a secure, encrypted storage
+via QtKeychain.
+ * E-mails with attachments are decorated with a paperclip
+icon in the overview.
+ * Better rendering of e-mails with extraordinary MIME structure.
+ * By default, only one instance is kept running, and can be
+controlled via D-Bus.
+ * Trojitá now provides better error reporting, and can reconnect
+on network failures automatically.
+ * The network state (Offline, Expensive Connection or Free Access)
+will be remembered across sessions.
+ * When replying, it is now possible to retroactively change the
+reply type (Private Reply, Reply to All but Me, Reply to All,
+Reply to Mailing List, Handpicked).
+ * When searching in a message, Trojitá will scroll to
+the current match.
+ * Attachment preview for quick access to the enclosed files.
+ * The mark-message-read-after-X-seconds setting is
+now configurable.
+ * The IMAP refresh interval is now configurable.
+ * Speed and memory consumption improvements.
+ * Miscellaneous IMAP improvements.
+ * Various fixes and improvements.
+- Drop 0001-Explicitly-mark-libs-as-STATIC-to-not-allow-cmake-ru.patch,
+ merged upstream
+- Bump Qt BuildRequires to 5.2
+
+---
Old:
0001-Explicitly-mark-libs-as-STATIC-to-not-allow-cmake-ru.patch
trojita-0.4.1.tar.bz2
New:
trojita-0.5.tar.bz2
trojita-0.5.tar.bz2.asc
Other differences:
--
++ trojita.spec ++
--- /var/tmp/diff_new_pack.cE80IG/_old 2015-02-24 13:07:14.0 +0100
+++ /var/tmp/diff_new_pack.cE80IG/_new 2015-02-24 13:07:14.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package trojita
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -18,7 +18,7 @@
%define X_display :98
Name: trojita
-Version:0.4.1
+Version:0.5
Release:0
Summary:Qt5 IMAP e-mail client
License:(GPL-2.0 or GPL-3.0) and BSD-3-Clause and LGPL-2.0 and
(LGPL-2.1 or GPL-3.0) and LGPL-2.1+ and GPL-2.0
@@ -32,22 +32,24 @@
# src/qwwsmtpclient/: GPLv2
Url:http://trojita.flaska.net/
Source:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.bz2
-Patch0: 0001-Explicitly-mark-libs-as-STATIC-to-not-allow-cmake-ru.patch
+Source1:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.bz2.asc
BuildRequires: cmake = 2.8.7
BuildRequires: git
-BuildRequires: libqt5-qttools-devel
-BuildRequires: libqt5-sql-sqlite
+BuildRequires: libqt5-linguist-devel = 5.2.0
BuildRequires: ragel
BuildRequires: update-desktop-files
BuildRequires: xkeyboard-config
BuildRequires: xorg-x11-Xvfb
-BuildRequires: pkgconfig(Qt5Gui)
-BuildRequires: pkgconfig(Qt5Network)
-BuildRequires: pkgconfig(Qt5Sql)
-BuildRequires: pkgconfig(Qt5Test)
-BuildRequires: pkgconfig(Qt5WebKit)
-BuildRequires: pkgconfig(Qt5WebKitWidgets)
-BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5Core) = 5.2.0
+BuildRequires: pkgconfig(Qt5DBus) = 5.2.0
+BuildRequires: pkgconfig(Qt5Gui) = 5.2.0
+BuildRequires: pkgconfig(Qt5Network) = 5.2.0
+BuildRequires: pkgconfig(Qt5Sql) = 5.2.0
+# both pkgconfig(Qt5Test) and libqt5-sql-sqlite are needed on buildtime for
tests!
+BuildRequires: libqt5-sql-sqlite
+BuildRequires: pkgconfig(Qt5Test) = 5.2.0
+BuildRequires: pkgconfig(Qt5WebKitWidgets) = 5.2.0
+BuildRequires: pkgconfig(Qt5Widgets) = 5.2.0
BuildRequires: pkgconfig(zlib)
Requires: libqt5-sql-sqlite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -63,7 +65,6 @@
%prep
%setup -q
-%patch0 -p1
%build
export CXXFLAGS=%{optflags} -fPIC
@@ -82,6 +83,7 @@
commit trojita for openSUSE:Factory
Hello community, here is the log from the commit of package trojita for openSUSE:Factory checked in at 2014-12-01 14:00:47 Comparing /work/SRC/openSUSE:Factory/trojita (Old) and /work/SRC/openSUSE:Factory/.trojita.new (New) Package is trojita Changes: --- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2014-06-25 21:20:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.trojita.new/trojita.changes 2014-12-01 14:00:54.0 +0100 @@ -1,0 +2,5 @@ +Fri Nov 28 11:10:00 UTC 2014 - tchva...@suse.com + +- Add libqt5-sql-sqlite to BuildRequires too + +--- Other differences: -- ++ trojita.spec ++ --- /var/tmp/diff_new_pack.I47jCz/_old 2014-12-01 14:00:55.0 +0100 +++ /var/tmp/diff_new_pack.I47jCz/_new 2014-12-01 14:00:55.0 +0100 @@ -36,6 +36,7 @@ BuildRequires: cmake = 2.8.7 BuildRequires: git BuildRequires: libqt5-qttools-devel +BuildRequires: libqt5-sql-sqlite BuildRequires: ragel BuildRequires: update-desktop-files BuildRequires: xkeyboard-config -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit trojita for openSUSE:Factory
Hello community,
here is the log from the commit of package trojita for openSUSE:Factory checked
in at 2014-06-25 21:20:14
Comparing /work/SRC/openSUSE:Factory/trojita (Old)
and /work/SRC/openSUSE:Factory/.trojita.new (New)
Package is trojita
Changes:
--- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2014-03-21
13:51:39.0 +0100
+++ /work/SRC/openSUSE:Factory/.trojita.new/trojita.changes 2014-06-25
21:20:15.0 +0200
@@ -1,0 +2,6 @@
+Mon Apr 28 18:29:35 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Swap libQt5Sql5-sqlite to libqt5-sql-sqlite, as the latter is
+ available also in 13.1 release
+
+---
Other differences:
--
++ trojita.spec ++
--- /var/tmp/diff_new_pack.12Dnlj/_old 2014-06-25 21:20:16.0 +0200
+++ /var/tmp/diff_new_pack.12Dnlj/_new 2014-06-25 21:20:16.0 +0200
@@ -48,7 +48,7 @@
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(zlib)
-Requires: libQt5Sql5-sqlite
+Requires: libqt5-sql-sqlite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit trojita for openSUSE:Factory
Hello community,
here is the log from the commit of package trojita for openSUSE:Factory checked
in at 2014-03-21 13:51:30
Comparing /work/SRC/openSUSE:Factory/trojita (Old)
and /work/SRC/openSUSE:Factory/.trojita.new (New)
Package is trojita
Changes:
--- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2014-03-09
20:27:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.trojita.new/trojita.changes 2014-03-21
13:51:39.0 +0100
@@ -1,0 +2,11 @@
+Thu Mar 20 21:39:18 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to 0.4.1
+ * Fix for CVE-2014-2567
+
+---
+Fri Mar 14 14:56:49 UTC 2014 - tchva...@suse.com
+
+- Require sqlite backend for qtsql as we use just that one.
+
+---
Old:
trojita-0.4.tar.bz2
New:
trojita-0.4.1.tar.bz2
Other differences:
--
++ trojita.spec ++
--- /var/tmp/diff_new_pack.3ebMI8/_old 2014-03-21 13:51:39.0 +0100
+++ /var/tmp/diff_new_pack.3ebMI8/_new 2014-03-21 13:51:39.0 +0100
@@ -18,9 +18,11 @@
%define X_display :98
Name: trojita
-Version:0.4
+Version:0.4.1
Release:0
Summary:Qt5 IMAP e-mail client
+License:(GPL-2.0 or GPL-3.0) and BSD-3-Clause and LGPL-2.0 and
(LGPL-2.1 or GPL-3.0) and LGPL-2.1+ and GPL-2.0
+Group: Productivity/Networking/Email/Clients
# Almost everything: dual-licensed under the GPLv2 or GPLv3
# (with KDE e.V. provision for relicensing)
# src/XtConnect: BSD
@@ -28,8 +30,6 @@
# Nokia imports: LGPLv2.1 or GPLv3
# src/Imap/Parser/3rdparty/rfccodecs.cpp: LGPLv2+
# src/qwwsmtpclient/: GPLv2
-License:(GPL-2.0 or GPL-3.0) and BSD-3-Clause and LGPL-2.0 and
(LGPL-2.1 or GPL-3.0) and LGPL-2.1+ and GPL-2.0
-Group: Productivity/Networking/Email/Clients
Url:http://trojita.flaska.net/
Source:
http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.bz2
Patch0: 0001-Explicitly-mark-libs-as-STATIC-to-not-allow-cmake-ru.patch
@@ -48,6 +48,7 @@
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(zlib)
+Requires: libQt5Sql5-sqlite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++ trojita-0.4.tar.bz2 - trojita-0.4.1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trojita-0.4/qtc_packaging/debian_harmattan/changelog
new/trojita-0.4.1/qtc_packaging/debian_harmattan/changelog
--- old/trojita-0.4/qtc_packaging/debian_harmattan/changelog2014-03-04
12:12:58.0 +0100
+++ new/trojita-0.4.1/qtc_packaging/debian_harmattan/changelog 2014-03-20
20:44:27.0 +0100
@@ -1,3 +1,8 @@
+trojita-tp (0.4.1) unstable; urgency=low
+ * Fix security problem, an information leak with STARTTLS and PREAUTH
+
+ -- Jan Kundrát j...@flaska.net Wed, 19 Mar 2014 08:00:00 -0400
+
trojita-tp (0.4) unstable; urgency=low
* Add change description here
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trojita-0.4/src/Imap/Tasks/OpenConnectionTask.cpp
new/trojita-0.4.1/src/Imap/Tasks/OpenConnectionTask.cpp
--- old/trojita-0.4/src/Imap/Tasks/OpenConnectionTask.cpp 2014-03-04
12:12:58.0 +0100
+++ new/trojita-0.4.1/src/Imap/Tasks/OpenConnectionTask.cpp 2014-03-20
20:44:27.0 +0100
@@ -153,6 +153,17 @@
{
switch (resp-kind) {
case PREAUTH:
+if (model-m_startTls) {
+// Oops, we cannot send STARTTLS when the connection is
already authenticated.
+// This is serious enough to warrant an error; an attacker
might be going after a plaintext
+// of a message we're going to APPEND, etc.
+// Thanks to Arnt Gulbrandsen on the imap-protocol ML for
asking what happens when we're configured
+// to request STARTTLS and a PREAUTH is received, and to
Michael M Slusarz for starting that discussion.
+logout(tr(Configuration requires sending STARTTLS, but the
IMAP server greets us with PREAUTH.
+ Encryption cannot be established. If this
configuration worked previously, someone
+ is after your data and they are pretty smart.));
+return true;
+}
// Cool, we're already authenticated. Now, let's see if we have to
issue CAPABILITY or if we already know that
if (model-accessParser(parser).capabilitiesFresh) {
// We're alsmost done here, apart from compression
diff -urN
