From 7a951025df3a9198b0aa585808f2126e4364d7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 17 Jul 2018 13:12:18 +0200 Subject: [PATCH] Fixed menu in dotty Resolves: rhbz#1505230 --- graphviz-2.40.1-dotty-menu-fix.patch | 22 ++++++++++++++++++++++ graphviz.spec | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 graphviz-2.40.1-dotty-menu-fix.patch diff --git a/graphviz-2.40.1-dotty-menu-fix.patch b/graphviz-2.40.1-dotty-menu-fix.patch new file mode 100644 index 0000000..8c5f34a --- /dev/null +++ b/graphviz-2.40.1-dotty-menu-fix.patch @@ -0,0 +1,22 @@ +diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty +index a8c9116..a708c61 100644 +--- a/cmd/dotty/dotty_ui.lefty ++++ b/cmd/dotty/dotty_ui.lefty +@@ -342,7 +342,7 @@ dotty.protovt.normal.uifuncs = [ + else + gt.insertedge (gt, data.pobj, null, data.obj, null, null, 1); + }; +- 'rightdown' = function (data) { ++ 'rightup' = function (data) { + local vt, gt, menu, i; + + vt = dotty.views[data.widget]; +@@ -447,7 +447,7 @@ dotty.protovt.birdseye.uifuncs = [ + 'middledown' = dotty.protovt.normal.uifuncs.middledown; + 'middlemove' = dotty.protovt.normal.uifuncs.middlemove; + 'middleup' = dotty.protovt.normal.uifuncs.middleup; +- 'rightdown' = dotty.protovt.normal.uifuncs.rightdown; ++ 'rightup' = dotty.protovt.normal.uifuncs.rightup; + 'keyup' = dotty.protovt.normal.uifuncs.keyup; + 'redraw' = dotty.protovt.normal.uifuncs.redraw; + 'closeview' = dotty.protovt.normal.uifuncs.closeview; diff --git a/graphviz.spec b/graphviz.spec index b6f94d6..0266db9 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -49,13 +49,14 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.40.1 -Release: 22%{?dist} +Release: 23%{?dist} Group: Applications/Multimedia License: EPL URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Patch0: graphviz-2.40.1-visio.patch Patch1: graphviz-2.40.1-CVE-2018-10196.patch +Patch2: graphviz-2.40.1-dotty-menu-fix.patch BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig BuildRequires: fontconfig-devel, libtool-ltdl-devel, ruby-devel, ruby, guile-devel, python2-devel @@ -268,6 +269,7 @@ Various tcl packages (extensions) for the graphviz tools. %setup -q %patch0 -p1 -b .visio %patch1 -p1 -b .CVE-2018-10196 +%patch2 -p1 -b .dotty-menu-fix # Attempt to fix rpmlint warnings about executable sources find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';' @@ -560,6 +562,10 @@ php --no-php-ini \ %{_mandir}/man3/*.3tcl* %changelog +* Tue Jul 17 2018 Jaroslav Škarvada - 2.40.1-23 +- Fixed menu in dotty + Resolves: rhbz#1505230 + * Fri May 18 2018 Zbigniew Jędrzejewski-Szmek - 2.40.1-22 - Rename python2 subpackage to graphviz-python2, because there is intent to package python-graphviz, which is a separate project