Accepting request 871605 from Base:System
OBS-URL: https://build.opensuse.org/request/show/871605 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=104
This commit is contained in:
commit
ff1eab95a2
@ -1,34 +0,0 @@
|
|||||||
Index: kbd-2.3.0/src/libkfont/kdfontop.c
|
|
||||||
===================================================================
|
|
||||||
--- kbd-2.3.0.orig/src/libkfont/kdfontop.c
|
|
||||||
+++ kbd-2.3.0/src/libkfont/kdfontop.c
|
|
||||||
@@ -321,6 +321,23 @@ kfont_put_font(struct kfont_context *ctx
|
|
||||||
if (ret <= 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
+#if 1
|
|
||||||
+ // We no longer try PIO_FONT* calls.
|
|
||||||
+ // A former patch even added a possible 5 seconds delay loop here, in an attempt to
|
|
||||||
+ // gain victory over kdm. We no do this fight, as it can only result in races.
|
|
||||||
+ // https://bugzilla.novell.com/show_bug.cgi?id=302010
|
|
||||||
+ //
|
|
||||||
+ // Two effects:
|
|
||||||
+ // a) Without the delay loop, we are fast enough to run early.
|
|
||||||
+ // Moving setfont calls to an earlier point most likly
|
|
||||||
+ // avoids the race.
|
|
||||||
+ // b) Without the old compat calls, it should be easier to
|
|
||||||
+ // fix this in kernel side.
|
|
||||||
+ //
|
|
||||||
+ fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", get_progname(), count, width, height, ret);
|
|
||||||
+ perror("putfont: KDFONTOP");
|
|
||||||
+ return -1;
|
|
||||||
+#else
|
|
||||||
/* Second attempt: PIO_FONTX */
|
|
||||||
ret = put_font_piofontx(ctx, fd, buf, count, width, height);
|
|
||||||
if (ret <= 0)
|
|
||||||
@@ -328,4 +345,5 @@ kfont_put_font(struct kfont_context *ctx
|
|
||||||
|
|
||||||
/* Third attempt: PIO_FONT */
|
|
||||||
return put_font_piofont(ctx, fd, buf, count, width, height);
|
|
||||||
+#endif
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5756c79bad9765cdf52980b84ad5bd4333dcead39a65d602cef20a6a849749ea
|
|
||||||
size 783172
|
|
3
kbd-2.4.0-repack.tar.xz
Normal file
3
kbd-2.4.0-repack.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:42a138b498f633cb4eebbfbd2970bff3949a6119337c222ee94b78a99b9b65be
|
||||||
|
size 807180
|
20
kbd.changes
20
kbd.changes
@ -1,3 +1,23 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 18 07:29:33 UTC 2020 - Jiri Slaby <jslaby@suse.cz>
|
||||||
|
|
||||||
|
- Update to version 2.4.0:
|
||||||
|
* po: Update cs and sr translations (from translationproject.org)
|
||||||
|
* libkfont: Use only KDFONTOP
|
||||||
|
* Added support for a few derivatives of neo
|
||||||
|
* Fix use-after-free of pipe_cmd
|
||||||
|
* Update solar24x32 font
|
||||||
|
* vlock's pam config added to destination directory
|
||||||
|
* Update sun12x22.psfu
|
||||||
|
* libkeymap: unify non/unicode accent_table generation
|
||||||
|
* libkeymap: note about --unicode use
|
||||||
|
* libkeymap: remove last ushort
|
||||||
|
* fi.map: use newly added deadkeys
|
||||||
|
* Do not install internal library
|
||||||
|
* Additional deadkeys
|
||||||
|
- Remove kbd-1.15.2-setfont-no-cruft.patch
|
||||||
|
The old ioctls were finally dropped.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Oct 16 09:58:12 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
|
Fri Oct 16 09:58:12 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
|
||||||
|
|
||||||
|
12
kbd.spec
12
kbd.spec
@ -24,16 +24,14 @@
|
|||||||
%define legacy_folders amiga,atari,i386,include,mac,ppc,sun
|
%define legacy_folders amiga,atari,i386,include,mac,ppc,sun
|
||||||
|
|
||||||
Name: kbd
|
Name: kbd
|
||||||
Version: 2.3.0
|
Version: 2.4.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Keyboard and Font Utilities
|
Summary: Keyboard and Font Utilities
|
||||||
# git: git://git.altlinux.org/people/legion/packages/kbd.git
|
# git: git://git.altlinux.org/people/legion/packages/kbd.git
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: System/Console
|
Group: System/Console
|
||||||
URL: http://kbd-project.org/
|
URL: http://kbd-project.org/
|
||||||
# repack_kbd.sh on ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-%%{version}.tar.xz
|
# repack_kbd.sh on https://www.kernel.org/pub/linux/utils/kbd/kbd-%%{version}.tar.xz
|
||||||
# or
|
|
||||||
# repack_kbd.sh on ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%%{version}.tar.xz
|
|
||||||
Source: %{name}-%{version}-repack.tar.xz
|
Source: %{name}-%{version}-repack.tar.xz
|
||||||
Source1: kbd_fonts.tar.bz2
|
Source1: kbd_fonts.tar.bz2
|
||||||
Source2: suse-add.tar.bz2
|
Source2: suse-add.tar.bz2
|
||||||
@ -55,7 +53,6 @@ Patch0: kbd-1.15.2-prtscr_no_sigquit.patch
|
|||||||
Patch2: kbd-1.15.2-unicode_scripts.patch
|
Patch2: kbd-1.15.2-unicode_scripts.patch
|
||||||
Patch3: kbd-1.15.2-docu-X11R6-xorg.patch
|
Patch3: kbd-1.15.2-docu-X11R6-xorg.patch
|
||||||
Patch4: kbd-1.15.2-sv-latin1-keycode10.patch
|
Patch4: kbd-1.15.2-sv-latin1-keycode10.patch
|
||||||
Patch5: kbd-1.15.2-setfont-no-cruft.patch
|
|
||||||
Patch6: kbd-1.15.2-dumpkeys-C-opt.patch
|
Patch6: kbd-1.15.2-dumpkeys-C-opt.patch
|
||||||
Patch9: kbd-2.0.2-comment-typo-qwerty.patch
|
Patch9: kbd-2.0.2-comment-typo-qwerty.patch
|
||||||
Patch10: kbd-2.0.2-doshell-reference.patch
|
Patch10: kbd-2.0.2-doshell-reference.patch
|
||||||
@ -123,7 +120,6 @@ cp -fp %{SOURCE22} .
|
|||||||
%patch2
|
%patch2
|
||||||
%patch3
|
%patch3
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
|
||||||
%patch6
|
%patch6
|
||||||
%patch9
|
%patch9
|
||||||
%patch10
|
%patch10
|
||||||
@ -189,9 +185,6 @@ install -m 644 fonts/*/* $K/consolefonts/
|
|||||||
# Now call kbd install
|
# Now call kbd install
|
||||||
echo "# Now call kbd install DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir}"
|
echo "# Now call kbd install DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir}"
|
||||||
make DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir} install
|
make DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir} install
|
||||||
# This is an internal library, these files have no use outside kbd.
|
|
||||||
rm %{buildroot}%{_libdir}/libtswrap.la
|
|
||||||
rm %{buildroot}%{_libdir}/libtswrap.so*
|
|
||||||
# ln -s iso01-12x22.psfu $K/consolefonts/suse12x22.psfu
|
# ln -s iso01-12x22.psfu $K/consolefonts/suse12x22.psfu
|
||||||
install -m 644 data/consolefonts/README* $DOC/fonts/
|
install -m 644 data/consolefonts/README* $DOC/fonts/
|
||||||
mkdir -p $DOC/doc/
|
mkdir -p $DOC/doc/
|
||||||
@ -282,6 +275,7 @@ install -m 755 fbtest %{buildroot}%{_sbindir}
|
|||||||
install -d %{buildroot}%{_libexecdir}/%{name}
|
install -d %{buildroot}%{_libexecdir}/%{name}
|
||||||
install -m 755 numlockbios %{buildroot}%{_libexecdir}/%{name}
|
install -m 755 numlockbios %{buildroot}%{_libexecdir}/%{name}
|
||||||
%endif
|
%endif
|
||||||
|
rm -rf %{buildroot}%{_sysconfdir}/pam.d
|
||||||
install -d %{buildroot}%{_distconfdir}/pam.d
|
install -d %{buildroot}%{_distconfdir}/pam.d
|
||||||
install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/vlock
|
install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/vlock
|
||||||
install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
|
install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
|
||||||
|
Loading…
Reference in New Issue
Block a user