diff --git a/mono-4.2-fix-winforms-trayicon.patch b/mono-4.2-fix-winforms-trayicon.patch new file mode 100644 index 0000000..8fdbc15 --- /dev/null +++ b/mono-4.2-fix-winforms-trayicon.patch @@ -0,0 +1,27 @@ +From bc9d2b37c682f3fdc2c41450cf367c78d0f6ca22 Mon Sep 17 00:00:00 2001 +From: Arsen Shnurkov +Date: Thu, 4 Jun 2015 21:32:20 +0300 +Subject: [PATCH] https://bugzilla.xamarin.com/show_bug.cgi?id=14976 + +--- + mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs +index b0777b5..d50d6c4 100644 +--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs ++++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs +@@ -6239,9 +6239,6 @@ namespace System.Windows.Forms { + atoms [0] = 1; // Version 1 + atoms [1] = 1; // we want to be mapped + +- // This line cost me 3 days... +- XChangeProperty(DisplayHandle, hwnd.whole_window, _XEMBED_INFO, _XEMBED_INFO, 32, PropertyMode.Replace, atoms, 2); +- + // Need to pick some reasonable defaults + tt = new ToolTip(); + tt.AutomaticDelay = 350; +-- +2.0.5 + + diff --git a/mono.spec b/mono.spec index c349144..80182cd 100644 --- a/mono.spec +++ b/mono.spec @@ -16,7 +16,7 @@ Name: mono Version: 4.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform, Open Source, .NET development framework Group: Development/Languages @@ -33,6 +33,7 @@ Patch1: mono-4.0.0-libgdiplusconfig.patch Patch2: mono-4.2.1-ppc.patch Patch3: mono-4.2.1-s390.patch Patch4: mono-4.3.2-find-provides.patch +Patch5: mono-4.2-fix-winforms-trayicon.patch BuildRequires: bison BuildRequires: gcc-c++ @@ -273,6 +274,7 @@ Development file for monodoc %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # Add undeclared Arg sed -i "61a #define ARG_MAX _POSIX_ARG_MAX" mono/io-layer/wapi_glob.h @@ -757,6 +759,9 @@ mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_bindir} %{_libdir}/pkgconfig/monodoc.pc %changelog +* Thu Jun 23 2016 Timotheus Pokorra - 4.4.1-2 +- Fix winforms problem with TrayIcon (#1284609) + * Wed Jun 22 2016 Claudio Rodrigo Pereyra Diaz - 4.4.1-1 - update to 4.4.1.0 Cycle 7 Service Release 0