From 64ec73244b03a9aa39aa59fd02b6966306cd23fc Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sat, 30 Mar 2019 22:02:59 -0500 Subject: [PATCH] Remove reverse-applicable patches. --- debian/changelog | 6 ++ debian/patches/fix-gpg-test.patch | 15 ----- debian/patches/series | 2 - debian/patches/vanilla-gpgme-support.patch | 76 ---------------------- 4 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 debian/patches/fix-gpg-test.patch delete mode 100644 debian/patches/series delete mode 100644 debian/patches/vanilla-gpgme-support.patch diff --git a/debian/changelog b/debian/changelog index ff0e3ac..a5dc9f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +trojita (0.7-0ubuntu3) UNRELEASED; urgency=medium + + * Remove reverse-applicable patches. + + -- Simon Quigley Sat, 30 Mar 2019 22:02:45 -0500 + trojita (0.7-0ubuntu2) cosmic; urgency=medium * Fix debian/rules to explicitly allow for encryption support. diff --git a/debian/patches/fix-gpg-test.patch b/debian/patches/fix-gpg-test.patch deleted file mode 100644 index c84130e..0000000 --- a/debian/patches/fix-gpg-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fix GPG test. -Author: Amaury Pouly -Origin: upstream https://cgit.kde.org/trojita.git/commit/?id=be8fd5831afa0a04f14cd6206e6576f03ee59558 -Last-Update: 2018-09-26 ---- a/tests/Cryptography/keygen.sh -+++ b/tests/Cryptography/keygen.sh -@@ -115,7 +115,7 @@ $TAIL" > crypto_test_data.h - echo -n "key *\nexpire\nseconds=1\nsave\n" | ${GPG} --no-tty --quiet --command-fd 0 --edit-key "expired@test.trojita.flaska.net" - - # extract fingerprint of key to be deleted --FINGERPRINT="$(${GPG} --quiet --no-tty --list-keys --with-colons --fingerprint unknown@test.trojita.flaska.net | grep fpr | cut -d : -f 10)" -+FINGERPRINT="$(${GPG} --quiet --no-tty --list-keys --with-colons --fingerprint unknown@test.trojita.flaska.net | grep fpr | head -n 1 | cut -d : -f 10)" - - # delete key - yes | DISPLAY="" ${GPG} --quiet --batch --no-tty --delete-secret-and-public-key --yes --command-fd 0 --passphrase-fd 0 "${FINGERPRINT}" diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 24d3be3..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -vanilla-gpgme-support.patch -fix-gpg-test.patch diff --git a/debian/patches/vanilla-gpgme-support.patch b/debian/patches/vanilla-gpgme-support.patch deleted file mode 100644 index c5fdfa9..0000000 --- a/debian/patches/vanilla-gpgme-support.patch +++ /dev/null @@ -1,76 +0,0 @@ -Description: Support both vanilla gpgme and KDE Frameworks gpgmepp. -Author: Jan Kundrát -Origin: upstream https://cgit.kde.org/trojita.git/commit/?id=e8393376969caf27b0c976d01645edd023c14df2 -Last-Update: 2018-09-26 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,7 +61,8 @@ trojita_option(WITH_ZLIB "Build with zli - 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_PL - 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