| 1 |
commit: 7dd24ef8cbd4a84ddd39fb700b9160f62a7652a8 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 19 18:03:19 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 19 18:03:19 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7dd24ef8 |
| 7 |
|
| 8 |
kde-apps/kopete: Drop obsolete patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../kopete/files/kopete-17.04.0-kde4qgpgme.patch | 56 ---------------------- |
| 13 |
1 file changed, 56 deletions(-) |
| 14 |
|
| 15 |
diff --git a/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch b/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 59e2a3752e..0000000000 |
| 18 |
--- a/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,56 +0,0 @@ |
| 21 |
---- a/CMakeLists.txt |
| 22 |
-+++ b/CMakeLists.txt |
| 23 |
-@@ -98,8 +98,8 @@ |
| 24 |
- macro_optional_find_package(QJSON) |
| 25 |
- macro_log_feature(QJSON_FOUND "QJSON" "JSON handling library for Qt" "http://qjson.sourceforge.net/" FALSE "" "Required for the Jabber protocol") |
| 26 |
- |
| 27 |
--macro_optional_find_package(QGpgme) |
| 28 |
--macro_log_feature(QGPGME_FOUND "QGpgme" "QGpgME library (from kdepimlibs)" "http://www.kde.org/" FALSE "" "Required for the Cryptography plugin") |
| 29 |
-+macro_optional_find_package(KDE4_QGpgme) |
| 30 |
-+macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgme" "KDE4_QGpgME library (from kdepimlibs)" "http://www.kde.org/" FALSE "" "Required for the Cryptography plugin") |
| 31 |
- |
| 32 |
- macro_optional_find_package(Sqlite) |
| 33 |
- macro_log_feature(SQLITE_FOUND "Sqlite" "SQLite is a Binary-Database" "http://www.sqlite.org/" FALSE "" "Required for the Statistic plugin") |
| 34 |
---- a/plugins/CMakeLists.txt |
| 35 |
-+++ b/plugins/CMakeLists.txt |
| 36 |
-@@ -74,6 +74,6 @@ |
| 37 |
- if (WITH_otr AND LIBOTR_FOUND) |
| 38 |
- add_subdirectory ( otr ) |
| 39 |
- endif (WITH_otr AND LIBOTR_FOUND) |
| 40 |
--if (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND) |
| 41 |
-+if (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND) |
| 42 |
- add_subdirectory ( cryptography ) |
| 43 |
--endif (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND) |
| 44 |
-+endif (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND) |
| 45 |
---- a/plugins/cryptography/CMakeLists.txt |
| 46 |
-+++ b/plugins/cryptography/CMakeLists.txt |
| 47 |
-@@ -17,7 +17,7 @@ |
| 48 |
- |
| 49 |
- kde4_add_plugin(kopete_cryptography ${kopete_cryptography_PART_SRCS}) |
| 50 |
- |
| 51 |
--target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} ${QGPGME_LIBRARIES} ) |
| 52 |
-+target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} ${KDE4_QGPGME_LIBRARIES} ) |
| 53 |
- |
| 54 |
- install(TARGETS kopete_cryptography DESTINATION ${PLUGIN_INSTALL_DIR}) |
| 55 |
- |
| 56 |
---- a/plugins/cryptography/cryptographyplugin.cpp |
| 57 |
-+++ b/plugins/cryptography/cryptographyplugin.cpp |
| 58 |
-@@ -52,12 +52,12 @@ |
| 59 |
- #include <kleo/signjob.h> |
| 60 |
- #include <kleo/keylistjob.h> |
| 61 |
- #include <kleo/job.h> |
| 62 |
--#include <gpgme++/decryptionresult.h> |
| 63 |
--#include <gpgme++/verificationresult.h> |
| 64 |
--#include <gpgme++/keylistresult.h> |
| 65 |
--#include <gpgme++/signingresult.h> |
| 66 |
--#include <gpgme++/encryptionresult.h> |
| 67 |
--#include <gpgme++/key.h> |
| 68 |
-+#include <kde4_gpgme++/decryptionresult.h> |
| 69 |
-+#include <kde4_gpgme++/verificationresult.h> |
| 70 |
-+#include <kde4_gpgme++/keylistresult.h> |
| 71 |
-+#include <kde4_gpgme++/signingresult.h> |
| 72 |
-+#include <kde4_gpgme++/encryptionresult.h> |
| 73 |
-+#include <kde4_gpgme++/key.h> |
| 74 |
- |
| 75 |
- // kabc stuff |
| 76 |
- #include <kabc/addressbook.h> |
Archives