From 84d8dfc468df662a5f5b0e4374568dd21eb46578 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Mon, 10 Sep 2012 10:57:53 +0200 Subject: [PATCH] Resolves: #855788 - Make the status prompts for Ukrainian and Russian unique (from Daniil Ivanov ) - Make icons for Ukrainian and Russian unique (from Daniil Ivanov ) --- ...7-icons-russian-and-ukrainian-unique.patch | 477 ++++++++++++++++++ ...-prompt-ukrainian-and-russian-unique.patch | 40 ++ ibus-table-others.spec | 17 +- 3 files changed, 531 insertions(+), 3 deletions(-) create mode 100644 ibus-table-others-1.3.0.20100907-icons-russian-and-ukrainian-unique.patch create mode 100644 ibus-table-others-1.3.0.20100907-status-prompt-ukrainian-and-russian-unique.patch diff --git a/ibus-table-others-1.3.0.20100907-icons-russian-and-ukrainian-unique.patch b/ibus-table-others-1.3.0.20100907-icons-russian-and-ukrainian-unique.patch new file mode 100644 index 0000000..b4fbbb2 --- /dev/null +++ b/ibus-table-others-1.3.0.20100907-icons-russian-and-ukrainian-unique.patch @@ -0,0 +1,477 @@ +From 0c9d7f4bcb870a8a1af9b26fffd026e75c38c8c1 Mon Sep 17 00:00:00 2001 +From: Daniil Ivanov +Date: Sat, 8 Sep 2012 13:27:31 +0300 +Subject: [PATCH 2/2] PNG icons for Russian and Ukrainian replaced with + updated SVG versions + +--- + ibus-table-others.spec | 4 +-- + ibus-table-others.spec.in | 4 +-- + icons/Makefile | 8 ++--- + icons/Makefile.am | 8 ++--- + icons/Makefile.in | 8 ++--- + icons/translit-ua.png | Bin 2658 -> 0 bytes + icons/translit-ua.svg | 90 ++++++++++++++++++++++++++++++++++++++++++++++ + icons/translit.png | Bin 2658 -> 0 bytes + icons/translit.svg | 89 +++++++++++++++++++++++++++++++++++++++++++++ + tables/translit-ua.txt | 2 +- + tables/translit.txt | 2 +- + 11 files changed, 197 insertions(+), 18 deletions(-) + delete mode 100644 icons/translit-ua.png + create mode 100644 icons/translit-ua.svg + delete mode 100644 icons/translit.png + create mode 100644 icons/translit.svg + +diff --git a/ibus-table-others.spec b/ibus-table-others.spec +index 849796c..4984c1c 100644 +--- a/ibus-table-others.spec ++++ b/ibus-table-others.spec +@@ -49,8 +49,8 @@ rm -rf $RPM_BUILD_ROOT + %files + %defattr(-,root,root,-) + %doc AUTHORS COPYING README +-%{_datadir}/ibus-table/icons/translit.png +-%{_datadir}/ibus-table/icons/translit-ua.png ++%{_datadir}/ibus-table/icons/translit.svg ++%{_datadir}/ibus-table/icons/translit-ua.svg + %{_datadir}/ibus-table/icons/rustrad.png + %{_datadir}/ibus-table/icons/yawerty.png + %{_datadir}/ibus-table/tables/translit.db +diff --git a/ibus-table-others.spec.in b/ibus-table-others.spec.in +index 87ca595..1c653cf 100644 +--- a/ibus-table-others.spec.in ++++ b/ibus-table-others.spec.in +@@ -49,8 +49,8 @@ rm -rf $RPM_BUILD_ROOT + %files + %defattr(-,root,root,-) + %doc AUTHORS COPYING README +-%{_datadir}/ibus-table/icons/translit.png +-%{_datadir}/ibus-table/icons/translit-ua.png ++%{_datadir}/ibus-table/icons/translit.svg ++%{_datadir}/ibus-table/icons/translit-ua.svg + %{_datadir}/ibus-table/icons/rustrad.png + %{_datadir}/ibus-table/icons/yawerty.png + %{_datadir}/ibus-table/tables/translit.db +diff --git a/icons/Makefile b/icons/Makefile +index ed1ef0c..db4cc99 100644 +--- a/icons/Makefile ++++ b/icons/Makefile +@@ -54,8 +54,8 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + am__append_1 = compose.svg + am__append_2 = ipa-x-sampa.svg +-am__append_3 = translit.png +-am__append_4 = translit-ua.png ++am__append_3 = translit.svg ++am__append_4 = translit-ua.svg + am__append_5 = rustrad.png + am__append_6 = yawerty.png + am__append_7 = thai.png +@@ -193,8 +193,8 @@ iconsdir = $(datadir)/ibus-table/icons + EXTRA_DIST = \ + compose.svg \ + ipa-x-sampa.svg \ +- translit.png \ +- translit-ua.png \ ++ translit.svg \ ++ translit-ua.svg \ + rustrad.png \ + yawerty.png \ + thai.png \ +diff --git a/icons/Makefile.am b/icons/Makefile.am +index e52599b..e8658b7 100644 +--- a/icons/Makefile.am ++++ b/icons/Makefile.am +@@ -29,11 +29,11 @@ icons_DATA += ipa-x-sampa.svg + endif + + if IBUS_TABLE_BUILD_TRANSLIT +-icons_DATA += translit.png ++icons_DATA += translit.svg + endif + + if IBUS_TABLE_BUILD_TRANSLITUA +-icons_DATA += translit-ua.png ++icons_DATA += translit-ua.svg + endif + + if IBUS_TABLE_BUILD_RUSTRAD +@@ -75,8 +75,8 @@ iconsdir = $(datadir)/ibus-table/icons + EXTRA_DIST = \ + compose.svg \ + ipa-x-sampa.svg \ +- translit.png \ +- translit-ua.png \ ++ translit.svg \ ++ translit-ua.svg \ + rustrad.png \ + yawerty.png \ + thai.png \ +diff --git a/icons/Makefile.in b/icons/Makefile.in +index eb40290..f22e8da 100644 +--- a/icons/Makefile.in ++++ b/icons/Makefile.in +@@ -54,8 +54,8 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + @IBUS_TABLE_BUILD_COMPOSE_TRUE@am__append_1 = compose.svg + @IBUS_TABLE_BUILD_IPAXSAMPA_TRUE@am__append_2 = ipa-x-sampa.svg +-@IBUS_TABLE_BUILD_TRANSLIT_TRUE@am__append_3 = translit.png +-@IBUS_TABLE_BUILD_TRANSLITUA_TRUE@am__append_4 = translit-ua.png ++@IBUS_TABLE_BUILD_TRANSLIT_TRUE@am__append_3 = translit.svg ++@IBUS_TABLE_BUILD_TRANSLITUA_TRUE@am__append_4 = translit-ua.svg + @IBUS_TABLE_BUILD_RUSTRAD_TRUE@am__append_5 = rustrad.png + @IBUS_TABLE_BUILD_YAWERTY_TRUE@am__append_6 = yawerty.png + @IBUS_TABLE_BUILD_THAI_TRUE@am__append_7 = thai.png +@@ -193,8 +193,8 @@ iconsdir = $(datadir)/ibus-table/icons + EXTRA_DIST = \ + compose.svg \ + ipa-x-sampa.svg \ +- translit.png \ +- translit-ua.png \ ++ translit.svg \ ++ translit-ua.svg \ + rustrad.png \ + yawerty.png \ + thai.png \ +diff --git a/icons/translit-ua.png b/icons/translit-ua.png +deleted file mode 100644 +index aeb56285fa68535606788d3ce40010901089b085..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 2658 +zcmV-o3Z31LtnQlM=}N_H!8u@$QYRcNJNExkhm +zRYHObF3=*7QqV5qq8D5&S2TM8H6EG?vQ6VasG#!ktHJ@$CU^Zj+socH75 +zV$K-Hial7;K&+iKW-fkzI6GQ~(1m_%99L~9YwaB{z5R0=8 +zaSm%O)|&rg0Ib7UgS7)7*4Rw|BC;<4BzGtAaOLeiKtzOkz5W7F2Ly)mjXKF>lC`xpKK$@QmY0{QR5s}KdKhC#cpjOF31$w=Fq4}hH#5V;!~}^{ +zlF7+Qs@3Z8VsZVSfAc%vIeqSjKfLj&0cfMqk;NFjN$OFyu~Fvc#~*Y4{CWQM?YCLJ +zdlzHO_BI88nVA`m9XrPHIS1I));HQmVBtAv~k1M5S +zMI-|xlu~68xd!~5QtJ6?wR-xYhaSSls+aOpRwi;J +z{3PRJV{|$le)_=&gATws6pHcjF@hlYf{5gSOw5OW1J*|Z7_Pd}8eoXxEpqMJb#C6gNu^RD3<6M! +zY&Og6>@2ghvt%-vxRoE&8)FP=AW0sOQc6t$(<1USz>Sd+7#=!4Mggd;7jpel@kiNg +z_COeh6bc0v7Z>^WOP9EC;qO^lUfHpmee|o3^7XGh&DfZ~WlwU?^OT6BfN7=F&x**6 +z(Hs~OIBqH22of(XF1?VS%OC3Z`xMvKxP9ji*REgZ_4DUhUtbsCFM)GPsgJ@i>0bNRWOekzGlYNy+)SiRCpsl14cQlU5k+F;yZ^{v~zmALuw(yu3y35+%rR#&Oj +zYLwR3SzliVINJ)%ANiOAz#~8oNCU}3hYlS(b?Ov}M1n93(OT~aB96k;XcAkuB?5a( +zp=!1Em2$a^F_uoJjn*2aRJ=8H|KMYOHGcSHOiUk0%+JrCnwy&=3`3$Q+HKRMfP{#s +z(aoGOXdPj!8Ej~_)PbF%&uuT}GW7@IY%K9ig=ySqEyh+LcPB +z@{PH}bEL=9c%DZ(ljchgJjlUZ?y)DHcrxE=H9yo^hlh_G$)0%Rk)KPYQrTj$NV#05 +z)9LIL!01YhfC&HH$k|~-w{sNM*VoV0>-BF~YnjeYGnJjh_s2;2KKc9{nM`Iblm7DD +zEH8nMR{P=Ok#>O^zbFVk3Jp*{@rI#|zRukeVIOi}{qa!_x +zj=evLtAEpIG=AsOyO*Ate{h~$E=M+-C7n()K0Z!5ohFq^(d+eCT3X_@*IvU~+Xa66 +z#EBEH4xnR=LL +z?Ufw>>@>`IUql{IN{z=+@V7XXiv36{rH1ziM5GNY0lyfZS38bXu3Wi7GMU5}L!;4P +zb#;}Ml@&HNHa7piapMN%av2f1Dk2;Aao)xI-FpUH@!tacL_|u!2G9ZeN+}&XYym4G +z5zvZ%cNw_jd0rFfDWw7++;$9}QmfUtbLS4jO4#jo>2|v`n@tLZ0!vFvlu9K;q-2cw +z+js@H64=I$^zS!Oi@$3DKUPXTB_aovQkgivJ*CtzU3wzYjkk?u;E;1}HI7Jf$2u@v +z`A(-pqtO_2kfjnUD=QQVg`s5pr?vJ6A~MX=&DB>*=~$UYnHG_M0a7AzG|qcpM66P( +zB_el$_SOjv@YYBba?TM&QJm{*EG{l``}Xaj<89z|t@VX1UF7!F4}j(;P(Kaayx*MY +zlbQm^X0z{wVfc8Qn+;&yIad{to6fmwfEN#F$F~v60lj$M^An)>zdfB+yPW&2c(XAU +zJH1uTWcXe{DOD4Z0`TK~HC~VBHe*{PZ@c2?IBzS!+xzbQK)mBo+w$GTIp2@vt_r-n +zjd=U#1;-Yrol?q(NEqjQ3#bC`#9;R48=6?3ZLAvISk?-_`@=%=xqU|aF9Afs2OGhh +QasU7T07*qoM6N<$f^3f=WB>pF + +diff --git a/icons/translit-ua.svg b/icons/translit-ua.svg +new file mode 100644 +index 0000000..78edf16 +--- /dev/null ++++ b/icons/translit-ua.svg +@@ -0,0 +1,90 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ image/svg+xml ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/icons/translit.png b/icons/translit.png +deleted file mode 100644 +index aeb56285fa68535606788d3ce40010901089b085..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 2658 +zcmV-o3Z31LtnQlM=}N_H!8u@$QYRcNJNExkhm +zRYHObF3=*7QqV5qq8D5&S2TM8H6EG?vQ6VasG#!ktHJ@$CU^Zj+socH75 +zV$K-Hial7;K&+iKW-fkzI6GQ~(1m_%99L~9YwaB{z5R0=8 +zaSm%O)|&rg0Ib7UgS7)7*4Rw|BC;<4BzGtAaOLeiKtzOkz5W7F2Ly)mjXKF>lC`xpKK$@QmY0{QR5s}KdKhC#cpjOF31$w=Fq4}hH#5V;!~}^{ +zlF7+Qs@3Z8VsZVSfAc%vIeqSjKfLj&0cfMqk;NFjN$OFyu~Fvc#~*Y4{CWQM?YCLJ +zdlzHO_BI88nVA`m9XrPHIS1I));HQmVBtAv~k1M5S +zMI-|xlu~68xd!~5QtJ6?wR-xYhaSSls+aOpRwi;J +z{3PRJV{|$le)_=&gATws6pHcjF@hlYf{5gSOw5OW1J*|Z7_Pd}8eoXxEpqMJb#C6gNu^RD3<6M! +zY&Og6>@2ghvt%-vxRoE&8)FP=AW0sOQc6t$(<1USz>Sd+7#=!4Mggd;7jpel@kiNg +z_COeh6bc0v7Z>^WOP9EC;qO^lUfHpmee|o3^7XGh&DfZ~WlwU?^OT6BfN7=F&x**6 +z(Hs~OIBqH22of(XF1?VS%OC3Z`xMvKxP9ji*REgZ_4DUhUtbsCFM)GPsgJ@i>0bNRWOekzGlYNy+)SiRCpsl14cQlU5k+F;yZ^{v~zmALuw(yu3y35+%rR#&Oj +zYLwR3SzliVINJ)%ANiOAz#~8oNCU}3hYlS(b?Ov}M1n93(OT~aB96k;XcAkuB?5a( +zp=!1Em2$a^F_uoJjn*2aRJ=8H|KMYOHGcSHOiUk0%+JrCnwy&=3`3$Q+HKRMfP{#s +z(aoGOXdPj!8Ej~_)PbF%&uuT}GW7@IY%K9ig=ySqEyh+LcPB +z@{PH}bEL=9c%DZ(ljchgJjlUZ?y)DHcrxE=H9yo^hlh_G$)0%Rk)KPYQrTj$NV#05 +z)9LIL!01YhfC&HH$k|~-w{sNM*VoV0>-BF~YnjeYGnJjh_s2;2KKc9{nM`Iblm7DD +zEH8nMR{P=Ok#>O^zbFVk3Jp*{@rI#|zRukeVIOi}{qa!_x +zj=evLtAEpIG=AsOyO*Ate{h~$E=M+-C7n()K0Z!5ohFq^(d+eCT3X_@*IvU~+Xa66 +z#EBEH4xnR=LL +z?Ufw>>@>`IUql{IN{z=+@V7XXiv36{rH1ziM5GNY0lyfZS38bXu3Wi7GMU5}L!;4P +zb#;}Ml@&HNHa7piapMN%av2f1Dk2;Aao)xI-FpUH@!tacL_|u!2G9ZeN+}&XYym4G +z5zvZ%cNw_jd0rFfDWw7++;$9}QmfUtbLS4jO4#jo>2|v`n@tLZ0!vFvlu9K;q-2cw +z+js@H64=I$^zS!Oi@$3DKUPXTB_aovQkgivJ*CtzU3wzYjkk?u;E;1}HI7Jf$2u@v +z`A(-pqtO_2kfjnUD=QQVg`s5pr?vJ6A~MX=&DB>*=~$UYnHG_M0a7AzG|qcpM66P( +zB_el$_SOjv@YYBba?TM&QJm{*EG{l``}Xaj<89z|t@VX1UF7!F4}j(;P(Kaayx*MY +zlbQm^X0z{wVfc8Qn+;&yIad{to6fmwfEN#F$F~v60lj$M^An)>zdfB+yPW&2c(XAU +zJH1uTWcXe{DOD4Z0`TK~HC~VBHe*{PZ@c2?IBzS!+xzbQK)mBo+w$GTIp2@vt_r-n +zjd=U#1;-Yrol?q(NEqjQ3#bC`#9;R48=6?3ZLAvISk?-_`@=%=xqU|aF9Afs2OGhh +QasU7T07*qoM6N<$f^3f=WB>pF + +diff --git a/icons/translit.svg b/icons/translit.svg +new file mode 100644 +index 0000000..c034b87 +--- /dev/null ++++ b/icons/translit.svg +@@ -0,0 +1,89 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ image/svg+xml ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tables/translit-ua.txt b/tables/translit-ua.txt +index 5af3917..e533dd4 100644 +--- a/tables/translit-ua.txt ++++ b/tables/translit-ua.txt +@@ -23,7 +23,7 @@ UUID = 9068f86e-02b5-400b-9732-4f9433ac9968 + ### This number must be less than 2^32. + SERIAL_NUMBER = 20120906 + +-ICON = translit-ua.png ++ICON = translit-ua.svg + + ### The default name of this table + NAME = Ua-Translit +diff --git a/tables/translit.txt b/tables/translit.txt +index 11d6425..da3ec62 100644 +--- a/tables/translit.txt ++++ b/tables/translit.txt +@@ -21,7 +21,7 @@ UUID = e39c975a-262b-4ad3-b9b8-15c5ff211e4e + ### This number must be less than 2^32. + SERIAL_NUMBER = 20120906 + +-ICON = translit.png ++ICON = translit.svg + + ### The default name of this table + NAME = Translit +-- +1.7.11.4 + diff --git a/ibus-table-others-1.3.0.20100907-status-prompt-ukrainian-and-russian-unique.patch b/ibus-table-others-1.3.0.20100907-status-prompt-ukrainian-and-russian-unique.patch new file mode 100644 index 0000000..a2325ef --- /dev/null +++ b/ibus-table-others-1.3.0.20100907-status-prompt-ukrainian-and-russian-unique.patch @@ -0,0 +1,40 @@ +From 0d3d5a4bee836c7338ba4140415e672959f1e507 Mon Sep 17 00:00:00 2001 +From: Daniil Ivanov +Date: Fri, 7 Sep 2012 17:08:49 +0300 +Subject: [PATCH 1/2] Change status prompt for Ukrainian and Russian + transliteration tables to make it unique + +--- + tables/translit-ua.txt | 2 +- + tables/translit.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tables/translit-ua.txt b/tables/translit-ua.txt +index 0eeb497..5af3917 100644 +--- a/tables/translit-ua.txt ++++ b/tables/translit-ua.txt +@@ -38,7 +38,7 @@ LANGUAGES = uk_UA + AUTHOR = Daniil Ivanov + + ### Prompt string to be displayed in the status area. +-STATUS_PROMPT = Ua ++STATUS_PROMPT = Yi + + ### The Keyboard Layout used by this table. Unset or set to "Unknown" to accept any kind of layouts. + KEYBOARD_LAYOUT = Unknown +diff --git a/tables/translit.txt b/tables/translit.txt +index 9b4754b..11d6425 100644 +--- a/tables/translit.txt ++++ b/tables/translit.txt +@@ -36,7 +36,7 @@ LANGUAGES = ru_RU + AUTHOR = Daniil Ivanov + + ### Prompt string to be displayed in the status area. +-STATUS_PROMPT = Я ++STATUS_PROMPT = Ya + + ### The Keyboard Layout used by this table. Unset or set to "Unknown" to accept any kind of layouts. + KEYBOARD_LAYOUT = Unknown +-- +1.7.11.4 + diff --git a/ibus-table-others.spec b/ibus-table-others.spec index 9376130..86de118 100644 --- a/ibus-table-others.spec +++ b/ibus-table-others.spec @@ -2,7 +2,7 @@ Name: ibus-table-others Version: 1.3.0.20100907 -Release: 12%{?dist} +Release: 14%{?dist} Summary: Various tables for IBus-Table License: GPLv3 Group: System Environment/Libraries @@ -12,6 +12,8 @@ Patch0: ibus-table-others-1.3.0.20100907-fix-emoji-build.patch Patch1: ibus-table-others-1.3.0.20100907-improve-translit.patch Patch2: ibus-table-others-1.3.0.20100907-table-language-empty.patch Patch3: ibus-table-others-1.3.0.20100907-fix-ipa-x-sampa-icon.patch +Patch4: ibus-table-others-1.3.0.20100907-status-prompt-ukrainian-and-russian-unique.patch +Patch5: ibus-table-others-1.3.0.20100907-icons-russian-and-ukrainian-unique.patch BuildArch: noarch Requires: ibus-table @@ -70,6 +72,8 @@ The package contains table for writing Unicode mathematics symbols. %patch1 -p1 -b .improve-translit %patch2 -p1 -b .table-language-empty %patch3 -p1 -b .fix-ipa-x-sampa-icon +%patch4 -p1 -b .status-prompt-uk-ru-unique +%patch5 -p1 -b .icons-uk-ru-unique %build %configure @@ -118,8 +122,8 @@ cd ${RPM_BUILD_ROOT}/%{_datadir}/ibus-table/tables/ %files -n ibus-table-translit %{_datadir}/ibus-table/tables/translit.db %{_datadir}/ibus-table/tables/translit-ua.db -%{_datadir}/ibus-table/icons/translit.png -%{_datadir}/ibus-table/icons/translit-ua.png +%{_datadir}/ibus-table/icons/translit.svg +%{_datadir}/ibus-table/icons/translit-ua.svg %files -n ibus-table-tv %{_datadir}/ibus-table/tables/thai.db @@ -132,6 +136,13 @@ cd ${RPM_BUILD_ROOT}/%{_datadir}/ibus-table/tables/ %{_datadir}/ibus-table/icons/mathwriter.png %changelog +* Mon Sep 10 2012 Mike FABIAN - 1.3.0.20100907-14 +- Resolves: #855788 +- Make the status prompts for Ukrainian and Russian unique + (from Daniil Ivanov ) +- Make icons for Ukrainian and Russian unique + (from Daniil Ivanov ) + * Thu Sep 06 2012 Mike FABIAN - 1.3.0.20100907-13 - Resolves: #855098 - Correct the filename of the ipa-x-sampa icon and replace it with a nicer