* [gentoo-commits] proj/kde:master commit in: app-text/kbibtex/files/
@ 2017-01-28 12:19 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-01-28 12:19 UTC (permalink / raw
To: gentoo-commits
commit: 1a5fb2b879f6c3762cc1bc1bf2688b2022353c76
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 12:04:15 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 12:11:51 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a5fb2b8
app-text/kbibtex: Rebase patches on top of recent changes
Package-Manager: portage-2.3.3
.../kbibtex-part-revert-reenable-qtoauth.patch | 42 +++++++++--------
.../files/kbibtex-revert-removing-qtoauth.patch | 52 ++++++++++++----------
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 31402dc..6af5ecf 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 6956d3c..56738ff 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
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: app-text/kbibtex/files/
@ 2017-03-28 13:41 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-03-28 13:41 UTC (permalink / raw
To: gentoo-commits
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 <andreas.sturmlechner@gmail.com>
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 <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"
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-28 13:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-28 12:19 [gentoo-commits] proj/kde:master commit in: app-text/kbibtex/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2017-03-28 13:41 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox