pool/fcitx
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
a21ff7bfc6
fcitx/fix_fcitx_googlecode_resolv_error.patch

96 lines
5.4 KiB
Diff
Raw Normal View History

Accepting request 102707 from home:opensuse_zh - merge changelogs. - spec clean to make it pure openSUSE to submit to M17N. - set _service to localonly. - server deleted openSUSE unused sources. - Upstream fix issue 511, now builds on 11.4. - Change pyphrase.mb back upon Upstream request. - Fix local fcitx.googlecode.com resolv error because of #GFW. - Change pyphrase.mb to Sougou's Dict. - Update source to git, enable opencc for Traditional & Simplified Chinese Switch. - Fixed a bug for type words in comment box of facebook while using firefox visit facebook. Thanks to CSSlayer. - Fixed a bug with dbus. - update to 4.1.1 - upstream version 4.1.0 - Add start up script, README and template - add gtk-immodule-xim require OBS-URL: https://build.opensuse.org/request/show/102707 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=14
2012-02-04 17:14:33 +01:00
diff -urN fcitx-4.2.orig/data/CMakeLists.txt fcitx-4.2/data/CMakeLists.txt
--- fcitx-4.2.orig/data/CMakeLists.txt 2012-01-30 11:18:47.710767374 +0800
+++ fcitx-4.2/data/CMakeLists.txt 2012-01-30 11:45:34.373681320 +0800
@@ -33,8 +33,7 @@
set(PY_ORGDATA pyPhrase.org)
set(PY_DATA ${CMAKE_CURRENT_BINARY_DIR}/pybase.mb ${CMAKE_CURRENT_BINARY_DIR}/pyphrase.mb)
set(PY_TAR ${CMAKE_CURRENT_SOURCE_DIR}/pinyin.tar.gz)
-set(PY_URL http://fcitx.googlecode.com/files/pinyin.tar.gz)
-
+#set(PY_URL ../pinyin.tar.gz)
intltool_merge_translation(${CMAKE_CURRENT_SOURCE_DIR}/fcitx-configtool.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-configtool.desktop )
intltool_merge_translation(${CMAKE_CURRENT_SOURCE_DIR}/fcitx.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx.desktop )
@@ -42,7 +41,7 @@
add_custom_target(pinyin_data ALL DEPENDS ${PY_DATA})
add_custom_command(OUTPUT ${PY_ORGDATA}
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}" "${PY_URL}" "${PY_TAR}"
+# COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}" "${PY_URL}" "${PY_TAR}"
COMMAND ${TAR} xzmvf ${PY_TAR})
add_custom_command(OUTPUT ${PY_DATA}
DEPENDS ${PY_ORGDATA}
diff -urN fcitx-4.2.orig/data/table/CMakeLists.txt fcitx-4.2/data/table/CMakeLists.txt
--- fcitx-4.2.orig/data/table/CMakeLists.txt 2012-01-30 11:18:47.715767311 +0800
+++ fcitx-4.2/data/table/CMakeLists.txt 2012-01-30 11:45:02.252082896 +0800
@@ -11,7 +11,7 @@
set(TABLEORG_DATA db.txt erbi.txt qxm.txt wanfeng.txt wbpy.txt wbx.txt zrm.txt cj.txt)
set(TABLE_NAME db erbi qxm wanfeng wbpy wbx zrm cj)
set(TABLE_CONF db.conf erbi.conf qxm.conf wanfeng.conf wbpy.conf wbx.conf zrm.conf cangjie.conf)
-set(TABLE_URL http://fcitx.googlecode.com/files/table.tar.gz)
+#set(TABLE_URL http://fcitx.googlecode.com/files/table.tar.gz)
set(TABLE_TAR ${CMAKE_CURRENT_SOURCE_DIR}/table.tar.gz)
set(INSTALL_TABLE_CONF "")
@@ -24,7 +24,7 @@
add_custom_target(table_data ALL DEPENDS ${TABLE_DATA})
add_custom_command(OUTPUT ${TABLEORG_DATA}
- COMMAND ${PROJECT_SOURCE_DIR}/data/download.sh "${WGET}" "${TABLE_URL}" "${TABLE_TAR}"
+# COMMAND ${PROJECT_SOURCE_DIR}/data/download.sh "${WGET}" "${TABLE_URL}" "${TABLE_TAR}"
COMMAND ${TAR} xzmvf ${TABLE_TAR})
foreach(tblname ${TABLE_NAME})
diff -urN fcitx-4.2.orig/fix_fcitx_googlecode_resolv_error.patch fcitx-4.2/fix_fcitx_googlecode_resolv_error.patch
--- fcitx-4.2.orig/fix_fcitx_googlecode_resolv_error.patch 1970-01-01 08:00:00.000000000 +0800
+++ fcitx-4.2/fix_fcitx_googlecode_resolv_error.patch 2012-01-30 11:44:51.855212877 +0800
@@ -0,0 +1,48 @@
+diff -urN fcitx-4.2.orig/data/CMakeLists.txt fcitx-4.2/data/CMakeLists.txt
+--- fcitx-4.2.orig/data/CMakeLists.txt 2012-01-30 10:48:00.955854988 +0800
++++ fcitx-4.2/data/CMakeLists.txt 2012-01-30 10:49:51.497473024 +0800
+@@ -33,8 +33,7 @@
+ set(PY_ORGDATA pyPhrase.org)
+ set(PY_DATA ${CMAKE_CURRENT_BINARY_DIR}/pybase.mb ${CMAKE_CURRENT_BINARY_DIR}/pyphrase.mb)
+ set(PY_TAR ${CMAKE_CURRENT_SOURCE_DIR}/pinyin.tar.gz)
+-set(PY_URL http://fcitx.googlecode.com/files/pinyin.tar.gz)
+-
++#set(PY_URL ../pinyin.tar.gz)
+
+ intltool_merge_translation(${CMAKE_CURRENT_SOURCE_DIR}/fcitx-configtool.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-configtool.desktop )
+ intltool_merge_translation(${CMAKE_CURRENT_SOURCE_DIR}/fcitx.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx.desktop )
+@@ -42,11 +41,11 @@
+ add_custom_target(pinyin_data ALL DEPENDS ${PY_DATA})
+
+ add_custom_command(OUTPUT ${PY_ORGDATA}
+- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}" "${PY_URL}" "${PY_TAR}"
++# COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}" "${PY_URL}" "${PY_TAR}"
+ COMMAND ${TAR} xzmvf ${PY_TAR})
+ add_custom_command(OUTPUT ${PY_DATA}
+ DEPENDS ${PY_ORGDATA}
+- COMMAND createPYMB ${CMAKE_CURRENT_SOURCE_DIR}/gbkpy.org ${CMAKE_CURRENT_BINARY_DIR}/${PY_ORGDATA})
++ COMMAND createPYMB ${CMAKE_CURRENT_SOURCE_DIR}/gbkpy.org ${CMAKE_CURRENT_BINARY_DIR}/${PY_ORGDATA}
+
+ add_custom_target(desktopfile ALL DEPENDS ${FCITX_DSEKTOP_FILES})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx.desktop DESTINATION share/applications/)
+diff -urN fcitx-4.2.orig/data/table/CMakeLists.txt fcitx-4.2/data/table/CMakeLists.txt
+--- fcitx-4.2.orig/data/table/CMakeLists.txt 2012-01-30 10:48:00.962854900 +0800
++++ fcitx-4.2/data/table/CMakeLists.txt 2012-01-30 10:48:27.358524907 +0800
+@@ -11,7 +11,7 @@
+ set(TABLEORG_DATA db.txt erbi.txt qxm.txt wanfeng.txt wbpy.txt wbx.txt zrm.txt cj.txt)
+ set(TABLE_NAME db erbi qxm wanfeng wbpy wbx zrm cj)
+ set(TABLE_CONF db.conf erbi.conf qxm.conf wanfeng.conf wbpy.conf wbx.conf zrm.conf cangjie.conf)
+-set(TABLE_URL http://fcitx.googlecode.com/files/table.tar.gz)
++#set(TABLE_URL http://fcitx.googlecode.com/files/table.tar.gz)
+ set(TABLE_TAR ${CMAKE_CURRENT_SOURCE_DIR}/table.tar.gz)
+
+ set(INSTALL_TABLE_CONF "")
+@@ -24,7 +24,7 @@
+ add_custom_target(table_data ALL DEPENDS ${TABLE_DATA})
+
+ add_custom_command(OUTPUT ${TABLEORG_DATA}
+- COMMAND ${PROJECT_SOURCE_DIR}/data/download.sh "${WGET}" "${TABLE_URL}" "${TABLE_TAR}"
++# COMMAND ${PROJECT_SOURCE_DIR}/data/download.sh "${WGET}" "${TABLE_URL}" "${TABLE_TAR}"
+ COMMAND ${TAR} xzmvf ${TABLE_TAR})
+
+ foreach(tblname ${TABLE_NAME})
Reference in New Issue Copy Permalink