* [gentoo-commits] gentoo-x86 commit in kde-base/kdeplasma-addons/files: kdeplasma-addons-4.10.0-microblog-build.patch
@ 2013-02-26 4:40 Michael Palimaka (kensington)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka (kensington) @ 2013-02-26 4:40 UTC (permalink / raw
To: gentoo-commits
kensington 13/02/26 04:40:06
Added: kdeplasma-addons-4.10.0-microblog-build.patch
Log:
Backport patch from upstream to fix build issue wrt bug #452120.
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Revision Changes Path
1.1 kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.0-microblog-build.patch
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
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
Index: kdeplasma-addons-4.10.0-microblog-build.patch
===================================================================
From 7cc088acb353f7903c780e55126a5ec18946cb92 Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Tue, 26 Feb 2013 15:11:26 +1100
Subject: [PATCH] Fix build with OAuth present and QJson missing.
Building with OAuth enabled and QJSon disabled fails, since microblog unconditionally requires QJson.
REVIEW: 108662
---
CMakeLists.txt | 2 +-
dataengines/CMakeLists.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eba537c..20f070a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPOMUK)
macro_optional_find_package(QJSON)
-macro_log_feature(QJSON_FOUND "QJSon" "Used for various Internet runners, for parsing API responses" "" FALSE "" "")
+macro_log_feature(QJSON_FOUND "QJSon" "Used for various Internet runners, for parsing API responses, and the microblog dataengine" "" FALSE "" "")
macro_optional_find_package(QtOAuth)
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")
diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
index c86be79..15c1aab 100644
--- a/dataengines/CMakeLists.txt
+++ b/dataengines/CMakeLists.txt
@@ -1,8 +1,8 @@
add_subdirectory(comic)
-if (QCA2_FOUND AND QTOAUTH_FOUND)
+if (QCA2_FOUND AND QJSON_FOUND AND QTOAUTH_FOUND)
add_subdirectory(microblog)
-endif(QCA2_FOUND AND QTOAUTH_FOUND)
+endif(QCA2_FOUND AND QJSON_FOUND AND QTOAUTH_FOUND)
if(LIBATTICA_FOUND)
add_subdirectory(ocs)
--
1.8.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/kdeplasma-addons/files: kdeplasma-addons-4.10.0-microblog-build.patch
@ 2013-04-02 12:31 Michael Palimaka (kensington)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka (kensington) @ 2013-04-02 12:31 UTC (permalink / raw
To: gentoo-commits
kensington 13/04/02 12:31:11
Removed: kdeplasma-addons-4.10.0-microblog-build.patch
Log:
Remove unused patch.
(Portage version: 2.1.11.59/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-02 12:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-26 4:40 [gentoo-commits] gentoo-x86 commit in kde-base/kdeplasma-addons/files: kdeplasma-addons-4.10.0-microblog-build.patch Michael Palimaka (kensington)
-- strict thread matches above, loose matches on Subject: below --
2013-04-02 12:31 Michael Palimaka (kensington)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox