| 1 |
kensington 13/02/26 04:40:06 |
| 2 |
|
| 3 |
Added: kdeplasma-addons-4.10.0-microblog-build.patch |
| 4 |
Log: |
| 5 |
Backport patch from upstream to fix build issue wrt bug #452120. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.0-microblog-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.0-microblog-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.0-microblog-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: kdeplasma-addons-4.10.0-microblog-build.patch |
| 16 |
=================================================================== |
| 17 |
From 7cc088acb353f7903c780e55126a5ec18946cb92 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Michael Palimaka <kensington@g.o> |
| 19 |
Date: Tue, 26 Feb 2013 15:11:26 +1100 |
| 20 |
Subject: [PATCH] Fix build with OAuth present and QJson missing. |
| 21 |
|
| 22 |
Building with OAuth enabled and QJSon disabled fails, since microblog unconditionally requires QJson. |
| 23 |
|
| 24 |
REVIEW: 108662 |
| 25 |
--- |
| 26 |
CMakeLists.txt | 2 +- |
| 27 |
dataengines/CMakeLists.txt | 4 ++-- |
| 28 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 29 |
|
| 30 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 31 |
index eba537c..20f070a 100644 |
| 32 |
--- a/CMakeLists.txt |
| 33 |
+++ b/CMakeLists.txt |
| 34 |
@@ -30,7 +30,7 @@ macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPOMUK) |
| 35 |
|
| 36 |
|
| 37 |
macro_optional_find_package(QJSON) |
| 38 |
-macro_log_feature(QJSON_FOUND "QJSon" "Used for various Internet runners, for parsing API responses" "" FALSE "" "") |
| 39 |
+macro_log_feature(QJSON_FOUND "QJSon" "Used for various Internet runners, for parsing API responses, and the microblog dataengine" "" FALSE "" "") |
| 40 |
|
| 41 |
macro_optional_find_package(QtOAuth) |
| 42 |
macro_log_feature(QTOAUTH_FOUND "QtOAuth" "QtOAuth Library - required to build the Plasma Microblog DataEngine" "https://github.com/ayoy/qoauth" FALSE "" "Needed for building Plasma Microblog DataEngine") |
| 43 |
diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt |
| 44 |
index c86be79..15c1aab 100644 |
| 45 |
--- a/dataengines/CMakeLists.txt |
| 46 |
+++ b/dataengines/CMakeLists.txt |
| 47 |
@@ -1,8 +1,8 @@ |
| 48 |
add_subdirectory(comic) |
| 49 |
|
| 50 |
-if (QCA2_FOUND AND QTOAUTH_FOUND) |
| 51 |
+if (QCA2_FOUND AND QJSON_FOUND AND QTOAUTH_FOUND) |
| 52 |
add_subdirectory(microblog) |
| 53 |
-endif(QCA2_FOUND AND QTOAUTH_FOUND) |
| 54 |
+endif(QCA2_FOUND AND QJSON_FOUND AND QTOAUTH_FOUND) |
| 55 |
|
| 56 |
if(LIBATTICA_FOUND) |
| 57 |
add_subdirectory(ocs) |
| 58 |
-- |
| 59 |
1.8.1.4 |
Archives