Accepting request 920540 from home:StevenK:branches:M17N
- Add port-to-python3.patch: * Ports gen-keysym-entries.py to Python 3. - Remove unneeded BuildRequires on python and python-devel OBS-URL: https://build.opensuse.org/request/show/920540 OBS-URL: https://build.opensuse.org/package/show/M17N/eekboard?expand=0&rev=9
This commit is contained in:
Git OBS Bridge
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 21 07:31:09 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- Add port-to-python3.patch:
|
||||
* Ports gen-keysym-entries.py to Python 3.
|
||||
- Remove unneeded BuildRequires on python and python-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 28 05:34:45 UTC 2020 - Marguerite Su <i@marguerite.su>
|
||||
|
||||
|
||||
+9
-10
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package eekboard
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -12,7 +12,7 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
@@ -22,10 +22,11 @@ Name: eekboard
|
||||
Version: 1.0.8
|
||||
Release: 0
|
||||
Summary: An easy to use virtual keyboard toolkit
|
||||
License: GPL-3.0+
|
||||
License: GPL-3.0-or-later
|
||||
Group: System/GUI/Other
|
||||
Url: http://github.com/ueno/eekboard
|
||||
URL: http://github.com/ueno/eekboard
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch0: port-to-python3.patch
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gmodule-2.0)
|
||||
BuildRequires: pkgconfig(gobject-2.0)
|
||||
@@ -49,8 +50,6 @@ BuildRequires: libXtst-devel
|
||||
%endif
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: intltool
|
||||
BuildRequires: python
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: update-desktop-files
|
||||
|
||||
%glib2_gsettings_schema_requires
|
||||
@@ -59,7 +58,6 @@ BuildRequires: update-desktop-files
|
||||
eekboard is a virtual keyboard software package, including a set of
|
||||
tools to implement desktop virtual keyboards.
|
||||
|
||||
|
||||
%package -n typelib-1_0-Eek-0_90
|
||||
Summary: Eekboard libraries -- Introspection bindings
|
||||
Group: System/Libraries
|
||||
@@ -78,6 +76,7 @@ The eekboard-devel package contains the header files.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
# ./autogen.sh
|
||||
@@ -93,19 +92,19 @@ The eekboard-devel package contains the header files.
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
rm -rf %{buildroot}%{_libdir}/*.la
|
||||
|
||||
%suse_update_desktop_file -i %{name} System Utility DesktopUtility settings
|
||||
%suse_update_desktop_file -i %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
|
||||
%find_lang %{name}
|
||||
|
||||
%post
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%icon_theme_cache_post
|
||||
%glib2_gsettings_schema_post
|
||||
|
||||
%postun
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%icon_theme_cache_postun
|
||||
%glib2_gsettings_schema_postun
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
Written by Akinori Hattori <hattya@gentoo.org>, sourced from:
|
||||
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9f523470ee04ea0ed7ebadbc950b16e2afb17b5
|
||||
Index: eekboard-1.0.8/eek/gen-keysym-entries.py
|
||||
===================================================================
|
||||
--- eekboard-1.0.8.orig/eek/gen-keysym-entries.py
|
||||
+++ eekboard-1.0.8/eek/gen-keysym-entries.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
||||
# Copyright (C) 2010-2011 Red Hat, Inc.
|
||||
@@ -18,17 +18,20 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
# 02110-1301 USA
|
||||
|
||||
+from __future__ import print_function
|
||||
import sys
|
||||
import re
|
||||
|
||||
if len(sys.argv) != 2:
|
||||
- print >> sys.stderr, "Usage: %s TABLE-NAME" % sys.argv[0]
|
||||
+ print("Usage: %s TABLE-NAME" % sys.argv[0], file=sys.stderr)
|
||||
sys.exit(-1)
|
||||
|
||||
+py2 = sys.version_info[0] < 3
|
||||
table = dict()
|
||||
for line in sys.stdin:
|
||||
- line = line.decode('UTF-8')
|
||||
- match = re.match(r'\s*(0x[0-9A-F]+)\s+(\S*)\s+(\S*)', line, re.I)
|
||||
+ if py2:
|
||||
+ line = line.decode('UTF-8')
|
||||
+ match = re.match(r'\s*(0x[0-9A-F]+)\s+(\w*)\s+(\w*)', line, re.I)
|
||||
if match:
|
||||
table[int(match.group(1), 16)] = (match.group(2), match.group(3))
|
||||
|
||||
@@ -37,8 +40,10 @@ sys.stdout.write("static const EekKeysym
|
||||
|
||||
for index, (keysym, (l, c)) in enumerate([(keysym, table[keysym])
|
||||
for keysym in sorted(table.keys())]):
|
||||
- sys.stdout.write(" { 0x%X, %s, %s }" %
|
||||
- (keysym, l.encode('UTF-8'), c.encode('UTF-8')))
|
||||
+ if py2:
|
||||
+ l = l.encode('UTF-8')
|
||||
+ c = c.encode('UTF-8')
|
||||
+ sys.stdout.write(" { 0x%X, %s, %s }" % (keysym, l, c))
|
||||
if index < len(table) - 1:
|
||||
sys.stdout.write(",")
|
||||
sys.stdout.write("\n")
|
||||
Reference in New Issue
Block a user