File fcitx-rime-parallel-build-and-brise.patch of Package fcitx-rime

Overview Repositories Revisions Requests Users Attributes Meta

File fcitx-rime-parallel-build-and-brise.patch of Package fcitx-rime (Revision df0be7c641eafdf969e4e9fe6b7e2c65)

Currently displaying revision df0be7c641eafdf969e4e9fe6b7e2c65 , Show latest

diff -urN fcitx-rime-0.1.0.orig/cmake/FindBrise.cmake fcitx-rime-0.1.0/cmake/FindBrise.cmake
--- fcitx-rime-0.1.0.orig/cmake/FindBrise.cmake	1970-01-01 08:00:00.000000000 +0800
+++ fcitx-rime-0.1.0/cmake/FindBrise.cmake	2012-07-03 10:57:30.580849508 +0800
@@ -0,0 +1,18 @@
+# Author: Marguerite Su <i@marguerite.su>
+# License: same as fcitx
+# Description: find RIME brise schemas collection package.
+# BRISE_FOUND - System has brise package
+# BRISE_DIR - Brise absolute path
+
+if(IS_DIRECTORY /usr/share/brise)
+	set(BRISE_DIR /usr/share/brise)
+elseif(IS_DIRECTORY /usr/share/rime/brise)
+	set(BRISE_DIR /usr/share/rime/brise)
+else()
+	set(BRISE_FOUND FALSE)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Brise DEFAULT_MSG
+				  BRISE_DIR)
+mark_as_advanced(BRISE_DIR)
diff -urN fcitx-rime-0.1.0.orig/CMakeLists.txt fcitx-rime-0.1.0/CMakeLists.txt
--- fcitx-rime-0.1.0.orig/CMakeLists.txt	2012-06-11 15:18:54.000000000 +0800
+++ fcitx-rime-0.1.0/CMakeLists.txt	2012-07-03 10:57:30.580849508 +0800
@@ -7,6 +7,7 @@
 include(FindPkgConfig)
 find_package(Fcitx 4.2.0 REQUIRED)
 find_package(Rime REQUIRED)
+find_package(Brise REQUIRED)
 
 set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}")
 set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}")
diff -urN fcitx-rime-0.1.0.orig/data/CMakeLists.txt fcitx-rime-0.1.0/data/CMakeLists.txt
--- fcitx-rime-0.1.0.orig/data/CMakeLists.txt	2012-06-11 15:18:54.000000000 +0800
+++ fcitx-rime-0.1.0/data/CMakeLists.txt	2012-07-03 10:57:30.580849508 +0800
@@ -1,17 +1,17 @@
-file(GLOB PRESET_YAML "${PROJECT_SOURCE_DIR}/../brise/preset/*.yaml")
-file(GLOB SUPPLEMENT_YAML "${PROJECT_SOURCE_DIR}/../brise/supplement/*.yaml")
+file(GLOB PRESET_YAML "${BRISE_DIR}/preset/*.yaml")
+file(GLOB SUPPLEMENT_YAML "${BRISE_DIR}/supplement/*.yaml")
 
 set(GEN_RIME_DATADIR "${CMAKE_CURRENT_BINARY_DIR}/_data/rime")
 
 add_custom_target(
     data
-    ALL DEPENDS
+    ALL DEPENDS	"${PROJECT_BINARY_DIR}/src/build_yaml"
     COMMAND ${CMAKE_COMMAND} -E make_directory ${GEN_RIME_DATADIR}
-    COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/../brise/default.yaml" ${GEN_RIME_DATADIR}
-    COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/../brise/essay.kct" ${GEN_RIME_DATADIR}
+    COMMAND ${CMAKE_COMMAND} -E copy "${BRISE_DIR}/default.yaml" ${GEN_RIME_DATADIR}
+    COMMAND ${CMAKE_COMMAND} -E copy "${BRISE_DIR}/essay.kct" ${GEN_RIME_DATADIR}
     COMMAND cp ${PRESET_YAML} ${GEN_RIME_DATADIR}
     COMMAND cp ${SUPPLEMENT_YAML} ${GEN_RIME_DATADIR}
-    COMMAND cd ${GEN_RIME_DATADIR} && "${CMAKE_CURRENT_BINARY_DIR}/../src/build_yaml"
+    COMMAND cd ${GEN_RIME_DATADIR} && "${PROJECT_BINARY_DIR}/src/build_yaml"
     COMMAND ${CMAKE_COMMAND} -E remove -f "${GEN_RIME_DATADIR}/rime.log" "${GEN_RIME_DATADIR}/installation.yaml"
 )
 
@@ -19,4 +19,4 @@
 install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/default)
 install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/dark)
 install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/classic)
-install(FILES zhung.png RENAME fcitx-rime.png DESTINATION share/icons/hicolor/48x48/apps)
\ 文件尾没有 newline 字符
+install(FILES zhung.png RENAME fcitx-rime.png DESTINATION share/icons/hicolor/48x48/apps)
diff -urN fcitx-rime-0.1.0.orig/.gitignore fcitx-rime-0.1.0/.gitignore
--- fcitx-rime-0.1.0.orig/.gitignore	2012-06-11 15:18:54.000000000 +0800
+++ fcitx-rime-0.1.0/.gitignore	1970-01-01 08:00:00.000000000 +0800
@@ -1,9 +0,0 @@
-*~
-build/*
-*.kdev4
-.kdev_include_paths
-.directory
-*.kate-swp
-*.orig
-tags
-astyle.sh
diff -urN fcitx-rime-0.1.0.orig/README fcitx-rime-0.1.0/README
--- fcitx-rime-0.1.0.orig/README	2012-06-11 15:18:54.000000000 +0800
+++ fcitx-rime-0.1.0/README	1970-01-01 08:00:00.000000000 +0800
@@ -1,3 +0,0 @@
-Rime support for Fcitx
-
-For normal user: Please don't try to build it useless upstream refactor the build method.
diff -urN fcitx-rime-0.1.0.orig/README.md fcitx-rime-0.1.0/README.md
--- fcitx-rime-0.1.0.orig/README.md	1970-01-01 08:00:00.000000000 +0800
+++ fcitx-rime-0.1.0/README.md	2012-07-03 10:57:30.580849508 +0800
@@ -0,0 +1,63 @@
+## RIME support for Fcitx
+
+RIME(中州韻輸入法引擎) is _mainly_ a Traditional Chinese input method engine.
+
+project: https://code.google.com/p/rimeime
+
+
+## Build From Source:
+
+### special notice of RIME dependency:
+
+RIME split its devlopment source into a few sections, here we need librime.
+
+In librime source, there are two directory, brise and librime.
+
+According to your distribution, you might need brise+librime package(openSUSE) or only librime which includes brise at /usr/share/brise.
+
+If your distribution doesn't have one you need to download librime and put brise directory into /usr/share/brise.
+
+If you're a distribution packager, ask maintainer of librime to add brise sub-package.
+
+### special notice of Boost dependency:
+
+Boost is a RIME dependency, so without boost >= 1.46.1, you will not ble to install librime-devel.
+
+Generally it means, distros that are a little old like openSUSE 11.4 or Ubuntu 10.10 might not be possible to build or install.
+
+### Dependency
+
+*cmake
+
+*gcc-c++
+
+*intltool
+
+*fcitx-devel with all three skins
+
+ some distro like openSUSE split a fcitx-skin-classic and a fcitx-skin-dark, so you need them.
+
+*librime-devel
+
+*brise
+
+*hicolor-icon-theme 
+
+ optional, for directory ownership.
+
+#### openSUSE: 
+
+	sudo zypper ar -f http://download.opensuse.org/repositories/M17N/openSUSE_12.2/ M17N
+
+	sudo zypper in cmake gcc-c++ fcitx-devel fcitx-skin-classic fcitx-skin-dark librime-devel brise hicolor-icon-theme
+
+
+## Install from Distribution
+
+### openSUSE
+
+	sudo zypper ar -f http://download.opensuse.org/repositories/M17N/openSUSE_12.2/ M17N
+
+	sudo zypper in fcitx-rime
+
+

Places

File fcitx-rime-parallel-build-and-brise.patch of Package fcitx-rime (Revision df0be7c641eafdf969e4e9fe6b7e2c65)

Places