From db9ee48d2172e0414235d15fa7919410666029de5855b4134940b027f76273df Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 9 Nov 2014 07:38:43 +0000 Subject: [PATCH 1/3] Accepting request 260435 from home:MargueriteSu:branches:M17N update themes OBS-URL: https://build.opensuse.org/request/show/260435 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=106 --- fcitx.changes | 10 ++++++++++ fcitx.spec | 34 ++++++++++++++++++++-------------- input.svgz | Bin 1562 -> 0 bytes openSUSE-themes.tar.gz | 4 ++-- 4 files changed, 32 insertions(+), 16 deletions(-) delete mode 100644 input.svgz diff --git a/fcitx.changes b/fcitx.changes index 14b9f01..d18e9b4 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Sat Sep 20 09:32:24 UTC 2014 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index e6712ab..92d5922 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -33,7 +33,6 @@ Source3: xim.fcitx.suse.template 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 @@ Tools to convert txt or scel(sougou pinyin data format) pinyin sheets to fcitx m %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 @@ Conflicts: otherproviders(%{name}-branding) 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 @@ cd .. %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-Harlequin.svgz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz +cp -r openSUSE-themes/input-Dartmouth.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 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %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 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %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 diff --git a/input.svgz b/input.svgz deleted file mode 100644 index 9da72e30535fedfdb448cda13018dd0f808797dc7c99a970c64646fed62c8d13..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1562 zcmV+#2Icu5iwFP!000000OeRqkJ~m7zVEM4l}i@2C_eO}V{Z-(3Iyn>P0(W@OSG-5 zBnlM0w)5*d)Weo!J4u^GfJL-e>}qB>ocZSCkmBO)p~$T#q3TSQOPe5UTcS*4nw6WS z{qe)^PGnoPj>|O8Whs_+DebopcZ**f$NEi)Sc}x!XL@VBFCXh9u7ve^t93PZ-Ti)# zvQCJk+PL?Y<2>BmE$XMuon=`tZ&}aNWNCK;s-4Ok!!&V4E(%fV+9im%_Srl+n`5fDC}deTBg^{Lz*wd0leLLv&l)4bId?I2DRscYsgI?O56*Zf#CUBe#TdJwJ6nF6 z)w~8kEBHN`_X1SQol3+S#tBpk?Y{f)?xb`uN_9GL)8jdsbp&!57ox7>MAU9CZ^rMl zRBx9y!_C`PWSgyC+LR+6M4{gZvvg@g)Uj$6omW z+Qlg#GfDcCiM<)qX1a>&78%Q`;tjAUmuhLhA|YXfb&8c#sZhNtXr7Tu0@9g2w(F+z z-A81+p7a=ntbMMT)!R6gdnm_L`B};WoCi~Ra)2Ze4@2Pch0cV-kmobZqp1=qvoj0J z*_D|F@>Yk7;X9>_K^`9kWW8a;^E;b*EB6~^z+1=p3BA)uC?90ubW9_ddN(Y3_J!mk zzRm*Db1uN>bda8NfnujC;zL$sp9O?SrY3b6SB?q49>?EgwaZcga;sSekvoKS>Q6%nUR-71Ofx(X^<;(I{-oZPucDxfmOH zD%SORRhl=iA5sV%r?HOD>RuA|$wLF5|M~9shi>LYlFa{>>ah>RvW!8zk~^TA{csX5 z(qs-Tw}|yaRsgW3TmK3zcHy2CBV&`%*=g%miMDrN-N4eM$jl)3FP-K2doxLw*1&0| zb8!|f+%EbqH+PWS!tGOU-Zt$Jt>Usa;hIvxzd3Bjubl{SpHgUKGlyW0AsVuK`;1}N zUoU8`mPJVRRPh@!yPiFz6LGf+GaB3>Nw`79c;Mp6}hC%5rwr zx@$HM=TRJ2GFIuZdYfS>+L>{P2Ns4Iu?IG5*n%{cjit*D=OG3{DuO(G8H{l<9>4M43F4gi{}1@q>_$1+#Zqj7p~#PDcoEFk68Rbs0}Q$S(&_ONF+QBO zgXds;WcoQJUurea&Ug=TazVX@@fZb!d%-lA=VN>{b^Y?_@qNJij9vqtBkV;un3nn( zfuFkm`GEJX0q?&#)ui#%pUh%k(OI&-M$)R6_BG1Q0i`HUbE5YM8BM}cn)x)D>s6>b;| zq0>%V!TGXGmVk+t%1L(WDb_nBragb*ZU!&Y#c=)p5)!e$WOeu^tHJH+$6Bb`-5&Et zv65x&LSat#tNk=Hb3_x+m1ft=83)^~ zJfHbvbh{-xx|!~uez~)8;_asZ3s4a9aTSk^hC_LMSo_1PmQ8=jvT3hZ;LpO`0zKUQ M3pRa~ClVO|0I6>b<^TWy diff --git a/openSUSE-themes.tar.gz b/openSUSE-themes.tar.gz index f14879c..c33277e 100644 --- a/openSUSE-themes.tar.gz +++ b/openSUSE-themes.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c2083e6b4c71461caae058f3c65459ee95cf7c0f42fb981eeafbde8301bfde3 -size 780402 +oid sha256:da53fd98d21546e3d9094bac0e4bc581d0039526fc85bec6cd4047f680a45bbf +size 1089588 From 7a8f9d2ebed26ffff63fdeec09d8502b5d656426dcd7f392baf50efbd00b7a4e Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 9 Nov 2014 07:44:57 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=107 --- fcitx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fcitx.spec b/fcitx.spec index 92d5922..17f4eb9 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -440,8 +440,8 @@ 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/ mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/ -cp -r openSUSE-themes/input-Harlequin.svgz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz -cp -r openSUSE-themes/input-Dartmouth.svgz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz +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 From d9a90afe0655ea5425b3ffa9d4e956980f21d0aecb7344f675b32cea918fbe9a Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 9 Nov 2014 19:48:17 +0000 Subject: [PATCH 3/3] Accepting request 260516 from home:MargueriteSu:branches:M17N OBS-URL: https://build.opensuse.org/request/show/260516 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=108 --- fcitx.changes | 5 +++++ openSUSE-themes.tar.gz | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fcitx.changes b/fcitx.changes index d18e9b4..ffe02bf 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/openSUSE-themes.tar.gz b/openSUSE-themes.tar.gz index c33277e..7496325 100644 --- a/openSUSE-themes.tar.gz +++ b/openSUSE-themes.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da53fd98d21546e3d9094bac0e4bc581d0039526fc85bec6cd4047f680a45bbf -size 1089588 +oid sha256:056c28d1481305fb0d46dca888dcb238fb94aba7c6540b0afd4948706555b556 +size 1089321