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

Accepting request 261973 from home:Ledest:bashisms

Browse Source 
fix bashism in env_setup.sh script

OBS-URL: https://build.opensuse.org/request/show/261973
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=110
This commit is contained in:
Marguerite Su 2014-11-17 07:56:41 +00:00 committed by Git OBS Bridge
parent d9a90afe06
commit 166423fb00
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fcitx-4.2.8.5-fix-bashisms.patch Normal file
View File

@ -0,0 +1,12 @@
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

7
fcitx.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Nov 17 00:58:00 UTC 2014 - Led <ledest@gmail.com>
- fix bashism in env_setup.sh script
- add patches:
* fcitx-4.2.8.5-fix-bashisms.patch
-------------------------------------------------------------------
Sun Nov 9 19:42:33 UTC 2014 - i@marguerite.su

2
fcitx.spec
View File

@ -34,6 +34,7 @@ Source7: xinput-fcitx
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 @@ You can either use this package for download from kde-look.org using knewstaff i
%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 \