app-text/kbibtex: Rebase patches on top of recent changes

Package-Manager: portage-2.3.3

2 files changed, 53 insertions, 41 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 31402dcd7f..6af5ecf286 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
+
diff --git a/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch b/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch
index 6956d3c616..56738ff9ed 100644
--- a/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch
+++ b/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch
@@ -1,16 +1,19 @@
-commit 77047809b742c3b53ad0f31feddd4029525038e7
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sun Jan 24 13:04:26 2016 +0100
+From d4d49118533aa624331d0ee7cd588f661ca9660e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 24 Jan 2016 13:04:26 +0100
+Subject: [PATCH 1/2] Revert "Removing references to QtOAuth and Qca-Qt5"
 
-    Revert "Removing references to QtOAuth and Qca-Qt5"
-    
-    This reverts commit ff4b966f13b1b8da8471f92f44751b58012a53e8.
+This reverts commit ff4b966f13b1b8da8471f92f44751b58012a53e8.
+---
+ CMakeLists.txt                | 22 +++++++++++++++++++++-
+ src/networking/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++--
+ 2 files changed, 53 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb33c9e..082b1bd 100644
+index f862018..5502876 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -160,6 +160,26 @@ endif(
+@@ -152,6 +152,26 @@ endif(
  )
  
  find_package(
@@ -37,7 +40,7 @@ index eb33c9e..082b1bd 100644
      Qca-qt5 "2.1.0"
      REQUIRED
  )
-@@ -168,7 +188,7 @@ find_package(
+@@ -160,7 +180,7 @@ find_package(
  # TODO isn't there an "official" way to determine this directory?
  find_path(
      QTCRYPTO_INCLUDE_DIR qca.h
@@ -47,18 +50,18 @@ index eb33c9e..082b1bd 100644
  )
  
 diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt
-index f2f725b..4408821 100644
+index f99236c..8752f27 100644
 --- a/src/networking/CMakeLists.txt
 +++ b/src/networking/CMakeLists.txt
-@@ -30,7 +30,6 @@ set(
-     zotero/tags.cpp
-     zotero/tagmodel.cpp
-     zotero/items.cpp
--    zotero/oauthwizard.cpp
-     associatedfiles.cpp
-     findpdf.cpp
-     internalnetworkaccessmanager.cpp
-@@ -70,7 +69,6 @@ set(
+@@ -40,7 +40,6 @@ if(NOT WIN32)
+         zotero/collection.cpp
+         zotero/items.cpp
+         zotero/groups.cpp
+-        zotero/oauthwizard.cpp
+         zotero/tags.cpp
+         zotero/tagmodel.cpp
+         # QOAuth for Qt5 from Git
+@@ -79,7 +78,6 @@ set(
      zotero/tagmodel.h
      zotero/items.h
      zotero/api.h
@@ -66,8 +69,8 @@ index f2f725b..4408821 100644
      associatedfiles.h
      findpdf.h
      internalnetworkaccessmanager.h
-@@ -94,6 +92,26 @@ include_directories(
-     ${LIBXML2_INCLUDE_DIR}
+@@ -102,6 +100,26 @@ include_directories(
+     ${CMAKE_SOURCE_DIR}/src/global
  )
  
 +if(
@@ -93,8 +96,8 @@ index f2f725b..4408821 100644
  add_library(
      kbibtexnetworking
      SHARED
-@@ -119,6 +137,18 @@ target_link_libraries(
-     qca-qt5
+@@ -128,6 +146,18 @@ target_link_libraries(
+     ${Poppler_Qt5_LIBRARY}
  )
  
 +if(
@@ -112,3 +115,6 @@ index f2f725b..4408821 100644
  set_target_properties(
      kbibtexnetworking
      PROPERTIES
+-- 
+2.10.2
+