From 5f7893654551f0cbfaefa82e5e7a14543bca4313 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 5 Mar 2012 11:50:23 +0900 Subject: [PATCH] Update to 1.4.0-4. --- ibus-hangul-HEAD.patch | 518 ++++++++++++++++++++++++++++ ibus-hangul-no-ibus-daemon.patch | 44 --- ibus-hangul-use-system-icon.patch | 36 -- ibus-hangul-xx-icon-symbol.patch | 86 ----- ibus-hangul.spec | 41 +-- ibus-setup-hangul.png | Bin 0 -> 6771 bytes ibus-setup-hangul.svg | 548 ++++++++++++++++++++++++++++++ series | 2 - 8 files changed, 1084 insertions(+), 191 deletions(-) create mode 100644 ibus-hangul-HEAD.patch delete mode 100644 ibus-hangul-no-ibus-daemon.patch delete mode 100644 ibus-hangul-use-system-icon.patch delete mode 100644 ibus-hangul-xx-icon-symbol.patch create mode 100644 ibus-setup-hangul.png create mode 100644 ibus-setup-hangul.svg delete mode 100644 series diff --git a/ibus-hangul-HEAD.patch b/ibus-hangul-HEAD.patch new file mode 100644 index 0000000..8d13782 --- /dev/null +++ b/ibus-hangul-HEAD.patch @@ -0,0 +1,518 @@ +From 5ed10c1319f994536be4bbce2cf891be5a72d50a Mon Sep 17 00:00:00 2001 +From: Choe Hwanjin +Date: Wed, 11 Jan 2012 23:00:14 +0900 +Subject: [PATCH 1/7] Fix typo in README + +--- + README | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/README b/README +index 32481ef..3d64330 100644 +--- a/README ++++ b/README +@@ -1,7 +1,7 @@ + ibus-hangul + ----------- + +-ibus-hangul is a Korean input method engine for IBus. It is ++ibus-hangul is a Korean input method engine for IBus. + + The official web site is: + +-- +1.7.7.6 + + +From 64d68d37f61be45b187ef9de7855b423052cec96 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Thu, 26 Jan 2012 11:24:13 +0900 +Subject: [PATCH 2/7] Don't abort ibus-setup-hangul with exception when + ibus-daemon is not running. + +Fixes https://bugzilla.redhat.com/show_bug.cgi?id=784377 +--- + setup/main.py | 15 ++++++++++++--- + 1 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/setup/main.py b/setup/main.py +index 9dd0238..068c048 100644 +--- a/setup/main.py ++++ b/setup/main.py +@@ -32,8 +32,8 @@ from keycapturedialog import KeyCaptureDialog + _ = lambda a : gettext.dgettext(config.gettext_package, a) + + class Setup (): +- def __init__ (self): +- self.__bus = ibus.Bus() ++ def __init__ (self, bus): ++ self.__bus = bus + self.__config = self.__bus.get_config() + self.__config.connect("value-changed", self.on_value_changed, None) + +@@ -194,4 +194,13 @@ if __name__ == "__main__": + locale.bindtextdomain(config.gettext_package, config.localedir) + locale.bind_textdomain_codeset(config.gettext_package, "UTF-8") + +- Setup().run() ++ try: ++ bus = ibus.Bus() ++ except: ++ message = _("IBus daemon is not started") ++ dialog = gtk.MessageDialog(type = gtk.MESSAGE_ERROR, ++ buttons = gtk.BUTTONS_CLOSE, ++ message_format = message) ++ dialog.run() ++ sys.exit(1) ++ Setup(bus).run() +-- +1.7.7.6 + + +From c29819ff8c435bfc26ce51da8b48bb39ba500850 Mon Sep 17 00:00:00 2001 +From: Choe Hwanjin +Date: Mon, 6 Feb 2012 22:22:47 +0900 +Subject: [PATCH 3/7] Update icon files + +--- + icons/ibus-hangul.png | Bin 4044 -> 3602 bytes + icons/ibus-hangul.svg | 74 ++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 55 insertions(+), 19 deletions(-) + +diff --git a/icons/ibus-hangul.png b/icons/ibus-hangul.png +index 81071c6..5383120 100644 +Binary files a/icons/ibus-hangul.png and b/icons/ibus-hangul.png differ +diff --git a/icons/ibus-hangul.svg b/icons/ibus-hangul.svg +index bed691d..a882f73 100644 +--- a/icons/ibus-hangul.svg ++++ b/icons/ibus-hangul.svg +@@ -1,5 +1,6 @@ + + ++ + ++ inkscape:output_extension="org.inkscape.output.svg.inkscape" ++ version="1.1"> + + ++ ++ ++ + + ++ inkscape:snap-global="true" ++ inkscape:window-maximized="0"> + +@@ -218,41 +251,44 @@ + inkscape:label="Layer 1" + inkscape:groupmode="layer"> + ++ id="g3792"> + + + ++ d="m 36.3125,7.75 c -5.309812,0.20047 -11.096327,4.017047 -13.25,9.09375 -2.431845,5.732422 1.861299,15.292237 8.375,14.0625 3.39958,-5.846265 12.282749,-4.659751 16.03125,0.3125 3.319719,4.403489 3.13754,10.395082 0.65625,15.09375 -2.073489,3.926441 -5.569183,7.827979 -10.25,9.5 11.091004,-2.85578 19.28125,-12.927742 19.28125,-24.90625 0,-6.969356 -2.774462,-13.304038 -7.28125,-17.9375 C 46.076648,9.682735 40.789748,7.58096 36.3125,7.75 z" ++ style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:evenodd;stroke:none" ++ inkscape:connector-curvature="0" /> + ++ d="m 8.749353,38.529535 c 2.828518,4.498197 9.661005,7.918163 15.134393,7.244949 6.180347,-0.760172 11.417786,-9.62528 7.553484,-14.867948 C 24.674426,30.885546 21.260393,22.599239 23.692238,16.866816 25.845912,11.79011 31.125873,8.95209 36.435684,8.75161 40.872826,8.58409 45.999504,9.66068 49.787925,12.878372 41.769245,4.70117 28.951547,2.64419 18.577855,8.63345 12.542216,12.11812 8.443448,17.688221 6.684148,23.907944 5.737555,28.840418 6.364336,34.736644 8.749353,38.529535 z" ++ style="fill:url(#linearGradient3017);fill-opacity:1;fill-rule:evenodd;stroke:none" ++ inkscape:connector-curvature="0" /> + ++ d="M 48.124455,46.314422 C 50.605749,41.615755 50.809776,35.629209 47.490062,31.225723 43.74156,26.253472 34.835976,25.058764 31.436578,30.906169 34.799802,36.773424 29.330666,43.873217 23.15032,44.633389 17.676926,45.306606 12.579148,42.153035 9.750622,37.654844 7.386974,33.895926 5.75599,28.917798 6.648382,24.028083 3.576058,35.061065 8.20351,47.190007 18.577207,53.179258 c 6.035632,3.484681 12.908865,4.249268 19.174953,2.663005 4.744944,-1.646463 8.280063,-5.56591 10.372295,-9.527841 z" ++ style="fill:url(#linearGradient3014);fill-opacity:1;fill-rule:evenodd;stroke:none" ++ inkscape:connector-curvature="0" /> + + + +-- +1.7.7.6 + + +From 050c84ea5a7ba1dc19de34ee28ef02d00b7d0ad0 Mon Sep 17 00:00:00 2001 +From: Choe Hwanjin +Date: Fri, 10 Feb 2012 23:02:49 +0900 +Subject: [PATCH 4/7] Install icons to hicolor icon theme directory + +This makes ibus-hangul's icons themable. +--- + icons/Makefile.am | 10 +++++++--- + setup/Makefile.am | 6 ++++++ + src/hangul.xml.in.in | 2 +- + 3 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/icons/Makefile.am b/icons/Makefile.am +index 638af49..2414f13 100644 +--- a/icons/Makefile.am ++++ b/icons/Makefile.am +@@ -23,10 +23,14 @@ icons_DATA = \ + ibus-hangul.png \ + ibus-hangul.svg \ + $(NULL) +- + iconsdir = $(pkgdatadir)/icons + ++hicolor_icon_64_DATA = ibus-hangul.png ++hicolor_icon_64dir = $(datadir)/icons/hicolor/64x64/apps ++ ++hicolor_icon_scalable_DATA = ibus-hangul.svg ++hicolor_icon_scalabledir = $(datadir)/icons/hicolor/scalable/apps ++ + EXTRA_DIST = \ +- ibus-hangul.png \ +- ibus-hangul.svg \ ++ $(icon_DATA) \ + $(NULL) +diff --git a/setup/Makefile.am b/setup/Makefile.am +index eedb507..f0fd9b3 100644 +--- a/setup/Makefile.am ++++ b/setup/Makefile.am +@@ -43,6 +43,12 @@ desktop_DATA = ibus-setup-hangul.desktop + desktopdir = $(datadir)/applications + @INTLTOOL_DESKTOP_RULE@ + ++hicolor_icon_64_DATA = ibus-setup-hangul.png ++hicolor_icon_64dir = $(datadir)/icons/hicolor/64x64/apps ++ ++hicolor_icon_scalable_DATA = ibus-setup-hangul.svg ++hicolor_icon_scalabledir = $(datadir)/icons/hicolor/scalable/apps ++ + CLEANFILES = \ + ibus-setup-hangul \ + config.py \ +diff --git a/src/hangul.xml.in.in b/src/hangul.xml.in.in +index a87df59..c634d62 100644 +--- a/src/hangul.xml.in.in ++++ b/src/hangul.xml.in.in +@@ -16,7 +16,7 @@ + ko + GPL + Peng Huang <shawn.p.huang@gmail.com> +- ${pkgdatadir}/icons/ibus-hangul.png ++ ibus-hangul + us + Korean + Korean Input Method +-- +1.7.7.6 + + +From 5b2fbc34ea17cfa71efaca42bcfdf1aedafd3587 Mon Sep 17 00:00:00 2001 +From: Choe Hwanjin +Date: Sun, 12 Feb 2012 21:11:05 +0900 +Subject: [PATCH 5/7] Install symbolic link to ibus-setup-hangul in bindir + +ibus-setup scan $(libexecdir) to find setup executables. +So it is better to install ibus-setup-hangul into $(libexecdir). +--- + configure.ac | 2 ++ + setup/Makefile.am | 18 +++++++++++++++++- + 2 files changed, 19 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 03e2496..a7a42d9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,9 +45,11 @@ AM_DISABLE_STATIC + AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_CXX ++AC_PROG_LN_S + AC_ISC_POSIX + AC_HEADER_STDC + AM_PROG_LIBTOOL ++ + IT_PROG_INTLTOOL([0.35.0]) + + # check ibus +diff --git a/setup/Makefile.am b/setup/Makefile.am +index f0fd9b3..b3b48af 100644 +--- a/setup/Makefile.am ++++ b/setup/Makefile.am +@@ -29,7 +29,7 @@ nodist_setup_hangul_PYTHON = config.py + + setup_hanguldir = $(pkgdatadir)/setup + +-bin_SCRIPTS = ibus-setup-hangul ++libexec_SCRIPTS = ibus-setup-hangul + + setuplibdir = $(pkglibdir)/setup + setuplib_PROGRAMS = hangul_keyboard_list +@@ -75,3 +75,19 @@ config.py: config.py.in Makefile + + ibus-setup-hangul: ibus-setup-hangul.in config.py Makefile + sed -e 's&@SETUP_PKGDATADIR@&$(pkgdatadir)&g' $< > $@ ++ ++install-exec-hook: ++ $(mkdir_p) $(DESTDIR)$(bindir) ++ cd $(DESTDIR)$(bindir) && \ ++ rm -f ibus-setup-hangul && \ ++ a="$(bindir)"; b="$(libexecdir)"; updir=""; downdir=""; \ ++ while test "$$a" != "$$b"; do \ ++ bbase=`basename $$b`; \ ++ updir="../$$updir"; \ ++ downdir="$$bbase/$$downdir"; \ ++ a=`dirname $$a`; b=`dirname $$b`; \ ++ done; \ ++ $(LN_S) $$updir$${downdir}ibus-setup-hangul ibus-setup-hangul ++ ++uninstall-hook: ++ cd "$(DESTDIR)$(bindir)" && rm -f ibus-setup-hangul +-- +1.7.7.6 + + +From d3ca4607f87c5244f3ebddb99c2f8310da767eb7 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Tue, 14 Feb 2012 15:42:32 +0900 +Subject: [PATCH 6/7] Define in the component file. + +--- + src/hangul.xml.in.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/hangul.xml.in.in b/src/hangul.xml.in.in +index a87df59..0496f7f 100644 +--- a/src/hangul.xml.in.in ++++ b/src/hangul.xml.in.in +@@ -21,6 +21,7 @@ + Korean + Korean Input Method + 99 ++ 한 + + + +-- +1.7.7.6 + + +From 86a2b75ac2c0f999bf987b99d4b4920342a2cbd1 Mon Sep 17 00:00:00 2001 +From: Choe Hwanjin +Date: Sat, 18 Feb 2012 21:39:48 +0900 +Subject: [PATCH 7/7] Update ibus-setup-hangul icon + +Use alpha for shade instead of gray color. +This looks better on black background. +--- + setup/ibus-setup-hangul.png | Bin 6979 -> 6771 bytes + setup/ibus-setup-hangul.svg | 59 ++++++++++++++++++++++++++++++++----------- + 2 files changed, 44 insertions(+), 15 deletions(-) + +diff --git a/setup/ibus-setup-hangul.png b/setup/ibus-setup-hangul.png +index b515dbe..e79bd4a 100644 +Binary files a/setup/ibus-setup-hangul.png and b/setup/ibus-setup-hangul.png differ +diff --git a/setup/ibus-setup-hangul.svg b/setup/ibus-setup-hangul.svg +index 47beb5a..2195456 100644 +--- a/setup/ibus-setup-hangul.svg ++++ b/setup/ibus-setup-hangul.svg +@@ -350,6 +350,36 @@ + id="linearGradient3294" + xlink:href="#linearGradient4023" + inkscape:collect="always" /> ++ ++ ++ + + + ++ id="g3827"> + + ++ d="m 35.839182,22.424506 c -2.497751,0.0943 -5.219744,1.889631 -6.232838,4.277727 -1.143947,2.696548 0.87556,7.193512 3.939624,6.615041 1.599172,-2.7501 5.777841,-2.191961 7.541147,0.147001 1.561605,2.071414 1.475908,4.889876 0.308702,7.100143 -0.975376,1.84701 -2.61976,3.682304 -4.82163,4.468828 5.21724,-1.343367 9.069956,-6.081247 9.069956,-11.715972 0,-3.278406 -1.305115,-6.258258 -3.425121,-8.437852 -1.786756,-1.545751 -4.273729,-2.534432 -6.37984,-2.454916 z" ++ style="fill:url(#linearGradient3055);fill-opacity:1;fill-rule:evenodd;stroke:none" /> + ++ d="m 22.873398,36.903289 c 1.330543,2.115965 4.544565,3.724727 7.119262,3.408045 2.907254,-0.357587 5.37096,-4.52776 3.553181,-6.993926 -3.181242,-0.0099 -4.787213,-3.907776 -3.643267,-6.604325 1.013095,-2.388097 3.496804,-3.72311 5.994554,-3.817416 2.087245,-0.0788 4.498849,0.427629 6.280933,1.941241 -3.77201,-3.84658 -9.801492,-4.814189 -14.681307,-1.996824 -2.839182,1.639199 -4.767255,4.25939 -5.594834,7.185166 -0.44528,2.32025 -0.150441,5.093852 0.971478,6.878039 z" ++ style="fill:url(#linearGradient3052);fill-opacity:1;fill-rule:evenodd;stroke:none" /> + ++ d="m 41.39556,40.565322 c 1.167208,-2.210266 1.263183,-5.026355 -0.29842,-7.097767 -1.763306,-2.338962 -5.952519,-2.900956 -7.551606,-0.150319 1.582071,2.759973 -0.990627,6.099737 -3.897879,6.457324 -2.574701,0.316683 -4.97271,-1.166766 -6.303257,-3.282728 -1.111867,-1.768206 -1.879087,-4.109932 -1.459303,-6.410068 -1.44523,5.189947 0.731537,10.895436 5.611354,13.712797 2.839179,1.639204 6.072368,1.998868 9.019954,1.252685 2.232035,-0.774501 3.894965,-2.61822 4.879157,-4.481924 z" ++ style="fill:url(#linearGradient3049);fill-opacity:1;fill-rule:evenodd;stroke:none" /> + + + +-- +1.7.7.6 + diff --git a/ibus-hangul-no-ibus-daemon.patch b/ibus-hangul-no-ibus-daemon.patch deleted file mode 100644 index 3a3d0d7..0000000 --- a/ibus-hangul-no-ibus-daemon.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 64d68d37f61be45b187ef9de7855b423052cec96 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Thu, 26 Jan 2012 11:24:13 +0900 -Subject: [PATCH] Don't abort ibus-setup-hangul with exception when - ibus-daemon is not running. - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=784377 ---- - setup/main.py | 15 ++++++++++++--- - 1 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/setup/main.py b/setup/main.py -index 9dd0238..068c048 100644 ---- a/setup/main.py -+++ b/setup/main.py -@@ -32,8 +32,8 @@ from keycapturedialog import KeyCaptureDialog - _ = lambda a : gettext.dgettext(config.gettext_package, a) - - class Setup (): -- def __init__ (self): -- self.__bus = ibus.Bus() -+ def __init__ (self, bus): -+ self.__bus = bus - self.__config = self.__bus.get_config() - self.__config.connect("value-changed", self.on_value_changed, None) - -@@ -194,4 +194,13 @@ if __name__ == "__main__": - locale.bindtextdomain(config.gettext_package, config.localedir) - locale.bind_textdomain_codeset(config.gettext_package, "UTF-8") - -- Setup().run() -+ try: -+ bus = ibus.Bus() -+ except: -+ message = _("IBus daemon is not started") -+ dialog = gtk.MessageDialog(type = gtk.MESSAGE_ERROR, -+ buttons = gtk.BUTTONS_CLOSE, -+ message_format = message) -+ dialog.run() -+ sys.exit(1) -+ Setup(bus).run() --- -1.7.7.6 - diff --git a/ibus-hangul-use-system-icon.patch b/ibus-hangul-use-system-icon.patch deleted file mode 100644 index 2914004..0000000 --- a/ibus-hangul-use-system-icon.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ru ibus-hangul-1.4.0.orig/setup/ibus-setup-hangul.desktop.in ibus-hangul-1.4.0/setup/ibus-setup-hangul.desktop.in ---- ibus-hangul-1.4.0.orig/setup/ibus-setup-hangul.desktop.in 2011-12-29 23:14:31.000000000 +0900 -+++ ibus-hangul-1.4.0/setup/ibus-setup-hangul.desktop.in 2012-02-10 17:50:59.168224204 +0900 -@@ -3,7 +3,7 @@ - _Name=IBus Hangul Preferences - _Comment=Set IBus Hangul Preferences - Exec=ibus-setup-hangul --Icon=ibus-setup-hangul -+Icon=ibus-hangul - Terminal=false - Type=Application - StartupNotify=true -diff -ru ibus-hangul-1.4.0.orig/src/hangul.xml.in.in ibus-hangul-1.4.0/src/hangul.xml.in.in ---- ibus-hangul-1.4.0.orig/src/hangul.xml.in.in 2010-03-29 00:04:19.000000000 +0900 -+++ ibus-hangul-1.4.0/src/hangul.xml.in.in 2012-02-10 17:53:31.265182655 +0900 -@@ -16,7 +16,7 @@ - ko - GPL - Peng Huang <shawn.p.huang@gmail.com> -- ${pkgdatadir}/icons/ibus-hangul.png -+ ibus-hangul - us - Korean - Korean Input Method -diff -ru ibus-hangul-1.4.0.orig/src/main.c ibus-hangul-1.4.0/src/main.c ---- ibus-hangul-1.4.0.orig/src/main.c 2011-03-06 13:53:42.000000000 +0900 -+++ ibus-hangul-1.4.0/src/main.c 2012-02-10 17:26:04.361601262 +0900 -@@ -82,7 +82,7 @@ - "ko", - "GPL", - "Peng Huang ", -- PKGDATADIR"/icon/ibus-hangul.svg", -+ "ibus-hangul", - "us")); - - factory = ibus_factory_new (ibus_bus_get_connection (bus)); diff --git a/ibus-hangul-xx-icon-symbol.patch b/ibus-hangul-xx-icon-symbol.patch deleted file mode 100644 index 0484ce7..0000000 --- a/ibus-hangul-xx-icon-symbol.patch +++ /dev/null @@ -1,86 +0,0 @@ -Patch to embed hotkeys and symbol property in component XML. -Index: ibus-hangul-1.3.1/configure.ac -=================================================================== ---- ibus-hangul-1.3.1.orig/configure.ac -+++ ibus-hangul-1.3.1/configure.ac -@@ -75,6 +75,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET - AM_GNU_GETTEXT([external]) - AM_GNU_GETTEXT_VERSION([0.17]) - -+# hotkeys and symbol properties in component xml -+IBUS_WITH_HOTKEYS([Control+space,Hangul]) -+IBUS_SET_SYMBOL([한]) -+ - - # OUTPUT files - AC_CONFIG_FILES([ po/Makefile.in -Index: ibus-hangul-1.3.1/m4/ibus.m4 -=================================================================== ---- /dev/null -+++ ibus-hangul-1.3.1/m4/ibus.m4 -@@ -0,0 +1,52 @@ -+# IBUS_WITH_HOTKEYS([DEFAULT]) -+AC_DEFUN([IBUS_WITH_HOTKEYS], [ -+ IBUS_HOTKEYS_DEFAULT=m4_default([$1], [Control+space,Zenkaku_Hankaku]) -+ AC_ARG_WITH(hotkeys, -+ [AC_HELP_STRING([--with-hotkeys=HOTKEYS], -+ [Use hotkeys for ibus bridge mode. (available value: yes/no/keys)])], -+ [with_hotkeys="$withval"], -+ [with_hotkeys="no"]) -+ if test x$with_hotkeys = xno; then -+ IBUS_HOTKEYS_XML="" -+ elif test x$with_hotkeys = xyes -o x$with_hotkeys = x; then -+ IBUS_HOTKEYS="$IBUS_HOTKEYS_DEFAULT" -+ IBUS_HOTKEYS_XML="${IBUS_HOTKEYS}" -+ else -+ IBUS_HOTKEYS="$with_hotkeys" -+ IBUS_HOTKEYS_XML="${IBUS_HOTKEYS}" -+ fi -+ if test x$IBUS_HOTKEYS != x; then -+ AC_DEFINE_UNQUOTED(IBUS_IBUS_HOTKEYS, ["$IBUS_HOTKEYS"], -+ [IME specific hotkeys for IBus]) -+ AC_SUBST(IBUS_HOTKEYS) -+ fi -+ AC_SUBST(IBUS_HOTKEYS_XML) -+]) -+ -+# IBUS_SET_SYMBOL(SYMBOL) -+AC_DEFUN([IBUS_SET_SYMBOL], [ -+ IBUS_SYMBOL="$1" -+ if test x$PYTHON = x; then -+ AM_PATH_PYTHON([2.5]) -+ fi -+ AC_MSG_CHECKING([if ibus supports icon symbol]) -+ $PYTHON <<_IBUS_SYMBOL_TEST -+import ibus -+engine = ibus.EngineDesc('test') -+exit(not hasattr(engine, 'symbol')) -+_IBUS_SYMBOL_TEST -+ if test $? -eq 0; then -+ IBUS_SYMBOL_XML="${IBUS_SYMBOL}" -+ AC_MSG_RESULT([yes]) -+ else -+ IBUS_SYMBOL_XML="" -+ IBUS_SYMBOL= -+ AC_MSG_RESULT([no]) -+ fi -+ if test x$IBUS_SYMBOL != x; then -+ AC_DEFINE_UNQUOTED([IBUS_SYMBOL], ["$IBUS_SYMBOL"], -+ [Icon symbol string for IBus]) -+ AC_SUBST(IBUS_SYMBOL) -+ fi -+ AC_SUBST(IBUS_SYMBOL_XML) -+]) -Index: ibus-hangul-1.3.1/src/hangul.xml.in.in -=================================================================== ---- ibus-hangul-1.3.1.orig/src/hangul.xml.in.in -+++ ibus-hangul-1.3.1/src/hangul.xml.in.in -@@ -21,6 +21,8 @@ - Korean - Korean Input Method - 99 -+ @IBUS_HOTKEYS_XML@ -+ @IBUS_SYMBOL_XML@ - - - diff --git a/ibus-hangul.spec b/ibus-hangul.spec index 82e6686..edd7c3c 100644 --- a/ibus-hangul.spec +++ b/ibus-hangul.spec @@ -12,17 +12,16 @@ Name: ibus-hangul Version: 1.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Hangul engine for IBus input platform License: GPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz -# dummy source to keep quilt series file -Source1: series -Patch1: ibus-hangul-xx-icon-symbol.patch -Patch2: ibus-hangul-no-ibus-daemon.patch -Patch3: ibus-hangul-use-system-icon.patch +# To avoid binary patch, include copies of icon files. +Source1: ibus-setup-hangul.png +Source2: ibus-setup-hangul.svg +Patch0: ibus-hangul-HEAD.patch BuildRequires: gettext-devel BuildRequires: intltool @@ -30,6 +29,7 @@ BuildRequires: libtool BuildRequires: libhangul-devel >= %{require_libhangul_version} BuildRequires: pkgconfig BuildRequires: ibus-devel >= %{require_ibus_version} + %if %have_bridge_hotkey BuildRequires: ibus %endif @@ -44,9 +44,9 @@ libhangul. %prep %setup -q -%patch1 -p1 -b .icon-symbol -%patch2 -p1 -b .no-ibus-daemon -%patch3 -p1 -b .use-system-icon +cp %SOURCE1 %SOURCE2 setup +sed -i 's!^[-+][-+][-+] .*\.svg$!#\0!' %PATCH0 +%patch0 -p1 -b .HEAD %build autoreconf @@ -57,19 +57,6 @@ make %{?_smp_mflags} %install make DESTDIR=${RPM_BUILD_ROOT} install INSTALL="install -p" -# install icons into standard location -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/64x64/apps - -install -p -m 644 icons/ibus-hangul.png \ - ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/64x64/apps - -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/scalable/apps - -install -p -m 644 icons/ibus-hangul.svg \ - ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/scalable/apps - -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/ibus-hangul/icons - desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-hangul.desktop %find_lang %{name} @@ -89,14 +76,22 @@ fi %files -f %{name}.lang %doc AUTHORS COPYING README %{_libexecdir}/ibus-engine-hangul +%{_libexecdir}/ibus-setup-hangul %{_bindir}/ibus-setup-hangul %{_datadir}/ibus-hangul %{_datadir}/ibus/component/* %{_libdir}/ibus-hangul/setup/* %{_datadir}/applications/ibus-setup-hangul.desktop -%{_datadir}/icons/hicolor/*/apps/ibus-hangul.* +%{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Mar 5 2012 Daiki Ueno - 1.4.0-4 +- Package the latest git master. +- Fix bug 799776 - [abrt] ibus-hangul-1.4.0-3.fc17 +- Remove upstreamed patches: ibus-hangul-xx-icon-symbol.patch, + ibus-hangul-no-ibus-daemon.patch, and + ibus-hangul-use-system-icon.patch + * Fri Feb 10 2012 Daiki Ueno - 1.4.0-3 - Add ibus-hangul-use-system-icon.patch - Fix bug 789230 - ibus hangul Icon missing in gnome-shell (fedora 17) diff --git a/ibus-setup-hangul.png b/ibus-setup-hangul.png new file mode 100644 index 0000000000000000000000000000000000000000..e79bd4afbf2cecdd0f235158d20595a8c0ee94b8 GIT binary patch literal 6771 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%0A!*FM@O(m{ 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 VOW$3btN;K2002ovPDHLkV1f$QHNXG> literal 0 HcmV?d00001 diff --git a/ibus-setup-hangul.svg b/ibus-setup-hangul.svg new file mode 100644 index 0000000..2195456 --- /dev/null +++ b/ibus-setup-hangul.svg @@ -0,0 +1,548 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + System Applications + + + Jakub Steiner + + + http://jimmac.musichall.cz/ + + + system + applications + group + category + admin + root + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/series b/series deleted file mode 100644 index 42726e1..0000000 --- a/series +++ /dev/null @@ -1,2 +0,0 @@ -ibus-hangul-ibus-1.4.patch -ibus-hangul-xx-icon-symbol.patch