[packages/mono-addins] - added gtk3 patch (adjust cairo version, replace PaintFocus by RenderFocus for gtk 3.22); release 3

qboosh qboosh at pld-linux.org
Mon Apr 25 20:45:46 CEST 2022


commit 0da0ee09086763d9f73fc627e57b3f0cbead8649
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 25 20:46:04 2022 +0200

    - added gtk3 patch (adjust cairo version, replace PaintFocus by RenderFocus for gtk 3.22); release 3

 mono-addins-gtk3.patch | 23 +++++++++++++++++++++++
 mono-addins.spec       | 15 +++++++++------
 2 files changed, 32 insertions(+), 6 deletions(-)
---
diff --git a/mono-addins.spec b/mono-addins.spec
index 54083ec..1075a2a 100644
--- a/mono-addins.spec
+++ b/mono-addins.spec
@@ -9,27 +9,29 @@ Summary:	Mono.Addins - framework for creating extensible applications and librar
 Summary(pl.UTF-8):	Mono.Addins - framework do tworzenia elastycznych aplikacji i bibliotek
 Name:		mono-addins
 Version:	1.3.3
-Release:	2
+Release:	3
 License:	MIT
 Group:		Development/Tools
-# main download site
+# old download site
 #Source0:	http://download.mono-project.com/sources/mono-addins/%{name}-%{version}.tar.gz
-# sometimes newer releases are available on http://monoaddins.codeplex.com/ (requiring JS and POST forms) or github:
+# newer releases on github:
+#Source0Download: https://github.com/mono/mono-addins/tags
 Source0:	https://github.com/mono/mono-addins/archive/%{name}-%{version}.tar.gz
 # Source0-md5:	7ac27ffa4616fd03dc299749f16bce2a
 Patch0:		%{name}-monodir.patch
 Patch1:		%{name}-destdir.patch
-URL:		http://www.mono-project.com/Mono.Addins
+Patch2:		%{name}-gtk3.patch
+URL:		https://www.mono-project.com/Mono.Addins
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
 %{?with_gtk2:BuildRequires:	dotnet-gtk-sharp2-devel >= 2.9.0}
-%{?with_gtk3:BuildRequires:	dotnet-gtk-sharp3-devel >= 2.99}
+%{?with_gtk3:BuildRequires:	dotnet-gtk-sharp3-devel >= 3.22}
 BuildRequires:	mono-csharp >= 1.1.13
 # mono-nunit
 %{?with_tests:BuildRequires:	mono-devel}
 %{?with_monodoc:BuildRequires:	mono-monodoc}
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	rpmbuild(macros) >= 2.015
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -112,6 +114,7 @@ Pliki programistyczne biblioteki Mono.Addins.Gui dla GTK# 3.
 %setup -q -n %{name}-%{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
diff --git a/mono-addins-gtk3.patch b/mono-addins-gtk3.patch
new file mode 100644
index 0000000..3b4716c
--- /dev/null
+++ b/mono-addins-gtk3.patch
@@ -0,0 +1,23 @@
+--- mono-addins-mono-addins-1.3.3/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj.orig	2017-02-28 11:34:19.000000000 +0100
++++ mono-addins-mono-addins-1.3.3/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj	2022-04-25 19:22:00.714335222 +0200
+@@ -43,7 +43,7 @@
+     <Reference Include="pango-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+     <Reference Include="atk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+     <Reference Include="System.Core" />
+-    <Reference Include="cairo-sharp, Version=1.10.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
++    <Reference Include="cairo-sharp, Version=1.12.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+     <Reference Include="Mono.Posix" />
+     <Reference Include="gio-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+   </ItemGroup>
+--- mono-addins-mono-addins-1.3.3/Mono.Addins.GuiGtk3/Mono.Addins.Gui/HoverImageButton.cs.orig	2017-02-28 11:34:19.000000000 +0100
++++ mono-addins-mono-addins-1.3.3/Mono.Addins.GuiGtk3/Mono.Addins.Gui/HoverImageButton.cs	2022-04-25 20:40:40.262100571 +0200
+@@ -154,8 +154,7 @@ namespace Mono.Addins.GuiGtk3
+ 			PropagateDraw (Child, cr);
+ 
+             if(HasFocus && draw_focus) {
+-                Style.PaintFocus(Style, cr, StateType.Normal, this, "button",
+-                    0, 0, Allocation.Width, Allocation.Height);
++                StyleContext.RenderFocus(cr, 0, 0, Allocation.Width, Allocation.Height);
+             }
+         }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mono-addins.git/commitdiff/0da0ee09086763d9f73fc627e57b3f0cbead8649



More information about the pld-cvs-commit mailing list