rpms/mono/devel mono-2.0-swfxim.patch, NONE, 1.1 import.log, 1.1, 1.2 mono.spec, 1.75, 1.76 sources, 1.22, 1.23
Paul F. Johnson
pfj at fedoraproject.org
Tue Aug 26 10:37:33 UTC 2008
Author: pfj
Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5427/devel
Modified Files:
import.log mono.spec sources
Added Files:
mono-2.0-swfxim.patch
Log Message:
Bump to 2.0 preview 2
Added patch from cvs for xim problem
mono-2.0-swfxim.patch:
--- NEW FILE mono-2.0-swfxim.patch ---
--- mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Keyboard.cs 2008-08-12 17:12:15.000000000 +0100
+++ mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Keyboard-new.cs 2008-08-22 16:47:01.000000000 +0100
@@ -105,13 +105,26 @@
KeyboardLayout layout = DetectLayout (layouts);
lcid = layout.Lcid;
CreateConversionArray (layouts, layout);
+ SetupXIM ();
+ initialized = true;
+ }
+
+ private void SetupXIM ()
+ {
+ xim = IntPtr.Zero;
if (!XSupportsLocale ()) {
Console.Error.WriteLine ("X does not support your locale");
+ return;
}
if (!XSetLocaleModifiers (String.Empty)) {
Console.Error.WriteLine ("Could not set X locale modifiers");
+ return;
+ }
+
+ if (Environment.GetEnvironmentVariable (ENV_NAME_XIM_STYLE) == "disabled") {
+ return;
}
xim = XOpenIM (display, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
@@ -119,6 +132,7 @@
Console.Error.WriteLine ("Could not get XIM");
else
utf8_buffer = new byte [100];
+
initialized = true;
}
@@ -905,7 +919,7 @@
xic = CreateOverTheSpotXic (window, xim);
if (xic != IntPtr.Zero)
break;
- Console.WriteLine ("failed to create XIC in over-the-spot mode.");
+ //Console.WriteLine ("failed to create XIC in over-the-spot mode.");
continue;
case styleOnTheSpot:
// Since .NET/Winforms seems to support only over-the-spot mode,,
@@ -914,7 +928,7 @@
xic = CreateOnTheSpotXic (window, xim);
if (xic != IntPtr.Zero)
break;
- Console.WriteLine ("failed to create XIC in on-the-spot mode.");
+ //Console.WriteLine ("failed to create XIC in on-the-spot mode.");
continue;
case styleRoot:
xic = XCreateIC (xim,
@@ -1148,6 +1162,7 @@
keysym = (XKeySym) keysym_res.ToInt32 ();
return s.Length;
} else {
+ lookup_buffer.Length = 0;
res = XLookupString (ref xevent, lookup_buffer, len, out keysym_res, IntPtr.Zero);
keysym = (XKeySym) keysym_res.ToInt32 ();
return res;
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 14 Aug 2008 13:06:25 -0000 1.1
+++ import.log 26 Aug 2008 10:37:02 -0000 1.2
@@ -1 +1,2 @@
mono-2_0-1_fc10:HEAD:mono-2.0-1.fc10.src.rpm:1218719116
+mono-2_0-4_fc10:HEAD:mono-2.0-4.fc10.src.rpm:1219746940
Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mono.spec 14 Aug 2008 13:06:25 -0000 1.75
+++ mono.spec 26 Aug 2008 10:37:03 -0000 1.76
@@ -1,6 +1,6 @@
Name: mono
Version: 2.0
-Release: 1%{?dist}
+Release: 4%{?dist}
Summary: A .NET runtime environment
Group: Development/Languages
@@ -10,7 +10,7 @@
Source1: monodir.c
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: bison
+BuildRequires: bison
BuildRequires: glib2-devel
BuildRequires: pkgconfig
BuildRequires: libicu-devel
@@ -44,6 +44,7 @@
Patch6:mono-2.0-uselibdir.patch
Patch9:mono-2.0-monoservice.patch
Patch10: mono-2.0-metadata-makefile.patch
+Patch11: mono-2.0-swfxim.patch
%description
The Mono runtime implements a JIT engine for the ECMA CLI
@@ -259,6 +260,7 @@
%patch7 -p1 -b .pc-patches
%patch9 -p1 -b .monoservice
%patch10 -p1 -b .metadata
+%patch11 -p1 -b .swfxim
autoreconf -f -i -s
# Add undeclared Arg
@@ -277,7 +279,7 @@
gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
-%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes
+%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes --with-moonlight=no --disable-static
make
@@ -286,7 +288,6 @@
make DESTDIR=$RPM_BUILD_ROOT install
install monodir $RPM_BUILD_ROOT%{_bindir}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.a
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
# We put these inside rpm
@@ -311,6 +312,8 @@
%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/browsercaps-updater.exe*
%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/mono-api-diff.exe
%{__rm} $RPM_BUILD_ROOT%{monodir}/*/mono-api-info.exe
+%{__rm} $RPM_BUILD_ROOT/%_bindir/smcs
+%{__rm} $RPM_BUILD_ROOT/%_libdir/pkgconfig/smcs.pc
%post -p /sbin/ldconfig
@@ -329,7 +332,6 @@
%{_bindir}/mono
%{_bindir}/monodir
%{_bindir}/mono-api-*
-%{_bindir}/smcs
%{_bindir}/mono-test-install
%mono_bin certmgr
%mono_bin chktrust
@@ -345,9 +347,6 @@
%mono_bin monolinker
%{monodir}/1.0/transform.exe
%{monodir}/?.0/installutil.*
-%{monodir}/2.1/System*
-%{monodir}/2.1/smcs*
-%{monodir}/2.1/mscorlib*
%{monodir}/3.5/System.Web.Extensions*
%{monodir}/2.0/System.Xml.Linq.dll
%{_bindir}/mkbundle2
@@ -369,7 +368,6 @@
%dir %{monodir}
%dir %{monodir}/1.0
%dir %{monodir}/2.0
-%dir %{monodir}/2.1
%dir %{monodir}/3.5
%dir %{monodir}/gac
%dir %{monodir}/compat-*
@@ -393,11 +391,9 @@
%gac_dll System.Security
%gac_dll System.Xml
%gac_dll System.Core
-%{monodir}/gac/System.Net
%gac_dll cscompmgd
%gac_dll CustomMarshalers
%gac_dll OpenSystem.C
-#%{monodir}/gac/System.Xml.Core
%{monodir}/gac/System.Xml.Linq
%{monodir}/?.0/mscorlib.dll
%{monodir}/?.0/mscorlib.dll.mdb
@@ -491,7 +487,6 @@
%{_libdir}/pkgconfig/mono.pc
%{_libdir}/pkgconfig/cecil.pc
%{_libdir}/pkgconfig/dotnet35.pc
-%{_libdir}/pkgconfig/smcs.pc
%{_includedir}/mono-1.0
%{_datadir}/mono-1.0/mono/cil/cil-opcodes.xml
%dir %{_datadir}/mono-1.0
@@ -619,6 +614,19 @@
%gac_dll IBM.Data.DB2
%changelog
+* Fri Aug 22 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-4
+- fix for XIM with en_GB.UTF locale plus others
+
+* Mon Aug 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-3
+- removed canna-devel requirements
+- bump to preview 2
+- removed further bits for moonlight
+
+* Sun Aug 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-2
+- added Canna-devel BR and R Canna for mwf
+- removed the build of moonlight parts
+- disable-static on configure
+
* Sat Aug 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
- bump to 2.0 preview 1
- alter licence to MIT only
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 14 Aug 2008 13:06:25 -0000 1.22
+++ sources 26 Aug 2008 10:37:03 -0000 1.23
@@ -1 +1 @@
-16d986b04634d2022cf5747f01387744 mono-2.0.tar.bz2
+edf459582307603df250e2a87efe12a5 mono-2.0.tar.bz2
More information about the fedora-extras-commits
mailing list