| 1 |
yngwin 13/01/31 14:21:08 |
| 2 |
|
| 3 |
Added: fcitx-unikey-0.2.0-cmake-qt-option.patch |
| 4 |
Log: |
| 5 |
Initial commit. Ebuild based on the one by Wang Jiajun in gentoo-zh overlay. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-i18n/fcitx-unikey/files/fcitx-unikey-0.2.0-cmake-qt-option.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-unikey/files/fcitx-unikey-0.2.0-cmake-qt-option.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-unikey/files/fcitx-unikey-0.2.0-cmake-qt-option.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: fcitx-unikey-0.2.0-cmake-qt-option.patch |
| 16 |
=================================================================== |
| 17 |
From f0f0d7c1ee5d83f33ceacaf78f4b7845ec2819de Mon Sep 17 00:00:00 2001 |
| 18 |
From: Weng Xuetian <wengxt@×××××.com> |
| 19 |
Date: Sat, 26 Jan 2013 14:45:29 -0500 |
| 20 |
Subject: [PATCH] [unikey] option for qt, detect qt 4.8 |
| 21 |
|
| 22 |
--- |
| 23 |
CMakeLists.txt | 7 ++++++- |
| 24 |
macro-editor/CMakeLists.txt | 4 ++-- |
| 25 |
2 files changed, 8 insertions(+), 3 deletions(-) |
| 26 |
|
| 27 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 28 |
index cef1625..5ccf21c 100644 |
| 29 |
--- a/CMakeLists.txt |
| 30 |
+++ b/CMakeLists.txt |
| 31 |
@@ -4,6 +4,8 @@ project(fcitx-unikey) |
| 32 |
|
| 33 |
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) |
| 34 |
|
| 35 |
+option(ENABLE_QT "Enable Qt based macro editor" On) |
| 36 |
+ |
| 37 |
# uninstall target |
| 38 |
configure_file( |
| 39 |
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" |
| 40 |
@@ -21,9 +23,12 @@ set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}") |
| 41 |
find_package(Fcitx 4.2.7 REQUIRED) |
| 42 |
find_package(Libiconv REQUIRED) |
| 43 |
find_package(Gettext REQUIRED) |
| 44 |
-find_package(Qt4) |
| 45 |
+ |
| 46 |
+if (ENABLE_QT) |
| 47 |
+find_package(Qt4 4.8) |
| 48 |
|
| 49 |
pkg_check_modules(FCITX_QT "fcitx-qt>=4.2.7") |
| 50 |
+endif (ENABLE_QT) |
| 51 |
|
| 52 |
configure_file(config.h.in config.h) |
| 53 |
|
| 54 |
diff --git a/macro-editor/CMakeLists.txt b/macro-editor/CMakeLists.txt |
| 55 |
index fbb2482..145ee0b 100644 |
| 56 |
--- a/macro-editor/CMakeLists.txt |
| 57 |
+++ b/macro-editor/CMakeLists.txt |
| 58 |
@@ -16,9 +16,9 @@ fcitx_translate_add_sources( |
| 59 |
${MACRO_EDITOR_SRCS} |
| 60 |
${MACRO_EDITOR_HDRS}) |
| 61 |
|
| 62 |
-if (NOT QT_FOUND OR NOT FCITX_QT_FOUND) |
| 63 |
+if (NOT QT_FOUND OR NOT FCITX_QT_FOUND OR NOT ENABLE_QT) |
| 64 |
return() |
| 65 |
-endif (NOT QT_FOUND OR NOT FCITX_QT_FOUND) |
| 66 |
+endif (NOT QT_FOUND OR NOT FCITX_QT_FOUND OR NOT ENABLE_QT) |
| 67 |
|
| 68 |
include_directories( |
| 69 |
${FCITX_QT_INCLUDE_DIRS} |
| 70 |
-- |
| 71 |
1.7.10 |
Archives