[input-pad] Bumped to 1.0.2
Takao Fujiwara
fujiwara at fedoraproject.org
Mon Jun 25 09:23:41 UTC 2012
commit d323cd472e0751e09c8d07937a436798e1df0f4d
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date: Mon Jun 25 18:16:23 2012 +0900
Bumped to 1.0.2
.gitignore | 1 +
input-pad-HEAD.patch | 110 --------------------------------------------------
input-pad.spec | 59 +++++++++++++++++---------
sources | 2 +-
4 files changed, 40 insertions(+), 132 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f31bfb6..113e349 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ input-pad-0.1.1.tar.gz
/input-pad-0.1.2.tar.gz
/input-pad-1.0.0.tar.gz
/input-pad-1.0.1.tar.gz
+/input-pad-1.0.2.tar.gz
diff --git a/input-pad-HEAD.patch b/input-pad-HEAD.patch
index c82e1b2..8b13789 100644
--- a/input-pad-HEAD.patch
+++ b/input-pad-HEAD.patch
@@ -1,111 +1 @@
-From d168b5cbb3507a33acfca0c249073637f23e9b1b Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno at unixuser.org>
-Date: Mon, 2 Apr 2012 10:33:02 +0900
-Subject: [PATCH] Fix ABI breakage of eekboard 1.0.6.
-
----
- configure.ac | 2 +-
- input-pad/eek-gtk.c | 21 ++++++++++++++-------
- 2 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 20f9e8d..7b8c10b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -142,7 +142,7 @@ AC_MSG_RESULT($enable_eek)
- if test x"$enable_eek" = xyes; then
- dnl - check eek is available
- PKG_CHECK_MODULES(EEK, [
-- eek-gtk-0.90 eek-xkl-0.90
-+ eek-gtk-0.90 >= 1.0.6, eek-xkl-0.90 >= 1.0.6
- ],, AC_MSG_ERROR([libeek not found]))
- AM_CONDITIONAL(HAVE_EEK, true)
- else
-diff --git a/input-pad/eek-gtk.c b/input-pad/eek-gtk.c
-index abe966f..86ad0a5 100644
---- a/input-pad/eek-gtk.c
-+++ b/input-pad/eek-gtk.c
-@@ -27,6 +27,7 @@
- #include <X11/keysym.h>
- #include <eek/eek-gtk.h>
- #include <eek/eek-xkl.h>
-+#include <gdk/gdkx.h>
-
- #include "eek-gtk.h"
- #include "geometry-xkb.h"
-@@ -72,7 +73,7 @@ on_window_keyboard_changed_eek (InputPadGtkWindow *window,
- g_return_if_fail (INPUT_PAD_IS_GTK_KBDUI_EEK (data));
-
- kbdui = INPUT_PAD_GTK_KBDUI_EEK (data);
-- eek_keyboard_set_group (kbdui->priv->eek_keyboard, group);
-+ eek_element_set_group (EEK_ELEMENT(kbdui->priv->eek_keyboard), group);
- }
-
- static void
-@@ -81,7 +82,7 @@ on_eek_keyboard_key_pressed (EekKeyboard *keyboard,
- gpointer user_data)
- {
- InputPadGtkWindow *window;
-- char *str, *empty = "";
-+ const gchar *str, *empty = "";
- guint keycode;
- EekSymbol *symbol;
- EekSymbol *symbol0;
-@@ -102,7 +103,7 @@ on_eek_keyboard_key_pressed (EekKeyboard *keyboard,
- str = eek_symbol_get_label (symbol);
- if (str == NULL)
- str = empty;
-- group = eek_keyboard_get_group (keyboard);
-+ group = eek_element_get_group (EEK_ELEMENT(keyboard));
- symbol0 = eek_key_get_symbol_at_index (key, group, 0, 0, 0);
- if (EEK_IS_KEYSYM(symbol0))
- keysym0 = eek_keysym_get_xkeysym (EEK_KEYSYM(symbol0));
-@@ -119,8 +120,6 @@ on_eek_keyboard_key_pressed (EekKeyboard *keyboard,
- g_signal_emit_by_name (window, "button-pressed",
- str, INPUT_PAD_TABLE_TYPE_KEYSYMS, keysym, keycode, state,
- &retval);
-- if (str != empty)
-- g_free (str);
-
- if (keysym0 == XK_Num_Lock) {
- keysym0 = XK_Shift_L;
-@@ -128,7 +127,7 @@ on_eek_keyboard_key_pressed (EekKeyboard *keyboard,
- input_pad_gtk_window_set_keyboard_state_with_keysym (window, keysym0);
- if (keysym0 == XK_Shift_L || keysym0 == XK_Shift_R) {
- state = input_pad_gtk_window_get_keyboard_state (window);
-- eek_keyboard_set_level (keyboard, state & ShiftMask ? 1 : 0);
-+ eek_element_set_level (EEK_ELEMENT(keyboard), state & ShiftMask ? 1 : 0);
- }
- }
-
-@@ -142,11 +141,18 @@ create_keyboard_layout_ui_real_eek (InputPadGtkKbdui *kbdui,
- EekLayout *layout;
- GtkWidget *widget;
- gdouble width, height;
-+ Display *xdisplay = GDK_WINDOW_XDISPLAY (gtk_widget_get_window (GTK_WIDGET (window)));
-+ GError *error = NULL;
-
- g_return_if_fail (INPUT_PAD_IS_GTK_KBDUI_EEK (kbdui));
-
- kbdui_eek = INPUT_PAD_GTK_KBDUI_EEK (kbdui);
-- layout = eek_xkl_layout_new ();
-+ layout = eek_xkl_layout_new (xdisplay, &error);
-+ if (layout == NULL) {
-+ g_warning ("Can't get XKL layout: %s", error->message);
-+ g_error_free (error);
-+ return;
-+ }
-
- keyboard = kbdui_eek->priv->eek_keyboard = eek_keyboard_new (layout, 640, 480);
- g_object_unref (layout);
-@@ -258,6 +264,7 @@ input_pad_module_arg_init_post (int *argc,
- gboolean
- input_pad_module_init (InputPadGtkWindow *window)
- {
-+ eek_init ();
- return TRUE;
- }
-
---
-1.7.9.1
diff --git a/input-pad.spec b/input-pad.spec
index fab4be1..b0429d0 100644
--- a/input-pad.spec
+++ b/input-pad.spec
@@ -1,9 +1,10 @@
-%define have_python_devel 1
+%define have_pygobject3_devel 1
+%define have_pygobject2_devel 1
%define have_xtest_devel 1
%define have_eek_devel 1
%define use_gtk3 1
-%if %have_python_devel
+%if %have_pygobject2_devel
%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%endif
@@ -21,14 +22,14 @@
Name: input-pad
-Version: 1.0.1
-Release: 4%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
Summary: On-screen Input Pad to Send Characters with Mouse
License: LGPLv2+
Group: System Environment/Libraries
URL: http://code.google.com/p/input-pad/
Source0: http://input-pad.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: input-pad-HEAD.patch
+# Patch0: input-pad-HEAD.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +48,10 @@ BuildRequires: pkgconfig
%if %have_xtest_devel
BuildRequires: libXtst-devel
%endif
-%if %have_python_devel
+%if %have_pygobject3_devel
+BuildRequires: gobject-introspection-devel
+%endif
+%if %have_pygobject2_devel
BuildRequires: python2-devel
BuildRequires: swig
%endif
@@ -55,6 +59,10 @@ BuildRequires: swig
BuildRequires: eekboard-devel >= %eekboard_version
%endif
Requires: input-pad-xtest = %{version}-%{release}
+%if %have_pygobject3_devel
+Requires: gobject-introspection
+Requires: pygobject3
+%endif
%description
The input pad is a tool to send a character on button to text applications.
@@ -67,14 +75,15 @@ Requires: %{name} = %{version}-%{release}
%description devel
The input-pad-devel package contains the header files.
-%if %have_python_devel
-%package python
-Summary: Input Pad for python
+%if %have_pygobject2_devel
+%package pygobject2
+Summary: Input Pad for Python GObject2
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: pygtk2
-%description python
-The input-pad-python package contains the python wrapper files.
+%description pygobject2
+The input-pad-pygobject2 package contains the python wrapper files.
%endif
%if %have_xtest_devel
@@ -100,17 +109,16 @@ The input-pad-eek package contains eekboard extension module
%prep
%setup -q
-%patch0 -p1
+# %patch0 -p1
%build
# for configure.ac patch
-%if %have_eek_devel
-libtoolize -f
-autoreconf -v
-%endif
+# %if %have_eek_devel
+# autoreconf -v
+# %endif
%configure \
-%if ! %have_python_devel
- --disable-python \
+%if %have_pygobject2_devel
+ --enable-pygobject2 \
%endif
%if %have_eek_devel
--enable-eek \
@@ -145,7 +153,7 @@ rm -f $RPM_BUILD_ROOT%xkeysenddir/*.a
rm -f $RPM_BUILD_ROOT%kbduidir/*.la
rm -f $RPM_BUILD_ROOT%kbduidir/*.a
%endif
-%if %have_python_devel
+%if %have_pygobject2_devel
rm -f $RPM_BUILD_ROOT%python_sitearch/%{name}-%sub_version/*.la
rm -f $RPM_BUILD_ROOT%python_sitearch/%{name}-%sub_version/*.a
%endif
@@ -168,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %xkeysenddir
%dir %kbduidir
%{_libdir}/libinput-pad.so.*
+%if %have_pygobject3_devel
+%{_libdir}/girepository-1.0/InputPad-1.0.typelib
+%endif
%{_datadir}/%name
%{_datadir}/pixmaps/input-pad.png
@@ -176,9 +187,12 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/%{name}-%sub_version
%{_libdir}/libinput-pad.so
%{_libdir}/pkgconfig/*.pc
+%if %have_pygobject3_devel
+%{_datadir}/gir-1.0/InputPad-1.0.gir
+%endif
-%if %have_python_devel
-%files python
+%if %have_pygobject2_devel
+%files pygobject2
%defattr(-,root,root,-)
%python_sitearch/%{name}-%sub_version
%python_sitearch/pyinput_pad.pth
@@ -197,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jun 25 2012 Takao Fujiwara <tfujiwar at redhat.com> - 1.0.2-1
+- Bumped to 1.0.2
+
* Wed Apr 04 2012 Takao Fujiwara <tfujiwar at redhat.com> - 1.0.1-4
- Added input-pad-HEAD.patch from upstream
diff --git a/sources b/sources
index 00d33ea..74fc8de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-320461990a87fc31fd504c438fe9707a input-pad-1.0.1.tar.gz
+cfb03c042e699858d80e7c95efbc2092 input-pad-1.0.2.tar.gz
More information about the scm-commits
mailing list