Accepting request 350453 from home:MargueriteSu:branches:M17N

OBS-URL: https://build.opensuse.org/request/show/350453
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=130
This commit is contained in:
Marguerite Su 2015-12-23 06:24:14 +00:00 committed by Git OBS Bridge
parent 14d6742fc4
commit f471878918
5 changed files with 14 additions and 18 deletions

View File

@ -1,12 +0,0 @@
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.000000000 +0300
+++ fcitx-4.2.8.5-fix-bashisms/data/env_setup.sh 2014-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 2>&1
}
if [ -z "$XMODIFIERS" ]; then

View File

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

View File

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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Mon Nov 30 11:58:56 UTC 2015 - swyear@gmail.com

View File

@ -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 @@ Source3: xim.fcitx.suse.template
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 @@ You can either use this package for download from kde-look.org using knewstaff i
%prep
%setup -q -n %{name}-%{version}
%patch -p1
%patch1 -p1
%patch2 -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)