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 <[email protected]> + +- 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 %suse_update_desktop_file %{buildroot}/%{_datadir}/applications/trojita.desktop %check @@ -94,27 +98,26 @@ export DISPLAY=%{X_display} Xvfb %{X_display} & trap "kill $! || true" EXIT -cd build -ctest --output-on-failure +%ctest %files -%defattr(-,root,root) -%doc LICENSE README -%{_libdir}/libtrojita_plugins.so -%dir %{_libdir}/trojita -%{_libdir}/trojita/trojita_plugin_QtKeychainPasswordPlugin.so -%{_bindir}/trojita -%{_bindir}/be.contacts -%{_datadir}/applications/trojita.desktop +%license LICENSE +%doc README +%dir %{_datadir}/appdata %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/* %dir %{_datadir}/icons/hicolor/*/apps -%{_datadir}/icons/hicolor/32x32/apps/trojita.png -%{_datadir}/icons/hicolor/scalable/apps/trojita.svg %dir %{_datadir}/trojita %dir %{_datadir}/trojita/locale -%{_datadir}/trojita/locale/trojita_common_*.qm -%dir %{_datadir}/appdata +%dir %{_libdir}/trojita +%{_bindir}/be.contacts +%{_bindir}/trojita %{_datadir}/appdata/trojita.appdata.xml +%{_datadir}/applications/trojita.desktop +%{_datadir}/icons/hicolor/32x32/apps/trojita.png +%{_datadir}/icons/hicolor/scalable/apps/trojita.svg +%{_datadir}/trojita/locale/trojita_common_*.qm +%{_libdir}/libtrojita_plugins.so +%{_libdir}/trojita/trojita_plugin_QtKeychainPasswordPlugin.so %changelog ++++++ 0001-Support-both-vanilla-gpgme-and-KDE-Frameworks-gpgmep.patch ++++++ >From 7a1c6fba795432cd0bd5af3ccf1fec84474ea754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]> Date: Sat, 17 Dec 2016 13:26:56 +0100 Subject: [PATCH] Support both vanilla gpgme and KDE Frameworks gpgmepp KF5Gpgmepp has been merged into GPGME (since 1.7.0) and will not see any further releases with KDE Applications. We still care about older distros (and that means older gpgme, and therefore a need for extra bindings). Stuff is a bit more complicated because 1.7.x is not thread-safe by default. Given that gpgme upstream start making their releases pretty often this fall, it seems safe to go with 1.8.0. Change-Id: Ia2f05bd8ed2a894435ca328a886325366ba41622 Inspired-By: Heiko Becker <[email protected]> Inspired-By: Andreas Sturmlechner <[email protected]> Fixed-By: Caspar Schutijser <[email protected]> --- CMakeLists.txt | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19fd906..0a6355f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,8 @@ trojita_option(WITH_ZLIB "Build with zlib library" AUTO) trojita_option(WITH_SHARED_PLUGINS "Enable shared dynamic plugins" ON) trojita_option(WITH_TESTS "Build tests" ON) trojita_option(WITH_MIMETIC "Build with client-side MIME parsing" AUTO) -trojita_option(WITH_GPGMEPP "Build with the GpgME++ library for cryptography" AUTO) +trojita_option(WITH_GPGMEPP "Use GpgME's native C++ bindings" AUTO) +trojita_option(WITH_KF5_GPGMEPP "Use legacy discontinued GpgME++ library from KDE frameworks" AUTO) if(WIN32) trojita_option(WITH_NSIS "Build Windows NSIS installer" AUTO "WITH_DESKTOP") @@ -94,8 +95,13 @@ trojita_plugin_option(WITH_QTKEYCHAIN_PLUGIN "Build Qtkeychain password plugin" trojita_find_package(Git "" "" "" "") trojita_find_package(Mimetic "" "http://www.codesink.org/mimetic_mime_library.html"; "C++ MIME Library" "Required for client-side MIME parsing" WITH_MIMETIC) -trojita_find_package(KF5Gpgmepp "" "https://quickgit.kde.org/?p=gpgmepp.git"; "C++ bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_GPGMEPP) -trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_GPGMEPP") +trojita_find_package(Gpgmepp "1.8.0" "https://gnupg.org/related_software/gpgme/index.html"; "C++/Qt bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_GPGMEPP) +if(NOT WITH_GPGMEPP) + trojita_find_package(KF5Gpgmepp "" "https://commits.kde.org/gpgmepp?path=/"; "C++ bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_KF5_GPGMEPP) + trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_KF5_GPGMEPP") +else() + trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_GPGMEPP") +endif() if(WIN32) trojita_find_package(MakeNSIS "" "http://nsis.sourceforge.net"; "Nullsoft Scriptable Install System" "Needed for building Windows installer" WITH_NSIS) @@ -207,7 +213,7 @@ else() set(TROJITA_HAVE_MIMETIC False) endif() -if(WITH_GPGMEPP) +if(WITH_GPGMEPP OR WITH_KF5_GPGMEPP) set(TROJITA_HAVE_GPGMEPP True) else() set(TROJITA_HAVE_GPGMEPP False) @@ -321,12 +327,10 @@ if(WITH_MIMETIC) ) endif() if(WITH_CRYPTO_MESSAGES) - if(WITH_GPGMEPP) set(libCryptography_SOURCES ${libCryptography_SOURCES} ${path_Cryptography}/GpgMe++.cpp ) - endif() endif() if(WITH_ZLIB) @@ -625,13 +629,15 @@ if(WITH_MIMETIC) set_property(TARGET Cryptography APPEND PROPERTY INCLUDE_DIRECTORIES ${MIMETIC_INCLUDE_DIRS}) endif() if(WITH_CRYPTO_MESSAGES) - if(WITH_GPGMEPP) - if (WIN32) - target_link_libraries(Cryptography KF5::Gpgmepp KF5::QGpgme) - else() - target_link_libraries(Cryptography KF5::Gpgmepp-pthread KF5::QGpgme) + if(WITH_GPGMEPP) + target_link_libraries(Cryptography Gpgmepp QGpgme) + elseif(WITH_KF5_GPGMEPP) + if(WIN32) + target_link_libraries(Cryptography KF5::Gpgmepp KF5::QGpgme) + else() + target_link_libraries(Cryptography KF5::Gpgmepp-pthread KF5::QGpgme) + endif() endif() - endif() endif() ## ClearText password plugin -- 2.25.1
