rpms/mono/devel mono-2.2-winforms.patch, NONE, 1.1 import.log, 1.17, 1.18 mono-2.2-uselibdir.patch, 1.1, 1.2 mono.spec, 1.90, 1.91 mono-2.2-pcfiles.patch, 1.3, NONE mono-2.2-script.patch, 1.1, NONE mono-big-integer-CVE-2007-5197.patch, 1.1, NONE mono-mcs-config.patch, 1.3, NONE
Paul F. Johnson
pfj at fedoraproject.org
Sun Nov 30 19:12:41 UTC 2008
Author: pfj
Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19006/devel
Modified Files:
import.log mono-2.2-uselibdir.patch mono.spec
Added Files:
mono-2.2-winforms.patch
Removed Files:
mono-2.2-pcfiles.patch mono-2.2-script.patch
mono-big-integer-CVE-2007-5197.patch mono-mcs-config.patch
Log Message:
Reorganised patch files
Now uses sed to replace all incorrect uses of libdir
Add winforms patch - fixes quite a few problems
mono-2.2-winforms.patch:
--- NEW FILE mono-2.2-winforms.patch ---
--- mono-2.2/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs 2008-11-13 23:30:08.000000000 +0000
+++ mono-2.2/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI-new.cs 2008-11-30 18:37:14.000000000 +0000
@@ -740,7 +740,7 @@
SelectItem (item, item.MenuItems [0], false);
CurrentMenu = item;
}
- } else if (CurrentMenu.SelectedItem.IsPopup) {
+ } else if (CurrentMenu.SelectedItem != null && CurrentMenu.SelectedItem.IsPopup) {
item = CurrentMenu.SelectedItem;
ShowSubPopup (CurrentMenu, item);
SelectItem (item, item.MenuItems [0], false);
@@ -782,7 +782,8 @@
}
} else {
HideSubPopups (CurrentMenu, TopMenu);
- CurrentMenu = CurrentMenu.parent_menu;
+ if (CurrentMenu.parent_menu != null)
+ CurrentMenu = CurrentMenu.parent_menu;
}
break;
--- mono-2.2/mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingSource.cs 2008-11-13 23:30:08.000000000 +0000
+++ mono-2.2/mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingSource-new.cs 2008-11-30 18:34:35.000000000 +0000
@@ -284,7 +284,9 @@
[Browsable (false)]
public object Current {
get {
- return currency_manager.Current;
+ if (currency_manager.Count > 0)
+ return currency_manager.Current;
+ return null;
}
}
--- mono-2.2/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewRow.cs 2008-11-13 23:30:08.000000000 +0000
+++ mono-2.2/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewRow-new.cs 2008-11-30 18:33:10.000000000 +0000
@@ -39,7 +39,6 @@
private AccessibleObject accessibilityObject;
private DataGridViewCellCollection cells;
private ContextMenuStrip contextMenuStrip;
- private object dataBoundItem;
private int dividerHeight;
private string errorText;
private DataGridViewRowHeaderCell headerCell;
@@ -56,7 +55,6 @@
headerCell = new DataGridViewRowHeaderCell();
headerCell.SetOwningRow (this);
accessibilityObject = new AccessibleObject ();
- dataBoundItem = null;
SetState (DataGridViewElementStates.Visible);
}
@@ -92,7 +90,15 @@
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Advanced)]
public object DataBoundItem {
- get { return dataBoundItem; }
+ get {
+ if (base.DataGridView != null) {
+ CurrencyManager data = DataGridView.BindingContext[DataGridView.DataSource] as CurrencyManager;
+ if (data != null) {
+ return data.List[base.Index];
+ }
+ }
+ return null;
+ }
}
[Browsable (true)]
--- mono-2.2/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GroupBoxRenderer.cs 2008-09-10 17:22:36.000000000 +0100
+++ mono-2.2/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GroupBoxRenderer-new.cs 2008-11-30 18:29:53.000000000 +0000
@@ -99,7 +99,7 @@
// part of the bounds as height, they use it as the bottom, so the boxes are drawn in completely different
// places. Rather than emulate this bug, we do it correctly. After googling for a while, I don't think
// anyone has ever actually used this class for anything, so it should be fine. :)
- Rectangle new_bounds = new Rectangle (bounds.Left, bounds.Top + (int)(font_size.Height / 2) - 1, bounds.Width, bounds.Height - (int)(font_size.Height / 2) + 1);
+ Rectangle new_bounds = new Rectangle (bounds.Left, bounds.Top + (int)(font_size.Height / 2), bounds.Width, bounds.Height - (int)(font_size.Height / 2));
// Don't paint over the background where we are going to put the text
Region old_clip = g.Clip;
@@ -110,7 +110,11 @@
g.Clip = old_clip;
if (groupBoxText != String.Empty)
+ {
+ if (textColor == Color.Empty)
+ textColor = SystemColors.ControlText;
TextRenderer.DrawText (g, groupBoxText, font, new Point (bounds.Left + 8, bounds.Top), textColor, flags);
+ }
}
}
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- import.log 26 Nov 2008 13:16:32 -0000 1.17
+++ import.log 30 Nov 2008 19:12:11 -0000 1.18
@@ -15,3 +15,4 @@
mono-2_2-2_pre1_fc10:HEAD:mono-2.2-2.pre1.fc10.src.rpm:1227649766
mono-2_2-3_pre1_fc10:HEAD:mono-2.2-3.pre1.fc10.src.rpm:1227693180
mono-2_2-4_pre1_fc10:HEAD:mono-2.2-4.pre1.fc10.src.rpm:1227705354
+mono-2_2-5_pre1_fc11:HEAD:mono-2.2-5.pre1.fc11.src.rpm:1228072254
mono-2.2-uselibdir.patch:
Index: mono-2.2-uselibdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono-2.2-uselibdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-2.2-uselibdir.patch 25 Nov 2008 21:50:28 -0000 1.1
+++ mono-2.2-uselibdir.patch 30 Nov 2008 19:12:11 -0000 1.2
@@ -12,11 +12,4 @@
}
internal static string GetBinDir ()
---- mono-2.2/docs/Makefile.am 2008-11-19 22:34:05.000000000 +0000
-+++ mono-2.2/docs/Makefile-new.am 2008-11-25 19:45:45.000000000 +0000
-@@ -1,4 +1,4 @@
--sourcesdir = $(prefix)/lib/monodoc/sources
-+sourcesdir = $(libdir)/monodoc/sources
-
- sources_DATA = \
- monoapi.source \
+
Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mono.spec 26 Nov 2008 13:16:32 -0000 1.90
+++ mono.spec 30 Nov 2008 19:12:11 -0000 1.91
@@ -1,6 +1,6 @@
Name: mono
Version: 2.2
-Release: 4.pre1%{?dist}
+Release: 5.pre1%{?dist}
Summary: A .NET runtime environment
Group: Development/Languages
@@ -35,16 +35,13 @@
# Disabled due to strange build failure:
# s390 s390x
-Patch2: mono-2.2-ppc-threading.patch
-Patch3: mono-libdir-126.patch
-Patch4: mono-1.2.3-use-monodir.patch
-Patch5: mono-big-integer-CVE-2007-5197.patch
-Patch8: mono-mcs-config.patch
-Patch7: mono-2.2-pcfiles.patch
-Patch6:mono-2.2-uselibdir.patch
-Patch9:mono-2.0-monoservice.patch
-Patch10: mono-2.0-metadata-makefile.patch
-Patch11: mono-2.2-script.patch
+Patch0: mono-2.2-ppc-threading.patch
+Patch1: mono-libdir-126.patch
+Patch2: mono-1.2.3-use-monodir.patch
+Patch3: mono-2.2-uselibdir.patch
+Patch4: mono-2.0-monoservice.patch
+Patch5: mono-2.0-metadata-makefile.patch
+Patch6: mono-2.2-winforms.patch
%description
The Mono runtime implements a JIT engine for the ECMA CLI
@@ -266,19 +263,26 @@
%prep
%setup -q
-sed -i -e 's!@@LIBDIR@@!%{_libdir}!' %{PATCH8}
-%patch8 -p1 -b .config
-sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8}
-%patch2 -p1 -b .ppc-threading
-%patch3 -p1 -b .libdir
-%patch11 -p1 -b .libdir
-%patch4 -p1 -b .use-monodir
-%patch6 -p1 -b .use-libdir
-sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
-%patch7 -p1 -b .pc-patches
-sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
-%patch9 -p1 -b .monoservice
-%patch10 -p1 -b .metadata
+
+%patch0 -p1 -b .ppc-threading
+%patch1 -p1 -b .libdir
+%patch2 -p1 -b .usemonodir
+%patch3 -p1 -b .uselibdir
+%patch4 -p1 -b .monoservice
+%patch5 -p1 -b .metadata-makefile
+%patch6 -p1 -b .winforms
+
+find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
+ -or -name \*.in -or -name \*.make \
+ | while read f ;
+ do
+ sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f"
+ sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f"
+ sed -i -e 's!/usr/lib!%{_libdir}!' "$f"
+ sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f"
+ sed -i -e 's!${prefix}/@reloc_libdir@!%{_libdir}!' "$f";
+ done
+
autoreconf -f -i -s
# Add undeclared Arg
@@ -677,6 +681,11 @@
%{_libdir}/pkgconfig/monodoc.pc
%changelog
+* Sun Nov 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-5.pre1
+- new patch for winforms problems
+- reorganised patches
+- use sed to fix the incorrect libdir issues - experimental!!!!
+
* Wed Nov 26 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-4.pre1
- mono.pc libfile fix
--- mono-2.2-pcfiles.patch DELETED ---
--- mono-2.2-script.patch DELETED ---
--- mono-big-integer-CVE-2007-5197.patch DELETED ---
--- mono-mcs-config.patch DELETED ---
More information about the fedora-extras-commits
mailing list