| 1 |
commit: e26964494cd5a8ea670b5b497ff775b396db8dbb |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Sun Mar 5 19:20:22 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 30 21:26:57 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e2696449 |
| 7 |
|
| 8 |
kde-apps/kopete: Fix configure w/ KDE4_QGpgme |
| 9 |
|
| 10 |
Update gpgme++ and qgpgme references. |
| 11 |
|
| 12 |
.../kopete/files/kopete-17.04.0-kde4qgpgme.patch | 56 ++++++++++++++++++++++ |
| 13 |
kde-apps/kopete/kopete-17.04.49.9999.ebuild | 5 +- |
| 14 |
kde-apps/kopete/kopete-9999.ebuild | 5 +- |
| 15 |
3 files changed, 64 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch b/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000000..59e2a3752e |
| 20 |
--- /dev/null |
| 21 |
+++ b/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch |
| 22 |
@@ -0,0 +1,56 @@ |
| 23 |
+--- a/CMakeLists.txt |
| 24 |
++++ b/CMakeLists.txt |
| 25 |
+@@ -98,8 +98,8 @@ |
| 26 |
+ macro_optional_find_package(QJSON) |
| 27 |
+ macro_log_feature(QJSON_FOUND "QJSON" "JSON handling library for Qt" "http://qjson.sourceforge.net/" FALSE "" "Required for the Jabber protocol") |
| 28 |
+ |
| 29 |
+-macro_optional_find_package(QGpgme) |
| 30 |
+-macro_log_feature(QGPGME_FOUND "QGpgme" "QGpgME library (from kdepimlibs)" "http://www.kde.org/" FALSE "" "Required for the Cryptography plugin") |
| 31 |
++macro_optional_find_package(KDE4_QGpgme) |
| 32 |
++macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgme" "KDE4_QGpgME library (from kdepimlibs)" "http://www.kde.org/" FALSE "" "Required for the Cryptography plugin") |
| 33 |
+ |
| 34 |
+ macro_optional_find_package(Sqlite) |
| 35 |
+ macro_log_feature(SQLITE_FOUND "Sqlite" "SQLite is a Binary-Database" "http://www.sqlite.org/" FALSE "" "Required for the Statistic plugin") |
| 36 |
+--- a/plugins/CMakeLists.txt |
| 37 |
++++ b/plugins/CMakeLists.txt |
| 38 |
+@@ -74,6 +74,6 @@ |
| 39 |
+ if (WITH_otr AND LIBOTR_FOUND) |
| 40 |
+ add_subdirectory ( otr ) |
| 41 |
+ endif (WITH_otr AND LIBOTR_FOUND) |
| 42 |
+-if (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND) |
| 43 |
++if (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND) |
| 44 |
+ add_subdirectory ( cryptography ) |
| 45 |
+-endif (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND) |
| 46 |
++endif (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND) |
| 47 |
+--- a/plugins/cryptography/CMakeLists.txt |
| 48 |
++++ b/plugins/cryptography/CMakeLists.txt |
| 49 |
+@@ -17,7 +17,7 @@ |
| 50 |
+ |
| 51 |
+ kde4_add_plugin(kopete_cryptography ${kopete_cryptography_PART_SRCS}) |
| 52 |
+ |
| 53 |
+-target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} ${QGPGME_LIBRARIES} ) |
| 54 |
++target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} ${KDE4_QGPGME_LIBRARIES} ) |
| 55 |
+ |
| 56 |
+ install(TARGETS kopete_cryptography DESTINATION ${PLUGIN_INSTALL_DIR}) |
| 57 |
+ |
| 58 |
+--- a/plugins/cryptography/cryptographyplugin.cpp |
| 59 |
++++ b/plugins/cryptography/cryptographyplugin.cpp |
| 60 |
+@@ -52,12 +52,12 @@ |
| 61 |
+ #include <kleo/signjob.h> |
| 62 |
+ #include <kleo/keylistjob.h> |
| 63 |
+ #include <kleo/job.h> |
| 64 |
+-#include <gpgme++/decryptionresult.h> |
| 65 |
+-#include <gpgme++/verificationresult.h> |
| 66 |
+-#include <gpgme++/keylistresult.h> |
| 67 |
+-#include <gpgme++/signingresult.h> |
| 68 |
+-#include <gpgme++/encryptionresult.h> |
| 69 |
+-#include <gpgme++/key.h> |
| 70 |
++#include <kde4_gpgme++/decryptionresult.h> |
| 71 |
++#include <kde4_gpgme++/verificationresult.h> |
| 72 |
++#include <kde4_gpgme++/keylistresult.h> |
| 73 |
++#include <kde4_gpgme++/signingresult.h> |
| 74 |
++#include <kde4_gpgme++/encryptionresult.h> |
| 75 |
++#include <kde4_gpgme++/key.h> |
| 76 |
+ |
| 77 |
+ // kabc stuff |
| 78 |
+ #include <kabc/addressbook.h> |
| 79 |
|
| 80 |
diff --git a/kde-apps/kopete/kopete-17.04.49.9999.ebuild b/kde-apps/kopete/kopete-17.04.49.9999.ebuild |
| 81 |
index d51b05e789..fde591c1fc 100644 |
| 82 |
--- a/kde-apps/kopete/kopete-17.04.49.9999.ebuild |
| 83 |
+++ b/kde-apps/kopete/kopete-17.04.49.9999.ebuild |
| 84 |
@@ -64,7 +64,7 @@ testbed winpopup +xmpp yahoo zeroconf" |
| 85 |
IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" |
| 86 |
|
| 87 |
COMMONDEPEND=" |
| 88 |
- $(add_kdeapps_dep kdepimlibs) |
| 89 |
+ $(add_kdeapps_dep kdepimlibs '' 4.14.10_p20160611) |
| 90 |
dev-libs/libpcre |
| 91 |
>=dev-qt/qtgui-4.4.0:4[mng] |
| 92 |
kde-frameworks/kdelibs:4[zeroconf?] |
| 93 |
@@ -106,6 +106,7 @@ COMMONDEPEND=" |
| 94 |
yahoo? ( media-libs/jasper ) |
| 95 |
" |
| 96 |
RDEPEND="${COMMONDEPEND} |
| 97 |
+ !=kde-apps/kdepimlibs-4.14.11_pre20160211* |
| 98 |
jingle? ( media-libs/speex ) |
| 99 |
latex? ( |
| 100 |
virtual/imagemagick-tools |
| 101 |
@@ -119,6 +120,8 @@ DEPEND="${COMMONDEPEND} |
| 102 |
!aqua? ( x11-proto/scrnsaverproto ) |
| 103 |
" |
| 104 |
|
| 105 |
+PATCHES=( "${FILESDIR}/${PN}-17.04.0-kde4qgpgme.patch" ) |
| 106 |
+ |
| 107 |
src_configure() { |
| 108 |
local x x2 |
| 109 |
# Handle common stuff |
| 110 |
|
| 111 |
diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild |
| 112 |
index d51b05e789..fde591c1fc 100644 |
| 113 |
--- a/kde-apps/kopete/kopete-9999.ebuild |
| 114 |
+++ b/kde-apps/kopete/kopete-9999.ebuild |
| 115 |
@@ -64,7 +64,7 @@ testbed winpopup +xmpp yahoo zeroconf" |
| 116 |
IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" |
| 117 |
|
| 118 |
COMMONDEPEND=" |
| 119 |
- $(add_kdeapps_dep kdepimlibs) |
| 120 |
+ $(add_kdeapps_dep kdepimlibs '' 4.14.10_p20160611) |
| 121 |
dev-libs/libpcre |
| 122 |
>=dev-qt/qtgui-4.4.0:4[mng] |
| 123 |
kde-frameworks/kdelibs:4[zeroconf?] |
| 124 |
@@ -106,6 +106,7 @@ COMMONDEPEND=" |
| 125 |
yahoo? ( media-libs/jasper ) |
| 126 |
" |
| 127 |
RDEPEND="${COMMONDEPEND} |
| 128 |
+ !=kde-apps/kdepimlibs-4.14.11_pre20160211* |
| 129 |
jingle? ( media-libs/speex ) |
| 130 |
latex? ( |
| 131 |
virtual/imagemagick-tools |
| 132 |
@@ -119,6 +120,8 @@ DEPEND="${COMMONDEPEND} |
| 133 |
!aqua? ( x11-proto/scrnsaverproto ) |
| 134 |
" |
| 135 |
|
| 136 |
+PATCHES=( "${FILESDIR}/${PN}-17.04.0-kde4qgpgme.patch" ) |
| 137 |
+ |
| 138 |
src_configure() { |
| 139 |
local x x2 |
| 140 |
# Handle common stuff |
Archives