diff options
Diffstat (limited to 'app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch')
| -rw-r--r-- | app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch | 42 |
1 files changed, 24 insertions, 18 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 31402dcd7f6..6af5ecf2869 100644 --- a/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch +++ b/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch @@ -1,26 +1,29 @@ -commit 345ef2b7f11da68d9a2fbd92ace3fada85f70140 -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun Jan 24 13:16:54 2016 +0100 +From b89af27c4fd1e9ed9ea0fb4f1c53f07d1cc351d2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 24 Jan 2016 13:16:54 +0100 +Subject: [PATCH 2/2] Partially revert "Re-enabling code for QtOAuth" - Partially revert "Re-enabling code for QtOAuth" - - This partially reverts commit 7b6937326ba2a4e4072692add38a4abd28bd0cd4 - so that kbibtex is using system-qoauth instead of bundled one. +This partially reverts commit 7b6937326ba2a4e4072692add38a4abd28bd0cd4 +so that kbibtex is using system-qoauth instead of bundled one. +--- + 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 4408821..bd80b26 100644 +index 8752f27..58a124b 100644 --- a/src/networking/CMakeLists.txt +++ b/src/networking/CMakeLists.txt -@@ -35,8 +35,6 @@ set( - internalnetworkaccessmanager.cpp - ${CMAKE_SOURCE_DIR}/src/global/kbibtex.cpp - logging_networking.cpp -- # QOAuth for Qt5 from Git -- ../3rdparty/qoauth/src/interface.cpp - ) +@@ -42,8 +42,6 @@ if(NOT WIN32) + zotero/groups.cpp + zotero/tags.cpp + zotero/tagmodel.cpp +- # QOAuth for Qt5 from Git +- ../3rdparty/qoauth/src/interface.cpp + ) + endif(NOT WIN32) - set( -@@ -79,7 +77,6 @@ if(UNITY_BUILD) +@@ -88,7 +86,6 @@ if(UNITY_BUILD) endif(UNITY_BUILD) include_directories( @@ -29,7 +32,7 @@ index 4408821..bd80b26 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 61cf8b7..691fb40 100644 +index 1d9129e..91ff23b 100644 --- a/src/networking/zotero/oauthwizard.cpp +++ b/src/networking/zotero/oauthwizard.cpp @@ -34,7 +34,7 @@ @@ -41,3 +44,6 @@ index 61cf8b7..691fb40 100644 using namespace Zotero; +-- +2.10.2 + |