[ibus-panel-extensions] Workaround for new gucharmap.
Daiki Ueno
ueno at fedoraproject.org
Thu Mar 15 09:18:15 UTC 2012
commit 42ea1df88434a467d05f263030dd0ab9ba8fb3d5
Author: Daiki Ueno <ueno at unixuser.org>
Date: Thu Mar 15 18:17:59 2012 +0900
Workaround for new gucharmap.
ibus-panel-extensions-workaround-abi-break.patch | 16 ++++++++++++++++
ibus-panel-extensions.spec | 11 +++++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/ibus-panel-extensions-workaround-abi-break.patch b/ibus-panel-extensions-workaround-abi-break.patch
new file mode 100644
index 0000000..0bf889c
--- /dev/null
+++ b/ibus-panel-extensions-workaround-abi-break.patch
@@ -0,0 +1,16 @@
+diff -ru ibus-panel-extensions-1.4.99.20111207.orig/charmap/service/charmap-panel.vala ibus-panel-extensions-1.4.99.20111207/charmap/service/charmap-panel.vala
+--- ibus-panel-extensions-1.4.99.20111207.orig/charmap/service/charmap-panel.vala 2011-12-07 17:49:58.000000000 +0900
++++ ibus-panel-extensions-1.4.99.20111207/charmap/service/charmap-panel.vala 2012-03-15 18:08:22.868229439 +0900
+@@ -164,8 +164,12 @@
+ scrolled_window.add (chartable);
+ paned.pack_end (scrolled_window, true, true, 0);
+
++ // FIXME: workaround for gucharmap 3.3.1, enable those
++ // lines once newer gucharmap is released
++#if 0
+ var uc = Gucharmap.unicode_get_locale_character ();
+ select_character (uc);
++#endif
+
+ paned.show_all ();
+
diff --git a/ibus-panel-extensions.spec b/ibus-panel-extensions.spec
index 8f356e0..0720503 100644
--- a/ibus-panel-extensions.spec
+++ b/ibus-panel-extensions.spec
@@ -10,6 +10,7 @@ License: LGPLv2+ and GPLv2+
Group: System Environment/Libraries
URL: http://github.com/ueno/ibus-panel-extensions/
Source0: https://github.com/downloads/ueno/%{name}/%{name}-%{version}.tar.gz
+Patch0: ibus-panel-extensions-workaround-abi-break.patch
BuildRequires: vala
BuildRequires: gucharmap-devel
@@ -54,9 +55,12 @@ Python language binding for %{name}
%prep
%setup -q
-
+%patch0 -p1 -b .workaround-abi-break
%build
+# FIXME: workaround for gucharmap 3.3.1-1
+GUCHARMAP_CFLAGS="`pkg-config gtk+-3.0 glib-2.0 --cflags` -I%{_includedir}/gucharmap-2.90"
+export GUCHARMAP_CFLAGS
%configure
make %{?_smp_mflags}
@@ -104,8 +108,11 @@ fi
%changelog
-* Mon Mar 12 2012 Daiki Ueno <dueno at redhat.com> - 1.4.99.20111207-2
+* Thu Mar 15 2012 Daiki Ueno <dueno at redhat.com> - 1.4.99.20111207-2
- rebuild with new ibus
+- workaround for new gucharmap
+ https://bugzilla.gnome.org/show_bug.cgi?id=669734
+ http://git.gnome.org/browse/gucharmap/commit/?id=adb912e4
* Thu Dec 8 2011 Daiki Ueno <dueno at redhat.com> - 1.4.99.20111207-1
- new upstream release
More information about the scm-commits
mailing list