Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package fcitx-libpinyin for openSUSE:Factory
checked in at 2021-03-02 12:34:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx-libpinyin (Old)
and /work/SRC/openSUSE:Factory/.fcitx-libpinyin.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-libpinyin"
Tue Mar 2 12:34:03 2021 rev:23 rq:875855 version:0.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx-libpinyin/fcitx-libpinyin.changes
2020-11-13 18:59:23.322135645 +0100
+++
/work/SRC/openSUSE:Factory/.fcitx-libpinyin.new.2378/fcitx-libpinyin.changes
2021-03-02 12:45:40.992367266 +0100
@@ -1,0 +2,8 @@
+Mon Mar 1 04:18:57 UTC 2021 - Marguerite Su <[email protected]>
+
+- drop fcitx-libpinyin-0.5.3-libpinyin-2.4.92.patch
+ and model19.text.tar.gz
+ * can not use libpinyin data for libzhuyin
+- add fcitx-libpinyin-libpinyin-2.4.92-database_format.patch
+
+-------------------------------------------------------------------
Old:
----
fcitx-libpinyin-0.5.3-libpinyin-2.4.92.patch
model19.text.tar.gz
New:
----
fcitx-libpinyin-libpinyin-2.4.92-database_format.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fcitx-libpinyin.spec ++++++
--- /var/tmp/diff_new_pack.jwscE9/_old 2021-03-02 12:45:41.600367792 +0100
+++ /var/tmp/diff_new_pack.jwscE9/_new 2021-03-02 12:45:41.600367792 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fcitx-libpinyin
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,14 +26,13 @@
Group: System/I18n/Chinese
URL: https://github.com/fcitx/fcitx-libpinyin
Source:
http://download.fcitx-im.org/fcitx-libpinyin/%{name}-%{version}_dict.tar.xz
-Source1:
https://master.dl.sourceforge.net/project/libpinyin/models/model19.text.tar.gz
#PATCH-FIX-UPSTREAM downgrade qt5 requirement to 5.4 since qtwebengine is
available
# starting from that release
Patch0: dictmanager-qt5.4.patch
#PATCH-FIX-UPSTREAM linking against fcitx
Patch1: fcitx-libpinyin-linking.patch
#PATCH-FIX-UPSTREAM libpinyin 2.4.92 used new table format
-Patch2: %{name}-%{version}-libpinyin-2.4.92.patch
+Patch2: %{name}-libpinyin-2.4.92-database_format.patch
BuildRequires: cmake
BuildRequires: fcitx-devel
BuildRequires: fcitx-qt5-devel
@@ -59,10 +58,9 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-cp -r %{S:1} data
%build
-%cmake -DDATABASE_FORMAT="KyotoCabinet"
+%cmake
make %{?_smp_mflags}
%install
++++++ fcitx-libpinyin-libpinyin-2.4.92-database_format.patch ++++++
Index: fcitx-libpinyin-0.5.3/CMakeLists.txt
===================================================================
--- fcitx-libpinyin-0.5.3.orig/CMakeLists.txt
+++ fcitx-libpinyin-0.5.3/CMakeLists.txt
@@ -11,6 +11,15 @@ find_package(GLIB2 REQUIRED)
find_package(Libpinyin REQUIRED)
find_package(DBus REQUIRED)
+set(LIBZHUYIN_DATABASE_FORMAT "KyotoCabinet" CACHE STRING "When can't detect
dbformat fallback to this option")
+if (EXISTS ${LibZhuyin_LIBDIR}/libpinyin/data/table.conf)
+ file(STRINGS ${LibZhuyin_LIBDIR}/libpinyin/data/table.conf
LIBPINYIN_DATABASE_FORMAT REGEX "database format")
+ set(DATABASE_FORMAT "${LIBPINYIN_DATABASE_FORMAT}")
+else()
+ message(WARNING "Could not detect database format for libpinyin,
fallback to ${LIBZHUYIN_DATABASE_FORMAT}")
+ set(DATABASE_FORMAT "database format:${LIBZHUYIN_DATABASE_FORMAT}")
+endif()
+
_fcitx_add_uninstall_target()
set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter
-fvisibility=hidden ${CMAKE_C_FLAGS}")
Index: fcitx-libpinyin-0.5.3/data/CMakeLists.txt
===================================================================
--- fcitx-libpinyin-0.5.3.orig/data/CMakeLists.txt
+++ fcitx-libpinyin-0.5.3/data/CMakeLists.txt
@@ -23,7 +23,7 @@ set(ZHUYIN_ORGDATA ${_LIBPINYIN_TABLE_FI
set(ZHUYIN_DATA bigram.db ${_LIBPINYIN_BIN_FILES} phrase_index.bin
pinyin_index.bin addon_phrase_index.bin addon_pinyin_index.bin)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/table.conf
${CMAKE_CURRENT_BINARY_DIR}/table.conf COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/table.conf.in
${CMAKE_CURRENT_BINARY_DIR}/table.conf @ONLY)
fcitx_download(zhuyin_data_tar "${ZHUYIN_URL}" "${ZHUYIN_DATA_FILE_NAME}"
MD5SUM f657ea2e9091e35021037ef4ce796e1d)
@@ -47,7 +47,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
${CMAKE_CURRENT_BINARY_DIR}/pinyin_index.bin
${CMAKE_CURRENT_BINARY_DIR}/addon_phrase_index.bin
${CMAKE_CURRENT_BINARY_DIR}/addon_pinyin_index.bin
- table.conf
+ ${CMAKE_CURRENT_BINARY_DIR}/table.conf
DESTINATION ${FCITX_LIBPINYIN_ZHUYIN_DATADIR})
endif()
Index: fcitx-libpinyin-0.5.3/data/table.conf
===================================================================
--- fcitx-libpinyin-0.5.3.orig/data/table.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-binary format version:5
-model data version:10
-lambda parameter:0.347121
-
-source table format:pinyin
-
-default RESERVED NULL NULL NULL NOT_USED
-default GB_DICTIONARY gb_char.table gb_char.bin gb_char.dbin SYSTEM_FILE
-default GBK_DICTIONARY gbk_char.table gbk_char.bin gbk_char.dbin SYSTEM_FILE
-default MERGED_DICTIONARY merged.table merged.bin merged.dbin SYSTEM_FILE
-default ADDON_DICTIONARY NULL NULL addon.bin USER_FILE
-default NETWORK_DICTIONARY NULL NULL network.bin USER_FILE
-default USER_DICTIONARY NULL NULL user.bin USER_FILE
-
-addon 4 art.table art.bin NULL DICTIONARY
-addon 5 culture.table culture.bin NULL DICTIONARY
-addon 6 economy.table economy.bin NULL DICTIONARY
-addon 7 geology.table geology.bin NULL DICTIONARY
-addon 8 history.table history.bin NULL DICTIONARY
-
-addon 9 life.table life.bin NULL DICTIONARY
-addon 10 nature.table nature.bin NULL DICTIONARY
-addon 11 scitech.table scitech.bin NULL DICTIONARY
-addon 12 society.table society.bin NULL DICTIONARY
-addon 13 sport.table sport.bin NULL DICTIONARY
Index: fcitx-libpinyin-0.5.3/data/table.conf.in
===================================================================
--- /dev/null
+++ fcitx-libpinyin-0.5.3/data/table.conf.in
@@ -0,0 +1,25 @@
+binary format version:5
+model data version:10
+lambda parameter:0.347121
+
+source table format:pinyin
+@DATABASE_FORMAT@
+default RESERVED NULL NULL NULL NOT_USED
+default GB_DICTIONARY gb_char.table gb_char.bin gb_char.dbin SYSTEM_FILE
+default GBK_DICTIONARY gbk_char.table gbk_char.bin gbk_char.dbin SYSTEM_FILE
+default MERGED_DICTIONARY merged.table merged.bin merged.dbin SYSTEM_FILE
+default ADDON_DICTIONARY NULL NULL addon.bin USER_FILE
+default NETWORK_DICTIONARY NULL NULL network.bin USER_FILE
+default USER_DICTIONARY NULL NULL user.bin USER_FILE
+
+addon 4 art.table art.bin NULL DICTIONARY
+addon 5 culture.table culture.bin NULL DICTIONARY
+addon 6 economy.table economy.bin NULL DICTIONARY
+addon 7 geology.table geology.bin NULL DICTIONARY
+addon 8 history.table history.bin NULL DICTIONARY
+
+addon 9 life.table life.bin NULL DICTIONARY
+addon 10 nature.table nature.bin NULL DICTIONARY
+addon 11 scitech.table scitech.bin NULL DICTIONARY
+addon 12 society.table society.bin NULL DICTIONARY
+addon 13 sport.table sport.bin NULL DICTIONARY
