From 0cc6b9ba8c5fa75cd81bc72c70158401bd90e5c4 Mon Sep 17 00:00:00 2001 From: zhanglu Date: Mon, 13 Jan 2020 20:15:43 +0800 Subject: [PATCH 1/2] remove unnecessary patch --- ...om-Christian-Werner-on-the-observati.patch | 38 ------------------- tk.spec | 6 ++- 2 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 Further-patch-from-Christian-Werner-on-the-observati.patch diff --git a/Further-patch-from-Christian-Werner-on-the-observati.patch b/Further-patch-from-Christian-Werner-on-the-observati.patch deleted file mode 100644 index 18eb617..0000000 --- a/Further-patch-from-Christian-Werner-on-the-observati.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 537e7f8ae810343e6d6685e97492c5881298bd7d Mon Sep 17 00:00:00 2001 -From: fvogel -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 - diff --git a/tk.spec b/tk.spec index a9c0d70..d5a35fc 100644 --- a/tk.spec +++ b/tk.spec @@ -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 @@ -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 - 1:8.6.8-4 +- del patches to be consistent with open source + * Sat Jan 11 2020 zhangrui - 1:8.6.8-3 - del patches to be consistent with open source From 812ba21551a2583b0db5cb20d169c2bb813c195b Mon Sep 17 00:00:00 2001 From: zhanglu Date: Mon, 13 Jan 2020 20:17:11 +0800 Subject: [PATCH 2/2] remove unnecessary patch --- tk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tk.spec b/tk.spec index d5a35fc..42c4fee 100644 --- a/tk.spec +++ b/tk.spec @@ -95,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