diff options
Diffstat (limited to 'kde-apps/kopete')
| -rw-r--r-- | kde-apps/kopete/Manifest | 5 | ||||
| -rw-r--r-- | kde-apps/kopete/files/kopete-18.04.0-oscar.patch | 29 | ||||
| -rw-r--r-- | kde-apps/kopete/kopete-18.04.1.ebuild (renamed from kde-apps/kopete/kopete-18.04.0.ebuild) | 4 |
3 files changed, 3 insertions, 35 deletions
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest index 60cf6124ab01..cde794836346 100644 --- a/kde-apps/kopete/Manifest +++ b/kde-apps/kopete/Manifest @@ -1,4 +1,3 @@ -AUX kopete-18.04.0-oscar.patch 814 BLAKE2B a098ed38f9781f1f51a4d656cef8849da61fafac72371905061cfe1ea3d10f558c1d5227556a486b80f464d95cd0937b4ba0de5c9b891d8ef087cd8bb90dcc42 SHA512 d09dd7353380f6e6e5cc934831f8125c96077a754bb570118af2724fcdc7b83401a36ef03ce31ba99d0204fa35f6b2b395f980a98a52bc4ac9e9ca62c5baab7b -DIST kopete-18.04.0.tar.xz 9748688 BLAKE2B e4fb74b1dfa8627c8d47000f0841c5d51c18098fb8ed20c14742fb63aa2f078366202dede55a92e6572ded532cb67fe9af320b308128702764e7e566e85a4e49 SHA512 50b7d4e7d219a723d721ae979c310e0b8d80a616876d833d1ea13d3c074b1cb16c08c4909849f42b292e8482b439070c054fd83c721c9128455eaf0bc75b18bb -EBUILD kopete-18.04.0.ebuild 4664 BLAKE2B 1a11015093fcde521c639c62005f773b8450632c3c47e55942205c555a5be597b71c15ee112f1b5a79b87831f588da3e1cb737d2005fc54ccb22fb0cd7b59c38 SHA512 8189303d0b63055d688ca8a9da7eabde9b3fd70227b9a3c12bf0c5b84223285d32c25774dc8b7225228e5cfe869c59d21f2f5182b32f80c9f2a5c1b440bc8c79 +DIST kopete-18.04.1.tar.xz 9733608 BLAKE2B 33879b2d95c47f1d21e50b0577c82ce8a619d2967b8b6389cac11b0bd3b1235c9789b28e318f89387496639669cbebaa1e109d479b6365622bef74cb9d127d04 SHA512 2b503ba717d4b64823a64eb093bc4ddbdeb7cb7ae0a73827eaa4a8ae4ad3a5aacf33c4d9e3cc28d88bc4f915418135ddb6b236e5c9d8227e14c802f8b9385e6a +EBUILD kopete-18.04.1.ebuild 4615 BLAKE2B b6d483eb30ee85504a8ff917549d13354be4b907827d61c398303ce594086c536a8570561fd0bf1e4dd5e719ccad49ad4281d3727c283f06381e59e1a0720fc7 SHA512 c56282f80044aa835bec79c03b0e4b03b54641c41e262cf02fa1bc0f56c52de09f2cd5fa5c6bca01f8ae7ecdcde4f13a2c481530e01ed3078948f7e68cedb799 MISC metadata.xml 2351 BLAKE2B 0f8ef4e3906f98a4be58f252fe1beb8ff8a9bb872584e5be9432d63a4932872a81c3036a9cd0d72d98a1ce961ef79194b613b5115e19970e352d5b832bcb6b44 SHA512 2b0350f15c75e45326fc0a6c16f875a2b923726de45ff8558e55c7a592c3c033c0f518f85f9cb4dea3bf54b9c182ec0ea083f3b11b878d398df6d7429a3f75d1 diff --git a/kde-apps/kopete/files/kopete-18.04.0-oscar.patch b/kde-apps/kopete/files/kopete-18.04.0-oscar.patch deleted file mode 100644 index 0b88c1174b71..000000000000 --- a/kde-apps/kopete/files/kopete-18.04.0-oscar.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b1f4fa1401cba2e359e5a4b3ea2bafd119fca62b Mon Sep 17 00:00:00 2001 -From: Pino Toscano <pino@kde.org> -Date: Tue, 24 Apr 2018 06:30:19 +0200 -Subject: oscar: include buffer.h - -This header uses Buffer as by-value parameter, so make sure it knows -about it. - -BUG: 393372 -FIXED-IN: 18.04.1 ---- - protocols/oscar/liboscar/tasks/messagereceivertask.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/protocols/oscar/liboscar/tasks/messagereceivertask.h b/protocols/oscar/liboscar/tasks/messagereceivertask.h -index 8f52cd7..908e903 100644 ---- a/protocols/oscar/liboscar/tasks/messagereceivertask.h -+++ b/protocols/oscar/liboscar/tasks/messagereceivertask.h -@@ -21,6 +21,7 @@ - #include <QByteArray> - #include "oscarmessage.h" - #include "oscartypeclasses.h" -+#include "buffer.h" - - class QTextCodec; - --- -cgit v0.11.2 - diff --git a/kde-apps/kopete/kopete-18.04.0.ebuild b/kde-apps/kopete/kopete-18.04.1.ebuild index bc60afeea28e..d0421ecf7aa2 100644 --- a/kde-apps/kopete/kopete-18.04.0.ebuild +++ b/kde-apps/kopete/kopete-18.04.1.ebuild @@ -133,12 +133,10 @@ RDEPEND="${COMMONDEPEND} # sms? ( app-mobilephone/smssend ) # winpopup? ( net-fs/samba ) DEPEND="${COMMONDEPEND} - x11-proto/scrnsaverproto + x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) " -PATCHES=( "${FILESDIR}/${P}-oscar.patch" ) - src_configure() { local x x2 # Handle common stuff |