[packages/ibus-gjs] - separated from ibus.spec
qboosh
qboosh at pld-linux.org
Sat Nov 10 09:02:33 CET 2012
commit a9b7207908bd1d125536d35719f59bad626d34aa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Nov 10 09:02:20 2012 +0100
- separated from ibus.spec
ibus-gjs-fixes.patch | 59 +++++++++++++++++++++++++++++++++++++++++
ibus-gjs.spec | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 134 insertions(+)
---
diff --git a/ibus-gjs.spec b/ibus-gjs.spec
new file mode 100644
index 0000000..5d3439f
--- /dev/null
+++ b/ibus-gjs.spec
@@ -0,0 +1,75 @@
+%define gs_version %(rpm -q --qf '%{VERSION}' gnome-shell)
+%define gjs_version %(rpm -q --qf '%{VERSION}' gjs-devel)
+Summary: IBus gnome-shell extension
+Summary(pl.UTF-8): Rozszerzenie IBus dla powłoki gnome-shell
+Name: ibus-gjs
+Version: 3.4.1.20120815
+Release: 1
+License: LGPL v2+
+Group: Libraries
+##Source0Download: http://code.google.com/p/ibus/downloads/list
+#Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0: http://fujiwara.fedorapeople.org/ibus/gnome-shell/%{name}-%{version}.tar.gz
+# Source0-md5: 8acf4ac4d1a7dfb9a0af9e755a8e7dba
+Patch0: %{name}-fixes.patch
+URL: http://code.google.com/p/ibus/
+BuildRequires: gettext-devel
+BuildRequires: gjs-devel
+BuildRequires: gnome-shell
+BuildRequires: gtk-doc >= 1.9
+BuildRequires: ibus-devel >= 1.4
+BuildRequires: intltool >= 0.35.0
+BuildRequires: libtool
+BuildRequires: pkgconfig
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+IBus gnome-shell extension.
+
+%description -l pl.UTF-8
+Rozszerzenie IBus dla powłoki gnome-shell.
+
+%package -n ibus-gnome3
+Summary: IBus gnome-shell-extension for GNOME3
+Summary(pl.UTF-8): Rozszerzenie gnome-shell IBus dla GNOME3
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: gnome-shell
+
+%description -n ibus-gnome3
+This is a transitional package which allows users to try out new IBus
+GUI for GNOME3 in development. Note that this package will be marked
+as obsolete once the integration has completed in the GNOME3 upstream.
+
+%description -n ibus-gnome3 -l pl.UTF-8
+Pakiet przejściowy pozwalający użytkownikom wypróbować nowe GUI IBus
+dla GNOME3 w trakcie tworzenia. Uwaga: ten pakiet zostanie oznaczony
+jako przestarzały po zakończeniu integracji w GNOME3.
+
+%prep
+%setup -q
+%{__rm} js/ui/status/ibus/xkbLayout.js
+%patch0 -p1
+
+%build
+%configure \
+ --with-gnome-shell-version="%{gs_version},3.6,3.4,3.2" \
+ --with-gjs-version="%{gjs_version},1.33.3,1.32,1.31.22,1.31.20,1.31.10,1.31.6,1.31.11,1.30"
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+%{__rm} $RPM_BUILD_ROOT%{_localedir}/*/LC_MESSAGES/ibus-gjs.mo
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -n ibus-gnome3
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog README
+%{_datadir}/gnome-shell/js/ui/status/ibus
+%{_datadir}/gnome-shell/extensions/ibus-indicator at example.com
diff --git a/ibus-gjs-fixes.patch b/ibus-gjs-fixes.patch
new file mode 100644
index 0000000..0781543
--- /dev/null
+++ b/ibus-gjs-fixes.patch
@@ -0,0 +1,59 @@
+diff -ur ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/ibusPanel.js ibus-gjs-3.4.1.20120815/js/ui/status/ibus/ibusPanel.js
+--- ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/ibusPanel.js 2012-08-15 11:06:54.000000000 +0200
++++ ibus-gjs-3.4.1.20120815/js/ui/status/ibus/ibusPanel.js 2012-11-05 23:50:06.086089865 +0100
+@@ -954,8 +954,11 @@
+ },
+
+ _configLoadLookupTableOrientation: function() {
+- let value = this._config.get_value('panel', 'lookup_table_orientation',
+- GLib.Variant.new_int32(0)).get_int32();
++ let _value = this._config.get_value('panel', 'lookup_table_orientation',
++ GLib.Variant.new_int32(0));
++ let value = 0;
++ if (_value != null)
++ value = _value.get_int32();
+ let orientation = Common.ORIENTATION_VERTICAL;
+ if (value in [Common.ORIENTATION_HORIZONTAL,
+ Common.ORIENTATION_VERTICAL])
+diff -ur ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/panelMenu.js ibus-gjs-3.4.1.20120815/js/ui/status/ibus/panelMenu.js
+--- ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/panelMenu.js 2012-08-15 11:06:54.000000000 +0200
++++ ibus-gjs-3.4.1.20120815/js/ui/status/ibus/panelMenu.js 2012-11-05 23:50:06.086089865 +0100
+@@ -66,7 +66,6 @@
+ this._clearActor();
+ this._iconName = iconName;
+ this._iconActor = new St.Icon({ icon_name: iconName,
+- icon_type: St.IconType.SYMBOLIC,
+ style_class: 'system-status-icon' });
+ this.actor.add_child(this._iconActor);
+ this.actor.queue_redraw();
+diff -ur ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/switcher.js ibus-gjs-3.4.1.20120815/js/ui/status/ibus/switcher.js
+--- ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/switcher.js 2012-08-15 11:06:54.000000000 +0200
++++ ibus-gjs-3.4.1.20120815/js/ui/status/ibus/switcher.js 2012-11-05 23:50:06.086089865 +0100
+@@ -713,8 +713,7 @@
+ icon.clutter_text.set_font_description(desc);
+ }));
+ } else {
+- icon = new St.Icon({ icon_name: engine.icon,
+- icon_type: St.IconType.SYMBOLIC });
++ icon = new St.Icon({ icon_name: engine.icon });
+ }
+ if (icon != null) {
+ this._iconBin.child = icon
+diff -ur ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/xkbLayout.js.in ibus-gjs-3.4.1.20120815/js/ui/status/ibus/xkbLayout.js.in
+--- ibus-gjs-3.4.1.20120815.orig/js/ui/status/ibus/xkbLayout.js.in 2012-08-15 11:07:22.000000000 +0200
++++ ibus-gjs-3.4.1.20120815/js/ui/status/ibus/xkbLayout.js.in 2012-11-05 23:50:06.086089865 +0100
+@@ -68,10 +68,12 @@
+ value.get_child_value(i).dup_string()[0]);
+ }
+ if (this._useXmodmap) {
+- this._useXmodmap = this._config.get_value(
++ let _value = this._config.get_value(
+ 'general',
+ 'use_xmodmap',
+- GLib.Variant.new_boolean(true)).get_boolean();
++ GLib.Variant.new_boolean(true));
++ if (_value != null)
++ this._useXmodmap = _value.get_boolean();
+ }
+ }
+ },
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ibus-gjs.git/commitdiff/a9b7207908bd1d125536d35719f59bad626d34aa
More information about the pld-cvs-commit
mailing list