packages/tk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 remove unnecessary patch

Browse Source 
Merge pull request !3 from Anonymous_Z/local_master
This commit is contained in:
openeuler-ci-bot 2020-01-13 23:34:44 +08:00 committed by Gitee
commit a8a8483e6a
2 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Further-patch-from-Christian-Werner-on-the-observati.patch
View File

@ -1,38 +0,0 @@
From 537e7f8ae810343e6d6685e97492c5881298bd7d Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Thu, 3 May 2018 06:12:45 +0000
Subject: [PATCH 222/693] Further patch from Christian Werner, on the
observation that on Fedora 28 Workstation on x86_64 XKeyEvents generated by
input methods have the keycode field set to 0 which fails the range check and
thus doesn't get processed further
---
unix/tkUnixKey.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index d8aa5abe6..c5a024fe6 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -146,9 +146,15 @@ TkpGetString(
XDisplayKeycodes(winPtr->dispPtr->display, &mincode, &maxcode);
if ((eventPtr->xkey.keycode < mincode) ||
(eventPtr->xkey.keycode > maxcode)) {
- len = 0;
- Tcl_DStringSetLength(dsPtr, len);
- goto done;
+ if (eventPtr->xkey.keycode != 0) {
+ len = 0;
+ Tcl_DStringSetLength(dsPtr, len);
+ goto done;
+ }
+ /*
+ * Keycode 0 seems to come from e.g. ibus input methods,
+ * we let this pass and hope for the best.
+ */
}
#ifdef TK_USE_INPUT_METHODS
--
2.19.1

10
tk.spec
View File

@ -3,7 +3,7 @@
Name: tk
Version: 8.6.8
Release: 3
Release: 4
Summary: The graphical toolkit for the Tcl scripting language
Epoch: 1
License: TCL
@ -25,7 +25,6 @@ Patch6006: Fix-broken-build-one-line-of-the-patch-was-missing.patch
Patch6007: Latest-fix-proposal-from-Christian-Werner-revert-the.patch
Patch6008: Fix-5d991b822e-segmentation-violation-in-TclObjLooku.patch
Patch6009: Fix-502e74e9ad-crash-for-untrusted-X-connections-for.patch
Patch6010: Further-patch-from-Christian-Werner-on-the-observati.patch
Patch6011: Fix-de01e24aa1-Text-replace-command-involving-select.patch
Patch6012: Fix-fbaed1f66b-image-create-photo-errors-out-on-a-sa.patch
Patch6013: Fix-3441086fff-ttk-style-layout-with-empty-children-.patch
@ -96,16 +95,16 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu
%{_bindir}/wish*
%{_datadir}/%{name}%{majorver}
%exclude %{_datadir}/%{name}%{majorver}/tkAppInit.c
%{_libdir}/lib%{name}%{majorver}.so
%{_libdir}/%{name}%{majorver}
%{_libdir}/lib%{name}%{majorver}.so
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/lib%{name}.so
%{_libdir}/lib%{name}stub%{majorver}.a
%{_libdir}/%{name}Config.sh
%{_libdir}/pkgconfig/tk.pc
%{_libdir}/lib%{name}stub%{majorver}.a
%{_datadir}/%{name}%{majorver}/tkAppInit.c
%files help
@ -114,6 +113,9 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu
%{_mandir}/mann/*
%changelog
* Mon Jan 13 2020 zhangrui <zhangrui182@huawei.com> - 1:8.6.8-4
- del patches to be consistent with open source
* Sat Jan 11 2020 zhangrui <zhangrui182@huawei.com> - 1:8.6.8-3
- del patches to be consistent with open source