rpm/fcitx
SHA256
1
0
Fork 0
forked from pool/fcitx
Code Pull Requests Activity

Accepting request 183498 from M17N

Browse Source 
- update version 4.2.8.1
  * udpate default skin
  * Merge pull request #119 for fixing Libkvm detection with cmake 2.8.11
  * add support for using @ to escape icon name
  * remove an icon to support icon fallback in glib
  * Check window size to avoid BadWindow caused by invalid skin
  * Fix Issue #118
  * Fix some memory leak in Issue #117
  * Fix table punctuation ignore list
  * Fix Pinyin Remind mode
  * Fix behavior of trigger key with modifier
- fix systray icon in Dartmouth (forwarded request 183494 from MargueriteSu)

OBS-URL: https://build.opensuse.org/request/show/183498
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fcitx?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2013-07-18 14:00:53 +00:00 committed by Git OBS Bridge
commit b68a0106f5
7 changed files with 36 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
fcitx-4.2.8-arch-dependent-file-in-usr-share.patch
View File

@ -1,47 +0,0 @@
Index: fcitx-4.2.8/cmake/FcitxMacro.cmake
===================================================================
--- fcitx-4.2.8.orig/cmake/FcitxMacro.cmake
+++ fcitx-4.2.8/cmake/FcitxMacro.cmake
@@ -184,10 +184,10 @@ function(__fcitx_cmake_init)
CACHE INTERNAL "include dir" FORCE)
else()
set(FCITX_SCANNER_EXECUTABLE
- "${FCITX_MACRO_CMAKE_DIR}/fcitx-scanner"
+ "${FCITX4_ADDON_INSTALL_DIR}/libexec/fcitx-scanner"
CACHE INTERNAL "fcitx-scanner" FORCE)
set(FCITX_PO_PARSER_EXECUTABLE
- "${FCITX_MACRO_CMAKE_DIR}/fcitx-po-parser"
+ "${FCITX4_ADDON_INSTALL_DIR}/libexec/fcitx-po-parser"
CACHE INTERNAL "fcitx-po-parser" FORCE)
execute_process(COMMAND env ${FCITX_PO_PARSER_EXECUTABLE}
--gettext-support RESULT_VARIABLE result)
Index: fcitx-4.2.8/src/module/spell/dict/CMakeLists.txt
===================================================================
--- fcitx-4.2.8.orig/src/module/spell/dict/CMakeLists.txt
+++ fcitx-4.2.8/src/module/spell/dict/CMakeLists.txt
@@ -5,7 +5,7 @@ set(DICT_COMP_SRC
add_executable(comp-spell-dict ${DICT_COMP_SRC})
target_link_libraries(comp-spell-dict fcitx-utils)
install(TARGETS comp-spell-dict
- DESTINATION "${prefix}/share/cmake/fcitx/")
+ DESTINATION "${addondir}/libexec")
set(SPELL_EN_DICT_VER 20121020)
set(SPELL_EN_DICT "${CMAKE_CURRENT_BINARY_DIR}/en_dict.fscd")
@@ -27,4 +27,4 @@ add_custom_command(
COMMAND "${COMP_SPELL_DICT}" --comp-dict
"${SPELL_EN_DICT_SRC}" "${SPELL_EN_DICT}")
add_custom_target(spell_en_dict ALL DEPENDS "${SPELL_EN_DICT}")
-install(FILES "${SPELL_EN_DICT}" DESTINATION "${pkgdatadir}/spell")
\ No newline at end of file
+install(FILES "${SPELL_EN_DICT}" DESTINATION "${pkgdatadir}/spell")
Index: fcitx-4.2.8/tools/dev/CMakeLists.txt
===================================================================
--- fcitx-4.2.8.orig/tools/dev/CMakeLists.txt
+++ fcitx-4.2.8/tools/dev/CMakeLists.txt
@@ -20,4 +20,4 @@ if(NOT _FCITX_DISABLE_GETTEXT)
endif()
install(TARGETS fcitx-scanner fcitx-po-parser
- DESTINATION "${prefix}/share/cmake/fcitx/")
+ DESTINATION "${addondir}/libexec")

15
fcitx-4.2.8-freedesktop-notify.c-DBUS_TIMEOUT_USE_DEFAULT.patch
View File

@ -1,15 +0,0 @@
Index: fcitx-4.2.8/src/module/freedesktop-notify/freedesktop-notify.c
===================================================================
--- fcitx-4.2.8.orig/src/module/freedesktop-notify/freedesktop-notify.c
+++ fcitx-4.2.8/src/module/freedesktop-notify/freedesktop-notify.c
@@ -50,6 +50,10 @@
NOTIFICATIONS_MATCH_SIGNAL "," \
"member='NotificationClosed'"
+#ifndef DBUS_TIMEOUT_USE_DEFAULT
+# define DBUS_TIMEOUT_USE_DEFAULT (-1)
+#endif
+
static void *FcitxNotifyCreate(FcitxInstance *instance);
static void FcitxNotifyDestroy(void *arg);

3
fcitx-4.2.8.1_dict.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:77f5811dd8c095ad71b423837df1405510a021b036352754aab8a146639e7817
size 8604792

3
fcitx-4.2.8_dict.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a93a1d09dafe5f4da954add162730bd867818d4ee7332c623f7cff011f95ae62
size 8595224

16
fcitx.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sat Jul 13 06:22:19 UTC 2013 - i@marguerite.su
- update version 4.2.8.1
* udpate default skin
* Merge pull request #119 for fixing Libkvm detection with cmake 2.8.11
* add support for using @ to escape icon name
* remove an icon to support icon fallback in glib
* Check window size to avoid BadWindow caused by invalid skin
* Fix Issue #118
* Fix some memory leak in Issue #117
* Fix table punctuation ignore list
* Fix Pinyin Remind mode
* Fix behavior of trigger key with modifier
- fix systray icon in Dartmouth
-------------------------------------------------------------------
Sun Jun 30 23:12:53 UTC 2013 - i@marguerite.su

22
fcitx.spec
View File

@ -19,7 +19,7 @@
%define libver -4_2_8
Name: fcitx
Version: 4.2.8
Version: 4.2.8.1
Release: 0
Summary: Flexible Context-aware Input Tool with eXtension
License: GPL-2.0+
@ -33,10 +33,6 @@ Source3: xim.fcitx.suse.template
Source7: xinput-fcitx
Source8: openSUSE-default.tar.gz
Source9: macros.%{name}
# PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix missing DBUS_TIMEOUT_USE_DEFAULT in freedesktop-notify.c
Patch: fcitx-4.2.8-freedesktop-notify.c-DBUS_TIMEOUT_USE_DEFAULT.patch
# PATCH-FIX-UPSTREAM marguerite@opensuse.org - don't install binary into /usr/share/cmake/fcitx
Patch1: fcitx-4.2.8-arch-dependent-file-in-usr-share.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@ -51,6 +47,11 @@ BuildRequires: libxkbfile-devel
%endif
BuildRequires: enchant-devel
BuildRequires: iso-codes-devel
# Dictionary ownership
BuildRequires: kde4-filesystem
%if 0%{?suse_version} >= 1140
BuildRequires: kdebase4-runtime-branding-openSUSE
%endif
BuildRequires: libpresage-devel
BuildRequires: pango-devel
%if 0%{?suse_version} >= 1110 || 0%{?fedora_version}
@ -367,8 +368,6 @@ You can either use this package for download from kde-look.org using knewstaff i
%prep
%setup -q -n %{name}-%{version}
%patch -p1
%patch1 -p1
%build
mkdir build
@ -409,6 +408,9 @@ cd ..
# install openSUSE branding
pushd %{buildroot}%{_datadir}/%{name}/skin/
tar -xzf %{SOURCE8}
# fcitx 4.2.8 use new dbus systray mechanism, so fix the ugly oxygen keyboard icon
mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/
cp -r openSUSE-default/source/inactive.svg %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svg
popd
pushd %{buildroot}%{_datadir}/%{name}/configdesc
sed -i 's/DefaultValue=default/DefaultValue=openSUSE-default/' %{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc
@ -722,6 +724,12 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||
%files branding-openSUSE
%defattr(-,root,root)
%{_datadir}/%{name}/skin/openSUSE-default
%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svg
%if 0%{?suse_version} <= 1220
%dir %{_kde4_appsdir}/desktoptheme
%dir %{_kde4_appsdir}/desktoptheme/openSUSE
%dir %{_kde4_appsdir}/desktoptheme/openSUSE/icons
%endif
%endif

4
openSUSE-default.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48760fd516ffda47e9bce5a7d0273cf6c0485a332fd1677f0cedf0efc7a39eef
size 305550
oid sha256:ea201658d8b0e8246d5917ba46ea9bf1c78c966f37ddbcb7edd42b26f93bc7e3
size 306602