commit: b8259a77740ae49c59c3fc62d419c7790d9fbc31 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Mar 28 13:41:18 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Mar 28 13:41:18 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b8259a77
app-text/kbibtex: Update patches according to review Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../kbibtex-part-revert-reenable-qtoauth.patch | 10 ++++---- .../files/kbibtex-revert-removing-qtoauth.patch | 28 ++++++++-------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch b/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch index 6af5ecf286..ce095c6698 100644 --- a/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch +++ b/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch @@ -1,17 +1,19 @@ -From b89af27c4fd1e9ed9ea0fb4f1c53f07d1cc351d2 Mon Sep 17 00:00:00 2001 +From 84f84747649237afcf9bd7465ba85fafd6bbc240 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 24 Jan 2016 13:16:54 +0100 Subject: [PATCH 2/2] Partially revert "Re-enabling code for QtOAuth" This partially reverts commit 7b6937326ba2a4e4072692add38a4abd28bd0cd4 so that kbibtex is using system-qoauth instead of bundled one. + +REVIEW: 129927 --- src/networking/CMakeLists.txt | 3 --- src/networking/zotero/oauthwizard.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt -index 8752f27..58a124b 100644 +index 27507b3a..4f3d03bc 100644 --- a/src/networking/CMakeLists.txt +++ b/src/networking/CMakeLists.txt @@ -42,8 +42,6 @@ if(NOT WIN32) @@ -32,7 +34,7 @@ index 8752f27..58a124b 100644 ${CMAKE_SOURCE_DIR}/src/config ${CMAKE_BINARY_DIR}/src/data diff --git a/src/networking/zotero/oauthwizard.cpp b/src/networking/zotero/oauthwizard.cpp -index 1d9129e..91ff23b 100644 +index 1d9129ee..91ff23bf 100644 --- a/src/networking/zotero/oauthwizard.cpp +++ b/src/networking/zotero/oauthwizard.cpp @@ -34,7 +34,7 @@ @@ -45,5 +47,5 @@ index 1d9129e..91ff23b 100644 using namespace Zotero; -- -2.10.2 +2.12.2 diff --git a/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch b/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch index 56738ff9ed..3e0195b485 100644 --- a/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch +++ b/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch @@ -1,16 +1,18 @@ -From d4d49118533aa624331d0ee7cd588f661ca9660e Mon Sep 17 00:00:00 2001 +From 0ecdc46fbf9cdab24be92e785ec59b2338634cb1 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 24 Jan 2016 13:04:26 +0100 Subject: [PATCH 1/2] Revert "Removing references to QtOAuth and Qca-Qt5" This reverts commit ff4b966f13b1b8da8471f92f44751b58012a53e8. + +REVIEW: 129927 --- - CMakeLists.txt | 22 +++++++++++++++++++++- - src/networking/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++-- - 2 files changed, 53 insertions(+), 3 deletions(-) + CMakeLists.txt | 20 ++++++++++++++++++++ + src/networking/CMakeLists.txt | 33 +++++++++++++++++++++++++++++++-- + 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f862018..5502876 100644 +index f8620185..b22b5ef8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,6 +152,26 @@ endif( @@ -40,17 +42,8 @@ index f862018..5502876 100644 Qca-qt5 "2.1.0" REQUIRED ) -@@ -160,7 +180,7 @@ find_package( - # TODO isn't there an "official" way to determine this directory? - find_path( - QTCRYPTO_INCLUDE_DIR qca.h -- HINTS ENV ${Qt5Core_INCLUDE_DIRS} ENV ${QT_INCLUDES} -+ HINTS ${QTOAUTH_INCLUDE_DIR} ENV ${Qt5Core_INCLUDE_DIRS} ENV ${QT_INCLUDES} - PATH_SUFFIXES QtCrypto - ) - diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt -index f99236c..8752f27 100644 +index f99236c1..27507b3a 100644 --- a/src/networking/CMakeLists.txt +++ b/src/networking/CMakeLists.txt @@ -40,7 +40,6 @@ if(NOT WIN32) @@ -96,7 +89,7 @@ index f99236c..8752f27 100644 add_library( kbibtexnetworking SHARED -@@ -128,6 +146,18 @@ target_link_libraries( +@@ -128,6 +146,17 @@ target_link_libraries( ${Poppler_Qt5_LIBRARY} ) @@ -105,7 +98,6 @@ index f99236c..8752f27 100644 +) + target_link_libraries( + kbibtexnetworking -+ ${cmake_2_8_12_PRIVATE} + ${QTOAUTH_LIBRARY} + ) +endif( @@ -116,5 +108,5 @@ index f99236c..8752f27 100644 kbibtexnetworking PROPERTIES -- -2.10.2 +2.12.2
