1 |
commit: 1a5fb2b879f6c3762cc1bc1bf2688b2022353c76 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 28 12:04:15 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 28 12:11:51 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a5fb2b8 |
7 |
|
8 |
app-text/kbibtex: Rebase patches on top of recent changes |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
|
12 |
.../kbibtex-part-revert-reenable-qtoauth.patch | 42 +++++++++-------- |
13 |
.../files/kbibtex-revert-removing-qtoauth.patch | 52 ++++++++++++---------- |
14 |
2 files changed, 53 insertions(+), 41 deletions(-) |
15 |
|
16 |
diff --git a/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch b/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch |
17 |
index 31402dc..6af5ecf 100644 |
18 |
--- a/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch |
19 |
+++ b/app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch |
20 |
@@ -1,26 +1,29 @@ |
21 |
-commit 345ef2b7f11da68d9a2fbd92ace3fada85f70140 |
22 |
-Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
23 |
-Date: Sun Jan 24 13:16:54 2016 +0100 |
24 |
+From b89af27c4fd1e9ed9ea0fb4f1c53f07d1cc351d2 Mon Sep 17 00:00:00 2001 |
25 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
26 |
+Date: Sun, 24 Jan 2016 13:16:54 +0100 |
27 |
+Subject: [PATCH 2/2] Partially revert "Re-enabling code for QtOAuth" |
28 |
|
29 |
- Partially revert "Re-enabling code for QtOAuth" |
30 |
- |
31 |
- This partially reverts commit 7b6937326ba2a4e4072692add38a4abd28bd0cd4 |
32 |
- so that kbibtex is using system-qoauth instead of bundled one. |
33 |
+This partially reverts commit 7b6937326ba2a4e4072692add38a4abd28bd0cd4 |
34 |
+so that kbibtex is using system-qoauth instead of bundled one. |
35 |
+--- |
36 |
+ src/networking/CMakeLists.txt | 3 --- |
37 |
+ src/networking/zotero/oauthwizard.cpp | 2 +- |
38 |
+ 2 files changed, 1 insertion(+), 4 deletions(-) |
39 |
|
40 |
diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt |
41 |
-index 4408821..bd80b26 100644 |
42 |
+index 8752f27..58a124b 100644 |
43 |
--- a/src/networking/CMakeLists.txt |
44 |
+++ b/src/networking/CMakeLists.txt |
45 |
-@@ -35,8 +35,6 @@ set( |
46 |
- internalnetworkaccessmanager.cpp |
47 |
- ${CMAKE_SOURCE_DIR}/src/global/kbibtex.cpp |
48 |
- logging_networking.cpp |
49 |
-- # QOAuth for Qt5 from Git |
50 |
-- ../3rdparty/qoauth/src/interface.cpp |
51 |
- ) |
52 |
+@@ -42,8 +42,6 @@ if(NOT WIN32) |
53 |
+ zotero/groups.cpp |
54 |
+ zotero/tags.cpp |
55 |
+ zotero/tagmodel.cpp |
56 |
+- # QOAuth for Qt5 from Git |
57 |
+- ../3rdparty/qoauth/src/interface.cpp |
58 |
+ ) |
59 |
+ endif(NOT WIN32) |
60 |
|
61 |
- set( |
62 |
-@@ -79,7 +77,6 @@ if(UNITY_BUILD) |
63 |
+@@ -88,7 +86,6 @@ if(UNITY_BUILD) |
64 |
endif(UNITY_BUILD) |
65 |
|
66 |
include_directories( |
67 |
@@ -29,7 +32,7 @@ index 4408821..bd80b26 100644 |
68 |
${CMAKE_SOURCE_DIR}/src/config |
69 |
${CMAKE_BINARY_DIR}/src/data |
70 |
diff --git a/src/networking/zotero/oauthwizard.cpp b/src/networking/zotero/oauthwizard.cpp |
71 |
-index 61cf8b7..691fb40 100644 |
72 |
+index 1d9129e..91ff23b 100644 |
73 |
--- a/src/networking/zotero/oauthwizard.cpp |
74 |
+++ b/src/networking/zotero/oauthwizard.cpp |
75 |
@@ -34,7 +34,7 @@ |
76 |
@@ -41,3 +44,6 @@ index 61cf8b7..691fb40 100644 |
77 |
|
78 |
using namespace Zotero; |
79 |
|
80 |
+-- |
81 |
+2.10.2 |
82 |
+ |
83 |
|
84 |
diff --git a/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch b/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch |
85 |
index 6956d3c..56738ff 100644 |
86 |
--- a/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch |
87 |
+++ b/app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch |
88 |
@@ -1,16 +1,19 @@ |
89 |
-commit 77047809b742c3b53ad0f31feddd4029525038e7 |
90 |
-Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
91 |
-Date: Sun Jan 24 13:04:26 2016 +0100 |
92 |
+From d4d49118533aa624331d0ee7cd588f661ca9660e Mon Sep 17 00:00:00 2001 |
93 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
94 |
+Date: Sun, 24 Jan 2016 13:04:26 +0100 |
95 |
+Subject: [PATCH 1/2] Revert "Removing references to QtOAuth and Qca-Qt5" |
96 |
|
97 |
- Revert "Removing references to QtOAuth and Qca-Qt5" |
98 |
- |
99 |
- This reverts commit ff4b966f13b1b8da8471f92f44751b58012a53e8. |
100 |
+This reverts commit ff4b966f13b1b8da8471f92f44751b58012a53e8. |
101 |
+--- |
102 |
+ CMakeLists.txt | 22 +++++++++++++++++++++- |
103 |
+ src/networking/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++-- |
104 |
+ 2 files changed, 53 insertions(+), 3 deletions(-) |
105 |
|
106 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
107 |
-index eb33c9e..082b1bd 100644 |
108 |
+index f862018..5502876 100644 |
109 |
--- a/CMakeLists.txt |
110 |
+++ b/CMakeLists.txt |
111 |
-@@ -160,6 +160,26 @@ endif( |
112 |
+@@ -152,6 +152,26 @@ endif( |
113 |
) |
114 |
|
115 |
find_package( |
116 |
@@ -37,7 +40,7 @@ index eb33c9e..082b1bd 100644 |
117 |
Qca-qt5 "2.1.0" |
118 |
REQUIRED |
119 |
) |
120 |
-@@ -168,7 +188,7 @@ find_package( |
121 |
+@@ -160,7 +180,7 @@ find_package( |
122 |
# TODO isn't there an "official" way to determine this directory? |
123 |
find_path( |
124 |
QTCRYPTO_INCLUDE_DIR qca.h |
125 |
@@ -47,18 +50,18 @@ index eb33c9e..082b1bd 100644 |
126 |
) |
127 |
|
128 |
diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt |
129 |
-index f2f725b..4408821 100644 |
130 |
+index f99236c..8752f27 100644 |
131 |
--- a/src/networking/CMakeLists.txt |
132 |
+++ b/src/networking/CMakeLists.txt |
133 |
-@@ -30,7 +30,6 @@ set( |
134 |
- zotero/tags.cpp |
135 |
- zotero/tagmodel.cpp |
136 |
- zotero/items.cpp |
137 |
-- zotero/oauthwizard.cpp |
138 |
- associatedfiles.cpp |
139 |
- findpdf.cpp |
140 |
- internalnetworkaccessmanager.cpp |
141 |
-@@ -70,7 +69,6 @@ set( |
142 |
+@@ -40,7 +40,6 @@ if(NOT WIN32) |
143 |
+ zotero/collection.cpp |
144 |
+ zotero/items.cpp |
145 |
+ zotero/groups.cpp |
146 |
+- zotero/oauthwizard.cpp |
147 |
+ zotero/tags.cpp |
148 |
+ zotero/tagmodel.cpp |
149 |
+ # QOAuth for Qt5 from Git |
150 |
+@@ -79,7 +78,6 @@ set( |
151 |
zotero/tagmodel.h |
152 |
zotero/items.h |
153 |
zotero/api.h |
154 |
@@ -66,8 +69,8 @@ index f2f725b..4408821 100644 |
155 |
associatedfiles.h |
156 |
findpdf.h |
157 |
internalnetworkaccessmanager.h |
158 |
-@@ -94,6 +92,26 @@ include_directories( |
159 |
- ${LIBXML2_INCLUDE_DIR} |
160 |
+@@ -102,6 +100,26 @@ include_directories( |
161 |
+ ${CMAKE_SOURCE_DIR}/src/global |
162 |
) |
163 |
|
164 |
+if( |
165 |
@@ -93,8 +96,8 @@ index f2f725b..4408821 100644 |
166 |
add_library( |
167 |
kbibtexnetworking |
168 |
SHARED |
169 |
-@@ -119,6 +137,18 @@ target_link_libraries( |
170 |
- qca-qt5 |
171 |
+@@ -128,6 +146,18 @@ target_link_libraries( |
172 |
+ ${Poppler_Qt5_LIBRARY} |
173 |
) |
174 |
|
175 |
+if( |
176 |
@@ -112,3 +115,6 @@ index f2f725b..4408821 100644 |
177 |
set_target_properties( |
178 |
kbibtexnetworking |
179 |
PROPERTIES |
180 |
+-- |
181 |
+2.10.2 |
182 |
+ |