pool/fcitx
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 418801 from M17N

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/418801
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fcitx?expand=0&rev=55
This commit is contained in:
Dominique Leuenberger 2016-08-12 13:44:07 +00:00 committed by Git OBS Bridge
commit 5cfa130717
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fcitx.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 4 14:57:37 UTC 2016 - i@marguerite.su Fri Mar 4 14:57:37 UTC 2016 - i@marguerite.su

11
fcitx.spec
View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define libver -4_2_9 %define libver -4_2_9
Name: fcitx Name: fcitx
@ -46,11 +45,12 @@ BuildRequires: dbus-1-glib-devel
BuildRequires: enchant-devel BuildRequires: enchant-devel
BuildRequires: iso-codes-devel BuildRequires: iso-codes-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
# Dictionary ownership # Directory ownership start
BuildRequires: kde4-filesystem BuildRequires: kde4-filesystem
%if 0%{?suse_version} >= 1140 %if 0%{?suse_version} >= 1140 && 0%{?suse_version} <= 1320
BuildRequires: kdebase4-runtime-branding-openSUSE BuildRequires: kdebase4-runtime-branding-openSUSE
%endif %endif
# Directory ownership end
BuildRequires: libpresage-devel BuildRequires: libpresage-devel
BuildRequires: pango-devel BuildRequires: pango-devel
%if 0%{?suse_version} >= 1110 %if 0%{?suse_version} >= 1110
@ -366,6 +366,7 @@ You can either use this package for download from kde-look.org using knewstaff i
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860) # hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if %suse_version < 1310 %if %suse_version < 1310
sed -i \ sed -i \
@ -417,7 +418,7 @@ mv openSUSE-themes/Harlequin %{buildroot}%{_datadir}/%{name}/skin/
mv openSUSE-themes/Dartmouth %{buildroot}%{_datadir}/%{name}/skin/ mv openSUSE-themes/Dartmouth %{buildroot}%{_datadir}/%{name}/skin/
mv openSUSE-themes/NewAir %{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 # 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/openSUSE/icons/
mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/ mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/
@ -656,7 +657,7 @@ exit 0
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/%{name}/skin/Harlequin %{_datadir}/%{name}/skin/Harlequin
%{_datadir}/%{name}/skin/Dartmouth %{_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/openSUSE/icons/input.svgz
%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz %{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz
%if 0%{?suse_version} <= 1310 %if 0%{?suse_version} <= 1310