Hello community, here is the log from the commit of package fcitx-libpinyin for openSUSE:Factory checked in at 2017-02-15 10:06:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-libpinyin (Old) and /work/SRC/openSUSE:Factory/.fcitx-libpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-libpinyin" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-libpinyin/fcitx-libpinyin.changes 2017-02-06 15:04:48.897371006 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx-libpinyin.new/fcitx-libpinyin.changes 2017-02-15 10:06:09.950223434 +0100 @@ -1,0 +2,11 @@ +Sat Feb 11 23:09:41 UTC 2017 - [email protected] + +- update version 0.5.0 + * port dictmanager to qt5 +- add dictmanager-qt5.4.patch + * downgrade qt5 requirement to 5.4 since qtwebengine is available + at 5.4 +- add fcitx-libpinyin-linking.patch + * linking against fcitx + +------------------------------------------------------------------- Old: ---- fcitx-libpinyin-0.4.1_dict.tar.xz New: ---- dictmanager-qt5.4.patch fcitx-libpinyin-0.5.0_dict.tar.xz fcitx-libpinyin-linking.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-libpinyin.spec ++++++ --- /var/tmp/diff_new_pack.h9b4Jg/_old 2017-02-15 10:06:10.822100624 +0100 +++ /var/tmp/diff_new_pack.h9b4Jg/_new 2017-02-15 10:06:10.826100061 +0100 @@ -17,22 +17,29 @@ Name: fcitx-libpinyin -Version: 0.4.1 +Version: 0.5.0 Release: 0 Summary: Libpinyin Wrapper for Fcitx License: GPL-2.0+ Group: System/I18n/Chinese Url: https://github.com/fcitx/fcitx-libpinyin Source: http://download.fcitx-im.org/fcitx-libpinyin/%{name}-%{version}_dict.tar.xz +#PATCH-FIX-UPSTREAM downgrade qt5 requirement to 5.4 since qtwebengine is available +# starting from that release +Patch: dictmanager-qt5.4.patch +#PATCH-FIX-UPSTREAM linking against fcitx +Patch1: fcitx-libpinyin-linking.patch BuildRequires: cmake BuildRequires: fcitx-devel +BuildRequires: fcitx-qt5-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: glib2-devel BuildRequires: intltool -BuildRequires: libQtWebKit-devel BuildRequires: libpinyin-devel +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtwebengine-devel BuildRequires: xz Provides: locale(fcitx:zh_CN;zh_SG) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,13 +50,11 @@ %prep %setup -q +%patch -p1 +%patch1 -p1 %build -mkdir build && cd build -CXXFLAGS+="%{optflags}" cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - .. +%cmake .. make %{?_smp_mflags} %install ++++++ dictmanager-qt5.4.patch ++++++ Index: b/dictmanager/CMakeLists.txt =================================================================== --- a/dictmanager/CMakeLists.txt +++ b/dictmanager/CMakeLists.txt @@ -15,7 +15,7 @@ if (NOT ENABLE_QT) return() endif () -find_package(Qt5 5.7 REQUIRED COMPONENTS Core Gui WebEngineWidgets Network DBus) +find_package(Qt5 5.4 REQUIRED COMPONENTS Core Gui WebEngineWidgets Network DBus) find_package(FcitxQt5WidgetsAddons 1.1 REQUIRED) find_package(FcitxQt5DBusAddons 1.1 REQUIRED) ++++++ fcitx-libpinyin-0.4.1_dict.tar.xz -> fcitx-libpinyin-0.5.0_dict.tar.xz ++++++ /work/SRC/openSUSE:Factory/fcitx-libpinyin/fcitx-libpinyin-0.4.1_dict.tar.xz /work/SRC/openSUSE:Factory/.fcitx-libpinyin.new/fcitx-libpinyin-0.5.0_dict.tar.xz differ: char 25, line 1 ++++++ fcitx-libpinyin-linking.patch ++++++ Index: b/src/CMakeLists.txt =================================================================== --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,5 +26,5 @@ add_definitions( -DLOCALEDIR=\"${CMAKE_I fcitx_add_addon_full(libpinyin DESC SOURCES ${fcitx_libpinyin_sources} IM_CONFIG pinyin-libpinyin.conf shuangpin-libpinyin.conf zhuyin-libpinyin.conf -LINK_LIBS ${LIBPINYIN_LIBRARIES} ${LIBINTL_LIBRARIES} ${GLIB2_LIBRARIES} ${DBUS_LIBRARIES} +LINK_LIBS ${LIBPINYIN_LIBRARIES} ${LIBINTL_LIBRARIES} ${GLIB2_LIBRARIES} ${DBUS_LIBRARIES} ${FCITX4_FCITX_UTILS_LIBRARIES} ${FCITX4_FCITX_CONFIG_LIBRARIES} ${FCITX4_FCITX_LIBRARIES} )
