diff --git a/librime-fix-dictionary-test.patch b/librime-fix-dictionary-test.patch deleted file mode 100644 index b2dce77..0000000 --- a/librime-fix-dictionary-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: librime/data/test/dictionary_test.dict.yaml -=================================================================== ---- librime.orig/data/test/dictionary_test.dict.yaml -+++ librime/data/test/dictionary_test.dict.yaml -@@ -5,7 +5,7 @@ - # http://android.git.kernel.org/?p=platform/packages/inputmethods/PinyinIME.git - - --- --name: luna_pinyin -+name: dictionary_test - version: "0.1" - sort: by_weight # by_weight / original - ... diff --git a/librime-fixes-zlib-cmake.patch b/librime-fixes-zlib-cmake.patch deleted file mode 100644 index 6fec58f..0000000 --- a/librime-fixes-zlib-cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: librime/CMakeLists.txt -=================================================================== ---- librime.orig/CMakeLists.txt -+++ librime/CMakeLists.txt -@@ -57,7 +57,6 @@ if(YamlCpp_FOUND) - include_directories(${YamlCpp_INCLUDE_PATH}) - endif(YamlCpp_FOUND) - --find_package(ZLIB) - find_package(KyotoCabinet REQUIRED) - if(KyotoCabinet_FOUND) - include_directories(${KyotoCabinet_INCLUDE_PATH}) -Index: librime/src/CMakeLists.txt -=================================================================== ---- librime.orig/src/CMakeLists.txt -+++ librime/src/CMakeLists.txt -@@ -15,7 +15,7 @@ endif(Gflags_FOUND) - - set(RIME_DEPS - ${Boost_LIBRARIES} ${Glog_LIBRARY} ${YamlCpp_LIBRARY} ${KyotoCabinet_LIBRARY} ${Opencc_LIBRARY} -- ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${RIME_OPTIONAL_DEPS}) -+ ${CMAKE_THREAD_LIBS_INIT} ${RIME_OPTIONAL_DEPS}) - - if(NOT BUILD_SHARED_LIBS) - add_library(rime-static STATIC ${LIBRIME_SRC}) diff --git a/librime.spec b/librime.spec index bd253ef..17a4950 100644 --- a/librime.spec +++ b/librime.spec @@ -14,7 +14,7 @@ BuildRequires: glog-devel, gtest-devel BuildRequires: yaml-cpp-devel, kyotocabinet-devel #Fixes arm build -Patch1: librime-fixes-misaligned-address.patch +#Patch1: librime-fixes-misaligned-address.patch %description Rime Input Method Engine Library @@ -44,9 +44,9 @@ The %{name}-tools package contains tools for %{name}. %prep %setup -q -n %{name} -%ifarch %{arm} -%patch1 -p1 -b .arm -%endif +#%ifarch %{arm} +#%patch1 -p1 -b .arm +#%endif %build %cmake