commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2020-03-03 10:14:36
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new.26092 (New)
Package is "fcitx"
Tue Mar 3 10:14:36 2020 rev:62 rq:780501 version:4.2.9.7
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2019-08-27
15:50:21.639771989 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new.26092/fcitx.changes 2020-03-03
10:14:42.938461090 +0100
@@ -1,0 +2,15 @@
+Sat Feb 29 15:14:52 UTC 2020 - Hillwood Yang
+
+- Update version to 4.2.9.7
+ * Do not link jsonc if XKB is disabled
+ * Update Translation
+ * use /org/freedesktop/portal as dbus path for portal.
+ * use the right color for gtk2
+ * use a different way to suppress unused warning
+ * Revert "[gtk] clean up unused variable."
+ * iso code root should be 639-3.
+ * use iso-codes json file to parse the iso codes data.
+ * fix fall through warning
+ * clean up unused variable.
+
+---
Old:
fcitx-4.2.9.6_dict.tar.xz
New:
fcitx-4.2.9.7_dict.tar.xz
fcitx-4.2.9.7_dict.tar.xz.sig
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.pK6FAp/_old 2020-03-03 10:14:44.714464765 +0100
+++ /var/tmp/diff_new_pack.pK6FAp/_new 2020-03-03 10:14:44.718464773 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fcitx
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define libver -4_2_9
Name: fcitx
-Version:4.2.9.6
+Version:4.2.9.7
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0-or-later
@@ -31,6 +31,7 @@
Source8:openSUSE-themes.tar.gz
Source9:macros.%{name}
Source99: baselibs.conf
+Source100:
https://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz.sig
# PATCH-FIX-OPENSUSE fcitx-autostart-check-INPUT_METHOD.patch boo#947576
Patch2: fcitx-autostart-check-INPUT_METHOD.patch
# PATCH-FIX-OPENSUSE downgrade cmake requirement to 3.1 again
@@ -61,6 +62,7 @@
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: xz
+BuildRequires: pkgconfig(json-c)
BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
BuildRequires: pkgconfig(xkbfile)
@@ -340,12 +342,10 @@
# fix gobject-introspection build
export SUSE_ASNEEDED=0
-make %{?_smp_mflags}
+%make_build
%install
-cd build
-%make_install
-cd ..
+%cmake_install
# install openSUSE skins
tar -xzf %{SOURCE8}
++ fcitx-4.2.9.6_dict.tar.xz -> fcitx-4.2.9.7_dict.tar.xz ++
/work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.9.6_dict.tar.xz
/work/SRC/openSUSE:Factory/.fcitx.new.26092/fcitx-4.2.9.7_dict.tar.xz differ:
char 25, line 1
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2019-08-27 15:50:19
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new.7948 (New)
Package is "fcitx"
Tue Aug 27 15:50:19 2019 rev:61 rq:726003 version:4.2.9.6
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2018-04-02
22:48:00.316510576 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new.7948/fcitx.changes2019-08-27
15:50:21.639771989 +0200
@@ -1,0 +2,6 @@
+Thu Aug 22 13:13:21 UTC 2019 - Christophe Giboudeaux
+
+- Stop packaging fcitx-qt4 for leap 15.2 and Tumbleweed.
+- Run spec-cleaner
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.Qsv8KL/_old 2019-08-27 15:50:22.875771686 +0200
+++ /var/tmp/diff_new_pack.Qsv8KL/_new 2019-08-27 15:50:22.875771686 +0200
@@ -1,7 +1,7 @@
#
# spec file for package fcitx
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define libver -4_2_9
-
Name: fcitx
Version:4.2.9.6
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0-or-later
Group: System/I18n/Chinese
-Url:https://github.com/fcitx/fcitx
+URL:https://github.com/fcitx/fcitx
Source:
https://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz
Source1:xim.d-fcitx
Source2:fcitx-README.suse
@@ -51,31 +50,35 @@
BuildRequires: iso-codes-devel
BuildRequires: libicu-devel
BuildRequires: libpresage-devel
+# Only for leap < 15.2
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
BuildRequires: libqt4-devel
+%endif
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
BuildRequires: opencc-devel
BuildRequires: pango-devel
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: xz
BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
BuildRequires: pkgconfig(xkbfile)
+Requires: %{name}-branding = %{version}
Requires: %{name}-gtk3 = %{version}-%{release}
Requires: lib%{name}%{libver} = %{version}-%{release}
Recommends: %{name}-gtk2 = %{version}-%{release}
-Recommends: %{name}-qt4 = %{version}-%{release}
Recommends: %{name}-pinyin = %{version}-%{release}
Recommends: %{name}-table = %{version}-%{release}
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
+Recommends: %{name}-qt4 = %{version}-%{release}
+%endif
# These libraries are dlopen-ed in fcitx at runtime
# for spell-checking for keyboard users. ld can't find
# them, so explicitly recommends.
+Recommends: libenchant1
Recommends: libopencc2
Recommends: libpresage1
-Recommends: libenchant1
-Requires: %{name}-branding = %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: locale(ko;zh_CN;zh_SG)
%description
@@ -103,7 +106,7 @@
Summary:Gtk2 IM module for %{name}
Group: System/I18n/Chinese
Requires: %{name} = %{version}-%{release}
-%gtk2_immodule_requires
+%{gtk2_immodule_requires}
%description gtk2
GTK+ version 2 input module for Fcitx input method rfamework.
@@ -112,7 +115,7 @@
Summary:Gtk3 IM module for %{name}
Group: System/I18n/Chinese
Requires: %{name} = %{version}-%{release}
-%gtk3_immodule_requires
+%{gtk3_immodule_requires}
%description gtk3
GTK+ version 3 input module for Fcitx input method framework.
@@ -127,6 +130,7 @@
This package provides the GObject Introspection bindings for Fcitx.
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
%package qt4
Summary:Qt4 IM module for %{name}
Group: System/I18n/Chinese
@@ -134,6 +138,7 @@
%description qt4
QT4 input module for Fcitx input method framework.
+%endif
%package quwei
Summary:Chinese Zone-bit(QuWei) engine for %{name}
@@ -209,8 +214,8 @@
%package table-cn-wubi-pinyin
Summary:Wubi and pinyin(wubi-pinyin) table for %{name}
Group: System/I18n/Chinese
-Provides: locale(fcitx-table:zh_CN;)
Requires: %{name}-table =
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2018-04-02 22:47:42
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Mon Apr 2 22:47:42 2018 rev:60 rq:592248 version:4.2.9.6
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2018-03-01
12:05:09.403809015 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2018-04-02
22:48:00.316510576 +0200
@@ -1,0 +2,12 @@
+Thu Mar 29 07:29:52 UTC 2018 - i...@marguerite.su
+
+- update 4.2.9.6
+ * [ipcportal] close connection first
+ * [gtk] workaround libreoffice surrounding text issue
+ * decrease the length of clipboard limit to 256 bytes
+ * [gtk] use symbolic color name to lookup selected color
+- change fcitx-gtk2 and fcitx-qt4 from Requires to Recommends
+- add fcitx-cmake-3.1.patch, downgrade cmake requirement to 3.1
+ again for Leap
+
+---
Old:
fcitx-4.2.9.5_dict.tar.xz
New:
fcitx-4.2.9.6_dict.tar.xz
fcitx-cmake-3.1.patch
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.9gaXhM/_old 2018-04-02 22:48:01.372472183 +0200
+++ /var/tmp/diff_new_pack.9gaXhM/_new 2018-04-02 22:48:01.376472037 +0200
@@ -19,13 +19,13 @@
%define libver -4_2_9
Name: fcitx
-Version:4.2.9.5
+Version:4.2.9.6
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0-or-later
Group: System/I18n/Chinese
-Url:http://code.google.com/p/fcitx
-Source:
http://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz
+Url:https://github.com/fcitx/fcitx
+Source:
https://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz
Source1:xim.d-fcitx
Source2:fcitx-README.suse
Source3:xim.fcitx.suse.template
@@ -34,6 +34,8 @@
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE fcitx-autostart-check-INPUT_METHOD.patch boo#947576
Patch2: fcitx-autostart-check-INPUT_METHOD.patch
+# PATCH-FIX-OPENSUSE downgrade cmake requirement to 3.1 again
+Patch3: fcitx-cmake-3.1.patch
BuildRequires: cairo-devel
BuildRequires: cmake
BuildRequires: dbus-1-devel
@@ -60,10 +62,10 @@
BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
BuildRequires: pkgconfig(xkbfile)
-Requires: %{name}-gtk2 = %{version}-%{release}
Requires: %{name}-gtk3 = %{version}-%{release}
-Requires: %{name}-qt4 = %{version}-%{release}
Requires: lib%{name}%{libver} = %{version}-%{release}
+Recommends: %{name}-gtk2 = %{version}-%{release}
+Recommends: %{name}-qt4 = %{version}-%{release}
Recommends: %{name}-pinyin = %{version}-%{release}
Recommends: %{name}-table = %{version}-%{release}
# These libraries are dlopen-ed in fcitx at runtime
@@ -307,6 +309,7 @@
%prep
%setup -q -n %{name}-%{version}
%patch2 -p1
+%patch3 -p1
%build
mkdir build
++ fcitx-4.2.9.5_dict.tar.xz -> fcitx-4.2.9.6_dict.tar.xz ++
/work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.9.5_dict.tar.xz
/work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.9.6_dict.tar.xz differ: char
27, line 1
++ fcitx-cmake-3.1.patch ++
Index: fcitx-4.2.9.6/CMakeLists.txt
===
--- fcitx-4.2.9.6.orig/CMakeLists.txt
+++ fcitx-4.2.9.6/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.1)
project(fcitx)
Index: fcitx-4.2.9.6/src/frontend/ipcportal/CMakeLists.txt
===
--- fcitx-4.2.9.6.orig/src/frontend/ipcportal/CMakeLists.txt
+++ fcitx-4.2.9.6/src/frontend/ipcportal/CMakeLists.txt
@@ -2,8 +2,8 @@ set(FCITX_IPCPORTAL_LINK_LIBS)
if(_ENABLE_DBUS)
include_directories(${DBUS_INCLUDE_DIRS})
link_directories(${DBUS_LIBRARY_DIRS})
- pkg_check_modules(LibUUID "uuid" IMPORTED_TARGET REQUIRED)
- set(FCITX_IPCPORTAL_LINK_LIBS ${FCITX_IPCPORTAL_LINK_LIBS} ${DBUS_LIBRARIES}
PkgConfig::LibUUID)
+ pkg_check_modules(LibUUID "uuid" REQUIRED)
+ set(FCITX_IPCPORTAL_LINK_LIBS ${FCITX_IPCPORTAL_LINK_LIBS} ${DBUS_LIBRARIES}
-luuid)
set(ipcportal_noinstall)
else()
set(ipcportal_noinstall NO_INSTALL)
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2018-03-01 12:05:07
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Thu Mar 1 12:05:07 2018 rev:59 rq:580602 version:4.2.9.5
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2017-12-04
10:00:20.944830026 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2018-03-01
12:05:09.403809015 +0100
@@ -1,0 +2,8 @@
+Tue Feb 27 09:34:05 UTC 2018 - dims...@opensuse.org
+
+- Add pkgconfig(xkbfile) BuildRequires: in the past, this used to
+ be pulled in by libqt4, but since our own code depends on it, and
+ not Qt4, it is our own duty to request our build dependencies.
+- Package COPYING is %license, not as %doc.
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.OzCAYj/_old 2018-03-01 12:05:10.303776724 +0100
+++ /var/tmp/diff_new_pack.OzCAYj/_new 2018-03-01 12:05:10.303776724 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fcitx
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
Version:4.2.9.5
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/I18n/Chinese
Url:http://code.google.com/p/fcitx
Source:
http://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz
@@ -59,6 +59,7 @@
BuildRequires: xz
BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
+BuildRequires: pkgconfig(xkbfile)
Requires: %{name}-gtk2 = %{version}-%{release}
Requires: %{name}-gtk3 = %{version}-%{release}
Requires: %{name}-qt4 = %{version}-%{release}
@@ -361,7 +362,6 @@
cp -r %{SOURCE3} %{buildroot}%{_docdir}/%{name}/
cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/
cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/
-cp -r COPYING %{buildroot}%{_docdir}/%{name}/
# create autostart
mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
@@ -424,6 +424,7 @@
%files -f %{name}.lang
%defattr(-,root,root)
+%license COPYING
%{_bindir}/%{name}
%{_bindir}/%{name}-autostart
%{_bindir}/%{name}-configtool
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2017-12-04 10:00:17
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Mon Dec 4 10:00:17 2017 rev:58 rq:547516 version:4.2.9.5
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2017-04-30
21:10:04.341654303 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2017-12-04
10:00:20.944830026 +0100
@@ -1,0 +2,68 @@
+Sat Nov 11 01:06:32 UTC 2017 - i...@marguerite.su
+
+- update 4.2.9.5
+ * [qt] remove quickphrase editor, moved to qt5
+ * [misc] forget to remove the add_directory for quickphrase editor
+ * fcitx-configtool.desktop: Remove MimeType entry
+ * [frontend] add a compatibility layer for ofd.portal.Fcitx
+ * [gtk] run clang-format on gtk libraries
+ * [gclinet] remove a undefined function
+ * set display for fcitx and harden dbus frontend with sender verification
+ * extend dbus module to be able to accept external dbus connection
+ * [ipcportal] fix signal sending in portal
+ * [qt] delay the recheck on availability, but does do the recheck
+ * [portal] put ipc portal in queue
+ * [qt] do the real unwatch
+ * [misc] make more optional disabled option for easier flatpak
+ * [table] make sure we don't download table data if we disable table
+- changes in 4.2.9.4
+ * [gtk, kimpanel] add relative coordinate support
+ * [kimpanel] check null before use ic
+ * [kimpanel] correctly reset relative spot state
+ * [notificationitem] Reply event method call
+- changes in 4.2.9.3
+ * [core] Make sure when RealEnd is called, instance->destroy == true
+- changes in 4.2.9.2
+ * [notificationitem] avoid unnecessary xembed tray icon fallback
+ * [classicui] give tray icon a default size
+ * [qt] fix inconsistency when handling qstring and ucs4 string
+ * [classicui] Watch for dockWindow visual property change
+ * [qt] fromUcs4 expect a nul terminated string by default, give it a size
+ * [core] Expose internal show input speed function
+ * logging should not include the build path(boo#951602)
+ * autostart desktop file should not be shown(boo#968486)
+ * [qt] replace QPointer with raw pointer in icdata
+ * [notificationitem] display layout under unity
+ * [diagnose] Print info about dbus name owner
+ * Include emoji short codes ("emoji alpha codes")
+ * [notificationitem] Fix a bug in plugin entry
+ * [core] Add a new hook to watch ui status changed
+ * [xim] handle reset ic
+ * [utils] Improve process name detection on *BSD
+ * [quickphrase] use some different character, original one looks bad under
noto
+ * [misc] use RTLD_NODELETE for all dlopen
+ * Call sem_post() only on valid semaphore
+ * [unicode] Update Unicode 9.0 descriptions
+ * [classicui] Check XShape version before using it
+ * [remote] exit the loop after trying 20 times
+ * Require bash in fcitx-cmake-helper.sh
+ * [xim] fix a memset
+ * [pinyin] fix missing files
+ * [dbus] fix a wrong dbus destruct order that my cause deadlock on exit
+ * [xkb] handle some corner case for any evil third party that override layout
+ * [xkb, xkbdbus] add support for our gnome-shell kimpanel dbus helper
+ * [xkb] fix circular deps between xkb and xkbdbus
+ * [gclient] try to eliminate a warning for configtool
+ * [misc] enforce c99 for compiler
+ * [core] call backtrace() ahead to let it finish init()
+ * [misc] remove a dup define
+ * [unicode] enable prev/next key and enter to choose for unicode
+ * [gtk] fix wrong gobject add weak pointer
+ * [misc] use unsigned int instead for portability
+ * Remove deprecated api in enchant so we can also support 2.1.0.
+ * Fix bashism/use correct shebang
+- drop fcitx-autostart-desktop-no-display.patch, upstreamed
+- drop fcitx-use-basename-for-log.patch, upstreamed
+- drop boo954623.patch, upstreamed
+
+---
Old:
_service
boo954623.patch
fcitx-4.2.9.1_dict.tar.xz
fcitx-autostart-desktop-no-display.patch
fcitx-use-basename-for-log.patch
New:
fcitx-4.2.9.5_dict.tar.xz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.5pk2mw/_old 2017-12-04 10:00:22.932757873 +0100
+++ /var/tmp/diff_new_pack.5pk2mw/_new 2017-12-04 10:00:22.936757729 +0100
@@ -19,7 +19,7 @@
%define libver -4_2_9
Name: fcitx
-Version:4.2.9.1
+Version:4.2.9.5
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0+
@@ -32,14 +32,8 @@
Source8:openSUSE-themes.tar.gz
Source9:macros.%{name}
Source99: baselibs.conf
-# PATCH-FIX-OPENSUSE
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2017-04-30 21:10:03
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Sun Apr 30 21:10:03 2017 rev:57 rq:491015 version:4.2.9.1
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2016-11-15
18:01:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2017-04-30
21:10:04.341654303 +0200
@@ -1,0 +2,7 @@
+Fri Apr 21 12:12:12 UTC 2017 - fv...@suse.com
+
+- Clean up .spec file:
+ * Remove KDE4 parts (install custom systray icon)
+ * Remove checks for obsolete distro versions
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.0LIjMl/_old 2017-04-30 21:10:05.637471625 +0200
+++ /var/tmp/diff_new_pack.0LIjMl/_new 2017-04-30 21:10:05.641471061 +0200
@@ -1,7 +1,7 @@
#
# spec file for package fcitx
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define libver -4_2_9
Name: fcitx
@@ -40,49 +41,33 @@
# PATCH-FIX-UPSTREAM boo#964623
Patch4: boo954623.patch
BuildRequires: cairo-devel
+BuildRequires: cmake
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: enchant-devel
-BuildRequires: iso-codes-devel
-BuildRequires: update-desktop-files
-# Directory ownership start
-BuildRequires: kde4-filesystem
-%if 0%{?suse_version} >= 1140 && 0%{?suse_version} <= 1320
-BuildRequires: kdebase4-runtime-branding-openSUSE
-%endif
-# Directory ownership end
-BuildRequires: libpresage-devel
-BuildRequires: pango-devel
-%if 0%{?suse_version} >= 1110
-BuildRequires: fdupes
-%endif
-%if 0%{?suse_version} > 1110
-BuildRequires: libqt4-devel
-%endif
-BuildRequires: cmake
BuildRequires: extra-cmake-modules
-BuildRequires: gtk2-devel
-BuildRequires: opencc-devel
-BuildRequires: pkgconfig(lua)
-%if 0%{?suse_version} >= 1140
+BuildRequires: fdupes
+BuildRequires: gcc-c++
BuildRequires: gobject-introspection-devel
+BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
-%endif
-BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
+BuildRequires: iso-codes-devel
BuildRequires: libicu-devel
+BuildRequires: libpresage-devel
+BuildRequires: libqt4-devel
BuildRequires: libxml2-devel
+BuildRequires: opencc-devel
+BuildRequires: pango-devel
BuildRequires: pkg-config
+BuildRequires: update-desktop-files
BuildRequires: xz
+BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
Requires: %{name}-gtk2 = %{version}-%{release}
-Requires: lib%{name}%{libver} = %{version}-%{release}
-%if 0%{?suse_version} >= 1140
Requires: %{name}-gtk3 = %{version}-%{release}
-%endif
-%if 0%{?suse_version} > 1110
Requires: %{name}-qt4 = %{version}-%{release}
-%endif
+Requires: lib%{name}%{libver} = %{version}-%{release}
Recommends: %{name}-pinyin = %{version}-%{release}
Recommends: %{name}-table = %{version}-%{release}
# These libraries are dlopen-ed in fcitx at runtime
@@ -120,18 +105,11 @@
Summary:Gtk2 IM module for %{name}
Group: System/I18n/Chinese
Requires: %{name} = %{version}-%{release}
-%if 0%{?suse_version} >= 1140
%gtk2_immodule_requires
-%else
-Requires(post): gtk2
-Requires(postun): gtk2
-%endif
%description gtk2
GTK+ version 2 input module for Fcitx input method rfamework.
-%if 0%{?suse_version} >= 1140
-
%package gtk3
Summary:Gtk3 IM module for %{name}
Group: System/I18n/Chinese
@@ -151,10 +129,6 @@
This package provides the GObject Introspection bindings for Fcitx.
-%endif
-
-%if 0%{?suse_version} > 1110
-
%package qt4
Summary:Qt4 IM module for %{name}
Group: System/I18n/Chinese
@@ -163,8 +137,6 @@
%description qt4
QT4 input module for Fcitx input method framework.
-%endif
-
%package quwei
Summary:Chinese Zone-bit(QuWei) engine for %{name}
Group: System/I18n/Chinese
@@ -195,9 +167,7 @@
Summary:Simplified Chinese Tsang-Jei(Cangjie) table for %{name}
Group: System/I18n/Chinese
Requires: %{name}-table = %{version}-%{release}
-%if 0%{?suse_version} >= 1140
BuildArch: noarch
-%endif
%description table-cn-cangjie
Fcitx Tsang Jei (Cang Jie) input tables for Simplified Chinese.
@@ -206,9 +176,7 @@
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2016-11-15 18:01:18
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2016-08-12
15:44:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2016-11-15
18:01:19.0 +0100
@@ -1,0 +2,6 @@
+Sun Nov 13 15:25:00 UTC 2016 - toddrme2...@gmail.com
+
+- Fix language code for fcitx-table-cn-wubi and
+ fcitx-table-cn-wubi-pinyin: zh-cn --> zh_CN
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.BSB9Kc/_old 2016-11-15 18:01:20.0 +0100
+++ /var/tmp/diff_new_pack.BSB9Kc/_new 2016-11-15 18:01:20.0 +0100
@@ -249,7 +249,7 @@
%package table-cn-wubi-pinyin
Summary:Wubi and pinyin(wubi-pinyin) table for %{name}
Group: System/I18n/Chinese
-Provides: locale(fcitx-table:zh-cn;)
+Provides: locale(fcitx-table:zh_CN;)
Requires: %{name}-table = %{version}-%{release}
%if 0%{?suse_version} >= 1140
BuildArch: noarch
@@ -263,7 +263,7 @@
%package table-cn-wubi
Summary:Wubi table for %{name}
Group: System/I18n/Chinese
-Provides: locale(fcitx-table:zh-cn;)
+Provides: locale(fcitx-table:zh_CN;)
Requires: %{name}-table = %{version}-%{release}
%if 0%{?suse_version} >= 1140
BuildArch: noarch
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2016-08-12 15:44:07
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2016-03-07
13:29:02.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2016-08-12
15:44:11.0 +0200
@@ -1,0 +2,14 @@
+Tue Aug 9 02:04:02 UTC 2016 - i...@marguerite.su
+
+- fix Leap 42.2 build
+ * fcitx switched to DBus mechanism to select systray icon
+which made it impossible to customize systray icon in
+fcitx's themes. When the KDE default keyboard icon was
+used, it was ugly-looking and invisible on small screens.
+So we appended icons to openSUSE default Plasma themes
+ * in Leap 42.2 and Tumbleweed, our KDE team decided not to
+provide any customization of the themes from kdebase4-openSUSE
+package, so the customizations of systray icons are useless
+in those systems.
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.5DQWTw/_old 2016-08-12 15:44:13.0 +0200
+++ /var/tmp/diff_new_pack.5DQWTw/_new 2016-08-12 15:44:13.0 +0200
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
%define libver -4_2_9
Name: fcitx
@@ -46,11 +45,12 @@
BuildRequires: enchant-devel
BuildRequires: iso-codes-devel
BuildRequires: update-desktop-files
-# Dictionary ownership
+# Directory ownership start
BuildRequires: kde4-filesystem
-%if 0%{?suse_version} >= 1140
+%if 0%{?suse_version} >= 1140 && 0%{?suse_version} <= 1320
BuildRequires: kdebase4-runtime-branding-openSUSE
%endif
+# Directory ownership end
BuildRequires: libpresage-devel
BuildRequires: pango-devel
%if 0%{?suse_version} >= 1110
@@ -366,6 +366,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if %suse_version < 1310
sed -i \
@@ -417,7 +418,7 @@
mv openSUSE-themes/Dartmouth %{buildroot}%{_datadir}/%{name}/skin/
mv openSUSE-themes/NewAir %{buildroot}%{_datadir}/%{name}/skin/
-%if 0%{?suse_version} <= 1320
+%if 0%{?sle_version} == 120100 && 0%{?is_opensuse} == 1 || 0%{?suse_version}
== 1320 || 0%{?suse_version} <= 1310
# fcitx 4.2.8 use new dbus systray mechanism, so fix the ugly oxygen keyboard
icon
mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/
mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/
@@ -656,7 +657,7 @@
%defattr(-,root,root)
%{_datadir}/%{name}/skin/Harlequin
%{_datadir}/%{name}/skin/Dartmouth
-%if 0%{?suse_version} <= 1320
+%if 0%{?sle_version} == 120100 && 0%{?is_opensuse} == 1 || 0%{?suse_version}
== 1320 || 0%{?suse_version} <= 1310
%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz
%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz
%if 0%{?suse_version} <= 1310
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2016-03-07 13:27:44
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2016-03-01
10:21:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2016-03-07
13:29:02.0 +0100
@@ -1,0 +2,12 @@
+Fri Mar 4 14:57:37 UTC 2016 - i...@marguerite.su
+
+- backport a upstream fix:
+ * boo#954623: fcitx prevents dropbox system tray
+loading in KDE Plasma 5
+ * commit#c73761 : avoid unnecessary xembed tray
+icon fallback, try harder to avoid touch tray
+protocol related code when notification is
+available or kimpanel is available.
+ * add patch boo954623.patch, delete next update
+
+---
New:
boo954623.patch
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.UcVvh2/_old 2016-03-07 13:29:03.0 +0100
+++ /var/tmp/diff_new_pack.UcVvh2/_new 2016-03-07 13:29:03.0 +0100
@@ -38,6 +38,8 @@
Patch2: fcitx-autostart-check-INPUT_METHOD.patch
# PATCH-FIX-OPENSUSE fcitx-autostart-desktop-no-display.patch boo#968486
Patch3: fcitx-autostart-desktop-no-display.patch
+# PATCH-FIX-UPSTREAM boo#964623
+Patch4: boo954623.patch
BuildRequires: cairo-devel
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
@@ -363,6 +365,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if %suse_version < 1310
sed -i \
++ boo954623.patch ++
Index: fcitx-4.2.9.1/src/module/notificationitem/notificationitem.c
===
--- fcitx-4.2.9.1.orig/src/module/notificationitem/notificationitem.c
+++ fcitx-4.2.9.1/src/module/notificationitem/notificationitem.c
@@ -565,8 +565,17 @@ void FcitxNotificationItemUpdateIMList(v
boolean FcitxNotificationItemEnable(FcitxNotificationItem* notificationitem,
FcitxNotificationItemAvailableCallback callback, void* data)
{
-if (!callback || notificationitem->callback)
+if (!callback)
return false;
+
+if (notificationitem->callback == callback) {
+return true;
+}
+
+if (notificationitem->callback) {
+return false;
+}
+
if (notificationitem->serviceName) {
FcitxLog(ERROR, "This should not happen, please report bug.");
return false;
Index: fcitx-4.2.9.1/src/ui/classic/TrayWindow.c
===
--- fcitx-4.2.9.1.orig/src/ui/classic/TrayWindow.c
+++ fcitx-4.2.9.1/src/ui/classic/TrayWindow.c
@@ -226,11 +226,11 @@ boolean TrayEventHandler(void *arg, XEve
if (event->xclient.message_type == trayWindow->atoms[ATOM_MANAGER]
&& event->xclient.data.l[1] == trayWindow->atoms[ATOM_SELECTION]
&& trayWindow->dockWindow == None) {
-if (classicui->notificationItemAvailable)
-return true;
trayWindow->dockWindow = event->xclient.data.l[2];
TrayWindowRelease(trayWindow);
-TrayWindowInit(trayWindow);
+if (!classicui->notificationItemAvailable &&
!classicui->isSuspend) {
+TrayWindowInit(trayWindow);
+}
return true;
}
break;
Index: fcitx-4.2.9.1/src/ui/classic/classicui.c
===
--- fcitx-4.2.9.1.orig/src/ui/classic/classicui.c
+++ fcitx-4.2.9.1/src/ui/classic/classicui.c
@@ -168,7 +168,7 @@ void* ClassicUICreate(FcitxInstance* ins
void ClassicUIDelayedInitTray(void* arg) {
FcitxClassicUI* classicui = (FcitxClassicUI*) arg;
// FcitxLog(INFO, "yeah we delayed!");
-if (!classicui->bUseTrayIcon)
+if (!classicui->bUseTrayIcon || classicui->isSuspend)
return;
/*
* if this return false, something wrong happened and callback
@@ -187,7 +187,7 @@ void ClassicUIDelayedShowTray(void* arg)
{
FcitxClassicUI* classicui = (FcitxClassicUI*) arg;
classicui->trayTimeout = 0;
-if (!classicui->bUseTrayIcon)
+if (!classicui->bUseTrayIcon || classicui->isSuspend)
return;
if (!classicui->trayWindow->bTrayMapped) {
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2016-03-01 09:45:35
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2016-02-16
09:18:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2016-03-01
10:21:04.0 +0100
@@ -1,0 +2,7 @@
+Sun Feb 28 09:25:28 CET 2016 - ti...@suse.de
+
+- Add NoDisplay=true in autostart desktop file so that it won't be
+ shown (boo#968486):
+ fcitx-autostart-desktop-no-display.patch
+
+---
New:
fcitx-autostart-desktop-no-display.patch
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.jbUeW1/_old 2016-03-01 10:21:06.0 +0100
+++ /var/tmp/diff_new_pack.jbUeW1/_new 2016-03-01 10:21:06.0 +0100
@@ -36,6 +36,8 @@
Patch1: fcitx-use-basename-for-log.patch
# PATCH-FIX-OPENSUSE fcitx-autostart-check-INPUT_METHOD.patch boo#947576
Patch2: fcitx-autostart-check-INPUT_METHOD.patch
+# PATCH-FIX-OPENSUSE fcitx-autostart-desktop-no-display.patch boo#968486
+Patch3: fcitx-autostart-desktop-no-display.patch
BuildRequires: cairo-devel
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
@@ -360,6 +362,7 @@
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if %suse_version < 1310
sed -i \
++ fcitx-autostart-desktop-no-display.patch ++
---
data/fcitx-autostart.desktop.in |1 +
1 file changed, 1 insertion(+)
--- a/data/fcitx-autostart.desktop.in
+++ b/data/fcitx-autostart.desktop.in
@@ -8,6 +8,7 @@ Terminal=false
Type=Application
Categories=System;Utility;
StartupNotify=false
+NoDisplay=true
X-GNOME-Autostart-Phase=Applications
X-GNOME-AutoRestart=false
X-GNOME-Autostart-Notify=false
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2016-02-16 09:18:29
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2015-12-24
12:17:25.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2016-02-16
09:18:30.0 +0100
@@ -1,0 +2,8 @@
+Thu Feb 11 18:03:21 UTC 2016 - i...@marguerite.su
+
+- Due to changes in kdebase4-openSUSE in Tumbleweed
+ %{_kde4_appsdir}/desktoptheme/{openSUSE,openSUSElight}
+ are no longer available. Actually those icon tweaks
+ are not needed too.
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.aspfZY/_old 2016-02-16 09:18:31.0 +0100
+++ /var/tmp/diff_new_pack.aspfZY/_new 2016-02-16 09:18:31.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fcitx
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -411,11 +411,13 @@
mv openSUSE-themes/Dartmouth %{buildroot}%{_datadir}/%{name}/skin/
mv openSUSE-themes/NewAir %{buildroot}%{_datadir}/%{name}/skin/
+%if 0%{?suse_version} <= 1320
# fcitx 4.2.8 use new dbus systray mechanism, so fix the ugly oxygen keyboard
icon
mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/
mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/
cp -r openSUSE-themes/input-Dartmouth.svgz
%{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz
cp -r openSUSE-themes/input-Harlequin.svgz
%{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz
+%endif
# Change default skin
pushd %{buildroot}%{_datadir}/%{name}/configdesc
@@ -648,6 +650,7 @@
%defattr(-,root,root)
%{_datadir}/%{name}/skin/Harlequin
%{_datadir}/%{name}/skin/Dartmouth
+%if 0%{?suse_version} <= 1320
%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz
%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz
%if 0%{?suse_version} <= 1310
@@ -659,6 +662,7 @@
%dir %{_kde4_appsdir}/desktoptheme/openSUSE/icons
%endif
%endif
+%endif
%files skin-new-air
%defattr(-,root,root)
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2015-12-24 12:17:11
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2015-12-01
09:19:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2015-12-24
12:17:25.0 +0100
@@ -1,0 +2,10 @@
+Tue Dec 22 15:35:41 UTC 2015 - i...@marguerite.su
+
+- update version 4.2.9.1
+ * support QPlatformInputContext::locale()
+ * correctly set input window position on scaled gtk3 application
+ * support unicode 8.0 in unicode module
+ * qt input context is not recreated correctly when fcitx restarts
+- drop patch: fcitx-4.2.8.5-fix-bashisms.patch, upstreamed
+
+---
Old:
fcitx-4.2.8.5-fix-bashisms.patch
fcitx-4.2.9_dict.tar.xz
New:
fcitx-4.2.9.1_dict.tar.xz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.mcJApe/_old 2015-12-24 12:17:27.0 +0100
+++ /var/tmp/diff_new_pack.mcJApe/_new 2015-12-24 12:17:27.0 +0100
@@ -19,7 +19,7 @@
%define libver -4_2_9
Name: fcitx
-Version:4.2.9
+Version:4.2.9.1
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0+
@@ -32,7 +32,6 @@
Source8:openSUSE-themes.tar.gz
Source9:macros.%{name}
Source99: baselibs.conf
-Patch: fcitx-4.2.8.5-fix-bashisms.patch
# PATCH-FIX-OPENSUSE fcitx-use-basename-for-log.patch boo#951602
Patch1: fcitx-use-basename-for-log.patch
# PATCH-FIX-OPENSUSE fcitx-autostart-check-INPUT_METHOD.patch boo#947576
@@ -359,7 +358,6 @@
%prep
%setup -q -n %{name}-%{version}
-%patch -p1
%patch1 -p1
%patch2 -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
++ fcitx-4.2.9_dict.tar.xz -> fcitx-4.2.9.1_dict.tar.xz ++
/work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.9_dict.tar.xz
/work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.9.1_dict.tar.xz differ: char
29, line 1
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2015-12-01 09:19:48
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2015-10-26
12:48:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2015-12-01
09:19:57.0 +0100
@@ -1,0 +2,6 @@
+Mon Nov 30 11:58:56 UTC 2015 - swy...@gmail.com
+
+- Remove # fix desktop file script in fcitx.spec:
+ Upstream fixed.
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.8lQlbr/_old 2015-12-01 09:19:58.0 +0100
+++ /var/tmp/diff_new_pack.8lQlbr/_new 2015-12-01 09:19:58.0 +0100
@@ -424,9 +424,6 @@
sed -i 's/DefaultValue=default/DefaultValue=Harlequin/'
%{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc
popd
-# fix desktop file
-sed -i "s/x-fskin/x-fskin;/"
%{buildroot}%{_datadir}/applications/fcitx-skin-installer.desktop
-
%suse_update_desktop_file fcitx Utility DesktopUtility
%suse_update_desktop_file fcitx-skin-installer Utility DesktopUtility
%suse_update_desktop_file -r fcitx-configtool System X-SuSE-SystemSetup
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2015-10-26 12:48:51
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2015-10-06
13:25:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2015-10-26
12:48:57.0 +0100
@@ -1,0 +2,17 @@
+Thu Oct 22 16:02:07 CEST 2015 - ti...@suse.de
+
+- Fix logging not to include the build path (boo#951602):
+ fcitx-use-basename-for-log.patch
+
+---
+Thu Oct 22 14:59:29 CEST 2015 - ti...@suse.de
+
+- Several fixes and cleanup for starting fcitx on GNOME on Leap
+ (boo#947576,boo#942816)
+ * Remove the superfluous manual dbus-launch from xim script
+ * Use xdg autostart for GNOME, KDE, LXDE and XFCE;
+fcitx-autostart script is also modified to check $INPUT_METHOD:
+fcitx-autostart-check-INPUT_METHOD.patch
+ * Delay start of fcitx daemon a bit, too
+
+---
New:
fcitx-autostart-check-INPUT_METHOD.patch
fcitx-use-basename-for-log.patch
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.67xfOj/_old 2015-10-26 12:48:58.0 +0100
+++ /var/tmp/diff_new_pack.67xfOj/_new 2015-10-26 12:48:58.0 +0100
@@ -33,6 +33,10 @@
Source9:macros.%{name}
Source99: baselibs.conf
Patch: fcitx-4.2.8.5-fix-bashisms.patch
+# PATCH-FIX-OPENSUSE fcitx-use-basename-for-log.patch boo#951602
+Patch1: fcitx-use-basename-for-log.patch
+# PATCH-FIX-OPENSUSE fcitx-autostart-check-INPUT_METHOD.patch boo#947576
+Patch2: fcitx-autostart-check-INPUT_METHOD.patch
BuildRequires: cairo-devel
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
@@ -356,6 +360,8 @@
%prep
%setup -q -n %{name}-%{version}
%patch -p1
+%patch1 -p1
+%patch2 -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if %suse_version < 1310
sed -i \
@@ -450,9 +456,6 @@
done
popd
-# bnc#801319 remove the unneeded fcitx-autostart.desktop which blocks ibus
from starting.
-rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
-
# install rpm macros
install -D -m644 %{SOURCE9} %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
@@ -519,6 +522,7 @@
%{_mandir}/man1/fcitx.1.gz
%{_mandir}/man1/fcitx-remote.1.gz
%{_libdir}/%{name}/
+%{_sysconfdir}/xdg/autostart/%{name}*.desktop
%config %{_sysconfdir}/X11/xim.d/
%doc %{_docdir}/%{name}/
++ fcitx-autostart-check-INPUT_METHOD.patch ++
---
data/script/fcitx-autostart |2 ++
1 file changed, 2 insertions(+)
--- a/data/script/fcitx-autostart
+++ b/data/script/fcitx-autostart
@@ -1,5 +1,7 @@
#!/bin/sh
+test x"$INPUT_METHOD" = x"fcitx" || exit 0
+
# sleep for a little while to avoid duplicate startup
sleep 2
++ fcitx-use-basename-for-log.patch ++
---
src/lib/fcitx-utils/log.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/src/lib/fcitx-utils/log.c
+++ b/src/lib/fcitx-utils/log.c
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include "config.h"
#include "fcitx/fcitx.h"
@@ -136,7 +137,7 @@ FcitxLogFunc(FcitxLogLevel e, const char
{
va_list ap;
va_start(ap, fmt);
-FcitxLogFuncV(e, filename, line, fmt, ap);
+FcitxLogFuncV(e, basename(filename), line, fmt, ap);
va_end(ap);
}
++ xim.d-fcitx ++
--- /var/tmp/diff_new_pack.67xfOj/_old 2015-10-26 12:48:58.0 +0100
+++ /var/tmp/diff_new_pack.67xfOj/_new 2015-10-26 12:48:58.0 +0100
@@ -5,12 +5,17 @@
export QT_IM_SWITCHER=imsw-multi
export QT_IM_MODULE=fcitx
-# Avoid relying on autolaunch to improvise D-Bus sessions for each process
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] ; then
- eval $(dbus-launch --sh-syntax --exit-with-session)
-fi
-
-fcitx -d
+case "$WINDOWMANAGER" in
+*gnome*|*kde*|*xfce*|*lxde*)
+ # started via xdg autostart (boo#947576)
+ # explicitly set below, as referred in xdg autostart
+ export INPUT_METHOD=fcitx
+ ;;
+*)
+ # FIXME: a little bit of delay is required to avoid race (boo#947576)
+ (sleep 2; fcitx -d) &
+ ;;
+esac
# success:
return 0
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2015-10-06 13:25:47
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is "fcitx"
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2015-08-11
08:27:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2015-10-06
13:25:49.0 +0200
@@ -1,0 +2,26 @@
+Fri Oct 2 02:50:30 UTC 2015 - i...@marguerite.su
+
+- drop xinput-fcitx, which is not used by openSUSE
+- simplify xim.d-fcitx again
+ * do not define shell functions for success/failure, because
+previous x11-tools change has been reverted, we can use
+bash again.
+ * do not detect existence for fcitx itself, because this
+scriptlet is installed with fcitx.
+ * drop usage of GTK3_IM_MODULE/QT4_IM_MODULE, the former
+doesn't exist while the later is covered by QT_IM_MODULE
+
+---
+Thu Oct 1 11:30:10 CEST 2015 - ti...@suse.de
+
+- Add missing post/postun macro calls for updating desktops and
+ icons (boo#947842)
+- Remove superfluous ldconfig calls from the main package
+ post/postun
+
+---
+Wed Oct 1 06:06:23 UTC 2015 - hillw...@linuxfans.org
+
+- Use lua 5.2+, fix build in openSUSE_Factory
+
+---
Old:
xinput-fcitx
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.DIInU8/_old 2015-10-06 13:25:50.0 +0200
+++ /var/tmp/diff_new_pack.DIInU8/_new 2015-10-06 13:25:50.0 +0200
@@ -29,8 +29,6 @@
Source1:xim.d-fcitx
Source2:fcitx-README.suse
Source3:xim.fcitx.suse.template
-# for fedora auto-start
-Source7:xinput-fcitx
Source8:openSUSE-themes.tar.gz
Source9:macros.%{name}
Source99: baselibs.conf
@@ -54,20 +52,17 @@
%if 0%{?suse_version} > 1110
BuildRequires: libqt4-devel
%endif
-%if 0%{?suse_version} <= 1210
-BuildRequires: lua-devel
-%else
-BuildRequires: lua51-devel
-%endif
BuildRequires: cmake
BuildRequires: extra-cmake-modules
BuildRequires: gtk2-devel
BuildRequires: opencc-devel
+BuildRequires: pkgconfig(lua)
%if 0%{?suse_version} >= 1140
BuildRequires: gobject-introspection-devel
BuildRequires: gtk3-devel
%endif
BuildRequires: gcc-c++
+BuildRequires: hicolor-icon-theme
BuildRequires: libicu-devel
BuildRequires: libxml2-devel
BuildRequires: pkg-config
@@ -493,9 +488,15 @@
%endif
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+%desktop_database_post
+%icon_theme_cache_post
+exit 0
+
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+exit 0
%post -n lib%{name}%{libver} -p /sbin/ldconfig
++ xim.d-fcitx ++
--- /var/tmp/diff_new_pack.DIInU8/_old 2015-10-06 13:25:50.0 +0200
+++ /var/tmp/diff_new_pack.DIInU8/_new 2015-10-06 13:25:50.0 +0200
@@ -1,26 +1,9 @@
-function failure
-{
- return 1
-}
-
-function success
-{
- return 0
-}
-
-if ! [ -x /usr/bin/fcitx ] ; then
- echo "fcitx is not installed. please 'sudo zypper in fcitx'."
- $failure
-fi
-
#make sure set these vars before dbus-launch
export LC_CTYPE=$LANG
export XMODIFIERS="@im=fcitx"
export GTK_IM_MODULE=fcitx
-export GTK3_IM_MODULE=fcitx
export QT_IM_SWITCHER=imsw-multi
export QT_IM_MODULE=fcitx
-export QT4_IM_MODULE=fcitx
# Avoid relying on autolaunch to improvise D-Bus sessions for each process
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] ; then
@@ -30,4 +13,4 @@
fcitx -d
# success:
-$success
+return 0
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2015-08-11 08:27:17
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2015-06-02
10:08:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2015-08-11
08:27:19.0 +0200
@@ -1,0 +2,12 @@
+Mon Aug 10 14:19:20 UTC 2015 - i...@marguerite.su
+
+- fix boo#941052: /etc/X11/xim is broken: input methods
+ (Fcitx, IBus and etc) do not start at all
+- fix bashism in xim.d-fcitx
+ * return 0 can only be used in function or sourcing,
+so define functions
+ * type -p command is not available in sh builtins,
+change to -x
+ * other minor stuff
+
+---
Other differences:
--
++ xim.d-fcitx ++
--- /var/tmp/diff_new_pack.iPLNtK/_old 2015-08-11 08:27:20.0 +0200
+++ /var/tmp/diff_new_pack.iPLNtK/_new 2015-08-11 08:27:20.0 +0200
@@ -1,6 +1,16 @@
-if ! type -p fcitx /dev/null 21 ; then
- echo fcitx is not installed. please run `sudo zypper in fcitx`.
- return 1
+function failure
+{
+ return 1
+}
+
+function success
+{
+ return 0
+}
+
+if ! [ -x /usr/bin/fcitx ] ; then
+ echo fcitx is not installed. please 'sudo zypper in fcitx'.
+ $failure
fi
#make sure set these vars before dbus-launch
@@ -13,11 +23,11 @@
export QT4_IM_MODULE=fcitx
# Avoid relying on autolaunch to improvise D-Bus sessions for each process
-if test -z $DBUS_SESSION_BUS_ADDRESS ; then
- eval `dbus-launch --sh-syntax --exit-with-session`
+if [ -z $DBUS_SESSION_BUS_ADDRESS ] ; then
+ eval $(dbus-launch --sh-syntax --exit-with-session)
fi
fcitx -d
# success:
-return 0
+$success
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2015-06-02 10:08:32
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2015-04-07
09:29:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2015-06-02
10:08:33.0 +0200
@@ -1,0 +2,24 @@
+Sat May 30 17:22:00 UTC 2015 - Led led...@gmail.com
+
+- fix BuildRequires
+
+---
+Sat May 30 05:43:52 UTC 2015 - i...@marguerite.su
+
+- update version 4.2.9
+ * [qt,core]use xkbcommon for compose
+ * [qt,keyboard]use xkbcommon better by checking return value
+ * [qt, core] adjust xkb context log level
+ * [qt,core] adjust init order to ensure set log level works
+ * [unicode] fix decimal unicode search
+ * [qt] fix compose when fcitx is not running
+ * [gtk] use xkbcommon also for gtk im context
+ * [gtk] reset xkb compose state when context reset
+ * [gtk, gclient] make connection and xkb context/table of
+fcitxclient shared
+ * [gclient] fix some gtk-doc comment
+ * [qt] disable qt lib by option
+ * [core] fix invalid global imname
+- clean specfile, drop fedora support
+
+---
Old:
fcitx-4.2.8.6_dict.tar.xz
New:
fcitx-4.2.9_dict.tar.xz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.Ngj7CX/_old 2015-06-02 10:08:34.0 +0200
+++ /var/tmp/diff_new_pack.Ngj7CX/_new 2015-06-02 10:08:34.0 +0200
@@ -16,10 +16,10 @@
#
-%define libver -4_2_8
+%define libver -4_2_9
Name: fcitx
-Version:4.2.8.6
+Version:4.2.9
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0+
@@ -36,19 +36,11 @@
Source99: baselibs.conf
Patch: fcitx-4.2.8.5-fix-bashisms.patch
BuildRequires: cairo-devel
-%if 0%{?suse_version}
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
-BuildRequires: update-desktop-files
-%endif
-%if 0%{?fedora_version}
-BuildRequires: dbus-devel
-BuildRequires: dbus-glib-devel
-BuildRequires: desktop-file-utils
-BuildRequires: libxkbfile-devel
-%endif
BuildRequires: enchant-devel
BuildRequires: iso-codes-devel
+BuildRequires: update-desktop-files
# Dictionary ownership
BuildRequires: kde4-filesystem
%if 0%{?suse_version} = 1140
@@ -56,37 +48,39 @@
%endif
BuildRequires: libpresage-devel
BuildRequires: pango-devel
-%if 0%{?suse_version} = 1110 || 0%{?fedora_version}
+%if 0%{?suse_version} = 1110
BuildRequires: fdupes
%endif
-%if 0%{?suse_version} 1110 || 0%{?fedora_version}
+%if 0%{?suse_version} 1110
BuildRequires: libqt4-devel
%endif
-%if 0%{?suse_version} = 1210 || 0%{?fedora_version}
+%if 0%{?suse_version} = 1210
BuildRequires: lua-devel
%else
BuildRequires: lua51-devel
%endif
BuildRequires: cmake
+BuildRequires: extra-cmake-modules
BuildRequires: gtk2-devel
BuildRequires: opencc-devel
-%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
+%if 0%{?suse_version} = 1140
BuildRequires: gobject-introspection-devel
BuildRequires: gtk3-devel
%endif
BuildRequires: gcc-c++
BuildRequires: libicu-devel
BuildRequires: libxml2-devel
+BuildRequires: pkg-config
BuildRequires: xz
+BuildRequires: pkgconfig(xkbcommon) = 0.5.0
Requires: %{name}-gtk2 = %{version}-%{release}
Requires: lib%{name}%{libver} = %{version}-%{release}
-%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
+%if 0%{?suse_version} = 1140
Requires: %{name}-gtk3 = %{version}-%{release}
%endif
-%if 0%{?suse_version} 1110 || 0%{?fedora_version}
+%if 0%{?suse_version} 1110
Requires: %{name}-qt4 = %{version}-%{release}
%endif
-%if 0%{?suse_version}
Recommends: %{name}-pinyin = %{version}-%{release}
Recommends: %{name}-table = %{version}-%{release}
# These libraries are dlopen-ed in fcitx at runtime
@@ -96,16 +90,6 @@
Recommends: libpresage1
Recommends: libenchant1
Requires: %{name}-branding = %{version}
-%endif
-%if 0%{?fedora_version}
-Requires: %{name}-pinyin = %{version}-%{release}
-Requires: %{name}-table = %{version}-%{release}
-Requires: enchant
-Requires: libpresage1
-Requires: opencc
-Requires(post):%{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: locale(ko;zh_CN;zh_SG)
@@ -144,18 +128,13 @@
%description gtk2
GTK+ version 2 input module for Fcitx input method rfamework.
-%if
commit fcitx for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2015-04-07 09:29:39 Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) Package is fcitx Changes: --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2015-02-27 11:10:12.0 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2015-04-07 09:29:41.0 +0200 @@ -1,0 +2,6 @@ +Thu Apr 2 14:20:58 UTC 2015 - i...@marguerite.su + +- update version 4.2.8.6 + * add kf5 kcm support + +--- Old: fcitx-4.2.8.5_dict.tar.xz New: fcitx-4.2.8.6_dict.tar.xz Other differences: -- ++ fcitx.spec ++ --- /var/tmp/diff_new_pack.F0fHDi/_old 2015-04-07 09:29:42.0 +0200 +++ /var/tmp/diff_new_pack.F0fHDi/_new 2015-04-07 09:29:42.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define libver -4_2_8 Name: fcitx -Version:4.2.8.5 +Version:4.2.8.6 Release:0 Summary:Flexible Context-aware Input Tool with eXtension License:GPL-2.0+ ++ fcitx-4.2.8.5_dict.tar.xz - fcitx-4.2.8.6_dict.tar.xz ++ /work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.8.5_dict.tar.xz /work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.8.6_dict.tar.xz differ: char 27, line 1
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2015-02-27 11:10:09
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-11-18
22:49:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2015-02-27
11:10:12.0 +0100
@@ -1,0 +2,5 @@
+Thu Feb 26 12:22:34 UTC 2015 - hillw...@linuxfans.org
+
+- update version of opencc to 1.0.2
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.kXcooa/_old 2015-02-27 11:10:13.0 +0100
+++ /var/tmp/diff_new_pack.kXcooa/_new 2015-02-27 11:10:13.0 +0100
@@ -92,7 +92,7 @@
# These libraries are dlopen-ed in fcitx at runtime
# for spell-checking for keyboard users. ld can't find
# them, so explicitly recommends.
-Recommends: libopencc1
+Recommends: libopencc2
Recommends: libpresage1
Recommends: libenchant1
Requires: %{name}-branding = %{version}
@@ -403,7 +403,7 @@
-DCMAKE_CXX_FLAGS=$RPM_OPT_FLAGS \
-DCMAKE_VERBOSE_MAKEFILE=On \
-DCMAKE_BUILD_TYPE=Release \
--DOPENCC_LIBRARY_FILENAME=libopencc.so.1 \
+-DOPENCC_LIBRARY_FILENAME=libopencc.so.2 \
-DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \
-DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \
%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2014-11-18 22:47:07
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-11-11
01:11:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-11-18
22:49:01.0 +0100
@@ -1,0 +2,7 @@
+Mon Nov 17 00:58:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashism in env_setup.sh script
+- add patches:
+ * fcitx-4.2.8.5-fix-bashisms.patch
+
+---
New:
fcitx-4.2.8.5-fix-bashisms.patch
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.4rpZf5/_old 2014-11-18 22:49:02.0 +0100
+++ /var/tmp/diff_new_pack.4rpZf5/_new 2014-11-18 22:49:02.0 +0100
@@ -34,6 +34,7 @@
Source8:openSUSE-themes.tar.gz
Source9:macros.%{name}
Source99: baselibs.conf
+Patch: fcitx-4.2.8.5-fix-bashisms.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@@ -383,6 +384,7 @@
%prep
%setup -q -n %{name}-%{version}
+%patch -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if %suse_version 1310
sed -i \
++ fcitx-4.2.8.5-fix-bashisms.patch ++
diff -Ndur fcitx-4.2.8.5/data/env_setup.sh
fcitx-4.2.8.5-fix-bashisms/data/env_setup.sh
--- fcitx-4.2.8.5/data/env_setup.sh 2014-09-18 03:26:23.0 +0300
+++ fcitx-4.2.8.5-fix-bashisms/data/env_setup.sh2014-11-17
02:56:52.806374092 +0200
@@ -31,7 +31,7 @@
detect_qt_im_module()
{
QTPATH=`qmake -query QT_INSTALL_PLUGINS`
-ls $QTPATH/inputmethods/*fcitx* /dev/null
+ls $QTPATH/inputmethods/*fcitx* /dev/null 21
}
if [ -z $XMODIFIERS ]; then
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2014-11-11 01:10:50
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-09-22
09:23:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-11-11
01:11:37.0 +0100
@@ -1,0 +2,15 @@
+Sun Nov 9 19:42:33 UTC 2014 - i...@marguerite.su
+
+- fix Harlequin menu color, it should be greenish
+
+---
+Sun Nov 9 07:00:33 UTC 2014 - i...@marguerite.su
+
+- update themes
+ * reworked Dartmouth New Air
+ * added Harlequin
+- droped input.svgz
+ * new input-Dartmouth/Harlequin.svgz are in openSUSE-themes.tar.gz
+refers to Dark/Light versions of openSUSE
+
+---
Old:
input.svgz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.hX5pL9/_old 2014-11-11 01:11:39.0 +0100
+++ /var/tmp/diff_new_pack.hX5pL9/_new 2014-11-11 01:11:39.0 +0100
@@ -33,7 +33,6 @@
Source7:xinput-fcitx
Source8:openSUSE-themes.tar.gz
Source9:macros.%{name}
-Source10: input.svgz
Source99: baselibs.conf
BuildRequires: cairo-devel
%if 0%{?suse_version}
@@ -324,7 +323,7 @@
%if 0%{?suse_version}
%package branding-openSUSE
-Summary:openSUSE default Skin for Fcitx
+Summary:openSUSE default Skins for Fcitx
Group: System/I18n/Chinese
Requires: %{name} = %{version}-%{release}
%if 0%{?suse_version} = 1140
@@ -335,7 +334,7 @@
Supplements:packageand(%{name}:branding-openSUSE)
%description branding-openSUSE
-openSUSE default skin for Fcitx
+openSUSE default skins for Fcitx
You can either use this package or download from kde-look.org using knewstaff
in fcitx-config-kde4.
@@ -433,20 +432,20 @@
%if 0%{?suse_version}
# install openSUSE skins
-pushd %{buildroot}%{_datadir}/%{name}/skin/
tar -xzf %{SOURCE8}
-mv openSUSE-themes/Dartmouth ./openSUSE-default
-mv openSUSE-themes/New_Air ./New_Air
-rm -rf openSUSE-themes
-popd
+mv openSUSE-themes/Harlequin %{buildroot}%{_datadir}/%{name}/skin/
+mv openSUSE-themes/Dartmouth %{buildroot}%{_datadir}/%{name}/skin/
+mv openSUSE-themes/NewAir %{buildroot}%{_datadir}/%{name}/skin/
# 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 %{SOURCE10} %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/
+mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/
+cp -r openSUSE-themes/input-Dartmouth.svgz
%{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz
+cp -r openSUSE-themes/input-Harlequin.svgz
%{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz
# Change default skin
pushd %{buildroot}%{_datadir}/%{name}/configdesc
-sed -i 's/DefaultValue=default/DefaultValue=openSUSE-default/'
%{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc
+sed -i 's/DefaultValue=default/DefaultValue=Harlequin/'
%{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc
popd
%endif
@@ -625,8 +624,9 @@
%exclude %{_libdir}/%{name}/libexec/fcitx-po-parser
%exclude %{_libdir}/%{name}/libexec/fcitx-scanner
%if 0%{?suse_version}
-%exclude %{_datadir}/%{name}/skin/openSUSE-default
-%exclude %{_datadir}/%{name}/skin/New_Air
+%exclude %{_datadir}/%{name}/skin/Harlequin
+%exclude %{_datadir}/%{name}/skin/Dartmouth
+%exclude %{_datadir}/%{name}/skin/NewAir
%endif
%exclude %{_datadir}/%{name}/skin/classic
%exclude %{_datadir}/%{name}/skin/dark
@@ -736,17 +736,23 @@
%files branding-openSUSE
%defattr(-,root,root)
-%{_datadir}/%{name}/skin/openSUSE-default
+%{_datadir}/%{name}/skin/Harlequin
+%{_datadir}/%{name}/skin/Dartmouth
%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz
+%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz
+%if 0%{?suse_version} = 1310
+%dir %{_kde4_appsdir}/desktoptheme/openSUSElight
+%dir %{_kde4_appsdir}/desktoptheme/openSUSElight/icons
%if 0%{?suse_version} = 1220
%dir %{_kde4_appsdir}/desktoptheme
%dir %{_kde4_appsdir}/desktoptheme/openSUSE
%dir %{_kde4_appsdir}/desktoptheme/openSUSE/icons
%endif
+%endif
%files skin-new-air
%defattr(-,root,root)
-%{_datadir}/%{name}/skin/New_Air
+%{_datadir}/%{name}/skin/NewAir
%endif
++ openSUSE-themes.tar.gz ++
148623 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2014-09-22 09:23:54 Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) Package is fcitx Changes: --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-08-11 10:07:35.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-09-22 09:23:56.0 +0200 @@ -1,0 +2,6 @@ +Sat Sep 20 09:32:24 UTC 2014 - i...@marguerite.su + +- update version 4.2.8.5 + * bugfix release + +--- Old: fcitx-4.2.8.4_dict.tar.xz New: fcitx-4.2.8.5_dict.tar.xz Other differences: -- ++ fcitx.spec ++ --- /var/tmp/diff_new_pack.gnYIr8/_old 2014-09-22 09:23:57.0 +0200 +++ /var/tmp/diff_new_pack.gnYIr8/_new 2014-09-22 09:23:57.0 +0200 @@ -19,7 +19,7 @@ %define libver -4_2_8 Name: fcitx -Version:4.2.8.4 +Version:4.2.8.5 Release:0 Summary:Flexible Context-aware Input Tool with eXtension License:GPL-2.0+ ++ fcitx-4.2.8.4_dict.tar.xz - fcitx-4.2.8.5_dict.tar.xz ++ /work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.8.4_dict.tar.xz /work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.8.5_dict.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2014-08-11 10:07:26
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-06-10
14:38:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-08-11
10:07:35.0 +0200
@@ -1,0 +2,17 @@
+Sat Aug 9 05:33:21 UTC 2014 - i...@marguerite.su
+
+- add baselibs.conf to SOURCE99
+
+---
+Fri Aug 8 14:55:32 UTC 2014 - fcro...@suse.com
+
+- Fix default category for fcitx (ensure it doesn't go to Other on
+ GNOME Classic)
+
+---
+Tue Aug 5 16:22:59 UTC 2014 - sch...@suse.de
+
+- Build with RPM_OPT_FLAGS
+- Don't strip binaries
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.PIRXz3/_old 2014-08-11 10:07:36.0 +0200
+++ /var/tmp/diff_new_pack.PIRXz3/_new 2014-08-11 10:07:36.0 +0200
@@ -34,6 +34,7 @@
Source8:openSUSE-themes.tar.gz
Source9:macros.%{name}
Source10: input.svgz
+Source99: baselibs.conf
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@@ -397,6 +398,9 @@
# fix dlopen-ed library name
cmake .. \
+-DCMAKE_C_FLAGS=$RPM_OPT_FLAGS \
+-DCMAKE_CXX_FLAGS=$RPM_OPT_FLAGS \
+-DCMAKE_VERBOSE_MAKEFILE=On \
-DCMAKE_BUILD_TYPE=Release \
-DOPENCC_LIBRARY_FILENAME=libopencc.so.1 \
-DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \
@@ -452,7 +456,7 @@
%if 0%{?suse_version}
%suse_update_desktop_file fcitx Utility DesktopUtility
%suse_update_desktop_file fcitx-skin-installer Utility DesktopUtility
-%suse_update_desktop_file fcitx-configtool System X-SuSE-SystemSetup
+%suse_update_desktop_file -r fcitx-configtool System X-SuSE-SystemSetup
%endif
%if 0%{?fedora_version}
@@ -526,14 +530,6 @@
%endif
%endif
-# strip unnessary libraries
-%{__strip} %{buildroot}%{_libdir}/%{name}/*.so
-%{__strip} %{buildroot}%{_libdir}/libfcitx*.so.*
-%{__strip} %{buildroot}%{_libdir}/gtk-2.0/*/immodules/im-%{name}.so
-%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
-%{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so
-%endif
-
%post gtk2
%gtk2_immodule_post
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2014-06-10 14:38:52
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-05-08
12:38:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-06-10
14:38:53.0 +0200
@@ -1,0 +2,16 @@
+Sat Jun 7 16:41:30 UTC 2014 - i...@marguerite.su
+
+- update version 4.2.8.4
+ * Fix github issue fcitx/fcitx#134,137,153,154
+ * Fix google code issue 728
+ * Implement close event when close input method
+ * Restart from menu should be faster (but who cares :P).
+- remove patch: fcitx-context-variable-disable-punc-on-the-fly.patch
+ * upstreamed
+- remove patch: fcitx-password-visible-on-clutter-entry.patch
+ * upstreamed
+- tweak New_Air theme's color to increase contrast in darker
+ plasma themes.
+
+
+---
Old:
fcitx-4.2.8.3_dict.tar.xz
fcitx-context-variable-disable-punc-on-the-fly.patch
fcitx-password-visible-on-clutter-entry.patch
New:
fcitx-4.2.8.4_dict.tar.xz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.IyOAxy/_old 2014-06-10 14:38:55.0 +0200
+++ /var/tmp/diff_new_pack.IyOAxy/_new 2014-06-10 14:38:55.0 +0200
@@ -19,7 +19,7 @@
%define libver -4_2_8
Name: fcitx
-Version:4.2.8.3
+Version:4.2.8.4
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0+
@@ -34,10 +34,6 @@
Source8:openSUSE-themes.tar.gz
Source9:macros.%{name}
Source10: input.svgz
-#PATCH-FEATURE-OPENSUSE marguer...@opensuse.org To support sougou IM, we need
a context
-# variable to disable punc on the fly
-Patch: fcitx-context-variable-disable-punc-on-the-fly.patch
-Patch1: fcitx-password-visible-on-clutter-entry.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@@ -387,8 +383,6 @@
%prep
%setup -q -n %{name}-%{version}
-%patch -p1
-%patch1 -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if %suse_version 1310
sed -i \
@@ -472,20 +466,22 @@
# fix doc
%if 0%{?suse_version}
-mkdir %{buildroot}%{_docdir}
-mv %{buildroot}%{_datadir}/doc/%{name}/ %{buildroot}%{_docdir}
+mkdir -p %{buildroot}%{_docdir}/
+mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/
cp -r %{SOURCE2} %{buildroot}%{_docdir}/%{name}/
cp -r %{SOURCE3} %{buildroot}%{_docdir}/%{name}/
cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/
cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/
+cp -r COPYING %{buildroot}%{_docdir}/%{name}/
%endif
%if 0%{?fedora_version}
mkdir %{buildroot}%{_docdir}/packages/
-mv %{buildroot}%{_datadir}/doc/%{name}/ %{buildroot}%{_docdir}/packages/
+mv %{buildroot}%{_docdir}/%{name}/ %{buildroot}%{_docdir}/packages/
cp -r %{SOURCE2} %{buildroot}%{_docdir}/packages/%{name}/
cp -r %{SOURCE3} %{buildroot}%{_docdir}/packages/%{name}/
cp -r AUTHORS %{buildroot}%{_docdir}/packages/%{name}/
cp -r ChangeLog %{buildroot}%{_docdir}/packages/%{name}/
+cp -r COPYING %{buildroot}%{_docdir}/packages/%{name}/
%endif
# create autostart
@@ -591,7 +587,6 @@
%files -f %{name}.lang
%defattr(-,root,root)
-%doc COPYING
%{_bindir}/%{name}
%{_bindir}/%{name}-autostart
%{_bindir}/%{name}-configtool
@@ -609,11 +604,11 @@
%{_libdir}/%{name}/
%if 0%{?suse_version}
%config %{_sysconfdir}/X11/xim.d/
-%{_docdir}/%{name}/
+%doc %{_docdir}/%{name}/
%endif
%if 0%{?fedora_version}
%config %{_sysconfdir}/X11/xinit/xinput.d/
-%{_docdir}/packages/%{name}/
+%doc %{_docdir}/packages/%{name}/
%config %{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
%endif
++ fcitx-4.2.8.3_dict.tar.xz - fcitx-4.2.8.4_dict.tar.xz ++
/work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.8.3_dict.tar.xz
/work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.8.4_dict.tar.xz differ: char
25, line 1
++ openSUSE-themes.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-themes/New_Air/fcitx_skin.conf
new/openSUSE-themes/New_Air/fcitx_skin.conf
--- old/openSUSE-themes/New_Air/fcitx_skin.conf 2014-05-01 15:17:37.0
+0200
+++ new/openSUSE-themes/New_Air/fcitx_skin.conf 2014-05-06 06:50:20.0
+0200
@@ -22,7 +22,7 @@
# 输入信息颜色
InputColor=61 173 229
# 候选词索引颜色
-IndexColor=136 138 133
+IndexColor=119 119 119
# 第一候选词颜色
FirstCandColor=52 101 164
# 用户词组颜色
@@ -30,7 +30,7 @@
# 码表提示颜色
CodeColor=8 157 36
# 其他颜色
-OtherColor=136 138 133
+OtherColor=68 68 68
# 活动菜单项颜色
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2014-05-02 13:55:22
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-04-25
16:09:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-05-02
13:55:23.0 +0200
@@ -1,0 +2,10 @@
+Thu May 1 14:14:02 UTC 2014 - i...@marguerite.su
+
+- Fix bnc#851983: fcitx tray icon is incompatible with other
+ systray icons by refreshing input.svgz
+- Fix environment variables: QT_IM_MODULE supports Qt4 Qt5 now
+ we need a new QT4_IM_MODULE variable set to prepare for the
+ worst
+- new skin: New Air. Idea from KDE Air theme.
+
+---
Old:
openSUSE-default.tar.gz
New:
input.svgz
openSUSE-themes.tar.gz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.0 +0200
+++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.0 +0200
@@ -31,12 +31,13 @@
Source3:xim.fcitx.suse.template
# for fedora auto-start
Source7:xinput-fcitx
-Source8:openSUSE-default.tar.gz
+Source8:openSUSE-themes.tar.gz
Source9:macros.%{name}
-BuildRequires: cairo-devel
+Source10: input.svgz
#PATCH-FEATURE-OPENSUSE marguer...@opensuse.org To support sougou IM, we need
a context
# variable to disable punc on the fly
Patch: fcitx-context-variable-disable-punc-on-the-fly.patch
+BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
@@ -340,6 +341,20 @@
You can either use this package or download from kde-look.org using knewstaff
in fcitx-config-kde4.
+%package skin-new-air
+Summary:New Air skin for Fcitx
+Group: System/I18n/Chinese
+Requires: %{name} = %{version}
+%if 0%{?suse_version} = 1140
+BuildArch: noarch
+%endif
+
+%description skin-new-air
+New Air skin for Fcitx, inspired by KDE Air theme.
+
+You can either use this package or download from kde-look.org using knewstaff
in
+fcitx-config-kde4.
+
%endif
%package skin-classic
@@ -417,13 +432,19 @@
cd ..
%if 0%{?suse_version}
-# install openSUSE branding
+# install openSUSE skins
pushd %{buildroot}%{_datadir}/%{name}/skin/
tar -xzf %{SOURCE8}
+mv openSUSE-themes/Dartmouth ./openSUSE-default
+mv openSUSE-themes/New_Air ./New_Air
+rm -rf openSUSE-themes
+popd
+
# 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
+cp -r %{SOURCE10} %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/
+
+# Change default skin
pushd %{buildroot}%{_datadir}/%{name}/configdesc
sed -i 's/DefaultValue=default/DefaultValue=openSUSE-default/'
%{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc
popd
@@ -612,6 +633,7 @@
%exclude %{_libdir}/%{name}/libexec/fcitx-scanner
%if 0%{?suse_version}
%exclude %{_datadir}/%{name}/skin/openSUSE-default
+%exclude %{_datadir}/%{name}/skin/New_Air
%endif
%exclude %{_datadir}/%{name}/skin/classic
%exclude %{_datadir}/%{name}/skin/dark
@@ -722,13 +744,17 @@
%files branding-openSUSE
%defattr(-,root,root)
%{_datadir}/%{name}/skin/openSUSE-default
-%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svg
+%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz
%if 0%{?suse_version} = 1220
%dir %{_kde4_appsdir}/desktoptheme
%dir %{_kde4_appsdir}/desktoptheme/openSUSE
%dir %{_kde4_appsdir}/desktoptheme/openSUSE/icons
%endif
+%files skin-new-air
+%defattr(-,root,root)
+%{_datadir}/%{name}/skin/New_Air
+
%endif
%files skin-classic
++ xim.d-fcitx ++
--- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.0 +0200
+++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.0 +0200
@@ -10,6 +10,7 @@
export GTK3_IM_MODULE=fcitx
export QT_IM_SWITCHER=imsw-multi
export QT_IM_MODULE=fcitx
+export QT4_IM_MODULE=fcitx
# Avoid relying on autolaunch to improvise D-Bus sessions for each process
if test -z $DBUS_SESSION_BUS_ADDRESS ; then
++ xim.fcitx.suse.template ++
--- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.0 +0200
+++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.0 +0200
@@ -22,4 +22,5 @@
export GTK3_IM_MODULE=fcitx
export QT_IM_SWITCHER=imsw-multi
export QT_IM_MODULE=fcitx
+export QT4_IM_MODULE=fcitx
fcitx -d
++ xinput-fcitx ++
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2014-04-25 16:09:05
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-02-21
06:55:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-04-25
16:09:06.0 +0200
@@ -1,0 +2,7 @@
+Thu Apr 17 16:10:11 UTC 2014 - i...@marguerite.su
+
+- add patch: fcitx-context-variable-disable-punc-on-the-fly.patch
+ * To support the recently released Sogou Pinyin, we need this
+patch to allow Sogou to disable punc on the fly.
+
+---
New:
fcitx-context-variable-disable-punc-on-the-fly.patch
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.SuVIIB/_old 2014-04-25 16:09:07.0 +0200
+++ /var/tmp/diff_new_pack.SuVIIB/_new 2014-04-25 16:09:07.0 +0200
@@ -34,6 +34,9 @@
Source8:openSUSE-default.tar.gz
Source9:macros.%{name}
BuildRequires: cairo-devel
+#PATCH-FEATURE-OPENSUSE marguer...@opensuse.org To support sougou IM, we need
a context
+# variable to disable punc on the fly
+Patch: fcitx-context-variable-disable-punc-on-the-fly.patch
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
@@ -368,6 +371,7 @@
%prep
%setup -q -n %{name}-%{version}
+%patch -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if %suse_version 1310
sed -i \
++ fcitx-context-variable-disable-punc-on-the-fly.patch ++
From: Xuetian Weng wen...@gmail.com
Date: Tue, 11 Mar 2014 00:13:43 +0800
Subject: add a context variable to disable punc
---
src/lib/fcitx/context.h |2 ++
src/module/punc/punc.c | 12
2 files changed, 14 insertions(+)
diff --git a/src/lib/fcitx/context.h b/src/lib/fcitx/context.h
index 32115af..05f0f91 100644
--- a/src/lib/fcitx/context.h
+++ b/src/lib/fcitx/context.h
@@ -70,6 +70,8 @@ extern C {
#define CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT
CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT
/** disable auto first candidate highlight */
#define CONTEXT_DISABLE_FULLWIDTH CONTEXT_DISABLE_FULLWIDTH
+/** disable punc module */
+#define CONTEXT_DISABLE_PUNC CONTEXT_DISABLE_PUNC
/**
* @brief register a new global context variable
diff --git a/src/module/punc/punc.c b/src/module/punc/punc.c
index be6dec3..3327f9c 100644
--- a/src/module/punc/punc.c
+++ b/src/module/punc/punc.c
@@ -154,6 +154,8 @@ void* PuncCreate(FcitxInstance* instance)
PuncWhichCopy, PuncWhichFree,
puncState);
+FcitxInstanceRegisterWatchableContext(instance, CONTEXT_DISABLE_PUNC,
FCT_Boolean, FCF_ResetOnInputMethodChange);
+
FcitxPuncAddFunctions(instance);
return puncState;
}
@@ -250,6 +252,11 @@ boolean PuncPreFilter(void* arg, FcitxKeySym sym, unsigned
int state,
{
FCITX_UNUSED(retVal);
FcitxPuncState *puncState = (FcitxPuncState*)arg;
+boolean disablePunc = FcitxInstanceGetContextBoolean(
+puncState-owner, CONTEXT_DISABLE_PUNC);
+if (disablePunc)
+return false;
+
if (FcitxHotkeyIsHotKeySimple(sym, state)
!FcitxHotkeyIsHotKeyDigit(sym, state) !IsHotKeyPunc(sym, state))
puncState-bLastIsNumber = false;
@@ -269,6 +276,11 @@ boolean ProcessPunc(void* arg, FcitxKeySym sym, unsigned
int state, INPUT_RETURN
if (*retVal != IRV_TO_PROCESS)
return false;
+boolean disablePunc = FcitxInstanceGetContextBoolean(
+puncState-owner, CONTEXT_DISABLE_PUNC);
+if (disablePunc)
+return false;
+
FcitxCandidateWordList *candList = FcitxInputStateGetCandidateList(input);
if (FcitxCandidateWordGetListSize(candList) != 0) {
if (FcitxCandidateWordGetHasGoneToNextPage(candList)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2014-02-21 06:55:27
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-02-15
08:03:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-02-21
06:55:28.0 +0100
@@ -1,0 +2,5 @@
+Fri Feb 14 13:07:53 UTC 2014 - fcro...@suse.com
+
+- Ensure COPYING is installed.
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.lXEI7N/_old 2014-02-21 06:55:28.0 +0100
+++ /var/tmp/diff_new_pack.lXEI7N/_new 2014-02-21 06:55:29.0 +0100
@@ -564,6 +564,7 @@
%files -f %{name}.lang
%defattr(-,root,root)
+%doc COPYING
%{_bindir}/%{name}
%{_bindir}/%{name}-autostart
%{_bindir}/%{name}-configtool
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2014-02-15 08:03:58
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-12-10
17:42:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-02-15
08:03:59.0 +0100
@@ -1,0 +2,6 @@
+Fri Feb 14 12:10:13 CET 2014 - ti...@suse.de
+
+- Fix *-32bit post and postun calls for gtk-query-immodules-2 on
+ openSUSE 13.1 and later (bnc#845860)
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.njVdP8/_old 2014-02-15 08:04:00.0 +0100
+++ /var/tmp/diff_new_pack.njVdP8/_new 2014-02-15 08:04:00.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fcitx
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -368,6 +368,13 @@
%prep
%setup -q -n %{name}-%{version}
+# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
+%if %suse_version 1310
+sed -i \
+-e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1
prefix%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \
+-e's@\(gtk-query-immodules-2.0\) --update-cache@\1
prefix%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \
+$RPM_SOURCE_DIR/baselibs.conf
+%endif
%build
mkdir build
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.njVdP8/_old 2014-02-15 08:04:00.0 +0100
+++ /var/tmp/diff_new_pack.njVdP8/_new 2014-02-15 08:04:00.0 +0100
@@ -7,14 +7,14 @@
fcitx-gtk2
requires libfcitx-4_2_8-targettype = version
post %if %_lib == lib64
- post prefix%{_bindir}/gtk-query-immodules-2.0-64
%{_sysconfdir}/gtk-2.0/gtk64.immodules
+ post prefix%{_bindir}/gtk-query-immodules-2.0-64 --update-cache
post %else
- post prefix%{_bindir}/gtk-query-immodules-2.0
%{_sysconfdir}/gtk-2.0/gtk.immodules
+ post prefix%{_bindir}/gtk-query-immodules-2.0 --update-cache
post %endif
postun %if %_lib == lib64
- postun prefix%{_bindir}/gtk-query-immodules-2.0-64
%{_sysconfdir}/gtk-2.0/gtk64.immodules
+ postun prefix%{_bindir}/gtk-query-immodules-2.0-64 --update-cache
postun %else
- postun prefix%{_bindir}/gtk-query-immodules-2.0
%{_sysconfdir}/gtk-2.0/gtk.immodules
+ postun prefix%{_bindir}/gtk-query-immodules-2.0 --update-cache
postun %endif
fcitx-gtk3
requires libfcitx-4_2_8-targettype = version
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2013-12-10 17:42:15 Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) Package is fcitx Changes: --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-11-04 08:49:22.0 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-12-10 17:42:17.0 +0100 @@ -1,0 +2,5 @@ +Sat Dec 7 04:23:04 UTC 2013 - swy...@gmail.com + +- fix fcitx can't input in gnome-terminal + +--- Other differences: -- ++ xim.d-fcitx ++ --- /var/tmp/diff_new_pack.tRGOos/_old 2013-12-10 17:42:18.0 +0100 +++ /var/tmp/diff_new_pack.tRGOos/_new 2013-12-10 17:42:18.0 +0100 @@ -3,17 +3,19 @@ return 1 fi -# Avoid relying on autolaunch to improvise D-Bus sessions for each process -if test -z $DBUS_SESSION_BUS_ADDRESS ; then - eval `dbus-launch --sh-syntax --exit-with-session` -fi - +#make sure set these vars before dbus-launch export LC_CTYPE=$LANG export XMODIFIERS=@im=fcitx export GTK_IM_MODULE=fcitx export GTK3_IM_MODULE=fcitx export QT_IM_SWITCHER=imsw-multi export QT_IM_MODULE=fcitx + +# Avoid relying on autolaunch to improvise D-Bus sessions for each process +if test -z $DBUS_SESSION_BUS_ADDRESS ; then + eval `dbus-launch --sh-syntax --exit-with-session` +fi + fcitx -d # success: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-11-04 08:49:21
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-09-29
17:48:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-11-04
08:49:22.0 +0100
@@ -1,0 +2,5 @@
+Sat Nov 2 07:31:38 UTC 2013 - i...@marguerite.su
+
+- fix bnc#848694: fcitx still use the old gtk_immodule_post/postun
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.G5QBs6/_old 2013-11-04 08:49:23.0 +0100
+++ /var/tmp/diff_new_pack.G5QBs6/_new 2013-11-04 08:49:23.0 +0100
@@ -504,32 +504,16 @@
%{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so
%endif
-# Convenient define for the scriplets
-%if %{_lib} == lib64
-%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0-64
-%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules}
%{_sysconfdir}/gtk-2.0/gtk64.immodules
-%else
-%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0
-%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules}
%{_sysconfdir}/gtk-2.0/gtk.immodules
-%endif
-
%post gtk2
-%{_gtk2_query_immodules_update_cache}
+%gtk2_immodule_post
%postun gtk2
-%{_gtk2_query_immodules_update_cache}
+%gtk2_immodule_postun
%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
-%if %{_lib} == lib64
-%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0-64
-%else
-%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0
-%endif
-%define _gtk3_query_immodules_update_cache %{_gtk3_query_immodules}
--update-cache
-
%post gtk3
-%{_gtk3_query_immodules_update_cache}
+%gtk3_immodule_post
# Add fcitx icons to gnome3 panel
TARGET=/usr/share/gnome-shell/js/ui/statusIconDispatcher.js
@@ -539,7 +523,7 @@
fi
%postun gtk3
-%{_gtk3_query_immodules_update_cache}
+%gtk3_immodule_postun
%endif
++ xim.d-fcitx ++
--- /var/tmp/diff_new_pack.G5QBs6/_old 2013-11-04 08:49:23.0 +0100
+++ /var/tmp/diff_new_pack.G5QBs6/_new 2013-11-04 08:49:23.0 +0100
@@ -1,6 +1,5 @@
if ! type -p fcitx /dev/null 21 ; then
- echo fcitx is not available.
- PATH=$OLD_PATH
+ echo fcitx is not installed. please run `sudo zypper in fcitx`.
return 1
fi
@@ -10,7 +9,6 @@
fi
export LC_CTYPE=$LANG
-# So you can use either zh_CN.UTF-8 or zh_CN.GB2312
export XMODIFIERS=@im=fcitx
export GTK_IM_MODULE=fcitx
export GTK3_IM_MODULE=fcitx
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2013-09-29 17:48:10 Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) Package is fcitx Changes: --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-09-26 19:32:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-09-29 17:48:13.0 +0200 @@ -1,0 +2,7 @@ +Sat Sep 28 09:02:48 UTC 2013 - i...@marguerite.su + +- update version 4.2.8.3 + * fix for non-utf8 env + * fix for classic UI cursor position + +--- Old: fcitx-4.2.8.2_dict.tar.xz New: fcitx-4.2.8.3_dict.tar.xz Other differences: -- ++ fcitx.spec ++ --- /var/tmp/diff_new_pack.pysz5A/_old 2013-09-29 17:48:15.0 +0200 +++ /var/tmp/diff_new_pack.pysz5A/_new 2013-09-29 17:48:15.0 +0200 @@ -19,7 +19,7 @@ %define libver -4_2_8 Name: fcitx -Version:4.2.8.2 +Version:4.2.8.3 Release:0 Summary:Flexible Context-aware Input Tool with eXtension License:GPL-2.0+ ++ fcitx-4.2.8.2_dict.tar.xz - fcitx-4.2.8.3_dict.tar.xz ++ /work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.8.2_dict.tar.xz /work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.8.3_dict.tar.xz differ: char 25, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-09-26 19:32:26
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-07-18
16:00:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-09-26
19:32:28.0 +0200
@@ -1,0 +2,15 @@
+Thu Sep 26 05:14:42 UTC 2013 - i...@marguerite.su
+
+- update version 4.2.8.2
+ * a bug fix release with some small new features
+ * implement preedit blacklist, and gvim preedit is now blacklisted by
+ default (thanks to lilydjwg)
+ * add more unicode support to unicode addon (thanks to jimmyxu)
+ * more fix on xmodmap loading, now we only load it if we did a layout reset.
+ * fix some table punctuation related bug
+ * install a dbus activatation file by default.
+ * install more library based on prefix.
+ * fix table configuration parsing
+ * fix trigger on release
+
+---
Old:
fcitx-4.2.8.1_dict.tar.xz
New:
fcitx-4.2.8.2_dict.tar.xz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.aewAdo/_old 2013-09-26 19:32:30.0 +0200
+++ /var/tmp/diff_new_pack.aewAdo/_new 2013-09-26 19:32:30.0 +0200
@@ -19,7 +19,7 @@
%define libver -4_2_8
Name: fcitx
-Version:4.2.8.1
+Version:4.2.8.2
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0+
@@ -391,6 +391,7 @@
%endif
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir} \
+-DSYSCONFDIR=%{_sysconfdir} \
-DENABLE_LUA=On
# fix gobject-introspection build
@@ -583,6 +584,7 @@
%{_datadir}/applications/*.desktop
%{_datadir}/icons/*
%{_datadir}/mime/packages/*
+%{_datadir}/dbus-1/services/org.fcitx.Fcitx.service
%{_mandir}/man1/fcitx.1.gz
%{_mandir}/man1/fcitx-remote.1.gz
%{_libdir}/%{name}/
++ fcitx-4.2.8.1_dict.tar.xz - fcitx-4.2.8.2_dict.tar.xz ++
/work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.8.1_dict.tar.xz
/work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.8.2_dict.tar.xz differ: char
25, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-07-18 16:00:53
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-07-08
15:08:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-07-18
16:00:55.0 +0200
@@ -1,0 +2,16 @@
+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
+
+---
Old:
fcitx-4.2.8-arch-dependent-file-in-usr-share.patch
fcitx-4.2.8-freedesktop-notify.c-DBUS_TIMEOUT_USE_DEFAULT.patch
fcitx-4.2.8_dict.tar.xz
New:
fcitx-4.2.8.1_dict.tar.xz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.4NJeHh/_old 2013-07-18 16:00:56.0 +0200
+++ /var/tmp/diff_new_pack.4NJeHh/_new 2013-07-18 16:00:56.0 +0200
@@ -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 @@
Source7:xinput-fcitx
Source8:openSUSE-default.tar.gz
Source9:macros.%{name}
-# PATCH-FIX-UPSTREAM marguer...@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 marguer...@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 @@
%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 @@
%prep
%setup -q -n %{name}-%{version}
-%patch -p1
-%patch1 -p1
%build
mkdir build
@@ -409,6 +408,9 @@
# 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 @@
%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
++ fcitx-4.2.8_dict.tar.xz - fcitx-4.2.8.1_dict.tar.xz ++
/work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.8_dict.tar.xz
/work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.8.1_dict.tar.xz differ: char
26, line 1
++ openSUSE-default.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-default/source/inactive.svg
new/openSUSE-default/source/inactive.svg
--- old/openSUSE-default/source/inactive.svg2013-01-27 15:41:25.0
+0100
+++ new/openSUSE-default/source/inactive.svg2013-07-05 21:08:44.0
+0200
@@ -40,7 +40,7 @@
fit-margin-right=0
fit-margin-bottom=0
inkscape:window-width=1024
- inkscape:window-height=721
+ inkscape:window-height=718
inkscape:window-x=-2
inkscape:window-y=-3
inkscape:window-maximized=1 /
@@ -52,7 +52,7 @@
dc:formatimage/svg+xml/dc:format
dc:type
rdf:resource=http://purl.org/dc/dcmitype/StillImage; /
-dc:title/dc:title
+dc:title /
/cc:Work
/rdf:RDF
/metadata
@@ -62,7 +62,7 @@
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-07-08 15:08:15
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-04-29
09:53:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-07-08
15:08:17.0 +0200
@@ -1,0 +2,22 @@
+Sun Jun 30 23:12:53 UTC 2013 - i...@marguerite.su
+
+- update version 4.2.8
+ * New Default Theme
+ * Add modifier only key support to trigger keys
+ * New DBus based Tray Icon support
+ * Desktop Notification Support
+ * First time start will only choose language in current locale
+ * Use first keyboard input method as default keyboard layout for most case
+ * fcitx-qt supports a key grab widget forked from KDE, and Qt - Fcitx Key
+translation.
+ * Multi file quickphrase Support.
+ * Ship with some default quick phrase
+ * quickphrase editor support
+- drop all old patches: upstream absorbed.
+- add new patch:
fcitx-4.2.8-freedesktop-notify.c-DBUS_TIMEOUT_USE_DEFAULT.patch
+ * DBUS_TIMEOUT_USE_DEFAULT is undefined in
src/module/freedesktop-notify/freedesktop-notify.c
+- add new patch: fcitx-4.2.8-arch-dependent-file-in-usr-share.patch
+ * don't install fcitx-po-parser,fcitx-scanner,comp-spell-dict into
+/usr/share/cmake/fcitx
+
+---
Old:
bnc801318-fcitx-4.2.7-xkb-rule-symlink-detection.patch
fcitx-4.2.7-compat-12.2.patch
fcitx-4.2.7-compat-gcc46.patch
fcitx-4.2.7-compat-qt474.patch
fcitx-4.2.7.tar.bz2
New:
fcitx-4.2.8-arch-dependent-file-in-usr-share.patch
fcitx-4.2.8-freedesktop-notify.c-DBUS_TIMEOUT_USE_DEFAULT.patch
fcitx-4.2.8_dict.tar.xz
macros.fcitx
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.ruqp5l/_old 2013-07-08 15:08:19.0 +0200
+++ /var/tmp/diff_new_pack.ruqp5l/_new 2013-07-08 15:08:19.0 +0200
@@ -15,33 +15,28 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-%define libver -4_2_7
+
+%define libver -4_2_8
Name: fcitx
-Version:4.2.7
+Version:4.2.8
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0+
Group: System/I18n/Chinese
Url:http://code.google.com/p/fcitx
-#Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz
-# use bzip to be compatible with sles.
-Source: %{name}-%{version}.tar.bz2
+Source:
http://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz
Source1:xim.d-fcitx
Source2:fcitx-README.suse
Source3:xim.fcitx.suse.template
# for fedora auto-start
Source7:xinput-fcitx
Source8:openSUSE-default.tar.gz
-# fix-for-openSUSE wen...@gmail.com - fix opensuse builds = 1220
-Patch1: fcitx-4.2.7-compat-12.2.patch
-# fix-for-openSUSE wen...@gmail.com - fix qt 4.7 builds
-Patch2: fcitx-4.2.7-compat-qt474.patch
-# fix-for-openSUSE wen...@gmail.com - fix gcc 4.6 builds
-Patch3: fcitx-4.2.7-compat-gcc46.patch
-# fix-for-openSUSE wen...@gmail.com - xkeyboard-config in SUSE use symlink for
xkb rule files,
-# which caused fcitx unexpected behavior in keyboard layout handling.
-Patch4: bnc801318-fcitx-4.2.7-xkb-rule-symlink-detection.patch
+Source9:macros.%{name}
+# PATCH-FIX-UPSTREAM marguer...@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 marguer...@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
@@ -79,6 +74,7 @@
BuildRequires: gcc-c++
BuildRequires: libicu-devel
BuildRequires: libxml2-devel
+BuildRequires: xz
Requires: %{name}-gtk2 = %{version}-%{release}
Requires: lib%{name}%{libver} = %{version}-%{release}
%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
@@ -101,9 +97,9 @@
%if 0%{?fedora_version}
Requires: %{name}-pinyin = %{version}-%{release}
Requires: %{name}-table = %{version}-%{release}
-Requires: opencc
-Requires: libpresage1
Requires: enchant
+Requires: libpresage1
+Requires: opencc
Requires(post):%{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
%endif
@@ -371,14 +367,8 @@
%prep
%setup -q -n %{name}-%{version}
-%if 0%{?suse_version} = 1220
+%patch -p1
%patch1 -p1
commit fcitx for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2013-04-29 09:53:12 Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) Package is fcitx, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-04-17 23:04:41.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-04-29 09:53:14.0 +0200 @@ -1,0 +2,6 @@ +Fri Apr 26 23:57:32 UTC 2013 - i...@marguerite.su + +- in baselibs.conf, obsoletes libfcitx-targettype version + instead of =. + +--- Other differences: -- ++ baselibs.conf ++ --- /var/tmp/diff_new_pack.q20CeJ/_old 2013-04-29 09:53:18.0 +0200 +++ /var/tmp/diff_new_pack.q20CeJ/_new 2013-04-29 09:53:18.0 +0200 @@ -1,6 +1,6 @@ libfcitx-4_2_7 requires fcitx = version -obsoletes libfcitx-targettype = version +obsoletes libfcitx-targettype version provides libfcitx-targettype = version post /sbin/ldconfig postun /sbin/ldconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-04-17 23:04:38
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-02-09
10:04:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-04-17
23:04:41.0 +0200
@@ -1,0 +2,8 @@
+Thu Mar 28 18:28:49 UTC 2013 - i...@marguerite.su
+
+- add more locales into xim.d
+- some Taiwan users reported that after installation,
+ they can't have input panel because we don't start it
+ and export environments by default.
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.I4xwMz/_old 2013-04-17 23:04:52.0 +0200
+++ /var/tmp/diff_new_pack.I4xwMz/_new 2013-04-17 23:04:52.0 +0200
@@ -467,7 +467,9 @@
priority=30
pushd %{buildroot}%{_sysconfdir}/X11/xim.d/
-for lang in en ko zh_CN zh_SG ; do
+for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \
+pa ru sk vi zh_TW zh_CN zh_HK zh_SG \
+de fr it es nl cs pl da nn nb fi en sv ; do
mkdir $lang
pushd $lang
ln -s ../fcitx $priority-fcitx
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-02-09 10:04:23
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-02-05
15:42:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-02-09
10:04:24.0 +0100
@@ -1,0 +2,5 @@
+Fri Feb 8 17:40:06 UTC 2013 - i...@marguerite.su
+
+- disable DENABLE_DEBUG to avoid polluting .xsession-errors. (bnc#802866)
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.qGP1Mk/_old 2013-02-09 10:04:31.0 +0100
+++ /var/tmp/diff_new_pack.qGP1Mk/_new 2013-02-09 10:04:31.0 +0100
@@ -386,6 +386,7 @@
# fix dlopen-ed library name
cmake .. \
+-DCMAKE_BUILD_TYPE=Release \
-DOPENCC_LIBRARY_FILENAME=libopencc.so.1 \
-DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \
-DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \
@@ -400,7 +401,6 @@
%endif
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir} \
--DENABLE_DEBUG=On \
-DENABLE_LUA=On
# fix gobject-introspection build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-02-05 11:12:53
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-01-31
16:27:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-02-05
11:12:55.0 +0100
@@ -1,0 +2,9 @@
+Mon Feb 4 08:45:33 UTC 2013 - i...@marguerite.su
+
+- remove BuildRequires: intltool, fcitx no longer use intltool
+ to parse translations.
+- query immodules for gtk*-32bit subpackages.
+- explicitly add enchant, presage, opencc requirements, fcitx use
+ dlopen to detect them, ld can't fulfill its needs.
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.6bPb2H/_old 2013-02-05 11:12:56.0 +0100
+++ /var/tmp/diff_new_pack.6bPb2H/_new 2013-02-05 11:12:56.0 +0100
@@ -72,7 +72,6 @@
%endif
BuildRequires: cmake
BuildRequires: gtk2-devel
-BuildRequires: intltool
BuildRequires: opencc-devel
%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
BuildRequires: gobject-introspection-devel
@@ -92,9 +91,20 @@
%if 0%{?suse_version}
Recommends: %{name}-pinyin = %{version}-%{release}
Recommends: %{name}-table = %{version}-%{release}
+# These libraries are dlopen-ed in fcitx at runtime
+# for spell-checking for keyboard users. ld can't find
+# them, so explicitly recommends.
+Recommends: libopencc1
+Recommends: libpresage1
+Recommends: libenchant1
Requires: %{name}-branding = %{version}
%endif
%if 0%{?fedora_version}
+Requires: %{name}-pinyin = %{version}-%{release}
+Requires: %{name}-table = %{version}-%{release}
+Requires: opencc
+Requires: libpresage1
+Requires: enchant
Requires(post):%{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
%endif
@@ -375,7 +385,11 @@
mkdir build
cd build
+# fix dlopen-ed library name
cmake .. \
+-DOPENCC_LIBRARY_FILENAME=libopencc.so.1 \
+-DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \
+-DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \
%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
-DENABLE_GTK3_IM_MODULE=On \
%endif
@@ -390,14 +404,6 @@
-DENABLE_DEBUG=On \
-DENABLE_LUA=On
-# copy external data
-#pushd ../data
-#cp -r %{S:5} ./
-#popd
-#pushd ../data/table
-#cp -r %{S:6} ./
-#popd
-
# fix gobject-introspection build
export SUSE_ASNEEDED=0
make
@@ -499,9 +505,6 @@
%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
%{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so
%endif
-%if 0%{?suse_version} 1110 || 0%{?fedora_version}
-#%{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so
-%endif
# Convenient define for the scriplets
%if %{_lib} == lib64
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.6bPb2H/_old 2013-02-05 11:12:56.0 +0100
+++ /var/tmp/diff_new_pack.6bPb2H/_new 2013-02-05 11:12:56.0 +0100
@@ -1,4 +1,32 @@
libfcitx-4_2_7
+ requires fcitx = version
+obsoletes libfcitx-targettype = version
+provides libfcitx-targettype = version
+ post /sbin/ldconfig
+postun /sbin/ldconfig
fcitx-gtk2
+ requires libfcitx-4_2_7-targettype = version
+ post %if %_lib == lib64
+ post prefix%{_bindir}/gtk-query-immodules-2.0-64
%{_sysconfdir}/gtk-2.0/gtk64.immodules
+ post %else
+ post prefix%{_bindir}/gtk-query-immodules-2.0
%{_sysconfdir}/gtk-2.0/gtk.immodules
+ post %endif
+ postun %if %_lib == lib64
+ postun prefix%{_bindir}/gtk-query-immodules-2.0-64
%{_sysconfdir}/gtk-2.0/gtk64.immodules
+ postun %else
+ postun prefix%{_bindir}/gtk-query-immodules-2.0
%{_sysconfdir}/gtk-2.0/gtk.immodules
+ postun %endif
fcitx-gtk3
-fcitx-qt4
\ No newline at end of file
+ requires libfcitx-4_2_7-targettype = version
+post %if %_lib == lib64
+ post prefix%{_bindir}/gtk-query-immodules-3.0-64 --update-cache
+ post %else
+ post prefix%{_bindir}/gtk-query-immodules-3.0 --update-cache
+ post %endif
+ postun %if %_lib == lib64
+ postun prefix%{_bindir}/gtk-query-immodules-3.0-64 --update-cache
+ postun %else
+ postun prefix%{_bindir}/gtk-query-immodules-3.0 --update-cache
+ postun %endif
+fcitx-qt4
+ requires libfcitx-4_2_7-targettype = version
\ No newline at end of file
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-02-05 15:42:29
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-02-05
11:12:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-02-05
15:42:31.0 +0100
@@ -1,0 +2,5 @@
+Tue Feb 5 14:11:50 CET 2013 - m...@suse.de
+
+- fix typo in specfile
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.Lvt3DU/_old 2013-02-05 15:42:33.0 +0100
+++ /var/tmp/diff_new_pack.Lvt3DU/_new 2013-02-05 15:42:33.0 +0100
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
%define libver -4_2_7
Name: fcitx
@@ -359,7 +358,7 @@
%package skin-dark
Summary:Fcitx Dark Skin
Group: System/I18n/Chinese
-Requires: %{name} = %{version}-%release}
+Requires: %{name} = %{version}-%{release}
%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
BuildArch: noarch
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-01-31 16:27:30
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-01-30
11:15:40.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-01-31
16:27:31.0 +0100
@@ -1,0 +2,9 @@
+Wed Jan 30 18:24:37 UTC 2013 - i...@marguerite.su
+
+- fix bnc#801318: xkeyboard-config symlink breaks fcitx in detecting xkb rule
files.
+ * bnc801318-fcitx-4.2.7-xkb-rule-symlink-detection.patch
+ * remove next release
+- fix bnc#801319: invalid /etc/xdg/autostart/fcitx-autostart.desktop breaks
ibus
+ * leave fcitx-autostart.desktop only for fedora.
+
+---
New:
bnc801318-fcitx-4.2.7-xkb-rule-symlink-detection.patch
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.WLvlwc/_old 2013-01-31 16:27:33.0 +0100
+++ /var/tmp/diff_new_pack.WLvlwc/_new 2013-01-31 16:27:33.0 +0100
@@ -40,6 +40,9 @@
Patch2: fcitx-4.2.7-compat-qt474.patch
# fix-for-openSUSE wen...@gmail.com - fix gcc 4.6 builds
Patch3: fcitx-4.2.7-compat-gcc46.patch
+# fix-for-openSUSE wen...@gmail.com - xkeyboard-config in SUSE use symlink for
xkb rule files,
+# which caused fcitx unexpected behavior in keyboard layout handling.
+Patch4: bnc801318-fcitx-4.2.7-xkb-rule-symlink-detection.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@@ -366,6 +369,7 @@
%patch2 -p1
%patch3 -p1
%endif
+%patch4 -p1
%build
mkdir build
@@ -465,6 +469,9 @@
popd
done
popd
+
+# bnc#801319 remove the unneeded fcitx-autostart.desktop which blocks ibus
from starting.
+rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
%endif
%if 0%{?fedora_version}
@@ -589,8 +596,8 @@
%if 0%{?fedora_version}
%config %{_sysconfdir}/X11/xinit/xinput.d/
%{_docdir}/packages/%{name}/
-%endif
%config %{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
+%endif
# excludes
%exclude %{_datadir}/%{name}/pinyin
++ bnc801318-fcitx-4.2.7-xkb-rule-symlink-detection.patch ++
diff --git a/src/module/xkb/xkb.c b/src/module/xkb/xkb.c
index d5d928d..36025bb 100644
--- a/src/module/xkb/xkb.c
+++ b/src/module/xkb/xkb.c
@@ -176,37 +176,50 @@ static char* FcitxXkbFindXkbRulesFile(FcitxXkb* xkb)
} else {
int count = 0, i = 0;
const char* base = XLIBDIR;
+char *parent_to_free = NULL;
while (base[i]) {
if (base[i] == '/')
count++;
i++;
}
+/**
+ * guess X11 data base directory.
+ **/
if (count = 3) {
// .../usr/lib/X11 - /usr/share/X11/xkb vs
// .../usr/X11/lib - /usr/X11/share/X11/xkb
const char* delta = StringEndsWith(base, X11) ?
/../../share/X11 : /../share/X11;
-char *tmppath;
-fcitx_utils_alloc_cat_str(tmppath, base, delta,
- /xkb/rules/, rulesName, .xml);
-if(fcitx_utils_isreg(tmppath)) {
-rulesFile = realpath(tmppath, NULL);
-free(tmppath);
-} else {
-fcitx_utils_alloc_cat_str(tmppath, base, /X11/xkb/rules/,
- rulesName, .xml);
-if(fcitx_utils_isreg(tmppath)) {
-rulesFile = realpath(tmppath, NULL);
-free(tmppath);
+fcitx_utils_alloc_cat_str(parent_to_free, base, delta);
+if(!fcitx_utils_isdir(parent_to_free)) {
+// fallback to ${base}/X11
+fcitx_utils_set_cat_str(parent_to_free, base, /X11);
+if(!fcitx_utils_isdir(parent_to_free)) {
+free(parent_to_free);
+parent_to_free = NULL;
}
}
}
-if(!rulesFile) {
-fcitx_utils_alloc_cat_str(rulesFile,
- /usr/share/X11/xkb/rules/,
- rulesName, .xml);
+const char *parent_path;
+if (parent_to_free) {
+/**
+ * Found a existing dir, simplify it.
+ * Using realpath() on rules files' name can change the base
+ * name of the
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-01-30 11:15:39
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-01-29
12:07:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-01-30
11:15:40.0 +0100
@@ -1,0 +2,5 @@
+Wed Jan 30 08:54:58 UTC 2013 - co...@suse.com
+
+- fix the permissions of the .directory file in the openSUSE themeing
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.1gkWur/_old 2013-01-30 11:15:41.0 +0100
+++ /var/tmp/diff_new_pack.1gkWur/_new 2013-01-30 11:15:41.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fcitx
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -53,8 +53,8 @@
BuildRequires: libxkbfile-devel
%endif
BuildRequires: enchant-devel
-BuildRequires: libpresage-devel
BuildRequires: iso-codes-devel
+BuildRequires: libpresage-devel
BuildRequires: pango-devel
%if 0%{?suse_version} = 1110 || 0%{?fedora_version}
BuildRequires: fdupes
@@ -72,8 +72,8 @@
BuildRequires: intltool
BuildRequires: opencc-devel
%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
-BuildRequires: gtk3-devel
BuildRequires: gobject-introspection-devel
+BuildRequires: gtk3-devel
%endif
BuildRequires: gcc-c++
BuildRequires: libicu-devel
++ openSUSE-default.tar.gz ++
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2013-01-29 12:07:16
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-10-16
11:30:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-01-29
12:07:19.0 +0100
@@ -1,0 +2,45 @@
+Sat Jan 26 05:03:20 UTC 2013 - i...@marguerite.su
+
+- update to 4.2.7
+ * new feature for user:
++ qt im module support per window input context.
++ quickphrase add new custom ui editor.
++ all pinyin now support stroke.
++ add clipboard input support (Ctrl + ; to use it)
++ fcitx-diagnose script for diagnose the problem
++ new dark skin which can also work for non-composite window manager
(though
+ looks not the same)
++ Helping xmodmap user to correct loading ~/.Xmodmap by default
++ Bind one input method with specific key.
++ Translation update (German, and some spanish).
++ Add up and down to paging key by default
++ fcitx-config now will comment out the value which is same as the default
+ value upon save, so default value can be controlled by upstream fcitx
change.
++ reload only one addon configuration
+
+ * new feature for developer:
++ Big build system improvement
++ remove intltool dependency
++ auto-codegen tool for cross module function.
++ add libfcitx-qt, containing dbus stuff and provides custom ui plugin
+ architecture.
++ candidate window can be overriden to use horizontal / vertical by input
+ method. (kimpanel need KDE 4.10 to use this feature)
++ paging can be override by custom function
+
+ * bug fix:
++ fix for xim restart.
++ add more locale to xim by default.
++ compatible with lua 5.2
++ some other misc bugfix
+- added patches
+ * fcitx-4.2.7-compat-12.2.patch
++ fix 12.2 and below builds, remove next release
+ * fcitx-4.2.7-compat-qt474.patch
++ fix qt 4.7 builds with 12.1 and below
++ remove next release
+ * fcitx-4.2.7-compat-gcc46.patch
++ fix gcc 4.6 builds with 12.1 and below
++ remove next release
+
+---
Old:
fcitx-4.2.6.1.tar.bz2
fix_fcitx_googlecode_resolv_error.patch
pinyin.tar.gz
table.tar.gz
New:
fcitx-4.2.7-compat-12.2.patch
fcitx-4.2.7-compat-gcc46.patch
fcitx-4.2.7-compat-qt474.patch
fcitx-4.2.7.tar.bz2
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.oh4shk/_old 2013-01-29 12:07:23.0 +0100
+++ /var/tmp/diff_new_pack.oh4shk/_new 2013-01-29 12:07:23.0 +0100
@@ -16,10 +16,10 @@
#
-%define libver -4_2_6
+%define libver -4_2_7
Name: fcitx
-Version:4.2.6.1
+Version:4.2.7
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0+
@@ -31,13 +31,15 @@
Source1:xim.d-fcitx
Source2:fcitx-README.suse
Source3:xim.fcitx.suse.template
-#Source5:pinyin.tar.gz
-#Source6:table.tar.gz
# for fedora auto-start
Source7:xinput-fcitx
Source8:openSUSE-default.tar.gz
-#FIX-FOR-UPSTREAM i...@marguerite.su - dont download online
-#Patch1: fix_fcitx_googlecode_resolv_error.patch
+# fix-for-openSUSE wen...@gmail.com - fix opensuse builds = 1220
+Patch1: fcitx-4.2.7-compat-12.2.patch
+# fix-for-openSUSE wen...@gmail.com - fix qt 4.7 builds
+Patch2: fcitx-4.2.7-compat-qt474.patch
+# fix-for-openSUSE wen...@gmail.com - fix gcc 4.6 builds
+Patch3: fcitx-4.2.7-compat-gcc46.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@@ -357,23 +359,31 @@
%prep
%setup -q -n %{name}-%{version}
-#%patch1 -p1
+%if 0%{?suse_version} = 1220
+%patch1 -p1
+%endif
+%if 0%{?suse_version} = 1210
+%patch2 -p1
+%patch3 -p1
+%endif
%build
mkdir build
cd build
-cmake .. -DENABLE_GTK2_IM_MODULE=On \
+cmake .. \
%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
-DENABLE_GTK3_IM_MODULE=On \
%endif
-%if 0%{?suse_version} 1110 || 0%{?fedora_version}
- -DENABLE_QT_IM_MODULE=On \
+%if 0%{?suse_version} = 1210
+-DENABLE_QT_GUI=Off \
+%endif
+%if 0%{?sles_version}
+-DENABLE_QT=Off \
%endif
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir} \
-DENABLE_DEBUG=On \
--DENABLE_OPENCC=On \
-DENABLE_LUA=On
# copy external data
@@ -556,12 +566,15 @@
%files -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/%{name}
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-10-16 11:30:32
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-10-03
07:11:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-10-16
11:30:34.0 +0200
@@ -1,0 +2,15 @@
+Thu Oct 11 14:03:53 UTC 2012 - i...@marguerite.su
+
+- update to 4.2.6.1
+ * a bugfix release, fix including:
+ + FreeBSD xlib path detection
+ + A few crash related bug
+ + reduce remove call that save profile
+ + Workaround a bug for qt older than 4.8.0
+(http://code.google.com/p/fcitx/issues/detail?id=630)
+ + fcitx-config-gtk3 will not be called under KDE.
+ + fcitx-table-emoji not usable under 4.2.6
+ + IM switchkey will not be captured if there is only one im or no im at
all.
+ + A bunch of fix for gtk im module.
+
+---
Old:
fcitx-4.2.6-openSUSE-12.1-QDBusConnection.patch
fcitx-4.2.6.tar.bz2
New:
fcitx-4.2.6.1.tar.bz2
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.4VRulR/_old 2012-10-16 11:30:37.0 +0200
+++ /var/tmp/diff_new_pack.4VRulR/_new 2012-10-16 11:30:37.0 +0200
@@ -19,7 +19,7 @@
%define libver -4_2_6
Name: fcitx
-Version:4.2.6
+Version:4.2.6.1
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0+
@@ -38,8 +38,6 @@
Source8:openSUSE-default.tar.gz
#FIX-FOR-UPSTREAM i...@marguerite.su - dont download online
#Patch1: fix_fcitx_googlecode_resolv_error.patch
-#FIX-FOR-OPENSUSE wen...@gmail.com - fix QDBusConnection in Qt 4.7
-Patch2: fcitx-4.2.6-openSUSE-12.1-QDBusConnection.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@@ -360,9 +358,6 @@
%prep
%setup -q -n %{name}-%{version}
#%patch1 -p1
-%if 0%{?suse_version} = 1210
-%patch2 -p1
-%endif
%build
mkdir build
++ fcitx-4.2.6.tar.bz2 - fcitx-4.2.6.1.tar.bz2 ++
/work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.6.tar.bz2
/work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.6.1.tar.bz2 differ: char 11,
line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-10-03 07:11:19
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-09-17
01:29:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-10-03
07:11:21.0 +0200
@@ -1,0 +2,7 @@
+Sun Sep 23 13:32:25 UTC 2012 - i...@marguerite.su
+
+- fix openSUSE 12.1 and below build
+ * 4.2.6 uses a Qt 4.8+ only function (QDBusConnection) so it fails on 12.1
and below.
+ * weng fix it.
+
+---
New:
fcitx-4.2.6-openSUSE-12.1-QDBusConnection.patch
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.GEac0Q/_old 2012-10-03 07:11:23.0 +0200
+++ /var/tmp/diff_new_pack.GEac0Q/_new 2012-10-03 07:11:23.0 +0200
@@ -38,6 +38,8 @@
Source8:openSUSE-default.tar.gz
#FIX-FOR-UPSTREAM i...@marguerite.su - dont download online
#Patch1: fix_fcitx_googlecode_resolv_error.patch
+#FIX-FOR-OPENSUSE wen...@gmail.com - fix QDBusConnection in Qt 4.7
+Patch2: fcitx-4.2.6-openSUSE-12.1-QDBusConnection.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@@ -358,6 +360,9 @@
%prep
%setup -q -n %{name}-%{version}
#%patch1 -p1
+%if 0%{?suse_version} = 1210
+%patch2 -p1
+%endif
%build
mkdir build
++ fcitx-4.2.6-openSUSE-12.1-QDBusConnection.patch ++
diff --git a/src/frontend/qt/fcitx-input-context.cpp
b/src/frontend/qt/fcitx-input-context.cpp
index 5ba941b..6e5a9d9 100644
--- a/src/frontend/qt/fcitx-input-context.cpp
+++ b/src/frontend/qt/fcitx-input-context.cpp
@@ -113,11 +113,37 @@ typedef QInputMethodEvent::Attribute QAttribute;
static bool key_filtered = false;
+QByteArray QFcitxInputContext::localMachineId()
+{
+#if QT_VERSION = QT_VERSION_CHECK(4, 8, 0)
+return QDBusConnection::localMachineId();
+#else
+QFile file1(/var/lib/dbus/machine-id);
+QFile file2(/etc/machine-id);
+QFile* fileToRead = NULL;
+if (file1.open(QIODevice::ReadOnly)) {
+fileToRead = file1;
+}
+else if (file2.open(QIODevice::ReadOnly)) {
+fileToRead = file2;
+}
+if (fileToRead) {
+QByteArray result = fileToRead-readLine(1024);
+fileToRead-close();
+result = result.trimmed();
+if (!result.isEmpty())
+return result;
+}
+return machine-id;
+#endif
+}
+
QString
QFcitxInputContext::socketFile()
{
char* addressFile = NULL;
-asprintf(addressFile, %s-%d, QDBusConnection::localMachineId().data(),
fcitx_utils_get_display_number());
+
+asprintf(addressFile, %s-%d, localMachineId().data(),
fcitx_utils_get_display_number());
char* file = NULL;
diff --git a/src/frontend/qt/fcitx-input-context.h
b/src/frontend/qt/fcitx-input-context.h
index 6c7ecf4..ed7d2db 100644
--- a/src/frontend/qt/fcitx-input-context.h
+++ b/src/frontend/qt/fcitx-input-context.h
@@ -102,6 +102,7 @@ private Q_SLOTS:
void updateCursor();
#endif
private:
+static QByteArray localMachineId();
static QString socketFile();
static QString address();
void cleanUp();
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-09-17 01:28:56
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-09-10
15:20:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-09-17
01:29:20.0 +0200
@@ -1,0 +2,19 @@
+Sat Sep 15 18:04:19 UTC 2012 - i...@marguerite.su
+
+- update to 4.2.6
+ * Add a private dbus service for Fcitx IM Module, simplify the setup on some
light weight Desktop
+ * Improve “Select Character From Phrase” and Pinyin Symbol (typing special
symbols in pinyin input
+methods) as well as move them to a new Pinyin Enhance module, so that
these features can now be
+used in other pinyin input methods as well (previous just the builtin one).
+ * Move spell hint to a new module. Add a new spell hint backend using a
builtin dictionary. Load
+enchant and presage at runtime using dlopen() so that they are not link
dependencies anymore.
+ * Spell hint for pinyin/AutoEng/QuickPhrase
+ * Bug fixes for Gtk IM Module
+ * Add more compile options so it is possible to compile a more simplified
Fcitx if necessary
+ * Add long description (show as tooltip) and hidden options in configure
files for a more user
+friendly configure interface
+ * Add global font setting for classical UI
+ * Fix xkb support on BSD
+ * Other bug fixes
+
+---
Old:
fcitx-4.2.5.tar.bz2
New:
fcitx-4.2.6.tar.bz2
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.qYzu44/_old 2012-09-17 01:29:23.0 +0200
+++ /var/tmp/diff_new_pack.qYzu44/_new 2012-09-17 01:29:23.0 +0200
@@ -16,10 +16,10 @@
#
-%define libver -4_2_5
+%define libver -4_2_6
Name: fcitx
-Version:4.2.5
+Version:4.2.6
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0+
@@ -31,13 +31,13 @@
Source1:xim.d-fcitx
Source2:fcitx-README.suse
Source3:xim.fcitx.suse.template
-Source5:pinyin.tar.gz
-Source6:table.tar.gz
+#Source5:pinyin.tar.gz
+#Source6:table.tar.gz
# for fedora auto-start
Source7:xinput-fcitx
Source8:openSUSE-default.tar.gz
#FIX-FOR-UPSTREAM i...@marguerite.su - dont download online
-Patch1: fix_fcitx_googlecode_resolv_error.patch
+#Patch1: fix_fcitx_googlecode_resolv_error.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@@ -357,7 +357,7 @@
%prep
%setup -q -n %{name}-%{version}
-%patch1 -p1
+#%patch1 -p1
%build
mkdir build
@@ -377,12 +377,12 @@
-DENABLE_LUA=On
# copy external data
-pushd ../data
-cp -r %{S:5} ./
-popd
-pushd ../data/table
-cp -r %{S:6} ./
-popd
+#pushd ../data
+#cp -r %{S:5} ./
+#popd
+#pushd ../data/table
+#cp -r %{S:6} ./
+#popd
# fix gobject-introspection build
export SUSE_ASNEEDED=0
@@ -437,8 +437,8 @@
mv %{buildroot}%{_datadir}/doc/%{name}/ %{buildroot}%{_docdir}/packages/
cp -r %{SOURCE2} %{buildroot}%{_docdir}/packages/%{name}/
cp -r %{SOURCE3} %{buildroot}%{_docdir}/packages/%{name}/
-cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/
-cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/
+cp -r AUTHORS %{buildroot}%{_docdir}/packages/%{name}/
+cp -r ChangeLog %{buildroot}%{_docdir}/packages/%{name}/
%endif
# create autostart
@@ -483,7 +483,7 @@
%{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so
%endif
%if 0%{?suse_version} 1110 || 0%{?fedora_version}
-%{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so
+#%{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so
%endif
# Convenient define for the scriplets
@@ -561,6 +561,7 @@
%{_bindir}/%{name}-configtool
%{_bindir}/%{name}-remote
%{_bindir}/%{name}-skin-installer
+%{_bindir}/%{name}-dbus-watcher
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/icons/*
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.qYzu44/_old 2012-09-17 01:29:23.0 +0200
+++ /var/tmp/diff_new_pack.qYzu44/_new 2012-09-17 01:29:23.0 +0200
@@ -1,4 +1,4 @@
-libfcitx-4_2_5
+libfcitx-4_2_6
fcitx-gtk2
fcitx-gtk3
fcitx-qt4
\ No newline at end of file
++ fcitx-4.2.5.tar.bz2 - fcitx-4.2.6.tar.bz2 ++
/work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.5.tar.bz2
/work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.6.tar.bz2 differ: char 11, line
1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-09-10 15:20:41
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-08-28
20:45:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-09-10
15:20:51.0 +0200
@@ -1,0 +2,6 @@
+Fri Sep 7 10:27:34 UTC 2012 - i...@marguerite.su
+
+- fix libfcitx Provides, which can't drop old libraries.
+- fix 32bit baselib name.
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.kmLIl0/_old 2012-09-10 15:20:52.0 +0200
+++ /var/tmp/diff_new_pack.kmLIl0/_new 2012-09-10 15:20:52.0 +0200
@@ -103,8 +103,8 @@
%package -n lib%{name}%{libver}
Summary:Shared libraries for %{name}
Group: System/I18n/Chinese
-Obsoletes: lib%{name}%{libver} %{version}
-Provides: lib%{name}%{libver} = %{version}
+Obsoletes: lib%{name} %{version}
+Provides: lib%{name} = %{version}
%description -n lib%{name}%{libver}
Shared libraries for Fcitx input method framework.
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.kmLIl0/_old 2012-09-10 15:20:52.0 +0200
+++ /var/tmp/diff_new_pack.kmLIl0/_new 2012-09-10 15:20:52.0 +0200
@@ -1,4 +1,4 @@
-libfcitx-4_2_4
+libfcitx-4_2_5
fcitx-gtk2
fcitx-gtk3
fcitx-qt4
\ No newline at end of file
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-08-28 20:45:07
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-07-24
14:58:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-08-28
20:45:09.0 +0200
@@ -1,0 +2,11 @@
+Sun Aug 26 01:15:41 UTC 2012 - i...@marguerite.su
+
+- add openSUSE-branding theme for 12.2
+
+---
+Thu Aug 16 22:34:07 UTC 2012 - i...@marguerite.su
+
+- add Dependency: libpresage-devel, which will provide word prediction
+ for keyboard users.
+
+---
Old:
fcitx-4.2.4.1.tar.bz2
fix-fcitx-4.2.4.1-memory-overflow.patch
New:
openSUSE-default.tar.gz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.emHXa4/_old 2012-08-28 20:45:11.0 +0200
+++ /var/tmp/diff_new_pack.emHXa4/_new 2012-08-28 20:45:11.0 +0200
@@ -35,6 +35,7 @@
Source6:table.tar.gz
# for fedora auto-start
Source7:xinput-fcitx
+Source8:openSUSE-default.tar.gz
#FIX-FOR-UPSTREAM i...@marguerite.su - dont download online
Patch1: fix_fcitx_googlecode_resolv_error.patch
BuildRequires: cairo-devel
@@ -50,6 +51,7 @@
BuildRequires: libxkbfile-devel
%endif
BuildRequires: enchant-devel
+BuildRequires: libpresage-devel
BuildRequires: iso-codes-devel
BuildRequires: pango-devel
%if 0%{?suse_version} = 1110 || 0%{?fedora_version}
@@ -85,6 +87,7 @@
%if 0%{?suse_version}
Recommends: %{name}-pinyin = %{version}-%{release}
Recommends: %{name}-table = %{version}-%{release}
+Requires: %{name}-branding = %{version}
%endif
%if 0%{?fedora_version}
Requires(post):%{_sbindir}/alternatives
@@ -305,6 +308,26 @@
%description pinyin-tools
Tools to convert txt or scel(sougou pinyin data format) pinyin sheets to fcitx
match lists.
+%if 0%{?suse_version}
+
+%package branding-openSUSE
+Summary: openSUSE default Skin for Fcitx
+Group: System/I18n/Chinese
+Requires: %{name} = %{version}-%{release}
+%if 0%{?suse_version} = 1140
+BuildArch: noarch
+%endif
+Provides: %{name}-branding = %{version}
+Conflicts: otherproviders(%{name}-branding)
+Supplements: packageand(%{name}:branding-openSUSE)
+
+%description branding-openSUSE
+openSUSE default skin for Fcitx
+
+You can either use this package or download from kde-look.org using knewstaff
in fcitx-config-kde4.
+
+%endif
+
%package skin-classic
Summary: Fcitx Classic Skin
Group: System/I18n/Chinese
@@ -372,6 +395,16 @@
cd ..
+%if 0%{?suse_version}
+# install openSUSE branding
+pushd %{buildroot}%{_datadir}/%{name}/skin/
+tar -xzf %{SOURCE8}
+popd
+pushd %{buildroot}%{_datadir}/%{name}/configdesc
+sed -i 's/DefaultValue=default/DefaultValue=openSUSE-default/'
%{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc
+popd
+%endif
+
# fix desktop file
sed -i s/x-fskin/x-fskin;/
%{buildroot}%{_datadir}/applications/fcitx-skin-installer.desktop
@@ -394,14 +427,18 @@
%if 0%{?suse_version}
mkdir %{buildroot}%{_docdir}
mv %{buildroot}%{_datadir}/doc/%{name}/ %{buildroot}%{_docdir}
+cp -r %{SOURCE2} %{buildroot}%{_docdir}/%{name}/
+cp -r %{SOURCE3} %{buildroot}%{_docdir}/%{name}/
cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/
cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/
%endif
%if 0%{?fedora_version}
mkdir %{buildroot}%{_docdir}/packages/
mv %{buildroot}%{_datadir}/doc/%{name}/ %{buildroot}%{_docdir}/packages/
-cp -r AUTHORS %{buildroot}%{_docdir}/packages/%{name}/
-cp -r ChangeLog %{buildroot}%{_docdir}/packages/%{name}/
+cp -r %{SOURCE2} %{buildroot}%{_docdir}/packages/%{name}/
+cp -r %{SOURCE3} %{buildroot}%{_docdir}/packages/%{name}/
+cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/
+cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/
%endif
# create autostart
@@ -554,6 +591,9 @@
%exclude %{_libdir}/%{name}/fcitx-pinyin.so
%exclude %{_libdir}/%{name}/fcitx-table.so
%exclude %{_libdir}/%{name}/fcitx-qw.so
+%if 0%{?suse_version}
+%exclude %{_datadir}/%{name}/skin/openSUSE-default
+%endif
%exclude %{_datadir}/%{name}/skin/classic
%exclude %{_datadir}/%{name}/skin/dark
@@ -667,6 +707,14 @@
%{_mandir}/man1/mb2org.1.gz
%{_mandir}/man1/scel2org.1.gz
+%if 0%{?suse_version}
+
+%files branding-openSUSE
+%defattr(-,root,root)
+%{_datadir}/%{name}/skin/openSUSE-default
+
+%endif
+
%files skin-classic
%defattr(-,root,root)
%{_datadir}/%{name}/skin/classic
++ fcitx-README.suse
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-07-24 14:58:33
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-06-26
15:19:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-07-24
14:58:35.0 +0200
@@ -1,0 +2,31 @@
+Sun Jul 22 00:13:01 UTC 2012 - i...@marguerite.su
+
+- add Provides to libfcitx as AJ suggested.
+
+---
+Sat Jul 21 18:23:11 UTC 2012 - i...@marguerite.su
+
+- update to 4.2.5
+ *For user:
+ 1. Default 3 skin change to support a new feature that respect the DPI on
the screen.
+ 2. Display current input method after switch the input method, and the hint
window will disappear after a while.
+ 3. fcitx-keyboard wordhint now is a per input context option, not a global
one.
+ 4. fcitx-xkb support loading custom xmodmap script when needed.
+ 5. fcitx-xkb support assign a default layout when there is no input method.
+ 6. fcitx-pinyin support fix like “jv - ju”
+ 7. fcitx-pinyin add xiaohe support.
+ 8. fcitx-pinyin now can use “v” to trigger quick-phrase
+ 9. change zh_HK punctutation map for “$” from ￥ to ＄.
+ 10. support typing unicode character via “ctrl+shift+alt+u”
+ 11. shift for default “active-inactive” switch, and can be only used after
switch from “active to inactive” by default.
+ 12. safer for handling signal and exit.
+ 13. restart is displayed on the UI (both classic and kimpanel)
+ 14. log message now includes pid.
+ *For API:
+ 1. add timeout support.
+ 2. add per-inputcontext data support
+ 3. move all keysym to fcitx-utils.
+ *For module:
+ 1. Quickphrase can be triggered via cross module call.
+
+---
New:
fcitx-4.2.5.tar.bz2
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.ELI4If/_old 2012-07-24 14:58:37.0 +0200
+++ /var/tmp/diff_new_pack.ELI4If/_new 2012-07-24 14:58:37.0 +0200
@@ -16,10 +16,10 @@
#
-%define libver -4_2_4
+%define libver -4_2_5
Name: fcitx
-Version:4.2.4.1
+Version:4.2.5
Release:0
Summary:Flexible Context-aware Input Tool with eXtension
License:GPL-2.0+
@@ -37,8 +37,6 @@
Source7:xinput-fcitx
#FIX-FOR-UPSTREAM i...@marguerite.su - dont download online
Patch1: fix_fcitx_googlecode_resolv_error.patch
-#FIX-FOR-UPSTREAM wengxuet...@gmail.com - fix memeory overflow
-Patch2: fix-fcitx-4.2.4.1-memory-overflow.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@@ -102,6 +100,8 @@
%package -n lib%{name}%{libver}
Summary:Shared libraries for %{name}
Group: System/I18n/Chinese
+Obsoletes: lib%{name}%{libver} %{version}
+Provides: lib%{name}%{libver} = %{version}
%description -n lib%{name}%{libver}
Shared libraries for Fcitx input method framework.
@@ -144,6 +144,16 @@
%description gtk3
GTK+ version 3 input module for Fcitx input method framework.
+%package -n typelib-1_0-Fcitx-1_0
+Summary:The Flexible Context-aware Input Tool with eXtension --
Introspection bindings
+Group: System/Libraries
+
+%description -n typelib-1_0-Fcitx-1_0
+Fcitx is a CJK input method framework. It supports Table,
+Pinyin and QuWei input methods. It's flexible and fast.
+
+This package provides the GObject Introspection bindings for Fcitx.
+
%endif
%if 0%{?suse_version} 1110 || 0%{?fedora_version}
@@ -325,8 +335,6 @@
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
-# remove when next release
-%patch2 -p1
%build
mkdir build
@@ -512,6 +520,7 @@
%defattr(-,root,root)
%{_bindir}/%{name}
%{_bindir}/%{name}4-config
+%{_bindir}/%{name}-autostart
%{_bindir}/%{name}-configtool
%{_bindir}/%{name}-remote
%{_bindir}/%{name}-skin-installer
@@ -530,6 +539,7 @@
%config %{_sysconfdir}/X11/xinit/xinput.d/
%{_docdir}/packages/%{name}/
%endif
+%config %{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
# excludes
%exclude %{_datadir}/%{name}/pinyin
@@ -561,8 +571,10 @@
%files gtk3
%defattr(-,root,root)
%{_libdir}/gtk-3.0/*
+
+%files -n typelib-1_0-Fcitx-1_0
+%defattr(-,root,root)
%{_libdir}/girepository-1.0/Fcitx-1.0.typelib
-%{_datadir}/gir-1.0/Fcitx-1.0.gir
%endif
@@ -665,9 +677,12 @@
%files devel
%defattr(-,root,root)
+%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_datadir}/cmake/
-%{_includedir}/*
+%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-06-26 15:19:26
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-06-15
16:31:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-06-26
15:19:33.0 +0200
@@ -1,0 +2,8 @@
+Sat Jun 16 14:32:39 UTC 2012 - i...@marguerite.su
+
+- fix memory overflow, thanks to reporter dieter.
+ * http://lists.opensuse.org/opensuse-factory/2012-06/msg00359.html
+- support fedora builds.
+- further split packages by input engines and tables, no longer a big mess.
+
+---
New:
fix-fcitx-4.2.4.1-memory-overflow.patch
xinput-fcitx
Other differences:
--
++ fcitx.spec ++
677 lines (skipped)
between /work/SRC/openSUSE:Factory/fcitx/fcitx.spec
and /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.spec
++ _service ++
--- /var/tmp/diff_new_pack.IM6bsT/_old 2012-06-26 15:19:35.0 +0200
+++ /var/tmp/diff_new_pack.IM6bsT/_new 2012-06-26 15:19:35.0 +0200
@@ -4,7 +4,7 @@
- param name=history-depthall/paramparam
name=urlhttp://code.google.com/p/fcitx//paramparam
name=versionprefix4.2git/paramparam name=filenamefcitx/paramparam
name=scmgit/param/service
+ param name=history-depthall/paramparam
name=urlhttps://github.com/fcitx/fcitx.git/paramparam
name=versionprefix4.2git/paramparam name=filenamefcitx/paramparam
name=scmgit/param/service
service name=recompress mode=disabled
param name=file*.tar/param
param name=compressionbz2/param
++ fix-fcitx-4.2.4.1-memory-overflow.patch ++
diff -urN fcitx-4.2.4.1.orig/src/module/xkb/xkb.c
fcitx-4.2.4.1/src/module/xkb/xkb.c
--- fcitx-4.2.4.1.orig/src/module/xkb/xkb.c 2012-06-16 22:27:00.087029656
+0800
+++ fcitx-4.2.4.1/src/module/xkb/xkb.c 2012-06-16 22:29:18.941293740 +0800
@@ -197,8 +197,7 @@
xkbParentDir = strdup(/usr/share/X11);
}
-rulesFile = fcitx_utils_malloc0(sizeof(char) * (1 +
strlen(xkbParentDir) + strlen(rulesName) + strlen(/xkb/rules/)));
-sprintf(rulesFile, %s/xkb/rules/%s.xml, xkbParentDir, rulesName);
+asprintf(rulesFile, %s/xkb/rules/%s.xml, xkbParentDir, rulesName);
fcitx_utils_free(xkbParentDir);
}
diff -urN fcitx-4.2.4.1.orig/src/ui/classic/skin.c
fcitx-4.2.4.1/src/ui/classic/skin.c
--- fcitx-4.2.4.1.orig/src/ui/classic/skin.c2012-06-16 22:27:00.090029620
+0800
+++ fcitx-4.2.4.1/src/ui/classic/skin.c 2012-06-16 22:30:39.775283176 +0800
@@ -216,7 +216,7 @@
const char* fallbackChainNoFallback[] = { buf };
const char* fallbackChainPanel[] = { buf, skin/default };
const char* fallbackChainTray[] = { imicon };
-const char* fallbackChainPanelIMIcon[] = { buf, imicon };
+const char* fallbackChainPanelIMIcon[] = { buf, imicon, skin/default };
HASH_FIND_STR(*imageTable, name, image);
if (image != NULL) {
++ xinput-fcitx ++
XIM=fcitx
XIM_PROGRAM=/usr/bin/fcitx
ICON=/usr/share/pixmaps/fcitx.png
XIM_ARGS=-D
PREFERENCE_PROGRAM=/usr/bin/fcitx-configtool
SHORT_DESC=FCITX
GTK_IM_MODULE=fcitx
if test -f /usr/lib/qt4/plugins/inputmethods/qtim-fcitx.so || \
test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx.so;
then
QT_IM_MODULE=fcitx
else
QT_IM_MODULE=xim
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2012-06-15 15:39:50 Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) Package is fcitx, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-06-07 15:38:03.0 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-06-15 16:31:14.0 +0200 @@ -1,0 +2,7 @@ +Tue Jun 12 07:22:31 UTC 2012 - i...@marguerite.su + +- update to 4.2.4.1 + * urgent fix for compose key. +- use new xim.d-fcitx. + +--- Old: fcitx-4.2.4.tar.bz2 New: fcitx-4.2.4.1.tar.bz2 Other differences: -- ++ fcitx.spec ++ --- /var/tmp/diff_new_pack.jrIGTL/_old 2012-06-15 16:31:15.0 +0200 +++ /var/tmp/diff_new_pack.jrIGTL/_new 2012-06-15 16:31:15.0 +0200 @@ -19,7 +19,7 @@ %define libver -4_2_4 Name: fcitx -Version:4.2.4 +Version:4.2.4.1 Release:0 Summary:A Flexible Input Method Framework for CJK License:GPL-2.0+ ++ fcitx-4.2.4.tar.bz2 - fcitx-4.2.4.1.tar.bz2 ++ /work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.4.tar.bz2 /work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.4.1.tar.bz2 differ: char 11, line 1 ++ xim.d-fcitx ++ --- /var/tmp/diff_new_pack.jrIGTL/_old 2012-06-15 16:31:16.0 +0200 +++ /var/tmp/diff_new_pack.jrIGTL/_new 2012-06-15 16:31:16.0 +0200 @@ -1,48 +1,21 @@ -OLD_PATH=$PATH -PATH=/usr/bin:/usr/X11R6/bin:/opt/kde3/bin:$PATH - if ! type -p fcitx /dev/null 21 ; then -echo fcitx is not available. -PATH=$OLD_PATH -return 1 + echo fcitx is not available. + PATH=$OLD_PATH + return 1 fi -#when skim installed, Autostart must be false. -#here we move $HOME/.kde/share/config/skimrc to skimrc.orig.fcitx -case $WINDOWMANAGER in -*kde*) -if type -p skim /dev/null 21 \ - ! grep -i -q ^[[:space:]]*Autostart.*=.*false $HOME/.kde/share/config/skimrc -then -if [ -f $HOME/.kde/share/config/skimrc.orig.fcitx ] ; then - mv -f $HOME/.kde/share/config/skimrc $HOME/.kde/share/config/skimrc.orig.fcitx - chmod 777 $HOME/.kde/share/config/skimrc.orig.fcitx -fi -cat $HOME/.kde/share/config/skimrc __END -[General] -Autostart=false -__END -chmod 777 $HOME/.kde/share/config/skimrc -else -# do nothing - : -fi -;; -*) -# do nothing -;; -esac - -eval `dbus-launch --sh-syntax --exit-with-session` -export LC_CTYPE=$LANG -# So you can use either zh_CN.UTF-8 or zh_CN.GB2312 -export XMODIFIERS=@im=fcitx -export GTK_IM_MODULE=fcitx -export QT_IM_SWITCHER=imsw-multi -export QT_IM_MODULE=xim -fcitx -d +# Avoid relying on autolaunch to improvise D-Bus sessions for each process +if test -z $DBUS_SESSION_BUS_ADDRESS ; then + eval `dbus-launch --sh-syntax --exit-with-session` +fi -PATH=$OLD_PATH +export LC_CTYPE=$LANG +# So you can use either zh_CN.UTF-8 or zh_CN.GB2312 +export XMODIFIERS=@im=fcitx +export GTK_IM_MODULE=fcitx +export QT_IM_SWITCHER=imsw-multi +export QT_IM_MODULE=fcitx +fcitx -d # success: return 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-06-07 15:37:49
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-05-21
07:24:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-06-07
15:38:03.0 +0200
@@ -1,0 +2,23 @@
+Sun Jun 3 13:05:53 UTC 2012 - i...@marguerite.su
+
+- update to 4.2.4
+ * fix some xim problem
+ * add fcitx-gclient for glib and gir binding, can be used to control fcitx
or implement fcitx client.
+ * merge fcitx-keyboard into fcitx
+ * bind specific keyboard layout with inputmethod
+(you need up to date fcitx-configtool，gtk3 ver or kcm-fcitx to configure
this feature)
+ * adjust some default hotkey setting.
+- drop openSUSE 11.4 lua51 patch. upstream fixed.
+- drop downgrade gio version patch. upstream fixed.
+- add SUSE_ASNEEDED=0 macro to avoid a gobject-introspection bug as vuntz
suggested. thanks!
+
+---
+Sun Jun 3 04:46:37 UTC 2012 - i...@marguerite.su
+
+- fix sles builds.
+ * add version tags.
+ * changed source compression.
+ * add a patch to downgrade gio's version.
+ * use xim instead of qt im module.
+
+---
Old:
fcitx-4.2.3-openSUSE-11.4-lua51.patch
fcitx-4.2.3.tar.xz
New:
fcitx-4.2.4.tar.bz2
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.kqllbT/_old 2012-06-07 15:38:06.0 +0200
+++ /var/tmp/diff_new_pack.kqllbT/_new 2012-06-07 15:38:06.0 +0200
@@ -15,16 +15,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-%define libver -4_2_3
+
+%define libver -4_2_4
Name: fcitx
-Version:4.2.3
-Release:1
+Version:4.2.4
+Release:0
Summary:A Flexible Input Method Framework for CJK
-Url:http://code.google.com/p/fcitx
-Group: System/I18n/Chinese
License:GPL-2.0+
-Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz
+Group: System/I18n/Chinese
+Url:http://code.google.com/p/fcitx
+#Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz
+# use bzip to be compatible with sles.
+Source: %{name}-%{version}.tar.bz2
Source1:xim.d-fcitx
Source2:fcitx-README.suse
Source3:xim.fcitx.suse.template
@@ -32,32 +35,43 @@
Source6: table.tar.gz
#FIX-FOR-UPSTREAM i...@marguerite.su - dont download online
Patch1:fix_fcitx_googlecode_resolv_error.patch
-#FIX-FOR-UPSTREAM i...@marguerite.su - fix lua51 builds on 11.4
-Patch2: fcitx-4.2.3-openSUSE-11.4-lua51.patch
-BuildRequires: xz
BuildRequires: cairo-devel
-BuildRequires: pango-devel
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
+BuildRequires: enchant-devel
+BuildRequires: iso-codes-devel
+BuildRequires: pango-devel
BuildRequires: update-desktop-files
+%if 0%{?suse_version} = 1110
BuildRequires: fdupes
+%endif
+%if 0%{?suse_version} 1110
BuildRequires: libqt4-devel
+%endif
%if 0%{?suse_version} = 1210
BuildRequires: lua-devel
%else
BuildRequires: lua51-devel
%endif
-BuildRequires: opencc-devel
-BuildRequires: intltool
BuildRequires: cmake
BuildRequires: gtk2-devel
+BuildRequires: intltool
+BuildRequires: opencc-devel
+%if 0%{?suse_version} = 1140
BuildRequires: gtk3-devel
+BuildRequires: gobject-introspection-devel
+%endif
BuildRequires: gcc-c++
BuildRequires: libicu-devel
-Requires: lib%{name}%{libver} = %{version}-%{release}
+BuildRequires: libxml2-devel
Requires: %{name}-gtk2 = %{version}-%{release}
+Requires: lib%{name}%{libver} = %{version}-%{release}
+%if 0%{?suse_version} = 1140
Requires: %{name}-gtk3 = %{version}-%{release}
+%endif
+%if 0%{?suse_version} 1110
Requires: %{name}-qt4 = %{version}-%{release}
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: locale(ko;zh_CN;zh_SG)
@@ -92,6 +106,8 @@
%description gtk2
This package contains fcitx im module for gtk2
+%if 0%{?suse_version} = 1140
+
%package gtk3
Summary:Gtk3 IM Module for %{name}
Group: System/I18n/Chinese
@@ -101,6 +117,9 @@
%description gtk3
This package contains fcitx im module for gtk3
+%endif
+%if 0%{?suse_version} 1110
+
%package qt4
Summary:Qt4 IM Module for %{name}
Group: System/I18n/Chinese
@@ -109,18 +128,23 @@
%description qt4
This package contains fcitx im module for qt4
+%endif
+
%prep
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-05-21 07:24:28
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-05-07
22:47:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-05-21
07:24:39.0 +0200
@@ -1,0 +2,6 @@
+Sat May 12 12:49:11 UTC 2012 - i...@marguerite.su
+
+- bring fcitx in as default IM in DVD.
+- add Provides(en;ko;zh_CN;zh_SG).
+
+---
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.uIVmme/_old 2012-05-21 07:24:40.0 +0200
+++ /var/tmp/diff_new_pack.uIVmme/_new 2012-05-21 07:24:40.0 +0200
@@ -59,6 +59,7 @@
Requires: %{name}-gtk3 = %{version}-%{release}
Requires: %{name}-qt4 = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Provides: locale(ko;zh_CN;zh_SG)
%description
FCITX is a simplified Chinese input server. It supports Tables,
@@ -157,11 +158,12 @@
mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
install -m 644 %{S:1} %{buildroot}%{_sysconfdir}/X11/xim.d/fcitx
+priority=30
pushd %{buildroot}%{_sysconfdir}/X11/xim.d/
-for lang in en zh_CN ; do
+for lang in en ko zh_CN zh_SG ; do
mkdir $lang
pushd $lang
-ln -s ../fcitx 30-fcitx
+ln -s ../fcitx $priority-fcitx
popd
done
popd
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-05-07 22:45:19
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-04-12
09:22:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-05-07
22:47:02.0 +0200
@@ -1,0 +2,19 @@
+Mon May 7 02:55:27 UTC 2012 - i...@marguerite.su
+
+- enable lua by default
+
+---
+Sun May 6 22:57:27 UTC 2012 - i...@marguerite.su
+
+- update to 4.2.3
+ * Lua extension support, same interface with Googlepinyin.
+ * super can be used in hotkey again
+ * fixes Trad-Simp native engine in chttrans.
+ * Update fcitx-pinyin algorithm
+ * txt2mb and mb2txt support new English format
+ * Fix a crash when enable share status.
+ * Add surrounding text support.
+ * Commit input when unfocus.
+ * Classic UI improvement, including trayicon, menu.
+
+---
Old:
fcitx-4.2.2.tar.xz
New:
fcitx-4.2.3-openSUSE-11.4-lua51.patch
fcitx-4.2.3.tar.xz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.f9IFgq/_old 2012-05-07 22:47:04.0 +0200
+++ /var/tmp/diff_new_pack.f9IFgq/_new 2012-05-07 22:47:04.0 +0200
@@ -15,10 +15,10 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-%define libver -4_2_2
+%define libver -4_2_3
Name: fcitx
-Version:4.2.2
+Version:4.2.3
Release:1
Summary:A Flexible Input Method Framework for CJK
Url:http://code.google.com/p/fcitx
@@ -30,7 +30,10 @@
Source3:xim.fcitx.suse.template
Source5: pinyin.tar.gz
Source6: table.tar.gz
+#FIX-FOR-UPSTREAM i...@marguerite.su - dont download online
Patch1:fix_fcitx_googlecode_resolv_error.patch
+#FIX-FOR-UPSTREAM i...@marguerite.su - fix lua51 builds on 11.4
+Patch2: fcitx-4.2.3-openSUSE-11.4-lua51.patch
BuildRequires: xz
BuildRequires: cairo-devel
BuildRequires: pango-devel
@@ -39,6 +42,11 @@
BuildRequires: update-desktop-files
BuildRequires: fdupes
BuildRequires: libqt4-devel
+%if 0%{?suse_version} = 1210
+BuildRequires: lua-devel
+%else
+BuildRequires: lua51-devel
+%endif
BuildRequires: opencc-devel
BuildRequires: intltool
BuildRequires: cmake
@@ -103,6 +111,7 @@
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
+%patch2 -p1
%build
mkdir build
@@ -114,7 +123,8 @@
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir} \
-DENABLE_DEBUG=On \
--DENABLE_OPENCC=On
+-DENABLE_OPENCC=On \
+ -DENABLE_LUA=On
#copy external data
pushd ../data
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.f9IFgq/_old 2012-05-07 22:47:04.0 +0200
+++ /var/tmp/diff_new_pack.f9IFgq/_new 2012-05-07 22:47:04.0 +0200
@@ -1,4 +1,4 @@
-libfcitx-4_2_2
+libfcitx-4_2_3
fcitx-gtk2
fcitx-gtk3
fcitx-qt4
\ No newline at end of file
++ fcitx-4.2.3-openSUSE-11.4-lua51.patch ++
diff --git a/src/module/lua/luawrap.c b/src/module/lua/luawrap.c
index 67883a7..417a1c9 100644
--- a/src/module/lua/luawrap.c
+++ b/src/module/lua/luawrap.c
@@ -58,13 +58,13 @@ typedef struct _ConverterItem {
UT_hash_handle hh;
} ConverterItem;
-typedef struct _LuaExtension {
+struct _LuaExtension {
char *name;
lua_State *lua;
UT_hash_handle hh;
-} LuaExtension;
+};
-typedef struct _LuaModule {
+struct _LuaModule {
FcitxInstance *fcitx;
LuaExtension *extensions;
CommandItem *commands;
@@ -73,7 +73,7 @@ typedef struct _LuaModule {
ConverterItem *converters;
ConverterItem *current_converter;
size_t shortest_input_trigger_key_length;
-} LuaModule;
+};
typedef void (*LuaResultFn)(LuaModule *luamodule, const char *in, const char
*out);
diff --git a/src/module/lua/luawrap.h b/src/module/lua/luawrap.h
index 152d835..592b275 100644
--- a/src/module/lua/luawrap.h
+++ b/src/module/lua/luawrap.h
@@ -21,18 +21,18 @@
#ifndef _LUA_WRAP_H_
#define _LUA_WRAP_H_
-typedef struct lua_State lua_State;
-typedef struct _LuaModule LuaModule;
-typedef struct _LuaExtension LuaExtension;
-typedef struct _FcitxInstance FcitxInstance;
+#include lua.h
typedef struct _LuaResultItem {
char *result;
char *help;
} LuaResultItem;
+typedef struct _LuaModule LuaModule;
+typedef struct _LuaExtension LuaExtension;
+
// alloc/free luamodule
-LuaModule * LuaModuleAlloc(FcitxInstance *fcitx);
+LuaModule * LuaModuleAlloc(struct _FcitxInstance
commit fcitx for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2012-04-12 09:22:14 Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) Package is fcitx, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-03-09 21:22:18.0 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-04-12 09:22:16.0 +0200 @@ -1,0 +2,14 @@ +Tue Apr 10 14:14:34 UTC 2012 - i...@marguerite.su + +- added baselibs.conf to build 32bit im modules and libraries. + +--- +Sun Apr 8 02:00:07 UTC 2012 - i...@marguerite.su + +- update to 4.2.2 + * Can use text as classic UI icon. + * Add more key can be used as hotkey. + * Fixes 536(trayicon),538(enter as submit). + * Make tray icon has a maximum size, so it will looks good under other tray. + +--- Old: fcitx-4.2.1.tar.xz New: baselibs.conf fcitx-4.2.2.tar.xz Other differences: -- ++ fcitx.spec ++ --- /var/tmp/diff_new_pack.cWYXdD/_old 2012-04-12 09:22:18.0 +0200 +++ /var/tmp/diff_new_pack.cWYXdD/_new 2012-04-12 09:22:18.0 +0200 @@ -15,10 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define libver -4_2_0 +%define libver -4_2_2 Name: fcitx -Version:4.2.1 +Version:4.2.2 Release:1 Summary:A Flexible Input Method Framework for CJK Url:http://code.google.com/p/fcitx ++ baselibs.conf ++ libfcitx-4_2_2 fcitx-gtk2 fcitx-gtk3 fcitx-qt4-- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked
in at 2012-03-09 21:22:14
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
Package is fcitx, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-03-05
17:59:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-03-09
21:22:18.0 +0100
@@ -1,0 +2,26 @@
+Fri Mar 09 13:11:40 UTC+8 2012 - hillw...@linuxfans.org
+
+- update to 4.2.1
+ * Changes related to API:
+Cleanup Unused macro and API
+Some new FcitxInputState series API for get the origin key event
+for frontend.
+Portable with custom path, hide two path related API that may
+break portable.
+Make FcitxHotkeyGetKey process latin letter and strip shift
+modifier for them.
+Ability to bind menu with a status.
+Ability to update client preedit with formatted string.
+ * Change related to user:
+Update Taiwan punctuation
+Quick Phrase can use grave as trigger key.
+ctrl rshift can switch input method in reverse order.
+2nd 3rd candidate choosing key will not conflict with same
+switch key.
+AutoEng can accept upper case english key which is not the
+initial key.
+Add Zenkaku_Hankaku and Hangul as default trigger key when
+locale is ja and ko.
+Add Symbolic icon for gnome-shell’s kimpanel.
+
+---
Old:
fcitx-4.2.tar.bz2
New:
fcitx-4.2.1.tar.xz
Other differences:
--
++ fcitx.spec ++
--- /var/tmp/diff_new_pack.yFARBC/_old 2012-03-09 21:22:20.0 +0100
+++ /var/tmp/diff_new_pack.yFARBC/_new 2012-03-09 21:22:20.0 +0100
@@ -18,19 +18,20 @@
%define libver -4_2_0
Name: fcitx
-Version:4.2
+Version:4.2.1
Release:1
Summary:A Flexible Input Method Framework for CJK
Url:http://code.google.com/p/fcitx
Group: System/I18n/Chinese
License:GPL-2.0+
-Source: %{name}-%{version}.tar.bz2
+Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz
Source1:xim.d-fcitx
Source2:fcitx-README.suse
Source3:xim.fcitx.suse.template
Source5: pinyin.tar.gz
Source6: table.tar.gz
Patch1:fix_fcitx_googlecode_resolv_error.patch
+BuildRequires: xz
BuildRequires: cairo-devel
BuildRequires: pango-devel
BuildRequires: dbus-1-devel
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fcitx for openSUSE:Factory
Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2012-03-05 17:59:26 Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) Package is fcitx, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-02-27 18:35:18.0 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-03-05 17:59:28.0 +0100 @@ -1,0 +2,7 @@ +Wed Feb 29 21:04:39 UTC 2012 - i...@marguerite.su + +- update source from git. +- to keep source in the same state as modules submited, + as upstream suggested. + +--- Other differences: -- ++ fcitx-4.2.tar.bz2 ++ 14232 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
