From d66db62c713f756a0c067d0642e5380a1f5b2df9 Mon Sep 17 00:00:00 2001 From: Martin Willemoes Hansen Date: Mon, 10 Nov 2003 09:12:37 +0000 Subject: [PATCH] * WISHLIST: Removed, content added to TODO * TODO: Updated, with content from TODO and various things which has been done has been removed. * autogen.sh: Added, autoconf enabled. * configure.in: Added, autoconf enabled. * patches: Removed, not needed anymore * makefile: All of them removed, autoconf enabled * makefile.am: All of them added, autoconf enabled * .cvsignore: Added * README: Does not mention make prefix option anymore * COPYRIGHT: Removed * COPYING: Added * INSTALL: Added * dia/cvsignore: Added makefile and makefile.in * doc/cvsignore: Ditto * glue/cvsignore: Ditto * sample/cvsignore: Ditto * sources/cvsignore: Ditto svn path=/trunk/diacanvas-sharp/; revision=19777 --- .cvsignore | 12 + COPYRIGHT => COPYING | 0 ChangeLog | 21 + INSTALL | 10 + NEWS | 1 + PROBLEMS | 1 - README | 7 - TODO | 8 +- WISHLIST | 4 - autogen.sh | 4 + configure.in | 17 + dia/.cvsignore | 2 + dia/{makefile => makefile.am} | 22 +- doc/.cvsignore | 2 + doc/diacanvas-docs.zip | Bin 94757 -> 94678 bytes doc/{makefile => makefile.am} | 0 glue/.cvsignore | 2 + glue/{makefile => makefile.am} | 3 +- makefile => makefile.am | 1 - .../diacanvas/AddedPropertyPangoLayout.diff | 242 ---- patches/diacanvas/PropertyShouldBeDouble.diff | 17 - patches/diacanvas/PythonUpdate.diff | 4 - patches/diacanvas/removal_of_persistens.diff | 132 -- patches/diacanvas/unit_tests.cvsignore.diff | 22 - patches/generator/AssemblyTagGenerator.diff | 267 ---- .../generator/MangleNameModifications.diff | 165 --- ...ToStringOnlyOverridesWhenNoParameters.diff | 17 - patches/gtksharp/APIdecentralized.diff | 1128 ----------------- patches/gtksharp/GnomePrintFixes.diff | 158 --- patches/gtksharp/UpdateTargetsToGnome2.2.diff | 183 --- .../gtksharp/const-gucharVsconst-gchar.diff | 703 ---------- patches/parser/AdditionOfAssemblyTag.diff | 83 -- patches/parser/ByPassingOfEnumStyle.diff | 88 -- patches/parser/StripsCAndCppComments.diff | 37 - sample/.cvsignore | 2 + sample/{makefile => makefile.am} | 0 sources/.cvsignore | 2 + sources/{makefile => makefile.am} | 4 +- 38 files changed, 95 insertions(+), 3276 deletions(-) create mode 100644 .cvsignore rename COPYRIGHT => COPYING (100%) create mode 100644 INSTALL delete mode 100644 WISHLIST create mode 100755 autogen.sh create mode 100644 configure.in rename dia/{makefile => makefile.am} (56%) rename doc/{makefile => makefile.am} (100%) create mode 100644 glue/.cvsignore rename glue/{makefile => makefile.am} (77%) rename makefile => makefile.am (97%) delete mode 100644 patches/diacanvas/AddedPropertyPangoLayout.diff delete mode 100644 patches/diacanvas/PropertyShouldBeDouble.diff delete mode 100644 patches/diacanvas/PythonUpdate.diff delete mode 100644 patches/diacanvas/removal_of_persistens.diff delete mode 100644 patches/diacanvas/unit_tests.cvsignore.diff delete mode 100644 patches/generator/AssemblyTagGenerator.diff delete mode 100644 patches/generator/MangleNameModifications.diff delete mode 100644 patches/generator/ToStringOnlyOverridesWhenNoParameters.diff delete mode 100644 patches/gtksharp/APIdecentralized.diff delete mode 100644 patches/gtksharp/GnomePrintFixes.diff delete mode 100644 patches/gtksharp/UpdateTargetsToGnome2.2.diff delete mode 100644 patches/gtksharp/const-gucharVsconst-gchar.diff delete mode 100644 patches/parser/AdditionOfAssemblyTag.diff delete mode 100644 patches/parser/ByPassingOfEnumStyle.diff delete mode 100644 patches/parser/StripsCAndCppComments.diff rename sample/{makefile => makefile.am} (100%) rename sources/{makefile => makefile.am} (72%) diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..099eb2d --- /dev/null +++ b/.cvsignore @@ -0,0 +1,12 @@ +aclocal.m4 +autom4te.cache +config.guess +config.log +config.status +config.sub +configure +Makefile +Makefile.in +install-sh +missing +mkinstalldirs diff --git a/COPYRIGHT b/COPYING similarity index 100% rename from COPYRIGHT rename to COPYING diff --git a/ChangeLog b/ChangeLog index 8060011..97cb08b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2003-11-10 Martin Willemoes Hansen + + * WISHLIST: Removed, content added to TODO + * TODO: Updated, with content from TODO and + various things which has been done has been removed. + * autogen.sh: Added, autoconf enabled. + * configure.in: Added, autoconf enabled. + * patches: Removed, not needed anymore + * makefile: All of them removed, autoconf enabled + * makefile.am: All of them added, autoconf enabled + * .cvsignore: Added + * README: Does not mention make prefix option anymore + * COPYRIGHT: Removed + * COPYING: Added + * INSTALL: Added + * dia/cvsignore: Added makefile and makefile.in + * doc/cvsignore: Ditto + * glue/cvsignore: Ditto + * sample/cvsignore: Ditto + * sources/cvsignore: Ditto + 2003-11-05 Martin Willemoes Hansen * doc/en/Dia/WrapMode.xml: Added diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..510b23a --- /dev/null +++ b/INSTALL @@ -0,0 +1,10 @@ +Installing DiaCanvas# +===================== + +CVS edition: + + ./autogen.sh --prefix=YOUR_PREFIX + +Source tarball edition: + + ./configure --prefix=YOUR_PREFIX diff --git a/NEWS b/NEWS index 81b6030..8530c3e 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ ===== * Works with DiaCanvas2-0.10.0 +* Autoconf enabled 0.2.0 ===== diff --git a/PROBLEMS b/PROBLEMS index 51a1160..47429e7 100644 --- a/PROBLEMS +++ b/PROBLEMS @@ -3,7 +3,6 @@ Array fields are not generated properly warning: array field Dia.ShapeText.affine probably incorrectly generated warning: array field Dia.CanvasIter.data probably incorrectly generated -warning: array field Dia.DashStyle.dash probably incorrectly generated warning: array field Dia.ShapeImage.affine probably incorrectly generated This seems to be a problem with the generator. diff --git a/README b/README index 4ec799b..558e8ae 100644 --- a/README +++ b/README @@ -6,13 +6,6 @@ mono-0.28 gtk-sharp-0.12 diacanvas2-0.10.0 -==== -Make -==== - -If you use another prefix than /usr then you can specify it to make like -this: make -e PREFIX=/myprefix - ====== Sample ====== diff --git a/TODO b/TODO index d91777f..0761d03 100644 --- a/TODO +++ b/TODO @@ -15,5 +15,11 @@ Document API Dia.Variable Dia.Constraint Dia.Solver -Dia.Strength Dia.CanvasViewItem.EmitEvent + + +Free form drawing +----------------- +Investigate, if it is posible to use +DiaCanvas# as a free form drawing canvas. +Requested by Miguel De Icaza. \ No newline at end of file diff --git a/WISHLIST b/WISHLIST deleted file mode 100644 index 0093763..0000000 --- a/WISHLIST +++ /dev/null @@ -1,4 +0,0 @@ -Free form drawing (miguel) -autoconf (gonzalo) - - diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..166199d --- /dev/null +++ b/autogen.sh @@ -0,0 +1,4 @@ +automake -a +aclocal +autoconf +./configure $* diff --git a/configure.in b/configure.in new file mode 100644 index 0000000..b65d4da --- /dev/null +++ b/configure.in @@ -0,0 +1,17 @@ +AC_INIT(README) +AC_CANONICAL_SYSTEM +AM_INIT_AUTOMAKE(diacanvas-sharp, 0.3.0) +AM_MAINTAINER_MODE + +dnl Defines CC to avoid warnings +AC_PROG_CC +AC_PROG_INSTALL + +AC_OUTPUT([ +makefile +dia/makefile +doc/makefile +glue/makefile +sample/makefile +sources/makefile +]) diff --git a/dia/.cvsignore b/dia/.cvsignore index 758858f..8db26ad 100644 --- a/dia/.cvsignore +++ b/dia/.cvsignore @@ -1,3 +1,5 @@ diacanvas-sharp.dll generated generated-stamp +makefile +makefile.in diff --git a/dia/makefile b/dia/makefile.am similarity index 56% rename from dia/makefile rename to dia/makefile.am index faddb23..09a7eb5 100644 --- a/dia/makefile +++ b/dia/makefile.am @@ -1,14 +1,12 @@ -PREFIX= /usr - APIS= diacanvas-api.xml diacanvas-symbols.xml -INCLUDE_APIS= $(PREFIX)/share/gapi/art-api.xml \ - $(PREFIX)/share/gapi/pango-api.xml \ - $(PREFIX)/share/gapi/atk-api.xml \ - $(PREFIX)/share/gapi/gnome-api.xml \ - $(PREFIX)/share/gapi/gtk-api.xml \ - $(PREFIX)/share/gapi/gdk-api.xml \ - $(PREFIX)/share/gapi/gdk-symbols.xml +INCLUDE_APIS= @prefix@/share/gapi/art-api.xml \ + @prefix@/share/gapi/pango-api.xml \ + @prefix@/share/gapi/atk-api.xml \ + @prefix@/share/gapi/gnome-api.xml \ + @prefix@/share/gapi/gtk-api.xml \ + @prefix@/share/gapi/gdk-api.xml \ + @prefix@/share/gapi/gdk-symbols.xml ASSEMBLIES= -r gtk-sharp.dll \ -r glib-sharp.dll \ @@ -30,9 +28,9 @@ $(LIBRARY): generated-stamp *.cs mcs --unsafe -nowarn:0660,0661 --target library $(ASSEMBLIES) --recurse '*.cs' -o $(LIBRARY) install: - install -o root -g root -m 644 diacanvas-api.xml $(PREFIX)/share/gapi - install -o root -g root -m 644 diacanvas-symbols.xml $(PREFIX)/share/gapi - install -o root -g root -m 644 $(LIBRARY) $(PREFIX)/lib + install -o root -g root -m 644 diacanvas-api.xml @prefix@/share/gapi + install -o root -g root -m 644 diacanvas-symbols.xml @prefix@/share/gapi + install -o root -g root -m 644 $(LIBRARY) @prefix@/lib clean: rm -f $(LIBRARY) diff --git a/doc/.cvsignore b/doc/.cvsignore index a9a5aec..4638796 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -1 +1,3 @@ tmp +makefile +makefile.in diff --git a/doc/diacanvas-docs.zip b/doc/diacanvas-docs.zip index 11025b5aa5cc68631b8a355db6d793d73283b59a..e5398373d6eae6cb3aa4fbad9fecbf4f859ead1e 100644 GIT binary patch delta 17959 zcmZvDWk8fm)bK8y(%s!H4bqKtcSuTyq%0r}g5*kfN=tWx(jC&$9nu2d3isak-uL~U zKYQlP$(b|fIXm-A{s!#KPgqnH1!x#-004jhuz?GyLVX1T4f*}51cL?r1iXRAdj|ZF z;-0&((B3{{0x&!+x5o14hsgrp?J#`IJ0HIMK0@-vjJhSc)005i#AJpU^ zd&eJjxDRc{VhzSF0YgTv?X}SXGrE(jJoYN}OYcHWvuGB!C?iSb_)kObuTG^B=zHH` zkH;PQ??kew`FakVr*(TYJzCU?u2QAto{ymSDGZeJrFe8SQ%AV%z=jwyS)Pyp7{?Km z%?Gd|I^gk@vG@`Z*aTLIqA*Y0W22}*#Qx-gQ2|22p0KPUtIk)G*J#)$>P{C}!I7{z z>px&Ek-Jv;#7Ue`oriiwBu53=*Ycpf8GrIdW#91W8TMjPLYI;=9Fq62t9ZR1wfw|- z+bV9y(fKj%1Z16GRrc92j8k#F6V32~PKE=ccQ#axdfya1H%J|Svm!O@m-`3<1ozt3#97-{Vt`I{7D2#RfzR%JH}C;<7O0 zV=+#?$ds6(tQ*3|J=BsF1;4el6&%IBC3M{o_fKXhjS2`5u>c#s8Sh+C&j1t=U@0)= z!*%Lc^x2A;yI~P^^vsfmwm+4_fs7IGsQ}&R!S@-6Qxz)Iqz<~LI9NrD-&QYH#4StI z{1S;Z^lGoCj&aO1yyHtjIIfa(?4r^w%%UPcDEKQWtlPDtrqEk4`*J_$;$XQ?*A5uL z&UsI{pZY7z2FeDe+1TF0{0imydBy&Ms)rQ=JU#iXXYyEs%aRtGGXI=!UfY9T0!^w{<7#eS3m(36*oV@&jGGy^q-jf53{qZ9 zeu3;{6kJxM!V@U5CfJzz5CJOV98m2HS7T9qIPqX*Y{IC;J+H{sM&?CU6r@Z#AtC1& z6-28^+&n|CqE*JlMCd`IE)pe9{N?;Tu}Q7W`G_RiH0aTr^C$gU4z3Eq0H$h$1WXc4 zXh#S4K1W-4Y04>H)1j2&MFPDUb#{&+Y)-B`6pDq{F?(jQ&hUpL?|Q2o?rJQspZh!Q zQ4;##H~6d6)Re>l#vo`FSkj!3I-NG$rZ>OvN)+24W?JS8=N&6O^`qT++RqCDTdBml zRCHnp&BZA{nZA5m>L_J|&<8))Rv1^iZPy;rnO5Ws@2Z3mJ>B}Mq}(vxfF2*Mj!%uD z);YHqiu+hfb6G$B13fK>RACDJE~rNT$MMA!6M5+#`ODQ=DEvlrmHbis0T;Mxb93@9 z-J*4DaGX|f)zGG^R$XtEHRzFS{TGpQ7^K2TQXePPjt4XI8_8fO%GX$KLkLI(`Du}R zJzO%!2vj2h?5lH)#%2^ZtP#gKe2S`kULV{da&U}S3+d%uqj_OK{l5#j4unpv{W}ol z8k{M*l692(x0HDr<43J?x~1mp1R)`VPI&fmBzj9FMBK$&dbf&HfAio&7l2>Qhf7%Z z$S=-nf8ldUZr#!5wk)d^9W8mawS$pqMDl~1PYnm8TxweCC&sgdhJ8TECkp^ivXl6i^KNy$w@h3~O z+2NySJGzFKLL8slyq;zE2C_(h-Q3p-i`4GV$ShGPOO_SiRhEgr92I#iuHTF}p7?%O z3GS+ruo&EED`#>v&S;vhgFCsnr*?dmwnp#vZUZU*B|_#0(GW|0!Dx3c@kF!3BHy<6 z6z@j&3H6Q`=|G)zEZwAYoeAi@#DZlJ_z1^zj1~S=vLNT=87+WcJ$U6%Gxftwl#0L` zr_ZL|{+o0UKLi3s-h_G{G#JI3d6w0><0CHTtSN1|hx)0_D(_k53U4(TIFS1)A2A3w zW*Yjqh}>nQ9eztWvba^FhNml$O2)XIEp{+S3Im-{{me{glcXJlcT}Q_ytQsB z&?9AVO@wUfHFa zUIX=d^^QSsX=4i>o4QPnbbD~R?u}b+`>&%UFu9bll8?>hD*=o*bH(o?&1jWhhvr0o z>}Q7(V|BXXnB_F|i8K?#c5kd~af}(=5bmd}*>@_=iBg-rrcuoJ8rvW)tib%aN-E@N zh5(NNe2sh<2kl<5;0Y@(d5T%m{Y&kgR~7ljYBV)S6~WS}xcp5Y_NQh~eG<_=n0^>a zI>0$AyH|-qhBh*B2fdz!*9&6=Rq?4M_}N;Is&LjY=Wd3q69+P4y!j+TRTkw`W-zCn zHJ6KNo-GYY=uL0jg{~hRTLBMDJvvh*ADriF0%a*lggM1it!kxfbqU^6xht85+L2n0 z0^wy4wWj5O18bl#pw{qctIq}&`T5uV6)VA$6*ILxNAL>kbxWvS56Q(R zv#M!-g7nYZv@CfE+gz%Hk0RrhM}{;s`PTHgnDY&3ZMic&a4$=$ zx>Gd9Qd%;{d&ir{W5hWlRMB4B_KY0vXqdJ|7Wpa5-Lw6tlKP6qI{RD#?Xq7!mr3h9 z=g+{LQ1Ek?iHH&0Q<>B$g$IxIr%b}wiqMir2LME!001Ze23SlFhz&Y4Typ)vg9%D{ zM2fl_bL&g=CUZqATTkw};Txs-NT)Qh#Q+`qDJX@~4M4Bk+W2_?4v!phFEUQHaeR7` zHk;n8YVO{&YR*vQ9xbxiMC3f&)7!6il7M&nKr@N@XaxCN^TW|5f%&hKGUEJ2OT9{7 zArcGUAeMH1t4z^?8PSaqcyAf?86~dQT|mQ=sv+3Gs4q@tYV^u-=%Qxji?6=D zlf>e^0yFDi|978hD-lHdJb5CYK@9gmfXsq@BQa&zkkly@(+}< z`+2r*o?eJV)vlhhkRdfU)GkJZ%N}mN^|?Zg57E6%I^~~T4+PRAF{Z9?kL}RCV}e;k zFU=hI6-~pqj(h#yJEKJBH(#}fl1gi_7S%8vR&um=xo}Z(lQVH;>REsvnvG#~_5?F- zRzZ*3UF${KI=)d6Xy6(n)sAy*K><$$+9MXXyKtM#4+Q|XZepI;6QUE-xH+VgE(ODF z`?i0Plchipf2U6vuXw5p{)$AF4o;NDm%@xzy>EU#iBv?6qu;3cz>u-7T1o?8ZZ~8V zc+Xm6MjjGAkrQ3FEAYY_hvHYQKbnV;D47X9amY8U0_zZbP=Q)u`>>Fzf~Y718vdC{ zRq;3OqL7evpPlNQeS2u|OxPQQ1L{ao-l><}1Sp*Bb#=;p>MEfZ*hRIfSe?>PTLN=P z9Ta2LYM+sl1_ZCg6{g5c?8OIYpmYhDX8EoQ1~VvN0QA;ETKtWg-xRHRaaXvNqs;tc z2Tb1#p13Z-f)@6!TuiPqUE@b>S|lfB;po`i?~OKzY%_WHjX!+caQFvZ=ps;ih>;4kd1lfl*$Ghy ziii@H6t49qO-d$6qcD2=5z~lOQL{?2`q&{_(xW{eQ%fUx7w2df^d+K&5w~9GmI$8U znmBad#)F8$d%@UqH-ws`=qwK2{oheH(!x{sFvDj5x6WbxOyq5A?A|<0gxd9EDqUq3?5rt`QdVl*OT#A7In*=Ms zO9J~0Dpd0AYnfi^eP8_UI9IxK4LB%Y_+rkF`znl*C|}TS)oRdFio>XxAN`=V&(gpA z(pSjkbSRT|o>y3<8e+yY`@+@KJO7(6p3IsSt8W!_@*0*GnP(e0EgJ5AYNBlKfxjTt zglh_9?cf+uK%Q9)Pk-IV|PE_cpFz@I`5DC|7e(vhZGLX?wz6XPWT6$sO+?i{7k9|fvJa*R&T=*$WTM<+qp40zrQ9ZI8>oM({*%8< zyF~|vX#Q-Y18dNDfZvttnVLnvEZHz!*o#|eN+n4pfsch9KBtcOvG;r*8*xy##DYhP z^+4TLTji`f5(+*rDFYpP&Pk1@UGlhe;8Dar8oQ3ZpJFbN=jyIVzvM0}vr=^D6XT)8^A z-V?QTAD8GW*3B0x$KiHmYWJgcveys$@++uGn=w7$HP9Dkq9Vo->I`szjetUURO#BX z^5(<2>IG|k^Or~o1Pwd)v1{5iP8!T}esh?^j8GvCD3A9hn`K+Ya%mNTr*^+8^x126 zY7B4!CZy}?!fBCJCp*uQ_GfA+>HW-PhBa8APhqP;cIvq}; z=?8m=Xt>?0q;Y%?Z>{c)oM98Y&s$@33pg2OpL>>2%u56%&06EeL)`;iV38(LN-F6a zjaLEv^E7OPAE@)jjHEd5*$Gx1Is^wSu&v@~w3P1QlH%w!>izRV)rcxNR1*R~9wZp* ztU(hjH;#Lz{VAhW2i-4S%8?lhn<#Ja4}(12IN(0D6?t>AeS1qUlX`sZG@}+DW(Bv< zF&z~I9Jo?N7FCc@moQGBu-I=+LL!X?UPJqh1fup5?-0#}e4qNc0>|8q^GkRL(|--e zY1Pu?rj<}HR)94ilJgct(IWN)H1ataNtOClebVQbOAD=VQupzcqM>UeGQ#qlBWPE% ztaWa&BCuTZevK7=1{yhZR9WYneiyhxnjZ^3T=r~yM)&w}kpy<6iy0fgs$OaOBv54^ zRz1aIKs+{9obCK(ptziaKyE(X#8u;4F>wvQcd(bc&O00j8+NszHi|3HU=Wd@oka`l z?4gx>{w+7&w|-C5FPPCGXP2(kOczz9DftVzxjcItx{X#Ee3FgKR>q5>?{+P!T-hSK zy-yo{)Pm_%O+s0s!hgvuEar#yE(4vzClS^b*dkPN&oJC7OL`t02o z8KGq0CEy?&PQy2_(}-P_2L;+?P2UaOP3r?kV&aw$s`ugPZt#?>h zbd8M*FD)r-WKE>zo=%f}G|)T0lvj?-{uRoW|1m#>KZE3nmURIRRrgZ0>aDK^ZC zVI~--f8~kt2EIa5PZeQn&^2WpPcTJu*F#1)NK_pU>{4XLId8?PBieGQ-TaQd#I^bX z`jukK4tJ*rL3xEFDC9o$W6*v0y+?e@c|@hO`o>Rp+sDhBkS*dwBsr^O&9p#%40CD=CWh=9TT<%Pf~OqF7aNJ@UeeI|B{xG zzf@iZz6q-Wmb7+?KJhm@L&P^ni=xZ0y6TII^L;J>CZQuDY!HGzDbAbYkgZwEHFM<+ zAji9e>mz}vvL1c3KK#-eq3H9Xg)wbVEmGZ~lx?$AR$ag$OFMKSapA}$AC;eQoiXHyJj#SuUY(=%o` z0aV&+>A1}3>VgJuL}@2j&!&Cfz9(K6Faj7wYLv&eN0O+?>UWZ$*ciKMr#P&P{R|&_ z;~cPd@{*0ZV6sk1G6yroU2Ha1%QbFB=O>Z)hycg5=NLv#4dKmI**z&4+6AXnFNJIV zc@BD1|4#~B-|JE=AtN~XG^NEGXzZg88-1BH;VERKl3Ac)?J>`^cNZ^S%9yHVAWbP; z2nkxqwC~ByEI238Ubd5;g>~UzFMDH0yI>Q3!W~qOVJ?FP8Ii|P4s+?!(q{%OBGjOC5Hvk6Ek5Nh<3aWDON&Cp`z3

$;OAWt{r1Ld4B0&dYgRt8Y4}lOHvraW5&Y~{tey+fv&ZwKJd`O&t>Dl(Ql9A zD&U&zj2TqrM{E-Ca3)cI6Wi6dm6vt;Xsu+sLU*&i8A%gaO1lQ@ zGIf@{zUa5bnatF0rsOlphc=J#e7Jh-+^>qmL2#f7y@u+Iw8i2Xnr4sQy9p1W;MiS+ z6$R_42mc&bmX#=pnZlhoE~C=<41Q?aoNceFN* zpjk=Lbl1L0_-S&;AC#6zDIj*o?Az9?t-&+rE2UwT-rhaYu5U(rdeFJ`(EMYGz5NPV z=5QI5F0A8kUa%Q8IcO5=2#PjSvf^6gkoaCzI%`H^BS4Rph4SH7WTb82Q}nKj+X_*vn$(ea|_ z(0{o`NRJ@uIFQrlff*x*1;p~(f3-j#n4%1_HW+WNLMzoq=VFF|a$a0_L~;K@z0~ME zT;jn?aYhp-Fb7_mcvM~SU5D{6%%sU^$!;p8X)laZK&qDY>?@g(JF8$7IpgnNU1CNx z5hWZ-G>Q`n?7G)@At;oT1ac-c)a1@kEWHz^*HY=3)Rhp@e;pa_lRxb2?(IplNN5kD zteTvm(&sf?%69UG<-EeNTYx28EN=RpUTPhUoMXyli}mmhXTi-E%dD*qMr>@s{ETe8 zdT_lyX{XfaCN3O3=ohl?k^e*g{%`H^lQGNdK%c#Z^r+xSF-w*V`o-KK&i0UsTj7cR zN5Fr!FxYVXrS6EJ0beZ)C7zFUzL=mtZ(OvQO+26Y#9MuN#)#Q!J=3JvPd#Itor0c$ zYnQoaVA9?6nTFSE_!$H5tN4u30KVxvhTcMtgkRI=tn$uta0O$CX zND7d#<4+zG&`KfsBKXD5fvL~iC4hd!enhRr*kzMduO((#^oE>^n&X@Y8I5jux(L|d ztI?0{G1@wYU73jA;k5C~vou|fb`jg-Y>FGOMqddvVaQ5yPS%k})-P3#i2(Hn(J`=G ziQ)~GW(HLpuaC&2PC6nY90qN5PEe`?ZBRih0KQ-aibDLWoB z4ETDkT`K(U?FKM$OYK)%%+d-b4T@Xg)t4^sT)Ilm2%N!P)2w8NsP*peSq?n$rAM@& z)=c_0HzY*a#m6XAXxZ$o3g@0M1|OVrJGKkjV>|5cyMLQ(CVVz!%Z&!jWAJdj1Otzd#OS ziqye1G)P|^VqYQ^QV!s%@m4ucLKn-&CkX+liO?s2RLhh%a`h;BF4f%%$DpaB0s5(G zwGI8O78#l<4x2Qktx?VTUlPNDV79W%PtLY2ZiWP@oMx4y+9yrQo*o3h-T zR_838K|G{zoJS+M za>rZ3i4?HfVCWo9N0Dk9dkv~?fHga-9URl9CvH%eYVBNVLa?ubuFBX&9zbIYogp+A z(KKw5IfdL0rF+I!Dn9S;qb}HnIzCKJ!qq&UPicQDTpyCXIDo2IQYLL)SmdrYmsrtn z90Q9JY3lYiBaB1MF=Z(^hi!LdScObZUumdG)V<_e#?f)?v^5YcXjmTBsYzPe)f)-SwZB z!5>ZJW0hEKBH7amTdK@+E_HUSuuHqb#Y=tSXS^3|&?old@cOBHzliH!uj$>s4ac!K zsglBnbdUT$+0GVn1j|;80IXJXN+Pl>N8+aKn#Ng z;bQy5rc7Q9$xae1e|Bzh!C59i0??tZs^bqHbib7fz9Ke~PrBWgGxTsN_zczD!KzjS zm0&+;t4TEc?}yH8FhQZ@u{8Jr z8kA@_Q+*AV&Lul!y~+J9y}~D`*FFr+{I9jNccb><3gwh-@Ozox?Bdaa;*e>pJ1TVd zUzl@6t~gs%kqojR5uCeSpLhH&Q0rt^7R^uUzlW$o~`xYmEueuK!dgERl_wsj# zwE{1k->{vi{K_h$CcPzdY1|1t(`*8!yemiCJ=~?K<|7``k*@2ssX`}~>M!fxcB0T3 z-uXyOiX@#UoP9y~&U)XKGGqG`h5;7()3yRUA&9>HT7lOr^qrqo_hLQcM$%?%mN;wm z^JkU1VihrVEidzJT<@Z z_jj7s`^Yg=PUEZg=1jg5i^Uf?^=DbqlU`1U@rdOyCg7&6FiKdEQYo*`zZ6ZwB z9OV;(BmALN3R~6Ro>stCRjg<9=;9Wh7cv~f&hKpGBRN9OaV(=hx>$aN zn_x53DB6l=>r}qf>HjOO!M0{Qp~hD2PC=(<m3ri^Ymh{M7o~ zx>ocRfmL1lnG=90DzN#*)h(;M*qcy1J=X8_?6=Ms#kl`Sj znh9wK;`hr5DJOr2?XpT5apfso+GZ1KFqKnc`|6w0Lm~SH5hP8XI3NLgL9flMgma(E zcdk?30N*ACqN8Cg{I_`J+7PBcm+Z3^=O@ja)xd zR?>ITpD5%mQGQxp{C1l(VJ*ve8hE9cq_GFqvo0u!PXy(iKvS{Wqx@c|1~R<=FsPCJ zxvG+}OIowMh+1QdGVVS6rK$TPFVfNcrfqk01YOR~`0rJJX`u^w0Q~|BH&6iS3b1tP-!AP2j6)3DI0vxh%hFxM?!#R@3X7zwW3gU6>Vux+xy@V#5 zEHfAs*-XYX5zK0dDYDN;b}{^h8z!pWIX{9tsohrkWA)t31=oK`vLgty8!lE;VZ|HN zP=WGz)`s_GdTuj(MYvkACa36s9zJMa6K>rY&4*vHc|KO6@&mgR)V6dG(GMP`>jVt4 z^-eP9(gg<+t3EI6&XHO(6Rz5Svw!74`#`JKpJGXfFu{2CDVAwCC%a=l+2j7*PlNzR z1KaAcUM8-p%n&S zm;^VJ*xll3aa`MD4Lrtare}4B+Xl)rQAAGO7?s@i{X`(HMAc2#Sqtv<&SY%P{z|N8 z#`4OdhEq0rWxOnT6TB*iy%zXlzXGL=ilci)i7z;MkvhD3nRMhjg@&aHGdxxx znJk_9HT&5EfkbGz%fP=`SpqwoDLLR?fx-HLw6eu6fnn%>p^qlXt) zNFrOS|IT&d3JkH04kgJZtR#)l3xwMv^S=Prq!Z1}-1Hoz8iXzxYCOkmb5w z-*51jkGx zrRjT4Fe^H+9wgELynOO%3FECCU$oo`(>&kT3IUEUf0O+;i+re4g?`E+FX*CrDS?@(!Y`ap|uH^JaWS zkx?8LZWxO1Aq?f%FC)Gu11JvgW#lVvLakvbSn;Qhk988EIq1es&N63GJ0oC%bOSMD zY0gvvK7fYTHO4{Mc%*|kR~@`#$N4?I)VfCb>gA}>a%_cUe@Z0ic#&`XSh}mTEf@Z= zy4}YOHFMG1xWQ3g3y+Of4`nLyGVia+mE8*Nv0Z6&stJt*BG%-?J>!@Xq&OeEc{+y; z$RqpgB5e7!6xX2Cryq+T6%q(iBC%D<(4L_DDUsyAR@Vv=%7?YEw& zk*+l-H`Ui%C$DmK;zshN-|!fDzawmh!Y_k^Y3tkTPCyR(6cIOIw8~qdvCY1b&CHo} zW7gSI4eB-x?8rgL?O^-(E==_Hr_oGkg0zHMIG(Rbb)Fh%nvqMB1jI)3dWGxzL|;cm zBdRO`kwHFEZ$hvp22Y90Ynp6MJg)in4nLjV$KXJp8AH@L)gwvl_fvkHS!*M$Y9DZN zj6jc&66xBBc{7Vm_G>;|TaBg`S0#_!s$d3YmtzNlbkz6go>(`n8phpdi>2b4cNozI z5kmD`Z0@fPiz;>i&>$DtE@OoGNj|wF@eHT&=+m@!PC5a^{-^7qkMQ>ep!-eOsy4cn z3dQ4|Un@dNS0;L)?VOPGK{0qqo|0qiwH$6GP`I{aPK>jC@~G(1vx{X4>&mwrYFUEU zb!X-4+jUN!-Kih9DGSLer~UR)4bt4(kF#rI0cBCW>Xc>kAn1=$Xi;@@JOsR`Agp2w zZZ1?98*bN3ReE8VV5ma8<>BU!G%#(5#faiojI&hxXmzyJ#9p!-A5{(2u*hmeJaJ0A zSDj&430n*WVKU1y$6w^so}ES|o%hIpje!oHDOpUzCNxV^w>QkI!y-1y>*X5asp3|c zf^{0*95yq~2Tf34LL*#axkrioxJu{l)UrkmT(VZBBiAh~o27Z1x`QD*BmDWL!n;Iy znK%;28+AE;XIh*)%)QGCD*H6UU(r72E#|!_Hn~EKXm0OW{m$gKT&e)0x;6ysok!I5 zDY!$zFEsW=O~q-lR~{0KP|Yzfng&d{B>b)rs7P>4YSE|h* z4H)78fkS&e3161*@)RFTE8Vn_jDl7?6MZ7zHIZOk<1_D?*KL@6U#-uz)gr%mJ1=V$ zONTI(qGpq-L8>If$a8)~yTNb}M#t_|*+Os1 zh^Bn9z3T;tQ3e8#wTCa$BD7danggX2kMt`j#QgiRTh6L$IumlaxY^m&$oz^uD)U(H2uwQk140BP*5t zNp0|u3JLeQLW+E@kX~GbWdBww@8BhT!23^bW24UZ6n%sR0LtTs+ZaH`0_2e)hx)nr zvRHY8DcI77wH*F2QSNcQgRja26y}A9!5$w*L2Yfsg4VM*sCf!kX zNQ^ogxpdd@3r-RRcLWe63_WpHCtJ*ZVTqRvQtL>5ro$d%iN-}V3M&A!5&r^)hIKvW zWXtwSnu4lrT-!*JKHC?Lre#%SDQKd)qB-Lgg?nr=95}sOU^#jg5~)v45#23~#j>fc zN*_XlpcOtk56*Z_(!d@lpAcVrcX5Q`Nc#Q?5or?zN*GL2{tjXQrI7~&QFgs%z)Bw( zgAv6BoOO|VOHw48vTpetN%n+lBR>?`IGfAkVpnL1)i}9>wsuT^p^Wi4t~O%64cZE# zB?EYj*3+ivcgt|J4qIM{84wIb3JUjrtyO7q9HPJpfZi z+X}TVp_yF11-p$?wkw@q`U62u+T)IZzsiYe;%Dh&u_#;yPxYk4l8|6Aq1h4+bO+cF z-afN=F{hqVf=z{{&1#3*8gI-b12w_@WUGk`%PA{2a@Ywv(3+1p5AU59bh3JtBRS$2 z^yu#F`y9A=ta2*Aqn}cCb^{p#qH4%E*>*)QpMS0}#eHVbsY#oIm{)`owXa~8#VoZ$ zXFVL>L@UWsm;DDH+@HyFbg8jNSf@w>aCH8d}V zxxe^rRuA7ibDoKC8NM1 z(<}wh{&_Um_=mijvFvIt3Q{XGY_if&+wCq_SBV@OC)cSmM{=}O!B6|*ALAn&W?>$-SQzJ*O+UWTJ7*=&Deu)VO z{u!gMYEYYkocOSgLBL6!Aj<&O~i?1&Gjr z;LSj#jVg>Wx3Kyl$Y1^JGU}J3su?T2(KIdU(L~E`Sv#U{^LC{|wpXK+!f$OC*SX~u z4l8b%3IbGsbt7b-;Z5fvH4ck~LRCsCU9HlA+&7lxq84T|MyX=w)mSu>BRRVKiyQ^+ zQ8w;)wud9S17p$4UE}&Y(z%Y*AIf@?2P#1cfntw2uqRx_i z|B|iHc3gB#ygT*zyubd-w;Ch|)7;!>ZRB%2Ba~Aow4_Ob0xz(V%#x3_!v6!|OS^OG z-3A5U`22bA9=NIv+RyF5w-iu?O3;SGiu}BTxn9pG!4=HWcrAt9;62)z|J0Kh%| z(;yAVn6u++$ff=l{DDDCn77DON`Yp^P~Qc9h`&+IFQQ$je0-z&i;cxFl2pOZE?87Zvl9g4ony-wF{#%#jRx zK(Q*4Iz}l@*~-=k9ms%2Q*`0%Pf_eY?}ZN`uZkF~%RFmmGkIF4O3 zSz@}K?l4+p9}%TqIpqe)jk@poFuFBR=Ssd!%lk@Dp!*n2j)s2u{=|@uO+%CZB(*S4 zkA^LQdeifWU&)2BH~)m)X4*9AWXosb3rI41UxQTPlfg`DIQ|$1DUP&G<##*>Ob5%Q zxF(4`8LwMoQ8^i5R>snuy)^mIygHmV8<9Z40U5 zQk|Ep0@60DM^gjM&_lzhX{kLsuWi2L3^&HfY0{zajtj6_rCA7+mJWM%2B8>26@p$j zC0?~6eh0zGt-_jiR1b$Kd;ONCkwq@uHwBH#{0hBt47zxE=|%sZSZXNn0&`>FR=zYw zR<;OsP3>XeLf!xryv;J4PK=oDWD6HX8IcJxwDf1|D0oALRSeX{-aAOXs{a6ktDKh@ zn@CxJG(tHMq7?;;9ubjr_c`)R(pgN>)OVrru3-#zHkJ}c20exLJkDZ*E&ogpenT`8 zu}h3UZYZjTPE*5XC0;|VZiwRSRg0ze?K@Pv4&e~rJ_5Pqc$X16P~YpCWDL-!4jDDl zbb~wPRSWEcN zlwI*eREb2w`82%Ac>K{9NOtcrY*H_J6G$H8*+PVd{{xG{ZcZzb#v@?k|l-waV#f&bJ&)V`hDMDW$+l!6x#u~zg zlfjCB@xxXh6M`XLk8T%lZeNa%=2Z3J7nw+-{iM2}AtB;=E|bx{=wdYa+}ks>?0iAk?6!1kMV*e-@x6DdkIJz2|R==DQqAnzoIY3bQbML5)Ti?3YM~e zhhhJK&`qvnS55ZOL}`Eu-SLA*tg@Q(S)uaPuO%_k6NZm7Y0>*iBdj!tM8xSV2z479 zdg_sgji)um8r@qB#fbSINh*&SsD~`oW|~dlMw~k<`%V?D>ya}gh|#P;(eN*SycC+#m{QP=J@4tT+qe^YE`zUGPojto4IPtip%{) z*qDAHjAPt&s*J}XJWxMHMoql`ex1=cYm%9%T!u5Uxn{Wtvh`dddSfBnxI7QCY&6>M zbc5k^i$Kca)P8n8yCf|khci|?dzhk{=6JT6I*zmU`RKcT{B6g3GWbX74^+mSo>2fI z89?ufGCJJZ+lK-74g71g|NP7NnmKXu{3?l?$#_1J;+iLfc{-a?S>k%`3R!&t`-A~+ z5I681)QQ!U8p(A$SC!%QNJQ1k`(m=23uepCK8vzv(hCfacFQ7;K>8Go+3S zjC_XH@PRtdkPs0N@=XBbjaolU0yKDrn8|_9=GJ#n0-w#Sr=|ghJ@;170cD?|TLz%% zGi1d4w~jJapxrZ$m;D8JF;f75F~o8MgI_C{EH|U+-(G;B>zK17H*P^1MzGF?GF*&zlhF~z_7+Z zx<9D{%w`Okl~*Z%c>feUuq|X(o)oNl5foZM9FB!3fdb(Fi&q~UV+>??Vr_=7LfvM9 z=Zt~mPl!7R0!RqPGl4k!N4AIwq|FG{Hvv*VN&R2n1pG^?95}<|FW+#f4&p5#s>>1o zsQz~>aey}+dI!FS5IuQIZU*tT7%XH4qIhDr|^VK z=ReP7KRCb)$oQoHpT9n`e?Q) z4*by^Nd2Vy(ro=08lwC5|16DPi{No{AeGS{--Qn<#MdDaEB`c#kTCh@VO#|OxL;a0 zuu0mOvS~Ov+Oc}t+x z2gb1ivQz)DGB_(tnGQnb{Irz*O@;6Pv4=Zx8HgVr^MLRq7x52=hDZ$p7C6=chy(2i z04Dwb(t^`0|8ivC3Svnw6cEe-4WtA!S^tF=u!f*DV1eKcSRf7f{om*)2paASJP^Rc z4~{{CEX{svAoi0-%a9%*Ir!EZ$nzA2oqGuWY!EA>pR6SNmoM+Z$~HiDgg=IzUtx-X zMXZ6iQ2Q^ynKnSqCsu+CTO39RtIiYazvoUId}8z0+>zTt^c8`HY=P`g`W+!{xGNkW zfR`J*W(y<$gK&We;N8F7?0|Gb2jc_5r}#j+r)hi|@wBQ$PbG*d$)`L_^)D+|3Beq1 zfm}~<@kWn(i2y={_cW)p|Dtjx0fLuEfDHc=7_Dz1ipI!*U?FlK{geJDpM1o>$^Qv0 ziYF2D{}N#dX0`h(Ds1f_t8RcA9BKz-c;ecdp`k>BaQ)vXRtJyT{WTJg5H7e31|Wcs z3+&7c!~&BuLOlPo5}pP|-X3BQ6f+R)zzn1SpV$FWo_sntTNC;-KZ*Y*id0#F;8s>3 z)syj0@uTV*c#ZQEKX4uF5IsEL4ptyOI9w8l{6B#t=m41ze6Y3ykmE^jLH$NrFUivYpdB9M^$ z6TnYnw4wE_fD__K?vo>w{~FmS@GB=E*Ar3n3>X>@LWKD={51a}0)Rg`0ePM*{N@Bv zU?2?y4@d(^p1gmG5$OR=XG{q1-qWfi`4?}WESTN-uURm0hFFUO_H_o5J_$>Qw4viw ff#63~2zt!$$Lqx4Q94_nwVT(xk zNCcxKKX&0_IzMtkabCke$lwvtKX!?d;XQWgQ2N3=bd6F2u;@^OoS;JFQ)FZis5xbU zjtczUZ9$0Ou2Vy*sfz~I_Rw+L;ycmPEJqU6DFp9@W-G27`uS~Hf_A#CKHgbh3v=0M zZL$Sy`ZeltA%fL}G)8q$2BA@b%?oNkvcN;^LGgs zguUDq);YgVLDUw!5Dv*C&^DAM@^=k4;2Pgxmum;**;$^{v!ddsIG2up=zr>cN z0fh#KZt-wipMXDi`97?FeOGJP(+en0t!crFJLX$ykkGDb0kG zq^aE3@_RWz$&Q#qv1<~i)>i!0bAIrZbQcjo6v=dOshSfUL383U98;Mgsi%Zcc~8Kj zlXhCRnKN11Uld%4l{fj$_IFtZtw<=qvu+36%wY_LqD%d1x6Y5;P2*~?PS98Vs`riN z7f07jUPUaTX$yfY&Zer)cg7rvI^xb(o(M=z-)fuvb9RzLcr6<;Du^Yh1F@CF? zt>4IP6o^aXh)rq5X{Af_U;BUO#W5OS!Ng6EC?%YlzhP0n?=|Xl=qHL=CW*U4$6J)k z?a83m9vdcaesikRQw!iRhr7b#sf|6cFvo{WfrsQzyU#lcdYKS*)j;YJC=Ax$4ar{h z%|AB`Ib(5=i>SdSLs=PGIyV5jq)8>9sHZwbpS}V=)0&7cuFnADw;MMZS3AOd(c4Cae#UmQ0V*CZnmM z6M{piFiJd8vz?CX{Nl=KU0NiIO^b|w$bv<#hhxb!{NmNMYQGc3^KY#V_~l8)rZ>}b zX8gW6c*#~FDX*hE;DYaACGq{DNaiiCjdznLEQ)!4-zl8gzqh}S>R)*FvG#iY9m+)l z9I}iRzf&A?v}EMO$LbDze`+F1%U{{bGugGjSrEK(2gpZ+<%IMvTlCDlQ%sqNFa?CP znd?3C`eFEw{25OgHqkf zxDCe?nb2O-)(ieh+4{j4EKmU{5pi1JpIO6ClQ|#e9(NGlj--j)#aYs5Bhrq9 zVT{uu)99u_ztYj~N&+VpP`!xerPXWOCe}$^!(QL)sgrtF8H@ES)eZ8@WQSemy8Eoc z3?A=8NULfA3&>*S2_~v{gfNF0DV7A6OUb2Ibkn|jNw%@~=p0wD*mPwPfpJe_Upq1$ z(K4Zg)#p2y+K@iaEdfmG^5*F2HaT}V zUxDMUh@Z53^JU;9z1`;U-meo&*Iy-B==q$ReeY(h)L;XsuCgGr*YFi{9NLn7o1UWeY;F)yY`68`!birnmS1phyg?V z*7Z_oW(!#_ratc!e7)^GCsyhFwAojfyup$Eq6?!eoN0U3QLj(ZPonw^MJVjt0OIHh zzv>%uO>UVcoH346AcOFVxDe4Wc)hb+XHV59YB1qDKXc?aV-v*GRd$jYp2{cZDJ{X; zf~1Gs-?pB?uDy7su{ZR4eLm$^|K(<&M#asoT{t1f6of`t2&~2aIqplRhWAE|Y$_%3 zef~K;kCFJ*$@7|GlPUh`Q^hyFj*gY zO(zV#Dupw9zLCfNRQEa0K2ZP~E!HNCZ)5Yjy?GO2)ZF6Xn62MIfec4#1Ru;^sgT&E zwh(YxoyH~f;qMz+cgLagJQp0BQEcwBcnTpaelb75ibVsCfoPJCL28C$QK%7p>7u2% zUaENa^A?6I_P^T)@h}K6UY`%%QB;pezuZl##KC>E$`k7zQXIr z5GW)KS5Z!e|6=I6Tb+7F&0Irg{NgRy%qGXHWdi|lAx$&=*;L>3ysidMzmt@jUU29K z>J+C-LiEgww*?qMiZsm%Ky0@A{=4Dux5NQXGzVK!2*uQj}R{F#6kZC!oUbj5C zur2HjSTQIeYmIlJ@5LwiMJ-HX6ZDLUXn(g!X=Q(L-1^&#=t#XIVP@l^2JftIMI8tJi`6&K=u5O577K zH3!p@OP0@)dv8{ZHdpldJ^ zzqcHASD$0dwmtUDj>jRcW?CEI`j-CtlX+)S-d*cNr>yPx>=x(S@g3>jBErd$w6#3h z%$i2iLV`P_-{+|g`dKxA_ss|qH!1z_@bizy(jLgoqKWj0#qWw(Xf~UGT|ML$ zf9tS~4-bBJo_3HxcFk8F2k%aS?Oxu>|2&ChlPbw9qN#n$xV3SOe&1AYoWR2xN4ae2 z9oUPh!|oS2I@rTe$=+zqp#9=*emSr=-zxnFPsgfpCU;Jsw%u770?F^biii-@Fm&8E z%T=;+i!hxU8anu~l#CYx$WC0}z)rc>E(}vcUG<3kI)VwXK6>I@WK`u|0{UJ(IM+a#V3}qP8qc~eX+OhyUHQ}9V z>!bB?=@@^V5C|IV&Y=naKybV@fVvBd_Oh4DzXxv=t52^ooL3y`5;Z{%-= zoBpC1h#92+yxnlDkKnTuQ zAH{0`#~)U(PWCr2V;^ox1Abjl{Ve|Flb{PUYLKMVM)lZGy|P<`kIjkMSsxPuQ8byn z51Pa`vz+oZD#VLpVZrOnfyAdIL#uFwZbHS2A1?fB*XWB?6GP(zv+)RH-e{XLBkweL z2^BA&f2{aYT;Si%ms1dI`RbCIEYQ2gkk`q*J2y1#ynIP;`_7YfI1T)^ldxKZ{py+E zrHQE<{%Ws|rAEiEk_;?(^3>~V6RRQ?3XCw7Yn>zb=gBzJx5l1n6z5^raAN3)-9IzC zEMX(o@DZJvC3zSui|fMiov++5U?BQj{21I<0$rArkyqH78iuCa)cCw%m<6`7mdZpt zsBc=~ro0h!uJm*2D-6L|Si@Iy$d0dizI@&_@!Vqgeu^&G5Pu=?+D0R+StflSp$$G` zq3Ui^-ujvz-ls!84N*2WcDeeQjIf>Jk3C1OPnLM3Z}lQG8!t@FQ*@=7(PoV1BHL4z zQRy?;1;2!c#x~%Gu?F-|jL#}z{>GqqDU8_ahM$CEnGcLyaVH^w`53!7@<`V>6Z&Ke znLU;y_FSdU$gUk6nX1p~;hp6C+?E7&(&(#hx2h07;#RZwl|2*NnWmV5L%U0e?rNh( z@eh^Bt^bf`o%~Z=)oQ3YNu7lj=y<97X26>XpC)n|F^Jh1Y1C8}Cmk#i>UGVbdsAMZ zMck-g&~!k5jBif>My{SBURrYr&K$brOF_0dmbfYmdq;0_Os}r+GT3QP|K~l?lvTm;(zvr0#$8)vL^dT1!H%%-&ELWK5ehF? zlZjZ}eB^`6* z>2kT@5FuZjM0Ya6h9Bp^4+b=k#@H4Y$!)G*FFs6~RB?o)N@D&@QtzVb%9ak3>J__q z?Yr>N)9&fZv!&(lHQZ@2zcH9hBc_UF9mEska>##XFv_p0W3hEki}FXGS#S-+i~AxD z5R$)%rSY2wf4a10M=%)LKeK>E^cbjTmF)rufO** zrM0FEJI1%5a)-*Ndn!`k5Cs=GM~a>M*Q_n(ouv)LN@XAQ8c)puX99t&WPpKnh)*vibyr*!aJ(z z8Kxd{dVoVV4pIo?Lvgitb8?B$a^pNKR>?PcYIuinSa*VTRHE@q?Ib5{O3-IBm_B#4 zCPXn4>hD2r8-G^Wj1n56SQ`s}gHLGtC-*`VHE)a)Esw985W&HFliOq`}2oG(f6eqzR;@b_jVhNs$Q zQvQ%=^_w!f!yB>vwN-KBZ4_Os8ZriH{i$-S%in`Bk6UXay?8kH#JnR*R9azWICw{T zzpnwzy<4NuYxgoz9eqhQHuJ9K13hyij!Oy)F+_eL-yp;L6};ivHbS1lF8#Aa)26Dy z!U1RRsj))cN{gVRz_|BTK|K?i`d}%7Lh%m0+NUov574CHKQ3~!u;!{lYWdu#ex27W zwnFS`%|&4@QH!rDa%Dq}8o0Q$X-b~IcS|1yw;26cL0`LQ6Sp&rVZ0RYPE_%H2`jm{ z$@_tv=VvJsi-afteltHq`YK~HKggv=hTv{4%15F_$r@58$$ zUGST-VffRkeR-oW4!|=)F58=}-okZQRnd#FGUvp@tj$1KVK-(={f!`6YQ&&yQFXT- zBzR>|4K^#qLeA=><(VDJ^$#mc)NLR=qE+20_Csymte~r!(^{&Tk_*roCfZltU1yoC z<1bP`VC3fUHSo@9cWd9w-!_AL4pF>@iqKvZPZ>+D=CH*Q;00Kh7?Nf7E%89g z*uNF-hDuS9dGMa(euKNWZR)@wzMvGqzF@pqaXlSl9W+);N`#dB{%&#cp3cNM7rvZc z*Qs%xr$X7!eOlL$PUoFH-RWlzmjc0>(fmlY{e!VNkA5|!sku~o6hF?WkQ#I_%dc#{ zyUR}R12x@K=uz z{^mn%r?E-F?UR~u#1L2BZ%Jx{rf*C!=pX2Mz}h1MZ!+X^hV+%As(njvRo7O;gZ8&# z*GtuKZjK~F=2#gIP%`-Eusz{Z@b5)&#Pnf1YC4=%ah}>)vXA z@JcNHISqRWTJY&-U~I3i&rGzXIpnbz^_>}^uGpYotyerExqdfG`=$MS9W^DCDnfx#>DM<*x8 zoI1K(HJT!vc-?-Y6h7UrGy=Le>~i|{`m%H+*OpZ}ZjF+Q<<6*J)Y`)aHtNcJbA(Z1 zPjz$5OHbxlHE#4YYQ_@U>#FbJlN9hOJ{-^Ic_in338^y-Zm_i@zuJIFLL+V;8KNxX zbuG7!n5E?s^rLtFg7(EQ#Rr@((v(7hWT0b~_w_*kEt^Ku#oTafFt+R9*%)@a8q665 z?x=!c=pM!GetSlGliQY=0j|sCuBCy9I74#lr`GcFvjVSXYJ!C%Gc%h&_bb<@&E!Fp z@gDT=S7#%)1~SYRf?FzUD!(&*l%h^4 zEmDJF&~l(2tLvb=Q)FA~BI#;G&K+oLW**w`m9(SJ%ROFK8SW+l41-!sZd7j7ILNHa zj%PNZKI?AYyZGVMV2D!dtkU)~?)5^q9E4<1J8q1}o0ZRRx+jf(XOqIotmZ{g8)wj< z4$+&0`!4DV<(^S%Ur^M zM`;m#BwaDj3%4ddTLwC$&Yd|#W4T^`-%x-PTtfa5D7_K3{9&oeTx!vp8Y^mp1RPsz zLBFRy>#X12f}X^gq-$g0qj0YfL>hw&$_`HVJB{40(Z9`B=3xFrvqoHI%sAA!e*0;M z?B!*BT?pXFWdIIPIz>Xc)Db>7HZ;ELcYJO(?Z;F7!#B@R3R}Y={=|i!o#6++;NZ05 znQ{~QysR~*NutZtbMIF@dwN5Q233xPPd$qEPcQ3og*l=k%Zt^nNDZD&og7A8&*Q*J zIVTQ*WrsOpS8Q`@1GZEcq_HMB9h+fqC^^q8G%)?=m%lX*JM>r5DBIR=| zHQ3dCLjdir!vcEP^aaQgb6E*+3t{i~?w^}vYbX|-jc zHj;sA9IHU#(C<8?A4Xaeu14sn*;4vk<=_wSpdt_IO}q_pT;4)Xbajo@Q{Vp2IQUCh zUS`Upk?`^!qfK1rQr-mBpFbht6x}(Ldy25_t8gdlf59=zdm-%bM&{mJBZFlspLgDj z%fsg`vVPDlelc&-G-esI`j<&=c<7JwU_C?kb2xqZYHMLJG`^{Ltw2NKucP+K(@Wrd zU)%_`PCHt@pXFAY)OdxyRul;#&RlMIvzg4IfHVxX+G{7{a|}0ZrI6PIrlOM6y!M}# zYZX6{X$)?6x6(7Gk+BM7J>yot4IuaDUxp!KW6Y24-|tpr`IHoGX1AaMQ)Or^4)GJwMcJ>NRn<{LaQlF-!3-(N3KusN?H<5~}yl%rr%W zJX~sCA=uhu=N-C)|`rjn&&%r-!eJ|=$-|TEV7}?SI z>;q?nKxs{kFLo|`m4Rf|I@WlE*f?5I*-=S;q>H0R8*9~a*mRSRs%QJVa_iB)h9tUp zLAiMmDR)N2GgzQ|BBLyU6-Dj$2iQW;XfgYz6xT#9a4K%`N5*vQ+$3F?L9FL33@se~ z12MVgy9bm>%)$ee-9GQ(pXf3=p~b-{M^tt{Gtv6kPBfG~KICOE?GiN1KQKFMEPeq& zUjRhkFH}fqw!t?eCPtKJ%n0~P!wT<4+f;0kZ+(>%YAOAex3~@W%i45d>D|$2((jGy z8Cc&nZQSYFXAuIa6uiYQZ+=*=x)bI3Bc^b^78VYA(&Ro@mp{6)`YAC2 z%<*rNetUygKVvmQ$eumx5koJC&YSN1U(ic_?ew@)d!MfKh*2tUNgj!(S(%Sug_uMB z$YIPwe1K)YA+{sw-t(3YAKebRA6IQ_XPngC|r4JhJJwMah~nqj|m-+k8x46 z`f7x5pdzW_U=quQLO0z-da>e5NB>59bLO=L!Jrh@?Dh%8Y4(c|T4uz?VYD?|lhp{p z>{>L=lOv)CL<9fi*=?(lfQpiP@(@qb!P?XkQ>sAQJvIm4eNn%SZgQ1p0q?d_=)f3K zG%8#$C9)JO#qplK>$(#XF{p`KF)vn0k1w^?t&`a*r2^N6r8JxqIs>Ly z%UgTC?n6_m*a4RqCt-cnH5i@g`y4REvLu@nF>93q!!a5XvUbI1eI@lBF8O?faH{Aj zL`A<(c%zp+D*oX|_WRwF>keV#a3*Z)&$ms$dvjI?XqI*RSXU%vm^vI((#py-FG5$u zb;x^Pzp9Bc+>V9E9lm3Kg$xr*69?1jQfCG?`3lkKNLzp;S-EXBc_>-=xBhqVh^=>9 zDqrCEQx!pk;87Pz<&{+tJ*GmokIBb$tb(aH%3j>bzu_+WOYb!B7HhXldn3abb9W0) z>H&1WA89NfxxC?iml5Gw_c<~@36dw_koFHu-m67e!F z@b3NUmTLY4S%F6`|N9(7B-ia6Y!Ds-%rS0ph95X)(p^$(H0=)fsh0_Tl)UKjJK4I= z>iE`qdmCoBl6+)PC}@4dNl|3NRla2LW;tr_wVer;+H$3+dmr!N^zj{c!q+y^CF~-D zaQu-wKgzcs%#n`XAA1(PknVZeNH>y%Lp8gB`F+ykrPJ7bCweZdDL;XOJos%rB1vpQ zqQIH}nIP6Zv-V(|JqgmJ)22ABfe2azOcCMoVJo8!Qs9O*ZbX8vfY`fNrW+;~OGWtu z#TCV=m@V#|D6TzNC zE$?~Q)p@>e&TwcGb}eN!4hMnpmESF1Qq3mn3f}FS2a$x8e=&ypm9Lo{aZr#@7GE2*2#xzA{(SG-G*gpylU_AOA?CHHUZ&+wJOGFc=~<3;L+ zN_AG6GDAd0+fz5Ru|44S>wKNq@9L>A^cGWuhS#4rygM}yDQ7>9_>HF=IP`sj;98kz zJa@!Gg}nlM;dIs3wy7t8=4%j3t>wX&^+0tP6R($F8A@QysL)%?TLmHF>E$J(w$%l~ zwsXvEfwILLTJm5t*6eg?aBM4S4|RGA=G*piS;rqN=xDdFyt+HbMv?n4NY?=9S*3!^InY$)ypdnU?1?Hz&tVi(aHq>jy&6`naQHJ*t6|>yvB95 zYN-3yTgv}MNAXGs4DO%fE89tA2YD#YDbxQsz9NJySOO&ALqn}Uco)1HvTZldEvwSHYAzz7f3o2(Ci|Cf-LFtXkTd(v9`Md`Pt?K7IOwkDC29KR zxxjD{Scxo5Hr*0VJ6cp%b7d>0za$ro=Rh%xf7vCt>z?1Y#b;zz$XkJ)phW3J)X!$S z=fD7lpfc2SRr-GiY`o$wn`&kgb`T=s{6%hUEbnHR3i3K`MKzw+^x}EZ8`hYci^Oax zNBg~HO_k#b=6$ysK>b<{S3suzEmNUKbO}iZSjU%>Dm^ETa8?Z04<;Or*`PpA`wO!w z)=&r*oo4_dGUl7yvuuCn#N(f)OGd`Gs>jWi!*-ctL8P2wt?^<&+&5Gh3mbH+0eD$O zIi*di;{}aUFQOAo0^;GoW?O6iwrwssORaFNRfv46ELBib%1`=&iPyU8@a}KeO1`?+ zgTJWiF|sNxV8%7oaUVOo!Do3Cn(gwLHdK%HW@{ zWJl#fwh0mW)=LaNSHVm(qj6fRM&S%%nDMvg1nBT%V{PBRkt!es;%cWvjOhx{3I^M8b#JYU>v=PeI}UPxzi|a~ z^zma13qFIq^aHaupo50!d!D0O(TnB7Bdvr;nWCa z9Tk+0izajd3$Lf6@y!jde(BDkXKj7KagJuzaW#FR9u1cEZvpASv_^UB?1(A;g!QJm ze}3dZVhlyVzLtp_QJ`Do(Aun~K^Xi5roRQ(aV6vmMmtMz&&`vyc4rGs( zDL%_$@ZfZP`((1Ki!dWkB;vjy+MUfWQo20hawoqMo#aRTvnXL&>l&M>3wdyHx0-y) zeiW7DhUQ*AhuQm|WrsJs)0I9|FUO+u#^_x{iBzc@8x{iv^7aW1RRhXUgJDDs3M@#o zyKsA<*dpIX|3&+vJhGU+ihktBC98?O>=k3C5hMNv5`_tTDET&su)wlb#%nt_5It|; zL`Fhk_;M2^FmL-Fcz_n9ho37#A*EKeLF@77h2viDnVX>4B9>CxOaV6jKbYe32UF^k zXiWZ#Db9Z|1&65j5mOQt18U0qJ)xN5-j%-}J@LA|_bU|(AXz};ec*I7wp*`1hjbtG>a5P&tQa+A|5279UB5sH*FiYWge3T%qRXJK5U)o&lYUnRZib#JPh zP1quUBFg-IiNl>fQ^AMjpx2Bdlff~~IBZ7VoaoTaJ6X{o{LeH*V6nHW_8hO}Yy{-$ z$yf_LLQD3+x|iD-iAR<@I)V zJmKwj2xBMk6geyJJU`&_LEtj>Mhc9de#K0PMNLni)ZXQuU6Nq+NybQ)?W{j6+U`EG z7cNu|TRzl6V4eeJuebf9FEc5+6219x=tBinHew5Yte}|wTS2k>r-J(S-wKN5p9(7d z*`EsPA`L+I{gFoU5$oseF9WHYpPMi~W2e>OhSKThAJK8H5(>hPNx8zX^Xh0l z>9UB+wOj0r8dCFI8BObKM2qmr^r;Xn z+pgB{)mQc`f`g?#9(}rGoigG6O_(@Eo-y;IQq{fx`KKE4D25}0?8fys7mj|HL<;@l zw-Qt2o&j=(-DC-uABguOj_-&mFPkXo`219A$e4jJvAZf}xA*g8B2{`ep33=P zVJO1vc0EmTed*bI{GO(M#J(_;s$BjD@3R6KO(u_kwWYQfJP}=j9Q;zdid!uXzb&0b zhqGVdO%YAg?pI5?9B#D4sgZyj2h3e>aQd#r1 z(XKR8@}E7Sg%*tW{6ZbVy)l*<{w3WQ6cG=L+6XO4Q3I_cB5*8D1M1{Da0Y6b z&J46;%K|)>^-JUo!e@_ru5_w>bDN5^@!i;OEnEc+<+ zu)5V6tu%Qe&y9`YNgW=TWN`_r#c*HT>B0x6pt+2X>sW9^GpkqPUAQ2QsLY4-!Cy~z zompdEw14XlJAGZxp?MUszvSf0MTMwt%0KU=Y|LNs1BZaS*|{SU4j_4@&EWl6Wau5m zPor&hjgM0(;x1V|^*C-g%_kID8bzr~>%y7=MYzETP>eGZ%#`#uXygn0?$h2q0R=fm zCG-SzH=nknIqCbwHB|NTq-0OH*0``P0?028TPm}ed@iR-czry;Myr9q2v4yzn){$L z5i=>*w&dq|sRa_uLLk{G1%(dea&q~38r3lc$HW_6qb@kL30$u(JrcRnW1jFL|NdP@ zkS#<>D3MwP8AgyRyU1hgow=x2mjY42t!whK!Wx<;9PK9TXGIa4E^tq0gw@EE1dRiR zDzQ%p>xXe>x#3?=y~z;`@eJjxMQA0$d5ORg=LRhybSI0_uGPJUV{7Eb%r0fyv^0Eu zC%cV0*O0v380)iGKAiLf>r@_?ytd|wPj7kUdw!)-za`#CFFz?n4a<=T1+2@EU!t*V zjmW#t_3~nAciFOsB!XY(;C3ZR#=YSvXq$58l8PdvT9vc91<{DUj2pikiLOpGADw%d z+pmU{joV}zd9tYYyCg4Cix;%f7P^D-5gUmM5MPhQna~+8&n~H2!x?{S&#eYgQPj_4 zMz}xkRS|1*{7HYSGxFdeP$@_Zm!y^;L5b3S3>5 z=Y!Xz;uv8k*{|<>m5qo#8f#`#lOeCfc}(!D86TH}5}v!u3;Hg6Ay-?CJ4zWnxOHz34 zD~B|Kgff;1-YctT_NzG1#tN@WO@BeqJ6KcXHdmCv5S4`pTsoU5?XzM8S>|+|X}{i+ zJt}+O31WJ8PQy!nznQXUXv?ykJ~Tq)@J4e&f!KJmaQ<8Zyl0VR6jh~eH$7hm)LegK zS`^4v-Vob8ClLR=ygp%`Tq;#&P<9H!kSu*Os7pT$CdVqhxa^?+3fKii*!V>6#)U^K z3VYMc;MhmlPOsH3a;&~T3N-fs(Fio`2dAYTgk*cke5R@=K&LyDn1_o|Ngk_W$#+pm z#guFmxiMc1szo}$_%v;cS$b(P{5n)u#5JjsRZ%xPaptF^-A@e3Y@T06Ukg7A{RrXH z+ioz1fSa*lhfX73Or;1YMJ0={w*?T+j2V)J7^1$(CiixTohxPcbQ;X?p)pR-q1M;p z8lb_*unYk4Z0XO7DeP-$2 z7t?*SBo3-CZ3R8qPq8N?Zs;b?vc8^f3T4e~Sg@EjPz6F^T(Tsv!nMA}>K>N3$S|cX zG}n%WWCrpY|Y=*QX6^17f}ZzTAhHNf^;*|#6f9f2pjrZFp_L6V`R!x+rJ zAWBuO-xs#)A@1m$_Zyi8-m+x7`9*>d^|q(A^!nh-8Q&2ZkD}3(fqe(V6(CUrtgRn1 z8;Q22YZ0OKRS!$Ov;ofW-Oi^{+UsXX--v5+QnHpm!D=l8CsN}M`t~}Sq3Cz+=w)NG z8vKy>pZ7y;L!a{Fjw0-*Cy&+es0~K<9`ub7ouV>K5AJ#mWb;3~G0fAc3{8kUanOF@ zXwD1~(8Q9+@t;KgzC2OGu^TRRHTKCQk+X?j7uyu`6{S!bYJW!`(y`8*=@W^YDT!!i zrUJ=q1!s_jpGa1mwkh~#ofgCzQB$-upPm3wegecmh@&?BO` zJ4!B{*?|>#>7k7EJ-)cXgk+5;rNq;)d`zrO30?bnA)1@8g375ErbQh^(yvr_ zlSj0&rmIe9(T^tDzKXw@H11KE_KFAPBJjGKYWeBcyKGO_6-KBGp{)pwG5;S?3m)V733av>TX36V1-vRXW!=_8k~od4?pv> zs&j|-ruUa%PeA&WXsUREwS9L0@-y2Y`WXc}ny+CV%;3!c`ijn;v-EBCgm85sepq?z z{_##W-Y!B*+?vGbuOVzG-WMak7NlTe87Dt~QpVPScffX(VP$|p>X#c18j8({?Xz0l8|==cFACZeS*E`<+NG|b_mNQKlvvY;8>#$SO)!pY z#{I)Ny&Wam$|85nKFq&tS?%~q6@*%i`Lzd|FYN7i&dndIGDzcsi`Gn=;1P7&O6<$aX+@FAcds zByn$Y%g_s`I#n)Ep7?>23q;%7;FyerlK@$tT+6Pwsc!`jKl7hRn$qe$v#d3)_+*OJ zX+eEs0FO#BfB7kQT&3+hIJn=V5w0M2h{JkmhpRzpCZZ|E<1^+pPaMw_w?B%nr8%?S z)6`UMZxLPI;y>cr<*{$v#wyM;_m#S8jPuYDu`)|HOE%|X>qfBcHU6a(U)<>$(0u2 z){zvTz|HKu2cyBhdj%+Ma1+e-!^o{;Vqu*+-+l7le0oLsuS=YNc11KNj~`zMGBeqa zr%#)+B#%esz!LA@)2CI8$NL6~TV#(Mhh6JO;gNllM}p;0;gNWLl=w&>oSHup4(BP4 z#P5s0TGrPVkDR_=>W>8eo$Uir9|-8czz#G-G)}?*agUT0JfQnXH6a4e9w~Md!1$4h zK?9s0sVj_sxQ z)FLF@5MX$4Q*H>50@IKoX!}7)*{xYX7J4nl4XOwOqWi}#^m`bBVFd6$2t6U1#btt4 zGq4Zm2E_jo(t%hT0W1%e6OEvj>mX%De=YytyE6aP8iO1g0W=Sm@k8W(k-~yNst>nv zaQ`a<(u8mu19T5UvQvlH^8g5>0o`7N0sY&3HsrbSU-uu3q3)|8?ZyBD^`F^T2}2wU zfDTLq^^ek@`_=z^A{{^}2@Zr1QWF5}A#xTIs45>s-UOg~XuJMt$3vn`0LBOZ_swz$ z+E7zk&~4BEomgAQxXIt)c1NXtDTWFmVEhsK_ej1&@J#<&eqsuc!VY+YQpUUqAs(iG z{ez)gfCci-^she)MKr8GlR^%)^1q?qK-NqF`iCHq&7h`~z@QW@FfK&I?5`;$C>LOd z*qQy6ivJ_!8wpAQM-oDmjQ>ha{NW-+gHo`f@mMug02n;z1R+8H{!H9|e!4^Q$2-A4 zvj+YC1mQ6M8=^O=-WyTqinx;eBZU1gp;E|mbAaX{#5d+pH-r#S3MPaE^Z&SktU@~h z8_2Es-_^V7Ph8{xoxdcgRTvP_zbuA8BrO2u2a7Hi04WS*4kX$Fpn70@gfajL$R~@x z<30Y<)_|Z{{#`o%IoW6bzk_juXjlS_4@Uegp>bMNf>P8g2_Y4h0NO*=|IcCBzXH03 z%vl0V4?>)@1FV$LR9!$Xh5hf+@PSZS{auRx*&2Tc;@?a0b2BKVs+kZHZ1vaae|DM_ z{@DAsXal6g>hB;Yte}JZ0Xc-WAK+mpSs@h;8U+5s(u1b$Kc6R`AUxIp%fkclpMOad z|Colx`=5{hFmx3S<3e6r|6L#Nt)UZ=JPAs%oW%S869?@CA|SWcf3r+&1I-D;97Nm( zpnGt1VZD9?3k~Py|9cW-mOv@kO9YTNHh+gJc2Ft3{+|O$%>P6L0{KJwYyhfgxg9`?P;w3e32>)iT~a^}>;Sxn?4jtMxROC_Fg(~`{+A7j zO9+)cApEdKP3@uM%ZK>c0~`0#Ut zok|YS+2{ZPX>kC*eBp}BQ00E2$CPdQ_;Cav_&UV6Qfod8)X#P7hNsteY0Q-Zx2}h{AOUNPA)I*!f z2|56I0*IIs!2Q7Rgff7yka#D6pYD&Z%<441KS`8*NFwdO;^8C(K!SphByxcCAr;hr z#BGiFmx!U_gb%4;_?LJWIRHr@2bdr836+JoIYZ})k_vzvQUXj6WN4Zn#_>XWNcqo- zpnfpH^e+?jkQHZWGXLn3x*mnP<9Rn0CD30XdyAK02=b2v1xgQUExDC8~}U-Ol|-q zBmnW`0Ei$WvH&V%2`cnp@&Kv}I6#ox{?4bU8?-$GF?0j?9{LlZZ3IpssJbx3Qv|C1 zpOvrz?Sah^fqE7ByTl#_=9p4U`X>SW4+;49g1CgJyZ=pNs5{h4I3&v*;C)cq)E_G3 zfhy%atOc5X&EW#%=pUhk83-&PR0!u`qUrx7qydrg00bW54e)?QRVEKW{N(}iha^$` znG5+(Jf1jE-Tem`Ape&xz7k~35c8EdWxb1>pY=EdI&q U>p#*_kdK}K9fGVLv|0iEKWGu9p#T5? diff --git a/doc/makefile b/doc/makefile.am similarity index 100% rename from doc/makefile rename to doc/makefile.am diff --git a/glue/.cvsignore b/glue/.cvsignore new file mode 100644 index 0000000..e6da98d --- /dev/null +++ b/glue/.cvsignore @@ -0,0 +1,2 @@ +makefile +makefile.in diff --git a/glue/makefile b/glue/makefile.am similarity index 77% rename from glue/makefile rename to glue/makefile.am index 0d3c168..5905ff5 100644 --- a/glue/makefile +++ b/glue/makefile.am @@ -1,4 +1,3 @@ -PREFIX= /usr GLUE_LIB= libdiacanvassharpglue.so all: $(GLUE_LIB) @@ -7,7 +6,7 @@ $(GLUE_LIB): *.c gcc *.c -shared -fPIC -o $(GLUE_LIB) `pkg-config --cflags --libs gtk+-2.0 libart-2.0 libgnomeui-2.0` install: $(GLUE_LIB) - install -o root -g root -m 644 $(GLUE_LIB) $(PREFIX)/lib + install -o root -g root -m 644 $(GLUE_LIB) @prefix@/lib clean: rm -f $(GLUE_LIB) diff --git a/makefile b/makefile.am similarity index 97% rename from makefile rename to makefile.am index cfda5f5..c3193f3 100644 --- a/makefile +++ b/makefile.am @@ -28,4 +28,3 @@ distclean: clean $(MAKE) -C doc distclean; rm -r CVS - rm -r patches diff --git a/patches/diacanvas/AddedPropertyPangoLayout.diff b/patches/diacanvas/AddedPropertyPangoLayout.diff deleted file mode 100644 index a5ad4b9..0000000 --- a/patches/diacanvas/AddedPropertyPangoLayout.diff +++ /dev/null @@ -1,242 +0,0 @@ -Index: ChangeLog -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/ChangeLog,v -retrieving revision 1.135 -diff -u -r1.135 ChangeLog ---- ChangeLog 9 Oct 2003 07:50:14 -0000 1.135 -+++ ChangeLog 9 Oct 2003 10:55:25 -0000 -@@ -1,3 +1,13 @@ -+2003-10-09 Martin Willemoes Hansen -+ -+ * src/dia-canvas.[ch]: Changed dia_canvas_new_pango_layout to dia_canvas_get_pango_layout -+ and registred it as a property. -+ * src/dia-shape-art.[ch]: Changed dia_shape_art_new_pango_layout to dia_shape_art_get_pango_layout. -+ * src/dia-shape-x.[ch]: Changed dia_shape_x_new_pango_layout to dia_shape_x_get_pango_layout and -+ fixed a typo. -+ * src/dia-shape.c: Updated to use dia_canvas_get_pango_layout -+ * src/diacanvas.defs: Ditto -+ - 2003-10-04 Arjan Molenaar - - * python/setup.py: New file. Build the python bindings in a Pythonic -Index: src/dia-canvas.c -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas.c,v -retrieving revision 1.62 -diff -u -r1.62 dia-canvas.c ---- src/dia-canvas.c 1 Sep 2003 18:26:43 -0000 1.62 -+++ src/dia-canvas.c 9 Oct 2003 10:55:26 -0000 -@@ -52,7 +52,8 @@ - PROP_GRID_OFS_X, - PROP_GRID_OFS_Y, - PROP_GRID_COLOR, -- PROP_GRID_BG -+ PROP_GRID_BG, -+ PROP_PANGO_LAYOUT - }; - - typedef struct { -@@ -264,6 +265,13 @@ - G_MAXULONG, - DIA_COLOR (200,200,200), - G_PARAM_READWRITE)); -+ g_object_class_install_property (object_class, -+ PROP_PANGO_LAYOUT, -+ g_param_spec_object ("pango_layout", -+ _("A newly created pango layout"), -+ _("A newly created pango layout"), -+ PANGO_TYPE_LAYOUT, -+ G_PARAM_READABLE)); - - klass->extents_changed = NULL; - //klass->move = NULL; -@@ -407,6 +415,9 @@ - case PROP_GRID_BG: - g_value_set_ulong (value, canvas->grid_bg); - break; -+ case PROP_PANGO_LAYOUT: -+ g_value_set_object (value, dia_canvas_get_pango_layout()); -+ break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -@@ -887,14 +898,14 @@ - } - - /** -- * dia_canvas_new_pango_layout: -+ * dia_canvas_get_pango_layout: - * - * Returns a usable #PangoLayout object. - * - * Return value: A newly created PangoLayout object. - **/ - PangoLayout* --dia_canvas_new_pango_layout (void) -+dia_canvas_get_pango_layout (void) - { - /* Make the context static, this will save time for future references. - */ -Index: src/dia-canvas.h -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas.h,v -retrieving revision 1.65 -diff -u -r1.65 dia-canvas.h ---- src/dia-canvas.h 15 Jul 2003 18:46:37 -0000 1.65 -+++ src/dia-canvas.h 9 Oct 2003 10:55:26 -0000 -@@ -171,7 +171,7 @@ - void dia_canvas_add_constraint (DiaCanvas *canvas, DiaConstraint *c); - void dia_canvas_remove_constraint (DiaCanvas *canvas, DiaConstraint *c); - --PangoLayout* dia_canvas_new_pango_layout (void); -+PangoLayout* dia_canvas_get_pango_layout (void); - - void dia_canvas_redraw_views (DiaCanvas *canvas); - -Index: src/dia-shape-art.c -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-shape-art.c,v -retrieving revision 1.49 -diff -u -r1.49 dia-shape-art.c ---- src/dia-shape-art.c 20 Jul 2003 14:14:21 -0000 1.49 -+++ src/dia-shape-art.c 9 Oct 2003 10:55:26 -0000 -@@ -70,17 +70,17 @@ - } - - /** -- * dia_shape_art_new_pango_layout: -+ * dia_shape_art_get_pango_layout: - * - * Return a new PangoLayout belonging to the AA renderer. - * - * Return value: A newly created PangoLayout object. - **/ - PangoLayout* --dia_shape_art_new_pango_layout (void) -+dia_shape_art_get_pango_layout (void) - { - /* Use the default (canvas) PangoLayout setup. */ -- return dia_canvas_new_pango_layout (); -+ return dia_canvas_get_pango_layout (); - } - - static ArtSVP* -@@ -679,7 +679,7 @@ - // } else { - // } - -- layout = dia_shape_art_new_pango_layout (); -+ layout = dia_shape_art_get_pango_layout (); - max_width = (gint) ceil (shape->max_width); - max_height = (gint) ceil (shape->max_height); - dia_shape_text_fill_pango_layout ((DiaShape*) shape, -Index: src/dia-shape-art.h -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-shape-art.h,v -retrieving revision 1.7 -diff -u -r1.7 dia-shape-art.h ---- src/dia-shape-art.h 9 Oct 2002 13:17:25 -0000 1.7 -+++ src/dia-shape-art.h 9 Oct 2003 10:55:26 -0000 -@@ -36,7 +36,7 @@ - void dia_shape_art_render (DiaShape *shape, DiaCanvasViewItem *item, - GnomeCanvasBuf *buf); - --PangoLayout* dia_shape_art_new_pango_layout (void); -+PangoLayout* dia_shape_art_get_pango_layout (void); - - G_END_DECLS - -Index: src/dia-shape-x.c -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-shape-x.c,v -retrieving revision 1.15 -diff -u -r1.15 dia-shape-x.c ---- src/dia-shape-x.c 3 Jun 2003 18:08:38 -0000 1.15 -+++ src/dia-shape-x.c 9 Oct 2003 10:55:26 -0000 -@@ -361,9 +361,9 @@ - } - - PangoLayout* --dia_shape_x_new_pango_layout (void) -+dia_shape_x_get_pango_layout (void) - { -- g_warning (G_STRLOC": No default fonr layout has been set..."); -+ g_warning (G_STRLOC": No default font layout has been set..."); - return NULL; - } - -Index: src/dia-shape-x.h -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-shape-x.h,v -retrieving revision 1.5 -diff -u -r1.5 dia-shape-x.h ---- src/dia-shape-x.h 9 Oct 2002 13:17:25 -0000 1.5 -+++ src/dia-shape-x.h 9 Oct 2003 10:55:26 -0000 -@@ -38,7 +38,7 @@ - int x, int y, - int width, int height); - --PangoLayout* dia_shape_x_new_pango_layout (void); -+PangoLayout* dia_shape_x_get_pango_layout (void); - - - G_END_DECLS -Index: src/dia-shape.c -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-shape.c,v -retrieving revision 1.41 -diff -u -r1.41 dia-shape.c ---- src/dia-shape.c 9 Oct 2003 07:50:15 -0000 1.41 -+++ src/dia-shape.c 9 Oct 2003 10:55:26 -0000 -@@ -1250,7 +1250,7 @@ - g_return_val_if_fail (shape != NULL, NULL); - g_return_val_if_fail (shape->type == DIA_SHAPE_TEXT, NULL); - -- layout = dia_canvas_new_pango_layout (); -+ layout = dia_canvas_get_pango_layout (); - g_return_val_if_fail (layout != NULL, NULL); - - if (fill) -Index: src/diacanvas.defs -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/diacanvas.defs,v -retrieving revision 1.2 -diff -u -r1.2 diacanvas.defs ---- src/diacanvas.defs 6 May 2002 09:43:54 -0000 1.2 -+++ src/diacanvas.defs 9 Oct 2003 10:55:26 -0000 -@@ -385,9 +385,9 @@ - ) - ) - --(define-function dia_canvas_new_pango_layout -+(define-function dia_canvas_get_pango_layout - (in-module "Dia") -- (c-name "dia_canvas_new_pango_layout") -+ (c-name "dia_canvas_get_pango_layout") - (return-type "PangoLayout*") - ) - -@@ -2071,9 +2071,9 @@ - ) - ) - --(define-function dia_shape_art_new_pango_layout -+(define-function dia_shape_art_get_pango_layout - (in-module "Dia") -- (c-name "dia_shape_art_new_pango_layout") -+ (c-name "dia_shape_art_get_pango_layout") - (return-type "PangoLayout*") - ) - -@@ -2095,9 +2095,9 @@ - ) - ) - --(define-function dia_shape_x_new_pango_layout -+(define-function dia_shape_x_get_pango_layout - (in-module "Dia") -- (c-name "dia_shape_x_new_pango_layout") -+ (c-name "dia_shape_x_get_pango_layout") - (return-type "PangoLayout*") - ) - diff --git a/patches/diacanvas/PropertyShouldBeDouble.diff b/patches/diacanvas/PropertyShouldBeDouble.diff deleted file mode 100644 index b4c474d..0000000 --- a/patches/diacanvas/PropertyShouldBeDouble.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- dia-canvas-view.c 2003-03-18 19:21:22.000000000 +0100 -+++ ../../diacanvas2-0.9.2.old/src/dia-canvas-view.c 2003-07-18 13:35:40.000000000 +0200 -@@ -217,10 +217,12 @@ - G_PARAM_READABLE)); - g_object_class_install_property (gobject_class, - PROP_ZOOM, -- g_param_spec_object ("zoom", -+ g_param_spec_double ("zoom", - _("Zoom"), - _("Set the zoom factor"), -- DIA_TYPE_TOOL, -+ -G_MAXDOUBLE, -+ G_MAXDOUBLE, -+ 0.0, - G_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, - PROP_TOOL, diff --git a/patches/diacanvas/PythonUpdate.diff b/patches/diacanvas/PythonUpdate.diff deleted file mode 100644 index 79dbf18..0000000 --- a/patches/diacanvas/PythonUpdate.diff +++ /dev/null @@ -1,4 +0,0 @@ -39c39 -< AC_PATH_PROGS(PYTHON, python2.2 python2 python) ---- -> AC_PATH_PROGS(PYTHON, python2.3 python2.2 python2 python) diff --git a/patches/diacanvas/removal_of_persistens.diff b/patches/diacanvas/removal_of_persistens.diff deleted file mode 100644 index e96a57d..0000000 --- a/patches/diacanvas/removal_of_persistens.diff +++ /dev/null @@ -1,132 +0,0 @@ -? removal_of_persistens.diff -Index: dia-canvas-bezier.c -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas-bezier.c,v -retrieving revision 1.5 -diff -u -r1.5 dia-canvas-bezier.c ---- dia-canvas-bezier.c 25 Mar 2002 15:44:53 -0000 1.5 -+++ dia-canvas-bezier.c 13 Sep 2003 14:19:40 -0000 -@@ -74,16 +74,9 @@ - static void - dia_canvas_bezier_class_init (DiaCanvasBezierClass *klass) - { --#ifdef USE_PERSISTENT -- static guint saveable_args[] = { ARG_BEZIER_WIDTH, ARG_COLOR, ARG_CAP, ARG_JOIN, 0 }; --#endif - GObjectClass *object_class; - DiaCanvasItemClass *item_class; - --#ifdef USE_PERSISTENT -- ((DiaPersistentClass*) klass)->saveable_args = saveable_args; --#endif -- - object_class = (GObjectClass*) klass; - //item_class = (DiaCanvasItemClass*) klass; - item_class = DIA_CANVAS_ITEM_CLASS (klass); -Index: dia-canvas-element.c -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas-element.c,v -retrieving revision 1.35 -diff -u -r1.35 dia-canvas-element.c ---- dia-canvas-element.c 20 Jul 2003 14:14:21 -0000 1.35 -+++ dia-canvas-element.c 13 Sep 2003 14:19:41 -0000 -@@ -80,16 +80,9 @@ - static void - dia_canvas_element_class_init (DiaCanvasElementClass *klass) - { --#ifdef USE_PERSISTENT -- static guint saveable_args[] = { ARG_WIDTH, ARG_HEIGHT, 0 }; --#endif - GObjectClass *object_class; - DiaCanvasItemClass *item_class; - --#ifdef USE_PERSISTENT -- ((DiaPersistentClass*) klass)->saveable_args = saveable_args; --#endif -- - object_class = (GObjectClass*) klass; - item_class = DIA_CANVAS_ITEM_CLASS (klass); - -Index: dia-canvas-ellipse.c -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas-ellipse.c,v -retrieving revision 1.6 -diff -u -r1.6 dia-canvas-ellipse.c ---- dia-canvas-ellipse.c 11 Feb 2002 15:40:54 -0000 1.6 -+++ dia-canvas-ellipse.c 13 Sep 2003 14:19:41 -0000 -@@ -228,8 +228,6 @@ - GtkObjectClass *object_class; - DiaCanvasItemClass *item_class; - -- ((DiaPersistentClass*) klass)->saveable_args = saveable_args; -- - object_class = (GtkObjectClass*) klass; - //item_class = (DiaCanvasItemClass*) klass; - item_class = DIA_CANVAS_ITEM_CLASS (klass); -Index: dia-canvas-line.c -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-canvas-line.c,v -retrieving revision 1.43 -diff -u -r1.43 dia-canvas-line.c ---- dia-canvas-line.c 20 Jul 2003 14:14:21 -0000 1.43 -+++ dia-canvas-line.c 13 Sep 2003 14:19:41 -0000 -@@ -135,16 +135,9 @@ - static void - dia_canvas_line_class_init (DiaCanvasLineClass *klass) - { --#ifdef USE_PERSISTENT -- static guint saveable_args[] = { ARG_LINE_WIDTH, ARG_COLOR, ARG_CAP, ARG_JOIN, 0 }; --#endif - GObjectClass *object_class; - DiaCanvasItemClass *item_class; - --#ifdef USE_PERSISTENT -- ((DiaPersistentClass*) klass)->saveable_args = saveable_args; --#endif -- - object_class = (GObjectClass*) klass; - item_class = DIA_CANVAS_ITEM_CLASS (klass); - -Index: dia-handle.c -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/src/dia-handle.c,v -retrieving revision 1.39 -diff -u -r1.39 dia-handle.c ---- dia-handle.c 19 May 2003 17:32:24 -0000 1.39 -+++ dia-handle.c 13 Sep 2003 14:19:41 -0000 -@@ -21,9 +21,6 @@ - #include - #include - #include --#ifdef USE_PERSISTENT --#include "dia-storage.h" --#endif - #include "diamarshal.h" - #include "diatypebuiltins.h" - #include "dia-canvas-i18n.h" -@@ -59,13 +56,6 @@ - static void dia_handle_finalize (GObject *object); - static void pos_w_changed (DiaVariable *variable, - DiaHandle *handle); --#ifdef USE_PERSISTENT --static gboolean dia_handle_load (DiaStorage *storage, DiaAttributeNode *attr, -- DiaPersistent *object, GtkArg *value); --static gboolean dia_handle_save (DiaStorage *storage, DiaAttributeNode *attr, -- DiaPersistent *object, GtkArg *value); --static void dia_handle_free (GtkArg *value); --#endif - - static GObjectClass *parent_class = NULL; - //static guint handle_signals[LAST_SIGNAL] = { 0 }; -@@ -113,11 +103,6 @@ - - parent_class = g_type_class_peek_parent (klass); - --#ifdef USE_PERSISTENT -- dia_storage_register_type (dia_handle_get_type (), -- dia_handle_load, dia_handle_save, -- dia_handle_free); --#endif - object_class->dispose = dia_handle_dispose; - object_class->finalize = dia_handle_finalize; - object_class->set_property = dia_handle_set_property; diff --git a/patches/diacanvas/unit_tests.cvsignore.diff b/patches/diacanvas/unit_tests.cvsignore.diff deleted file mode 100644 index 2e98610..0000000 --- a/patches/diacanvas/unit_tests.cvsignore.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: .cvsignore -=================================================================== -RCS file: /cvsroot/diacanvas/diacanvas2/unit_tests/.cvsignore,v -retrieving revision 1.1 -diff -u -r1.1 .cvsignore ---- .cvsignore 16 May 2002 14:10:59 -0000 1.1 -+++ .cvsignore 24 Aug 2003 15:41:52 -0000 -@@ -2,4 +2,13 @@ - .deps - Makefile - Makefile.in -- -+test-canvas -+test-canvas-item -+test-canvas-view -+test-constraint -+test-expression -+test-geometry -+test-shape-art -+test-solver -+test-strength -+test-variable diff --git a/patches/generator/AssemblyTagGenerator.diff b/patches/generator/AssemblyTagGenerator.diff deleted file mode 100644 index 73d4cb8..0000000 --- a/patches/generator/AssemblyTagGenerator.diff +++ /dev/null @@ -1,267 +0,0 @@ -? AssemblyTagGenerator.diff -? AssemblyTagGenerator2.diff -Index: CallbackGen.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/CallbackGen.cs,v -retrieving revision 1.24 -diff -u -r1.24 CallbackGen.cs ---- CallbackGen.cs 23 Jul 2003 17:19:19 -0000 1.24 -+++ CallbackGen.cs 31 Aug 2003 10:34:34 -0000 -@@ -17,7 +17,7 @@ - public CallbackGen (XmlElement ns, XmlElement elem) : base (ns, elem) - { - if (elem ["parameters"] != null) -- parms = new Parameters (elem ["parameters"], NS); -+ parms = new Parameters (elem ["parameters"], NS, Assembly); - } - - public string MarshalType { -@@ -54,10 +54,10 @@ - return CallByName (var); - } - -- public string GenWrapper (string ns) -+ public string GenWrapper (string ns, string assembly) - { - char sep = Path.DirectorySeparatorChar; -- string dir = ".." + sep + ns.ToLower() + sep + "generated"; -+ string dir = ".." + sep + assembly + sep + "generated"; - - if (!Directory.Exists (dir)) - Directory.CreateDirectory (dir); -@@ -238,7 +238,7 @@ - - CloseWriter (sw); - -- GenWrapper (NS); -+ GenWrapper (NS, Assembly); - - Statistics.CBCount++; - } -Index: Ctor.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/Ctor.cs,v -retrieving revision 1.12 -diff -u -r1.12 Ctor.cs ---- Ctor.cs 14 Jun 2003 17:30:32 -0000 1.12 -+++ Ctor.cs 31 Aug 2003 10:34:34 -0000 -@@ -41,7 +41,7 @@ - this.container_type = container_type; - XmlElement parms_elem = elem ["parameters"]; - if (parms_elem != null) -- parms = new Parameters (parms_elem, container_type.NS); -+ parms = new Parameters (parms_elem, container_type.NS, container_type.Assembly); - if (elem.HasAttribute ("preferred")) - preferred = true; - } -Index: GenBase.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/GenBase.cs,v -retrieving revision 1.11 -diff -u -r1.11 GenBase.cs ---- GenBase.cs 2 Jul 2003 18:13:24 -0000 1.11 -+++ GenBase.cs 31 Aug 2003 10:34:35 -0000 -@@ -52,6 +52,15 @@ - } - } - -+ public string Assembly { -+ get { -+ if (ns.HasAttribute ("assembly")) -+ return ns.GetAttribute ("assembly"); -+ else -+ return NS.ToLower(); -+ } -+ } -+ - public string QualifiedName { - get { - return NS + "." + Name; -@@ -66,7 +75,7 @@ - protected StreamWriter CreateWriter () - { - char sep = Path.DirectorySeparatorChar; -- string dir = ".." + sep + NS.ToLower() + sep + "generated"; -+ string dir = ".." + sep + Assembly + sep + "generated"; - if (!Directory.Exists(dir)) { - Console.WriteLine ("creating " + dir); - Directory.CreateDirectory(dir); -@@ -99,7 +108,7 @@ - public void AppendCustom (StreamWriter sw) - { - char sep = Path.DirectorySeparatorChar; -- string custom = ".." + sep + NS.ToLower() + sep + Name + ".custom"; -+ string custom = ".." + sep + Assembly + sep + Name + ".custom"; - if (File.Exists(custom)) { - sw.WriteLine ("#region Customized extensions"); - sw.WriteLine ("#line 1 \"" + Name + ".custom\""); -Index: Method.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/Method.cs,v -retrieving revision 1.32 -diff -u -r1.32 Method.cs ---- Method.cs 19 Aug 2003 10:51:33 -0000 1.32 -+++ Method.cs 31 Aug 2003 10:34:35 -0000 -@@ -31,7 +31,7 @@ - { - this.elem = elem; - if (elem["parameters"] != null) -- parms = new Parameters (elem["parameters"], container_type.NS); -+ parms = new Parameters (elem["parameters"], container_type.NS, container_type.Assembly); - this.container_type = container_type; - this.name = elem.GetAttribute("name"); - if (name == "GetType") -Index: ObjectGen.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/ObjectGen.cs,v -retrieving revision 1.44 -diff -u -r1.44 ObjectGen.cs ---- ObjectGen.cs 19 May 2003 02:45:17 -0000 1.44 -+++ ObjectGen.cs 31 Aug 2003 10:34:35 -0000 -@@ -16,6 +16,7 @@ - - private ArrayList strings = new ArrayList(); - private static Hashtable namespaces = new Hashtable (); -+ private static string assembly; - - public ObjectGen (XmlElement ns, XmlElement elem) : base (ns, elem) - { -@@ -49,6 +50,7 @@ - break; - } - } -+ assembly = Assembly; - } - - public void Generate () -@@ -189,10 +191,10 @@ - continue; - - char sep = Path.DirectorySeparatorChar; -- string dir = ".." + sep + ns.ToLower () + sep + "generated"; -+ string dir = ".." + sep + assembly + sep + "generated"; - if (!Directory.Exists(dir)) { - Console.WriteLine ("creating " + dir); -- Directory.CreateDirectory(dir); -+ Directory.CreateDirectory(dir); - } - String filename = dir + sep + "ObjectManager.cs"; - -Index: Parameters.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/Parameters.cs,v -retrieving revision 1.33 -diff -u -r1.33 Parameters.cs ---- Parameters.cs 28 Aug 2003 16:49:29 -0000 1.33 -+++ Parameters.cs 31 Aug 2003 10:34:35 -0000 -@@ -112,6 +112,7 @@ - - private XmlElement elem; - private string impl_ns; -+ private string impl_assembly; - private string import_sig; - private string call_string; - private string signature; -@@ -119,10 +120,11 @@ - private bool hide_data; - private bool is_static; - -- public Parameters (XmlElement elem, string impl_ns) { -+ public Parameters (XmlElement elem, string impl_ns, string impl_assembly) { - - this.elem = elem; - this.impl_ns = impl_ns; -+ this.impl_assembly = impl_assembly; - } - - public string CallString { -@@ -357,7 +359,7 @@ - - if (gen is CallbackGen) { - CallbackGen cbgen = gen as CallbackGen; -- string wrapper = cbgen.GenWrapper(impl_ns); -+ string wrapper = cbgen.GenWrapper(impl_ns, impl_assembly); - sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = null;", wrapper, name); - sw.Write (indent + "\t\t\t"); - if (p.NullOk) -Index: Signal.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/Signal.cs,v -retrieving revision 1.15 -diff -u -r1.15 Signal.cs ---- Signal.cs 14 Jun 2003 17:30:32 -0000 1.15 -+++ Signal.cs 31 Aug 2003 10:34:35 -0000 -@@ -24,7 +24,7 @@ - this.elem = elem; - this.name = elem.GetAttribute ("name"); - if (elem["parameters"] != null) -- parms = new Parameters (elem["parameters"], container_type.NS); -+ parms = new Parameters (elem["parameters"], container_type.NS, container_type.Assembly); - this.container_type = container_type; - } - -@@ -39,7 +39,7 @@ - - public bool Validate () - { -- marsh = SignalHandler.GetName(elem, container_type.NS, false); -+ marsh = SignalHandler.GetName(elem, container_type.NS, container_type.Assembly, false); - if ((Name == "") || (marsh == "")) { - Console.Write ("bad signal " + Name); - Statistics.ThrottledCount++; -@@ -83,8 +83,9 @@ - return handler; - - string ns = container_type.NS; -+ string assembly = container_type.Assembly; - char sep = Path.DirectorySeparatorChar; -- string dir = ".." + sep + ns.ToLower() + sep + "generated"; -+ string dir = ".." + sep + assembly + sep + "generated"; - - if (!Directory.Exists (dir)) - Directory.CreateDirectory (dir); -@@ -126,12 +127,16 @@ - { - string cname = "\"" + elem.GetAttribute("cname") + "\""; - string ns; -- if (implementor == null) -+ string assembly; -+ if (implementor == null) { - ns = container_type.NS; -- else -+ assembly = container_type.Assembly; -+ } else { - ns = implementor.NS; -+ assembly = implementor.Assembly; -+ } - -- string qual_marsh = SignalHandler.GetName(elem, ns, container_type.DoGenerate); -+ string qual_marsh = SignalHandler.GetName(elem, ns, assembly, container_type.DoGenerate); - - string argsname; - string handler = GenHandler (out argsname); -Index: SignalHandler.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/SignalHandler.cs,v -retrieving revision 1.30 -diff -u -r1.30 SignalHandler.cs ---- SignalHandler.cs 19 Aug 2003 04:52:25 -0000 1.30 -+++ SignalHandler.cs 31 Aug 2003 10:34:35 -0000 -@@ -13,7 +13,7 @@ - - public class SignalHandler { - -- public static string GetName(XmlElement sig, string ns, bool generate) -+ public static string GetName(XmlElement sig, string ns, string assembly, bool generate) - { - XmlElement ret_elem = sig["return-type"]; - if (ret_elem == null) { -@@ -84,7 +84,7 @@ - return ns + "." + sname; - - char sep = Path.DirectorySeparatorChar; -- String dir = ".." + sep + ns.ToLower() + sep + "generated"; -+ String dir = ".." + sep + assembly + sep + "generated"; - - if (!Directory.Exists(dir)) { - Directory.CreateDirectory(dir); diff --git a/patches/generator/MangleNameModifications.diff b/patches/generator/MangleNameModifications.diff deleted file mode 100644 index 4982ad3..0000000 --- a/patches/generator/MangleNameModifications.diff +++ /dev/null @@ -1,165 +0,0 @@ -? MangleNameModifications.diff -Index: Parameters.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/Parameters.cs,v -retrieving revision 1.32 -diff -u -r1.32 Parameters.cs ---- Parameters.cs 15 Jul 2003 05:52:08 -0000 1.32 -+++ Parameters.cs 27 Aug 2003 07:17:19 -0000 -@@ -75,7 +75,7 @@ - - public string Name { - get { -- return MangleName (elem.GetAttribute("name")); -+ return SymbolTable.Table.MangleName (elem.GetAttribute("name")); - } - } - -@@ -91,37 +91,6 @@ - } - } - -- private string MangleName(string name) -- { -- switch (name) { -- case "string": -- return "str1ng"; -- case "event": -- return "evnt"; -- case "null": -- return "is_null"; -- case "object": -- return "objekt"; -- case "params": -- return "parms"; -- case "ref": -- return "reference"; -- case "in": -- return "in_param"; -- case "out": -- return "out_param"; -- case "fixed": -- return "mfixed"; -- case "byte": -- return "_byte"; -- case "new": -- return "_new"; -- default: -- break; -- } -- -- return name; -- } - public string StudlyName { - get { - string name = elem.GetAttribute("name"); -Index: StructBase.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/StructBase.cs,v -retrieving revision 1.37 -diff -u -r1.37 StructBase.cs ---- StructBase.cs 23 Jul 2003 17:19:19 -0000 1.37 -+++ StructBase.cs 27 Aug 2003 07:17:19 -0000 -@@ -141,7 +141,7 @@ - if (IsBit (field)) - name = String.Format ("_bitfield{0}", bitfields++); - else -- name += MangleName (field.GetAttribute ("cname")); -+ name += SymbolTable.Table.MangleName (field.GetAttribute ("cname")); - - return true; - } -@@ -151,14 +151,14 @@ - string c_type, type, name; - if (!GetFieldInfo (field, out c_type, out type, out name)) - return false; -- sw.WriteLine ("\t\tpublic {0} {1};", type, name); -+ sw.WriteLine ("\t\tpublic {0} {1};", type, SymbolTable.Table.MangleName (name)); - - if (field.HasAttribute("array_len")) - Console.WriteLine ("warning: array field {0}.{1} probably incorrectly generated", QualifiedName, name); - SymbolTable table = SymbolTable.Table; - - string wrapped = table.GetCSType (c_type); -- string wrapped_name = MangleName (field.GetAttribute ("cname")); -+ string wrapped_name = SymbolTable.Table.MangleName (field.GetAttribute ("cname")); - if (table.IsObject (c_type)) { - sw.WriteLine (); - sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {"); -@@ -188,29 +188,6 @@ - } - - return true; -- } -- -- private String MangleName(String name) -- { -- if (name == "string") { -- return "str1ng"; -- } else if (name == "event") { -- return "evnt"; -- } else if (name == "null") { -- return "is_null"; -- } else if (name == "object") { -- return "objekt"; -- } else if (name == "ref") { -- return "reference"; -- } else if (name == "params") { -- return "parms"; -- } else if (name == "fixed") { -- return "mfixed"; -- } else if (name == "in") { -- return "inn"; -- } else { -- return name; -- } - } - - public virtual void Generate () -Index: SymbolTable.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/SymbolTable.cs,v -retrieving revision 1.46 -diff -u -r1.46 SymbolTable.cs ---- SymbolTable.cs 11 Jul 2003 02:00:11 -0000 1.46 -+++ SymbolTable.cs 27 Aug 2003 07:17:19 -0000 -@@ -292,6 +292,38 @@ - return false; - } - -+ public string MangleName(string name) -+ { -+ switch (name) { -+ case "string": -+ return "str1ng"; -+ case "event": -+ return "evnt"; -+ case "null": -+ return "is_null"; -+ case "object": -+ return "objekt"; -+ case "params": -+ return "parms"; -+ case "ref": -+ return "reference"; -+ case "in": -+ return "in_param"; -+ case "out": -+ return "out_param"; -+ case "fixed": -+ return "mfixed"; -+ case "byte": -+ return "_byte"; -+ case "new": -+ return "_new"; -+ case "base": -+ return "_base"; -+ default: -+ break; -+ } -+ -+ return name; -+ } - } - } -- diff --git a/patches/generator/ToStringOnlyOverridesWhenNoParameters.diff b/patches/generator/ToStringOnlyOverridesWhenNoParameters.diff deleted file mode 100644 index d3f0260..0000000 --- a/patches/generator/ToStringOnlyOverridesWhenNoParameters.diff +++ /dev/null @@ -1,17 +0,0 @@ -? Method.cs.diff -Index: Method.cs -=================================================================== -RCS file: /cvs/public/gtk-sharp/generator/Method.cs,v -retrieving revision 1.31 -diff -u -r1.31 Method.cs ---- Method.cs 23 Jul 2003 17:19:19 -0000 1.31 -+++ Method.cs 14 Aug 2003 13:57:51 -0000 -@@ -217,7 +217,7 @@ - sw.Write("static "); - sw.Write(safety); - Method dup = null; -- if (Name == "ToString") -+ if (Name == "ToString" && Params == null) - sw.Write("override "); - else if (Name == "GetGType" && container_type is ObjectGen) - sw.Write("new "); diff --git a/patches/gtksharp/APIdecentralized.diff b/patches/gtksharp/APIdecentralized.diff deleted file mode 100644 index 56635da..0000000 --- a/patches/gtksharp/APIdecentralized.diff +++ /dev/null @@ -1,1128 +0,0 @@ -Index: Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/Makefile.in,v -retrieving revision 1.3 -diff -u -r1.3 Makefile.in ---- Makefile.in 7 Oct 2003 05:52:22 -0000 1.3 -+++ Makefile.in 9 Oct 2003 21:17:43 -0000 -@@ -1,6 +1,6 @@ - NATIVE_DIRS = glue parser - --DIRS=generator api glib pango atk gdk gtk glade art gnome gtkhtml gda gnomedb gconf rsvg sample -+DIRS=generator glib pango atk gdk gtk glade art gnome gtkhtml gda gnomedb gconf rsvg sample - ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT))) - CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe - MCS=mcs -Index: configure.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/configure.in,v -retrieving revision 1.35 -diff -u -r1.35 configure.in ---- configure.in 7 Oct 2003 05:52:22 -0000 1.35 -+++ configure.in 9 Oct 2003 21:17:43 -0000 -@@ -111,7 +111,6 @@ - glue/Makefile - parser/Makefile - generator/Makefile --api/Makefile - glib/Makefile - pango/Makefile - atk/Makefile -Index: api/.cvsignore -=================================================================== -RCS file: api/.cvsignore -diff -N api/.cvsignore ---- api/.cvsignore 27 Feb 2003 05:16:47 -0000 1.2 -+++ /dev/null 1 Jan 1970 00:00:00 -0000 -@@ -1,6 +0,0 @@ --*.dll --*.exe --generated --generated-stamp --Makefile -- -Index: api/Makefile.in -=================================================================== -RCS file: api/Makefile.in -diff -N api/Makefile.in ---- api/Makefile.in 7 Oct 2003 05:52:22 -0000 1.10 -+++ /dev/null 1 Jan 1970 00:00:00 -0000 -@@ -1,33 +0,0 @@ --APIS = \ -- atk-api.xml \ -- pango-api.xml \ -- gdk-api.xml \ -- gdk-symbols.xml \ -- gtk-api.xml \ -- gtk-symbols.xml \ -- glade-api.xml \ -- art-api.xml \ -- gnome-api.xml \ -- gda-api.xml \ -- gst-api.xml \ -- gnomedb-api.xml \ -- rsvg-api.xml \ -- -- --RUNTIME=mono -- --all: generated-stamp -- --generated-stamp: $(APIS) ../generator/gapi_codegen.exe -- $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) && touch generated-stamp -- --clean: -- rm -f generated-stamp -- --prefix=@prefix@ --DESTDIR= --apidir=$(DESTDIR)$(prefix)/share/gapi -- --install: all -- ../mkinstalldirs $(apidir) && \ -- cp $(APIS) $(apidir) - -Index: art/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/art/.cvsignore,v -retrieving revision 1.1 -diff -u -r1.1 .cvsignore ---- art/.cvsignore 16 Aug 2002 05:00:30 -0000 1.1 -+++ art/.cvsignore 9 Oct 2003 21:17:43 -0000 -@@ -1,6 +1,5 @@ - *.dll --*.exe --*.xml - generated -+generated-stamp - Makefile - -Index: art/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/art/Makefile.in,v -retrieving revision 1.6 -diff -u -r1.6 Makefile.in ---- art/Makefile.in 8 Oct 2003 22:13:35 -0000 1.6 -+++ art/Makefile.in 9 Oct 2003 21:17:43 -0000 -@@ -1,22 +1,39 @@ --MCS=mcs --DESTDIR= --prefix=@prefix@ -+APIS= art-api.xml - --all: linux -+INCLUDE_APIS = ../atk/atk-api.xml \ -+ ../pango/pango-api.xml \ -+ ../gdk/gdk-api.xml \ -+ ../gdk/gdk-symbols.xml - --windows: -- $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gdk/gdk-imaging-sharp.dll /out:art-sharp.dll /recurse:*.cs -+RUNTIME=mono -+MCS=mcs -+ASSEMBLY=art-sharp.dll - --linux: art-sharp.dll -+all: $(ASSEMBLY) - --art-sharp.dll: generated/*.cs -- $(MCS) --unsafe -nowarn:0660,0661 --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../gdk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r gdk-sharp.dll -o art-sharp.dll --recurse '*.cs' -+generated-stamp: $(APIS) ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ -+ --assembly-name=art-sharp && touch generated-stamp -+ -+$(ASSEMBLY): generated-stamp -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r System.Drawing -r ../glib/glib-sharp.dll \ -+ -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ -+ -r ../gdk/gdk-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' - - clean: -- rm -f *.dll -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib -+ - install: all -- ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -- cp art-sharp.dll $(DESTDIR)$(prefix)/lib -+ ../mkinstalldirs $(libdir) && \ -+ cp $(APIS) $(apidir) && \ -+ cp $(ASSEMBLY) $(libdir) - -Index: atk/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/atk/.cvsignore,v -retrieving revision 1.3 -diff -u -r1.3 .cvsignore ---- atk/.cvsignore 21 Jun 2002 12:29:03 -0000 1.3 -+++ atk/.cvsignore 9 Oct 2003 21:17:43 -0000 -@@ -1,6 +1,5 @@ - *.dll --*.exe --*.xml - generated -+generated-stamp - Makefile - -Index: atk/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/atk/Makefile.in,v -retrieving revision 1.10 -diff -u -r1.10 Makefile.in ---- atk/Makefile.in 8 Oct 2003 22:13:35 -0000 1.10 -+++ atk/Makefile.in 9 Oct 2003 21:17:43 -0000 -@@ -1,22 +1,34 @@ --MCS=mcs --DESTDIR= --prefix=@prefix@ -+APIS= atk-api.xml - --all: linux -+INCLUDE_APIS = ../pango/pango-api.xml - --windows: -- $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /out:atk-sharp.dll /recurse:*.cs -+RUNTIME=mono -+MCS=mcs -+ASSEMBLY=atk-sharp.dll - --linux: atk-sharp.dll -+all: $(ASSEMBLY) - --atk-sharp.dll: generated/*.cs -- $(MCS) --unsafe -nowarn:0660,0661 --target library -L ../glib -L ../pango -r glib-sharp.dll -r pango-sharp.dll -o atk-sharp.dll --recurse '*.cs' -+generated-stamp: $(APIS) ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ -+ --assembly-name=art-sharp && touch generated-stamp -+ -+$(ASSEMBLY): generated-stamp -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ -+ -o $(ASSEMBLY) --recurse '*.cs' - - clean: -- rm -f *.dll -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - --install: all -- ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -- cp atk-sharp.dll $(DESTDIR)$(prefix)/lib -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib - -+install: all -+ ../mkinstalldirs $(libdir) && \ -+ cp $(APIS) $(apidir) && \ -+ cp $(ASSEMBLY) $(libdir) - -Index: gda/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/gda/.cvsignore,v -retrieving revision 1.1 -diff -u -r1.1 .cvsignore ---- gda/.cvsignore 1 Sep 2002 10:29:39 -0000 1.1 -+++ gda/.cvsignore 9 Oct 2003 21:17:44 -0000 -@@ -1,6 +1,5 @@ - *.dll --*.exe --*.xml - generated -+generated-stamp - Makefile - -Index: gda/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/gda/Makefile.in,v -retrieving revision 1.6 -diff -u -r1.6 Makefile.in ---- gda/Makefile.in 8 Oct 2003 22:13:36 -0000 1.6 -+++ gda/Makefile.in 9 Oct 2003 21:17:44 -0000 -@@ -1,22 +1,34 @@ -+APIS= gda-api.xml -+ -+RUNTIME=mono - MCS=mcs --DESTDIR= --prefix=@prefix@ -+ASSEMBLY=gda-sharp.dll - --@ENABLE_GDA_TRUE@ all: linux -+@ENABLE_GDA_TRUE@ all: $(ASSEMBLY) - @ENABLE_GDA_FALSE@ all: - --windows: -- $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /out:gda-sharp.dll /recurse:*.cs -- --linux: gda-sharp.dll -+all: $(ASSEMBLY) - --gda-sharp.dll: Application.cs generated/*.cs -- $(MCS) --unsafe -nowarn:0660,0661 --target library -L ../glib -r glib-sharp.dll -o gda-sharp.dll --recurse '*.cs' -+generated-stamp: $(APIS) ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe \ -+ --generate $(APIS) --outdir=generated --customdir=. \ -+ --assembly-name=gda-sharp && touch generated-stamp -+ -+$(ASSEMBLY): generated-stamp *.cs -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r ../glib/glib-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' - - clean: -- rm -f *.dll -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib -+ - install: all --@ENABLE_GDA_TRUE@ ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ --@ENABLE_GDA_TRUE@ cp gda-sharp.dll $(DESTDIR)$(prefix)/lib -+@ENABLE_GDA_TRUE@ ../mkinstalldirs $(libdir) && \ -+@ENABLE_GDA_TRUE@ cp $(APIS) $(apidir) && \ -+@ENABLE_GDA_TRUE@ cp $(ASSEMBLY) $(libdir) - -Index: gdk/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/gdk/.cvsignore,v -retrieving revision 1.4 -diff -u -r1.4 .cvsignore ---- gdk/.cvsignore 21 Jun 2002 12:29:03 -0000 1.4 -+++ gdk/.cvsignore 9 Oct 2003 21:17:44 -0000 -@@ -1,6 +1,5 @@ - *.dll --*.exe --*.xml - generated -+generated-stamp - Makefile - -Index: gdk/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/gdk/Makefile.in,v -retrieving revision 1.12 -diff -u -r1.12 Makefile.in ---- gdk/Makefile.in 8 Oct 2003 22:13:36 -0000 1.12 -+++ gdk/Makefile.in 9 Oct 2003 21:17:44 -0000 -@@ -1,22 +1,38 @@ --MCS=mcs --DESTDIR= --prefix=@prefix@ -+APIS= gdk-api.xml gdk-symbols.xml - --all: linux -+INCLUDE_APIS = ../atk/atk-api.xml \ -+ ../pango/pango-api.xml - --windows: -- $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:gdk-sharp.dll /recurse:*.cs -+RUNTIME=mono -+MCS=mcs -+ASSEMBLY=gdk-sharp.dll - --linux: gdk-sharp.dll -+all: $(ASSEMBLY) - --gdk-sharp.dll: *.cs generated/*.cs -- $(MCS) --unsafe -nowarn:0660,0661 --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -o gdk-sharp.dll --recurse '*.cs' -+generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ -+ --assembly-name=gdk-sharp && touch generated-stamp -+ -+$(ASSEMBLY): *.cs generated-stamp -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r System.Drawing -r ../glib/glib-sharp.dll \ -+ -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ -+ -o $(ASSEMBLY) --recurse '*.cs' - - clean: -- rm -f *.dll -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - --install: all -- ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -- cp gdk-sharp.dll $(DESTDIR)$(prefix)/lib -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib - -+install: all -+ ../mkinstalldirs $(libdir) && \ -+ for i in $(APIS); do \ -+ cp $$i $(apidir); \ -+ done && \ -+ cp $(ASSEMBLY) $(libdir) - -Index: gdk/gdk-symbols.xml -=================================================================== -RCS file: gdk/gdk-symbols.xml -diff -N gdk/gdk-symbols.xml ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gdk/gdk-symbols.xml 9 Oct 2003 21:17:45 -0000 -@@ -0,0 +1,5 @@ -+ -+ -+ -+ -+ -Index: glade/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/glade/.cvsignore,v -retrieving revision 1.1 -diff -u -r1.1 .cvsignore ---- glade/.cvsignore 16 Aug 2002 05:00:31 -0000 1.1 -+++ glade/.cvsignore 9 Oct 2003 21:17:45 -0000 -@@ -1,6 +1,5 @@ - *.dll --*.exe --*.xml - generated -+generated-stamp - Makefile - -Index: glade/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/glade/Makefile.in,v -retrieving revision 1.6 -diff -u -r1.6 Makefile.in ---- glade/Makefile.in 8 Oct 2003 22:13:36 -0000 1.6 -+++ glade/Makefile.in 9 Oct 2003 21:17:45 -0000 -@@ -1,22 +1,42 @@ --MCS=mcs --DESTDIR= --prefix=@prefix@ -+APIS= glade-api.xml - --@ENABLE_GLADE_TRUE@ all: linux --@ENABLE_GLADE_FALSE@ all: -+INCLUDE_APIS = ../atk/atk-api.xml \ -+ ../pango/pango-api.xml \ -+ ../gdk/gdk-api.xml \ -+ ../gdk/gdk-symbols.xml \ -+ ../gtk/gtk-api.xml \ -+ ../gtk/gtk-symbols.xml - --windows: -- $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /out:glade-sharp.dll /recurse:*.cs -+RUNTIME=mono -+MCS=mcs -+ASSEMBLY=glade-sharp.dll - --linux: glade-sharp.dll -+@ENABLE_GLADE_TRUE@ all: $(ASSEMBLY) -+@ENABLE_GLADE_FALSE@ all: - --glade-sharp.dll: *.cs generated/*.cs -- $(MCS) --unsafe -nowarn:0660,0661 --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../gdk -L ../gtk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -o glade-sharp.dll --recurse '*.cs' -+generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ -+ --assembly-name=art-sharp && touch generated-stamp -+ -+$(ASSEMBLY): *.cs generated-stamp -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r System.Drawing -r ../glib/glib-sharp.dll \ -+ -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ -+ -r ../gdk/gdk-sharp.dll -r ../gtk/gtk-sharp.dll \ -+ -o $(ASSEMBLY) --recurse '*.cs' - - clean: -- rm -f *.dll -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib -+ - install: all --@ENABLE_GLADE_TRUE@ ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ --@ENABLE_GLADE_TRUE@ cp glade-sharp.dll $(DESTDIR)$(prefix)/lib -+@ENABLE_GLADE_TRUE@ ../mkinstalldirs $(libdir) && \ -+@ENABLE_GLADE_TRUE@ cp $(APIS) $(apidir) && \ -+@ENABLE_GLADE_TRUE@ cp $(ASSEMBLY) $(libdir) - -Index: gnome/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/gnome/.cvsignore,v -retrieving revision 1.1 -diff -u -r1.1 .cvsignore ---- gnome/.cvsignore 4 Aug 2002 18:54:11 -0000 1.1 -+++ gnome/.cvsignore 9 Oct 2003 21:17:45 -0000 -@@ -1,6 +1,5 @@ - *.dll --*.exe --*.xml - generated -+generated-stamp - Makefile - -Index: gnome/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/gnome/Makefile.in,v -retrieving revision 1.10 -diff -u -r1.10 Makefile.in ---- gnome/Makefile.in 8 Oct 2003 22:13:37 -0000 1.10 -+++ gnome/Makefile.in 9 Oct 2003 21:17:45 -0000 -@@ -1,23 +1,43 @@ --MCS=mcs --DESTDIR= --prefix=@prefix@ -+APIS= gnome-api.xml - --@ENABLE_GNOME_TRUE@ all: linux --@ENABLE_GNOME_FALSE@ all: -+INCLUDE_APIS = ../atk/atk-api.xml \ -+ ../pango/pango-api.xml \ -+ ../art/art-api.xml \ -+ ../gdk/gdk-api.xml \ -+ ../gdk/gdk-symbols.xml \ -+ ../gtk/gtk-api.xml \ -+ ../gtk/gtk-symbols.xml - --windows: -- $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /out:gnome-sharp.dll /recurse:*.cs -+RUNTIME=mono -+MCS=mcs -+ASSEMBLY=gnome-sharp.dll - --linux: gnome-sharp.dll -+@ENABLE_GNOME_TRUE@ all: $(ASSEMBLY) -+@ENABLE_GNOME_FALSE@ all: - --gnome-sharp.dll: generated/*.cs -- $(MCS) --unsafe -nowarn:0660,0661 --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../art -L ../gdk -L ../gtk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r art-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -o gnome-sharp.dll --recurse '*.cs' -+generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ -+ --assembly-name=gnome-sharp && touch generated-stamp -+ -+$(ASSEMBLY): *.cs generated-stamp -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r System.Drawing -r ../glib/glib-sharp.dll \ -+ -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ -+ -r ../art/art-sharp.dll -r ../gdk/gdk-sharp.dll \ -+ -r ../gtk/gtk-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' - - clean: -- rm -f *.dll -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - --install: all --@ENABLE_GNOME_TRUE@ ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ --@ENABLE_GNOME_TRUE@ cp gnome-sharp.dll $(DESTDIR)$(prefix)/lib -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib - -+install: all -+@ENABLE_GNOME_TRUE@ ../mkinstalldirs $(libdir) && \ -+@ENABLE_GNOME_TRUE@ cp $(APIS) $(apidir) && \ -+@ENABLE_GNOME_TRUE@ cp $(ASSEMBLY) $(libdir) - -Index: gnomedb/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/gnomedb/.cvsignore,v -retrieving revision 1.1 -diff -u -r1.1 .cvsignore ---- gnomedb/.cvsignore 11 Sep 2002 09:43:17 -0000 1.1 -+++ gnomedb/.cvsignore 9 Oct 2003 21:17:51 -0000 -@@ -1,6 +1,5 @@ - *.dll --*.exe --*.xml - generated -+generated-stamp - Makefile - -Index: gnomedb/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/gnomedb/Makefile.in,v -retrieving revision 1.6 -diff -u -r1.6 Makefile.in ---- gnomedb/Makefile.in 8 Oct 2003 22:13:44 -0000 1.6 -+++ gnomedb/Makefile.in 9 Oct 2003 21:17:51 -0000 -@@ -1,22 +1,46 @@ --MCS=mcs --DESTDIR= --prefix=@prefix@ -+APIS= gnomedb-api.xml - --@ENABLE_GNOMEDB_TRUE@ all: linux --@ENABLE_GNOMEDB_FALSE@ all: -+INCLUDE_APIS = ../atk/atk-api.xml \ -+ ../pango/pango-api.xml \ -+ ../art/art-api.xml \ -+ ../gdk/gdk-api.xml \ -+ ../gdk/gdk-symbols.xml \ -+ ../gtk/gtk-api.xml \ -+ ../gtk/gtk-symbols.xml \ -+ ../gnome/gnome-api.xml \ -+ ../gda/gda-api.xml - --windows: -- $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../art/art-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../gnome/gnome-sharp.dll /r:../gda/gda-sharp.dll /out:gnomedb-sharp.dll /recurse:*.cs -+RUNTIME=mono -+MCS=mcs -+ASSEMBLY=gnomedb-sharp.dll - --linux: gnomedb-sharp.dll -+@ENABLE_GNOMEDB_TRUE@ all: $(ASSEMBLY) -+@ENABLE_GNOMEDB_FALSE@ all: - --gnomedb-sharp.dll: Application.cs generated/*.cs -- $(MCS) --unsafe -nowarn:0660,0661 --target library -L ../glib -L ../pango -L ../atk -L ../art -L ../gdk -L ../gtk -L ../gnome -L ../gda -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r art-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -r gnome-sharp.dll -r gda-sharp.dll -o gnomedb-sharp.dll --recurse '*.cs' -+generated-stamp: $(APIS) ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ -+ --assembly-name=gnomedb-sharp && touch generated-stamp -+ -+$(ASSEMBLY): *.cs generated-stamp -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ -+ -r ../atk/atk-sharp.dll -r ../art/art-sharp.dll \ -+ -r ../gdk/gdk-sharp.dll -r ../gtk/gtk-sharp.dll \ -+ -r ../gnome/gnome-sharp.dll -r ../gda/gda-sharp.dll \ -+ -o $(ASSEMBLY) --recurse '*.cs' - - clean: -- rm -f *.dll -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib -+ - install: all --@ENABLE_GNOMEDB_TRUE@ ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ --@ENABLE_GNOMEDB_TRUE@ cp gnomedb-sharp.dll $(DESTDIR)$(prefix)/lib -+@ENABLE_GNOMEDB_TRUE@ ../mkinstalldirs $(libdir) && \ -+@ENABLE_GNOMEDB_TRUE@ cp $(APIS) $(apidir) && \ -+@ENABLE_GNOMEDB_TRUE@ cp $(ASSEMBLY) $(libdir) - -Index: gst/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/gst/.cvsignore,v -retrieving revision 1.1 -diff -u -r1.1 .cvsignore ---- gst/.cvsignore 3 Nov 2002 22:03:42 -0000 1.1 -+++ gst/.cvsignore 9 Oct 2003 21:17:51 -0000 -@@ -1,6 +1,5 @@ - *.dll --*.exe --*.xml - generated -+generated-stamp - Makefile - -Index: gst/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/gst/Makefile.in,v -retrieving revision 1.4 -diff -u -r1.4 Makefile.in ---- gst/Makefile.in 8 Oct 2003 22:13:46 -0000 1.4 -+++ gst/Makefile.in 9 Oct 2003 21:17:51 -0000 -@@ -1,22 +1,33 @@ --MCS=mcs --DESTDIR= --prefix=@prefix@ -+APIS= gst-api.xml - --all: linux -- --windows: -- $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /out:gst-sharp.dll /recurse:*.cs -+RUNTIME=mono -+MCS=mcs -+ASSEMBLY=gst-sharp.dll - --linux: gst-sharp.dll -+all: $(ASSEMBLY) - --gst-sharp.dll: *.cs -- $(MCS) --unsafe --target library -L ../glib -r glib-sharp.dll -o gst-sharp.dll --recurse '*.cs' -+generated-stamp: $(APIS) ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --outdir=generated --customdir=. --assembly-name=gst-sharp \ -+ && touch generated-stamp -+ -+$(ASSEMBLY): *.cs generated-stamp -+ $(MCS) --unsafe --target library \ -+ -r glib-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' - - clean: -- rm -f *.dll -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib -+ - install: all -- ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -- cp gst-sharp.dll $(DESTDIR)$(prefix)/lib || exit 1 -+ ../mkinstalldirs $(libdir) && \ -+ cp $(APIS) $(apidir) && \ -+ cp $(ASSEMBLY) $(libdir) -+ - - -Index: gtk/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/gtk/.cvsignore,v -retrieving revision 1.5 -diff -u -r1.5 .cvsignore ---- gtk/.cvsignore 21 Jun 2002 12:29:04 -0000 1.5 -+++ gtk/.cvsignore 9 Oct 2003 21:17:51 -0000 -@@ -1,6 +1,5 @@ - *.dll --*.exe --*.xml - generated -+generated-stamp - Makefile - -Index: gtk/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/gtk/Makefile.in,v -retrieving revision 1.14 -diff -u -r1.14 Makefile.in ---- gtk/Makefile.in 8 Oct 2003 22:13:47 -0000 1.14 -+++ gtk/Makefile.in 9 Oct 2003 21:17:51 -0000 -@@ -1,22 +1,40 @@ --MCS=mcs --DESTDIR= --prefix=@prefix@ -+APIS= gtk-api.xml gtk-symbols.xml - --all: linux -+INCLUDE_APIS = ../atk/atk-api.xml \ -+ ../pango/pango-api.xml \ -+ ../gdk/gdk-api.xml \ -+ ../gdk/gdk-symbols.xml - --windows: -- $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gdk/gdk-imaging-sharp.dll /out:gtk-sharp.dll /recurse:*.cs -+RUNTIME=mono -+MCS=mcs -+ASSEMBLY=gtk-sharp.dll - --linux: gtk-sharp.dll -+all: $(ASSEMBLY) - --gtk-sharp.dll: *.cs generated/*.cs -- $(MCS) --unsafe -nowarn:0660,0661 --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../gdk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r gdk-sharp.dll -o gtk-sharp.dll --recurse '*.cs' -+generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ -+ --assembly-name=gtk-sharp && touch generated-stamp -+ -+$(ASSEMBLY): *.cs generated-stamp -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r System.Drawing -r ../glib/glib-sharp.dll \ -+ -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ -+ -r ../gdk/gdk-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' - - clean: -- rm -f *.dll -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - --install: all -- ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -- cp gtk-sharp.dll $(DESTDIR)$(prefix)/lib -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib - -+install: all -+ ../mkinstalldirs $(libdir) && \ -+ for i in $(APIS); do \ -+ cp $$i $(apidir) || true; \ -+ done && \ -+ cp $(ASSEMBLY) $(libdir) - -Index: gtk/gtk-symbols.xml -=================================================================== -RCS file: gtk/gtk-symbols.xml -diff -N gtk/gtk-symbols.xml ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gtk/gtk-symbols.xml 9 Oct 2003 21:17:53 -0000 -@@ -0,0 +1,5 @@ -+ -+ -+ -+ -+ -Index: gtkhtml/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/gtkhtml/.cvsignore,v -retrieving revision 1.2 -diff -u -r1.2 .cvsignore ---- gtkhtml/.cvsignore 7 Oct 2003 16:19:51 -0000 1.2 -+++ gtkhtml/.cvsignore 9 Oct 2003 21:17:53 -0000 -@@ -1,4 +1,4 @@ --gtkhtml-sharp.dll -+*.dll - generated - generated-stamp - Makefile -Index: gtkhtml/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/gtkhtml/Makefile.in,v -retrieving revision 1.4 -diff -u -r1.4 Makefile.in ---- gtkhtml/Makefile.in 7 Oct 2003 17:11:19 -0000 1.4 -+++ gtkhtml/Makefile.in 9 Oct 2003 21:17:53 -0000 -@@ -1,25 +1,34 @@ --INCLUDE_APIS = \ -- ../api/atk-api.xml \ -- ../api/pango-api.xml \ -- ../api/gdk-api.xml \ -- ../api/gdk-symbols.xml \ -- ../api/gtk-symbols.xml \ -- ../api/gtk-api.xml \ -- ../api/gnome-api.xml -+APIS= gtkhtml-api.xml -+ -+INCLUDE_APIS = ../atk/atk-api.xml \ -+ ../pango/pango-api.xml \ -+ ../gdk/gdk-api.xml \ -+ ../gdk/gdk-symbols.xml \ -+ ../gtk/gtk-symbols.xml \ -+ ../gtk/gtk-api.xml \ -+ ../gnome/gnome-api.xml - - RUNTIME=mono -+MCS=mcs -+ASSEMBLY=gtkhtml-sharp.dll - --all: gtkhtml-sharp.dll -+all: $(ASSEMBLY) - - generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe -- $(RUNTIME) ../generator/gapi_codegen.exe --generate gtkhtml-api.xml --include $(INCLUDE_APIS) --outdir=generated --customdir=. --assembly-name=gtkhtml-sharp && touch generated-stamp -- --gtkhtml-sharp.dll: generated-stamp -- $(MCS) --unsafe -nowarn:0660,0661 --target library -L ../glib -L ../pango -L ../atk -L ../gdk -L ../gtk -L ../art -L ../gnome -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -r art-sharp.dll -r gnome-sharp.dll -o gtkhtml-sharp.dll --recurse '*.cs' -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ -+ --assembly-name=gtkhtml-sharp && touch generated-stamp -+ -+$(ASSEMBLY): generated-stamp -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ -+ -r ../atk/atk-sharp.dll -r ../gdk/gdk-sharp.dll \ -+ -r ../gtk/gtk-sharp.dll -r ../art/art-sharp.dll \ -+ -r ../gnome/gnome-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' - - clean: - rm -f generated-stamp -- rm -f gtkhtml-sharp.dll -+ rm -f $(ASSEMBLY) - rm -rf generated - - prefix=@prefix@ -@@ -29,5 +38,5 @@ - - install: all - ../mkinstalldirs $(apidir) && \ -- cp gtkhtml-api.xml $(apidir) && \ -- cp gtkhtml-sharp.dll $(libdir) -+ cp $(APIS) $(apidir) && \ -+ cp $(ASSEMBLY) $(libdir) -Index: pango/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/pango/.cvsignore,v -retrieving revision 1.4 -diff -u -r1.4 .cvsignore ---- pango/.cvsignore 21 Jun 2002 12:29:04 -0000 1.4 -+++ pango/.cvsignore 9 Oct 2003 21:17:53 -0000 -@@ -1,6 +1,5 @@ - *.dll --*.exe --*.xml - generated -+generated-stamp - Makefile - -Index: pango/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/pango/Makefile.in,v -retrieving revision 1.11 -diff -u -r1.11 Makefile.in ---- pango/Makefile.in 8 Oct 2003 22:13:47 -0000 1.11 -+++ pango/Makefile.in 9 Oct 2003 21:17:53 -0000 -@@ -1,22 +1,32 @@ --MCS=mcs --DESTDIR= --prefix=@prefix@ -+APIS= pango-api.xml - --all: linux -- --windows: -- $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /out:pango-sharp.dll /recurse:*.cs -+RUNTIME=mono -+MCS=mcs -+ASSEMBLY=pango-sharp.dll - --linux: pango-sharp.dll -+all: $(ASSEMBLY) - --pango-sharp.dll: generated/*.cs -- $(MCS) --unsafe -nowarn:0660,0661 --target library -L ../glib -r glib-sharp.dll -r System.Drawing -o pango-sharp.dll --recurse '*.cs' -+generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --outdir=generated --customdir=. --assembly-name=pango-sharp \ -+ && touch generated-stamp -+ -+$(ASSEMBLY): *.cs generated-stamp -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r System.Drawing -r glib-sharp.dll \ -+ -o $(ASSEMBLY) --recurse '*.cs' - - clean: -- rm -f *.dll -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - --install: all -- ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ -- cp pango-sharp.dll $(DESTDIR)$(prefix)/lib -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib - -+install: all -+ ../mkinstalldirs $(libdir) && \ -+ cp $(APIS) $(apidir) && \ -+ cp $(ASSEMBLY) $(libdir) - -Index: rsvg/.cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/rsvg/.cvsignore,v -retrieving revision 1.1 -diff -u -r1.1 .cvsignore ---- rsvg/.cvsignore 27 Feb 2003 05:16:47 -0000 1.1 -+++ rsvg/.cvsignore 9 Oct 2003 21:17:53 -0000 -@@ -1,4 +1,5 @@ - *.dll - generated -+generated-stamp - Makefile - -Index: rsvg/Makefile.in -=================================================================== -RCS file: /cvs/public/gtk-sharp/rsvg/Makefile.in,v -retrieving revision 1.5 -diff -u -r1.5 Makefile.in ---- rsvg/Makefile.in 8 Oct 2003 22:13:47 -0000 1.5 -+++ rsvg/Makefile.in 9 Oct 2003 21:17:53 -0000 -@@ -1,39 +1,43 @@ --COMPILER=mcs --OUTPUT=rsvg-sharp.dll --prefix=@prefix@ -- --@ENABLE_RSVG_TRUE@ all: linux --@ENABLE_RSVG_FALSE@ all: -- --linux: $(OUTPUT) -- --$(OUTPUT): *.cs generated/*.cs -- $(COMPILER) \ -- --unsafe\ -- -nowarn:0660,0661 \ -- --target library \ -- -r ../glib/glib-sharp.dll \ -- -r ../pango/pango-sharp.dll \ -- -r ../atk/atk-sharp.dll \ -- -r ../gdk/gdk-sharp.dll \ -- -r ../gtk/gtk-sharp.dll \ -- -r ../art/art-sharp.dll \ -- -o $(OUTPUT) \ -- --recurse '*.cs' -- -+APIS= rsvg-api.xml - -+INCLUDE_APIS = ../atk/atk-api.xml \ -+ ../pango/pango-api.xml \ -+ ../gdk/gdk-api.xml \ -+ ../gdk/gdk-symbols.xml \ -+ ../gtk/gtk-api.xml \ -+ ../gtk/gtk-symbols.xml \ -+ ../art/art-api.xml -+ -+RUNTIME=mono -+MCS=mcs -+ASSEMBLY=rsvg-sharp.dll - --clean: clean-dll clean-generated -- --clean-dll: -- rm -f *.dll -+@ENABLE_RSVG_TRUE@ all: $(ASSEMBLY) -+@ENABLE_RSVG_FALSE@ all: - --clean-generated: -+generated-stamp: $(APIS) ../generator/gapi_codegen.exe -+ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ -+ --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ -+ --assembly-name=rsvg-sharp && touch generated-stamp -+ -+$(ASSEMBLY): *.cs generated-stamp -+ $(MCS) --unsafe -nowarn:0660,0661 --target library \ -+ -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ -+ -r ../atk/atk-sharp.dll -r ../gdk/gdk-sharp.dll \ -+ -r ../gtk/gtk-sharp.dll -r ../art/art-sharp.dll \ -+ -o $(ASSEMBLY) --recurse '*.cs' -+ -+clean: -+ rm -f generated-stamp -+ rm -f $(ASSEMBLY) - rm -rf generated - -- -+prefix=/usr -+DESTDIR= -+apidir=$(DESTDIR)$(prefix)/share/gapi -+libdir=$(DESTDIR)$(prefix)/lib - - install: all --@ENABLE_RSVG_TRUE@ ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ --@ENABLE_RSVG_TRUE@ cp $(OUTPUT) $(DESTDIR)$(prefix)/lib -- -+@ENABLE_RSVG_TRUE@ ../mkinstalldirs $(libdir) && \ -+@ENABLE_RSVG_TRUE@ cp $(APIS) $(apidir) && \ -+@ENABLE_RSVG_TRUE@ cp $(ASSEMBLY) $(libdir) - -Index: sources/gtk-sharp-sources.xml -=================================================================== -RCS file: /cvs/public/gtk-sharp/sources/gtk-sharp-sources.xml,v -retrieving revision 1.2 -diff -u -r1.2 gtk-sharp-sources.xml ---- sources/gtk-sharp-sources.xml 7 Oct 2003 05:52:23 -0000 1.2 -+++ sources/gtk-sharp-sources.xml 9 Oct 2003 21:17:53 -0000 -@@ -1,19 +1,19 @@ - -- -+ - - -

atk-1.2.4/atk - - - -- -+ - - - pango-1.2.3/pango - - - -- -+ - - - gtk+-2.2.2/gdk -@@ -25,14 +25,14 @@ - - - -- -+ - - - gtk+-2.2.2/gtk - - - -- -+ - - - libgnome-2.2.3/libgnome -@@ -67,42 +67,42 @@ - - - -- -+ - - - libglade-2.0.0/glade - - - -- -+ - - - libart_lgpl-2.3.10 - - - -- -+ - - - libgda-1.0.0/libgda - - - -- -+ - - - libgnomedb-1.0.0/libgnomedb - - - -- -+ - - - gstreamer-0.4.2/gst - - - -- -+ - - - librsvg-2.2.5 diff --git a/patches/gtksharp/GnomePrintFixes.diff b/patches/gtksharp/GnomePrintFixes.diff deleted file mode 100644 index caecf0c..0000000 --- a/patches/gtksharp/GnomePrintFixes.diff +++ /dev/null @@ -1,158 +0,0 @@ -? GnomePrintFixes.diff -Index: ChangeLog -=================================================================== -RCS file: /cvs/public/gtk-sharp/ChangeLog,v -retrieving revision 1.484 -diff -u -r1.484 ChangeLog ---- ChangeLog 5 Oct 2003 00:37:24 -0000 1.484 -+++ ChangeLog 8 Oct 2003 07:12:04 -0000 -@@ -1,3 +1,12 @@ -+2003-10-06 Martin Willemoes Hansen -+ -+ * gnome/PrintJob.custom: Added default ctor. -+ * gnome/PrintDialog.custom: Added overloaded ctor with fewer parameters. -+ * sources/Gnome.metadata: Disabled default ctor for PrintJob, -+ changed type from int to PrintDialogFlags for PrintDialog ctor and -+ changed return type from byte to string for PrintConfig.Get. -+ * api/Makefile: Added gtkhtml-api.xml -+ - 2003-10-04 Mike Kestner - - * generator/CallbackGen.cs : remove CloseWriter call. -Index: api/gnome-api.xml -=================================================================== -RCS file: /cvs/public/gtk-sharp/api/gnome-api.xml,v -retrieving revision 1.17 -diff -u -r1.17 gnome-api.xml ---- api/gnome-api.xml 2 Oct 2003 15:48:36 -0000 1.17 -+++ api/gnome-api.xml 8 Oct 2003 07:12:07 -0000 -@@ -4937,7 +4937,7 @@ - - - -- -+ - - - -@@ -5056,7 +5056,7 @@ - - - -- -+ - - - -@@ -6512,7 +6512,7 @@ - - - -- -+ - - - -Index: gnome/PrintDialog.custom -=================================================================== -RCS file: gnome/PrintDialog.custom -diff -N gnome/PrintDialog.custom ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnome/PrintDialog.custom 8 Oct 2003 07:12:10 -0000 -@@ -0,0 +1,12 @@ -+// -+// PrintDialog.custom - customizations -+// -+// Author: Martin Willemoes Hansen -+// -+// Copyright (C) 2003 Martin Willemoes Hansen -+// -+// This code is inserted after the automatically generated code. -+// -+ -+public PrintDialog (Gnome.PrintJob gpj, string title) -+ : this (gpj, title, 0) {} -Index: gnome/PrintJob.custom -=================================================================== -RCS file: gnome/PrintJob.custom -diff -N gnome/PrintJob.custom ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnome/PrintJob.custom 8 Oct 2003 07:12:10 -0000 -@@ -0,0 +1,14 @@ -+// -+// PrintJob.custom - customizations -+// -+// Author: Martin Willemoes Hansen -+// -+// Copyright (C) 2003 Martin Willemoes Hansen -+// -+// This code is inserted after the automatically generated code. -+// -+ -+public PrintJob() -+{ -+ Raw = gnome_print_job_new (PrintConfig.Default().Handle); -+} -Index: sources/Gnome.metadata -=================================================================== -RCS file: /cvs/public/gtk-sharp/sources/Gnome.metadata,v -retrieving revision 1.12 -diff -u -r1.12 Gnome.metadata ---- sources/Gnome.metadata 29 Sep 2003 11:05:30 -0000 1.12 -+++ sources/Gnome.metadata 8 Oct 2003 07:12:10 -0000 -@@ -319,6 +319,17 @@ - - - -+ -+ -+ -+ -+ -+ disabledefaultconstructor -+ 1 -+ -+ -+ -+ - - - -@@ -332,6 +343,18 @@ - - - -+ -+ -+ gnome_print_dialog_new -+ -+ -+ -+ flags -+ type -+ GnomePrintDialogFlags -+ -+ -+ - - - -@@ -499,6 +522,18 @@ - - type - const-gchar* -+ -+ -+ -+ -+ -+ -+ Get -+ -+ -+ -+ type -+ gchar* - - - diff --git a/patches/gtksharp/UpdateTargetsToGnome2.2.diff b/patches/gtksharp/UpdateTargetsToGnome2.2.diff deleted file mode 100644 index 522ebe5..0000000 --- a/patches/gtksharp/UpdateTargetsToGnome2.2.diff +++ /dev/null @@ -1,183 +0,0 @@ -Index: .cvsignore -=================================================================== -RCS file: /cvs/public/gtk-sharp/sources/.cvsignore,v -retrieving revision 1.3 -diff -u -r1.3 .cvsignore ---- .cvsignore 26 Aug 2003 21:35:28 -0000 1.3 -+++ .cvsignore 15 Sep 2003 15:37:25 -0000 -@@ -3,13 +3,13 @@ - gtk+-2.2.2 - gtkhtml-3.0.8 - libart_lgpl-2.3.10 --libgda-0.90.0 -+libgda-1.0.0 - libglade-2.0.0 --libgnome-2.0.1 --libgnomecanvas-2.0.1 --libgnomedb-0.90.0 -+libgnome-2.2.3 -+libgnomecanvas-2.2.1 -+libgnomedb-1.0.0 - libgnomeprint-2.2.1.3 - libgnomeprintui-2.2.1.3 --libgnomeui-2.0.1 --librsvg-2.0.1 -+libgnomeui-2.2.2 -+librsvg-2.2.5 - pango-1.2.3 -Index: Gda.metadata -=================================================================== -RCS file: /cvs/public/gtk-sharp/sources/Gda.metadata,v -retrieving revision 1.4 -diff -u -r1.4 Gda.metadata ---- Gda.metadata 12 Jul 2003 17:59:05 -0000 1.4 -+++ Gda.metadata 15 Sep 2003 15:37:25 -0000 -@@ -90,6 +90,24 @@ - - - -+ -+ -+ -+ -+ SetNColumns -+ -+ -+ SetNColumns -+ -+ -+ -+ new_flag -+ 1 -+ -+ -+ -+ -+ - - - ToXmlNode -Index: Gdk.metadata -=================================================================== -RCS file: /cvs/public/gtk-sharp/sources/Gdk.metadata,v -retrieving revision 1.19 -diff -u -r1.19 Gdk.metadata ---- Gdk.metadata 6 Sep 2003 18:11:13 -0000 1.19 -+++ Gdk.metadata 15 Sep 2003 15:37:25 -0000 -@@ -163,7 +163,7 @@ - - - -- GdkDrawable* -+ GdkDrawable** - pass_as - out - -Index: Gtk.metadata -=================================================================== -RCS file: /cvs/public/gtk-sharp/sources/Gtk.metadata,v -retrieving revision 1.60 -diff -u -r1.60 Gtk.metadata ---- Gtk.metadata 28 Aug 2003 16:35:19 -0000 1.60 -+++ Gtk.metadata 15 Sep 2003 15:37:25 -0000 -@@ -1869,6 +1869,31 @@ - - - -+ -+ -+ -+ PrintWithHeaderFooter -+ PrintSetMaster -+ Print -+ PrintGetPagesNum -+ -+ -+ -+ hidden -+ 1 -+ -+ -+ -+ -+ -+ -+ -+ hidden -+ 1 -+ -+ -+ -+ - - - -Index: gtk-sharp.sources -=================================================================== -RCS file: /cvs/public/gtk-sharp/sources/gtk-sharp.sources,v -retrieving revision 1.20 -diff -u -r1.20 gtk-sharp.sources ---- gtk-sharp.sources 26 Aug 2003 21:35:28 -0000 1.20 -+++ gtk-sharp.sources 15 Sep 2003 15:37:25 -0000 -@@ -3,16 +3,16 @@ - gtk+-2.2.2/gdk Gdk libgdk-win32-2.0-0.dll - gtk+-2.2.2/gdk-pixbuf Gdk libgdk_pixbuf-2.0-0.dll - gtk+-2.2.2/gtk Gtk libgtk-win32-2.0-0.dll --libgnome-2.0.1/libgnome Gnome gnome-2 --libgnomecanvas-2.0.1/libgnomecanvas Gnome gnomecanvas-2 --libgnomeui-2.0.1/libgnomeui Gnome gnomeui-2 -+libgnome-2.2.3/libgnome Gnome gnome-2 -+libgnomecanvas-2.2.1/libgnomecanvas Gnome gnomecanvas-2 -+libgnomeui-2.2.2/libgnomeui Gnome gnomeui-2 - libgnomeprint-2.2.1.3/libgnomeprint Gnome gnomeprint-2-2 - libgnomeprintui-2.2.1.3/libgnomeprintui Gnome gnomeprint-2-2 - libgnomeprintui-2.2.1.3/libgnomeprintui/gpaui Gnome gnomeprint-2.2 - gtkhtml-3.0.8/src Gtk gtkhtml-3.0 - libglade-2.0.0/glade Glade libglade-2.0-0.dll - libart_lgpl-2.3.10 Art art_lgpl --libgda-0.90.0/libgda Gda gda-2 --libgnomedb-0.90.0/libgnomedb GnomeDb gnomedb-2 -+libgda-1.0.0/libgda Gda gda-2 -+libgnomedb-1.0.0/libgnomedb GnomeDb gnomedb-2 - gstreamer-0.4.2/gst Gst gstreamer --librsvg-2.0.1 Rsvg rsvg-2 -+librsvg-2.2.5 Rsvg rsvg-2 -Index: makefile -=================================================================== -RCS file: /cvs/public/gtk-sharp/sources/makefile,v -retrieving revision 1.15 -diff -u -r1.15 makefile ---- makefile 26 Aug 2003 21:35:28 -0000 1.15 -+++ makefile 15 Sep 2003 15:37:25 -0000 -@@ -1,19 +1,18 @@ - DOWNLOADS = \ -- http://ftp.gnome.org/pub/GNOME/sources/pango/1.2/pango-1.2.3.tar.gz \ -- http://ftp.gnome.org/pub/GNOME/sources/atk/1.2/atk-1.2.4.tar.gz \ -- http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.2/gtk+-2.2.2.tar.gz \ -- http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libgnome-2.0.1.tar.gz \ -- http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libgnomecanvas-2.0.1.tar.gz \ -- http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libgnomeui-2.0.1.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/pango-1.2.3.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/atk-1.2.4.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/gtk+-2.2.2.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/libgnome-2.2.3.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/libgnomecanvas-2.2.1.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/libgnomeui-2.2.2.tar.gz \ - http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/libgnomeprint-2.2.1.3.tar.gz \ - http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/libgnomeprintui-2.2.1.3.tar.gz \ -- http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libglade-2.0.0.tar.gz \ -- http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.3/sources/libart_lgpl-2.3.10.tar.gz \ -- ftp://ftp.gnome-db.org/pub/gnome-db/sources/v0.90.0/libgda-0.90.0.tar.gz \ -- ftp://ftp.gnome-db.org/pub/gnome-db/sources/v0.90.0/libgnomedb-0.90.0.tar.gz \ -- ftp://unc.dl.sourceforge.net/sourceforge/gstreamer/gstreamer-0.4.2.tar.gz \ -- http://ftp.gnome.org/pub/GNOME/sources/gstreamer/0.4/gstreamer-0.4.2.tar.gz \ -- http://ftp.gnome.org/pub/gnome/sources/librsvg/2.0/librsvg-2.0.1.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libglade-2.0.0.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.3/sources/libart_lgpl-2.3.10.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/desktop/2.2/2.2.2/sources/librsvg-2.2.5.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/sources/gstreamer/0.4/gstreamer-0.4.2.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/sources/libgda/1.0/libgda-1.0.0.tar.gz \ -+ http://ftp.gnome.org/pub/GNOME/sources/libgnomedb/1.0/libgnomedb-1.0.0.tar.gz \ - - GTKHTML_SOURCES = \ - gtkhtml-3.0.8/src/gtkhtml.c \ diff --git a/patches/gtksharp/const-gucharVsconst-gchar.diff b/patches/gtksharp/const-gucharVsconst-gchar.diff deleted file mode 100644 index cc3da46..0000000 --- a/patches/gtksharp/const-gucharVsconst-gchar.diff +++ /dev/null @@ -1,703 +0,0 @@ -? const-gucharVsconst-gchar.diff -Index: ChangeLog -=================================================================== -RCS file: /cvs/public/gtk-sharp/ChangeLog,v -retrieving revision 1.476 -diff -u -r1.476 ChangeLog ---- ChangeLog 28 Sep 2003 11:20:00 -0000 1.476 -+++ ChangeLog 29 Sep 2003 11:02:06 -0000 -@@ -1,3 +1,8 @@ -+2003-09-29 Martin Willemoes Hansen -+ -+ * sources/Gnome.metadata: Use const-gchar* instead of const-guchar*, -+ when the value is realy a string -+ - 2003-09-28 Martin Willemoes Hansen - - * sources/gtk-sharp.sources: Fixed, wrong library used for libgnomeprintui -Index: api/gnome-api.xml -=================================================================== -RCS file: /cvs/public/gtk-sharp/api/gnome-api.xml,v -retrieving revision 1.14 -diff -u -r1.14 gnome-api.xml ---- api/gnome-api.xml 28 Sep 2003 11:20:01 -0000 1.14 -+++ api/gnome-api.xml 29 Sep 2003 11:02:10 -0000 -@@ -4549,27 +4549,27 @@ - - - -- -+ - - - - - - -- -+ - - - - - - -- -+ - - - - - -- -+ - - - -@@ -4578,7 +4578,7 @@ - - - -- -+ - - - -@@ -4598,7 +4598,7 @@ - - - -- -+ - - - -@@ -4645,7 +4645,7 @@ - - - -- -+ - - - -@@ -4654,7 +4654,7 @@ - - - -- -+ - - - -@@ -4666,7 +4666,7 @@ - - - -- -+ - - - -@@ -4708,7 +4708,7 @@ - - - -- -+ - - - -@@ -4736,13 +4736,13 @@ - - - -- -+ - - - - - -- -+ - - - -@@ -4760,7 +4760,7 @@ - - - -- -+ - - - -@@ -4768,8 +4768,8 @@ - - - -- -- -+ -+ - - - -@@ -4779,7 +4779,7 @@ - - - -- -+ - - - -@@ -4803,7 +4803,7 @@ - - - -- -+ - - - -@@ -4843,19 +4843,19 @@ - - - -- -+ - - - - - -- -+ - - -- -+ - - -- -+ - - - -@@ -4939,34 +4939,34 @@ - - - -- -+ - - - - - -- -+ - - - - - - -- -+ - - - - - - -- -+ - - - - - - -- -+ - - - -@@ -4987,35 +4987,35 @@ - - - -- -- -+ -+ - - - - - -- -+ - - - - - - -- -+ - - - - - - -- -+ - - - - - - -- -+ - - - -@@ -5152,14 +5152,14 @@ - - - -- -+ - - - - - - -- -+ - - - -@@ -5574,7 +5574,7 @@ - - - -- -+ - - - -@@ -5584,7 +5584,7 @@ - - - -- -+ - - - -@@ -5637,13 +5637,13 @@ - - - -- -+ - - - - - -- -+ - - - -@@ -5672,7 +5672,7 @@ - - - -- -+ - - - -@@ -5714,13 +5714,13 @@ - - - -- -+ - - - - - -- -+ - - - -@@ -5832,7 +5832,7 @@ - - - -- -+ - - - -@@ -5895,7 +5895,7 @@ - - - -- -+ - - - -@@ -5909,7 +5909,7 @@ - - - -- -+ - - - -@@ -5923,7 +5923,7 @@ - - - -- -+ - - - -@@ -5937,14 +5937,14 @@ - - - -- -+ - - - - - - -- -+ - - - -@@ -5959,7 +5959,7 @@ - - - -- -+ - - - -@@ -5974,7 +5974,7 @@ - - - -- -+ - - - -@@ -5988,7 +5988,7 @@ - - - -- -+ - - - -@@ -6002,7 +6002,7 @@ - - - -- -+ - - - -@@ -6211,14 +6211,14 @@ - - - -- -+ - - - - - - -- -+ - - - -@@ -6321,7 +6321,7 @@ - - - -- -+ - - - -@@ -6436,7 +6436,7 @@ - - - -- -+ - - - -@@ -6445,8 +6445,8 @@ - - - -- -- -+ -+ - - - -@@ -6461,8 +6461,8 @@ - - - -- -- -+ -+ - - - -@@ -6491,7 +6491,7 @@ - - - -- -+ - - - -@@ -6510,7 +6510,7 @@ - - - -- -+ - - - -@@ -6593,7 +6593,7 @@ - - - -- -+ - - - -Index: sources/Gnome.metadata -=================================================================== -RCS file: /cvs/public/gtk-sharp/sources/Gnome.metadata,v -retrieving revision 1.11 -diff -u -r1.11 Gnome.metadata ---- sources/Gnome.metadata 14 Aug 2003 14:47:19 -0000 1.11 -+++ sources/Gnome.metadata 29 Sep 2003 11:02:15 -0000 -@@ -333,6 +333,176 @@ - - - -+ -+ -+ -+ Find -+ FindClosest -+ FindClosestFromFullName -+ FindClosestFromWeightSlant -+ FindFromFullName -+ StyleList -+ -+ -+ Find -+ FindClosest -+ FindClosestFromWeightSlant -+ FindFromFamilyAndStyle -+ -+ -+ Get -+ GetBoolean -+ GetDouble -+ GetInt -+ GetLength -+ Set -+ SetBoolean -+ SetDouble -+ SetInt -+ SetLength -+ -+ -+ Construct -+ ConstructRangeAny -+ ConstructRangePage -+ gnome_print_dialog_new -+ -+ -+ RenderFile -+ RenderFilePage -+ -+ -+ FromTextDumb -+ FromTextSizedDumb -+ TextDumb -+ TextSizedDumb -+ -+ -+ GetByName -+ -+ -+ GetByAbbreviation -+ GetByName -+ -+ -+ Beginpage -+ DecodeAscii85 -+ DecodeHex -+ EncodeAscii85 -+ EncodeBlank -+ EncodeDeflate -+ EncodeDrow -+ EncodeHex -+ EncodeRlc -+ EncodeTiff -+ Show -+ ShowSized -+ -+ -+ SetPhrase -+ -+ -+ gnome_print_job_preview_new -+ -+ -+ gpa_option_menu_new -+ -+ -+ -+ name -+ type -+ const-gchar* -+ -+ -+ family -+ type -+ const-gchar* -+ -+ -+ string -+ type -+ const-gchar* -+ -+ -+ style -+ type -+ const-gchar* -+ -+ -+ key -+ type -+ const-gchar* -+ -+ -+ value -+ type -+ const-gchar* -+ -+ -+ filename -+ type -+ const-gchar* -+ -+ -+ text -+ type -+ const-gchar* -+ -+ -+ abbreviation -+ type -+ const-gchar* -+ -+ -+ in -+ type -+ const-gchar* -+ -+ -+ phrase -+ type -+ const-gchar* -+ -+ -+ title -+ type -+ const-gchar* -+ -+ -+ currentlabel -+ type -+ const-gchar* -+ -+ -+ rangelabel -+ type -+ const-gchar* -+ -+ -+ -+ -+ -+ GetFamilyName -+ GetName -+ GetPsName -+ GetSpeciesName -+ -+ -+ GetFamilyName -+ GetGlyphPsName -+ GetName -+ GetPsName -+ GetSample -+ GetSpeciesName -+ -+ -+ -+ type -+ const-gchar* -+ -+ -+ -+ - - - diff --git a/patches/parser/AdditionOfAssemblyTag.diff b/patches/parser/AdditionOfAssemblyTag.diff deleted file mode 100644 index 7dc0190..0000000 --- a/patches/parser/AdditionOfAssemblyTag.diff +++ /dev/null @@ -1,83 +0,0 @@ -Index: parser/gapi.pl -=================================================================== -RCS file: /cvs/public/gtk-sharp/parser/gapi.pl,v -retrieving revision 1.1 -diff -u -r1.1 gapi.pl ---- parser/gapi.pl 20 Aug 2002 20:35:42 -0000 1.1 -+++ parser/gapi.pl 1 Sep 2003 20:46:36 -0000 -@@ -28,10 +28,13 @@ - } - - foreach $entry (@srcs) { -- ($dir, $ns, $lib) = @$entry; -+ ($dir, $ns, $lib, $assembly) = @$entry; -+ if (!$assembly) { -+ $assembly = ""; -+ } - print "hi $ns\n"; - $file = $files{$ns}; -- system ("gapi_pp.pl $dir | gapi2xml.pl $ns $file $lib"); -+ system ("gapi_pp.pl $dir | gapi2xml.pl $ns $file $lib $assembly"); - } - - foreach $ns (keys (%files)) { -Index: parser/gapi2xml.pl -=================================================================== -RCS file: /cvs/public/gtk-sharp/parser/gapi2xml.pl,v -retrieving revision 1.40 -diff -u -r1.40 gapi2xml.pl ---- parser/gapi2xml.pl 15 Jul 2003 05:52:08 -0000 1.40 -+++ parser/gapi2xml.pl 1 Sep 2003 20:46:36 -0000 -@@ -3,8 +3,10 @@ - # gapi2xml.pl : Generates an XML representation of GObject based APIs. - # - # Author: Mike Kestner -+# Author: Martin Willemoes Hansen - # - # 2001-2003 Mike Kestner -+# 2003 Martin Willemoes Hansen - ############################################################## - - $debug=1; -@@ -12,12 +14,13 @@ - use XML::LibXML; - use GAPI::Metadata; - --if (!$ARGV[2]) { -- die "Usage: gapi_pp.pl | gapi2xml.pl \n"; -+if (!$ARGV[2] && !$ARGV[3]) { -+ die "Usage: gapi_pp.pl | gapi2xml.pl [assembly]\n"; - } - - $ns = $ARGV[0]; - $libname = $ARGV[2]; -+$assembly = $ARGV[3]; - - ############################################################## - # Check if the filename provided exists. We parse existing files into -@@ -40,6 +43,9 @@ - $ns_elem = $doc->createElement('namespace'); - $ns_elem->setAttribute('name', $ns); - $ns_elem->setAttribute('library', $libname); -+if ($assembly ne "") { -+ $ns_elem->setAttribute('assembly', $assembly); -+} - $root->appendChild($ns_elem); - - ############################################################## -Index: sources/gtk-sharp.sources -=================================================================== -RCS file: /cvs/public/gtk-sharp/sources/gtk-sharp.sources,v -retrieving revision 1.20 -diff -u -r1.20 gtk-sharp.sources ---- sources/gtk-sharp.sources 26 Aug 2003 21:35:28 -0000 1.20 -+++ sources/gtk-sharp.sources 1 Sep 2003 20:46:36 -0000 -@@ -9,7 +9,7 @@ - libgnomeprint-2.2.1.3/libgnomeprint Gnome gnomeprint-2-2 - libgnomeprintui-2.2.1.3/libgnomeprintui Gnome gnomeprint-2-2 - libgnomeprintui-2.2.1.3/libgnomeprintui/gpaui Gnome gnomeprint-2.2 --gtkhtml-3.0.8/src Gtk gtkhtml-3.0 -+gtkhtml-3.0.8/src Gtk gtkhtml-3.0 gtkhtml - libglade-2.0.0/glade Glade libglade-2.0-0.dll - libart_lgpl-2.3.10 Art art_lgpl - libgda-0.90.0/libgda Gda gda-2 diff --git a/patches/parser/ByPassingOfEnumStyle.diff b/patches/parser/ByPassingOfEnumStyle.diff deleted file mode 100644 index 4f78cc8..0000000 --- a/patches/parser/ByPassingOfEnumStyle.diff +++ /dev/null @@ -1,88 +0,0 @@ -? ByPassingOfEnumStyle.diff -Index: ChangeLog -=================================================================== -RCS file: /cvs/public/gtk-sharp/ChangeLog,v -retrieving revision 1.477 -diff -u -r1.477 ChangeLog ---- ChangeLog 29 Sep 2003 11:05:28 -0000 1.477 -+++ ChangeLog 1 Oct 2003 20:27:34 -0000 -@@ -1,3 +1,10 @@ -+2003-10-01 Martin Willemoes Hansen -+ -+ * parser/gapi2xml.pl: Fixed bypassing of this kind of enum style: -+ enum Foobar { ... }; -+ * api/gnome-api.xml: Added enums of the above style, also corrects the library -+ used by gnomeprint. -+ - 2003-09-29 Martin Willemoes Hansen - - * sources/Gnome.metadata: Use const-gchar* instead of const-guchar*, -Index: api/gnome-api.xml -=================================================================== -RCS file: /cvs/public/gtk-sharp/api/gnome-api.xml,v -retrieving revision 1.15 -diff -u -r1.15 gnome-api.xml ---- api/gnome-api.xml 29 Sep 2003 11:05:30 -0000 1.15 -+++ api/gnome-api.xml 1 Oct 2003 20:27:37 -0000 -@@ -6259,6 +6259,26 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -6578,7 +6598,7 @@ - - - -- -+ - - - -Index: parser/gapi2xml.pl -=================================================================== -RCS file: /cvs/public/gtk-sharp/parser/gapi2xml.pl,v -retrieving revision 1.40 -diff -u -r1.40 gapi2xml.pl ---- parser/gapi2xml.pl 15 Jul 2003 05:52:08 -0000 1.40 -+++ parser/gapi2xml.pl 1 Oct 2003 20:27:41 -0000 -@@ -69,6 +69,18 @@ - $edef =~ /}\s*(\w+);/; - $ename = $1; - $edefs{$ename} = $edef; -+ } elsif ($line =~ /^enum/) { -+ $line =~ /\s(\w+)\s+{/; -+ $ename = $1; -+ $edef = "typedef enum {\n"; -+ while ($line = ) { -+ $edef .= $line; -+ last if ($line =~ /};/); -+ } -+ $edef =~ s/;\n/ $ename;\n/g; -+ $edef =~ s/\n\s*//g; -+ $edef =~ s|/\*.*?\*/||g; -+ $edefs{$ename} = $edef; - } elsif ($line =~ /typedef\s+\w+\s*\**\s*\(\*\s*(\w+)\)\s*\(/) { - $fname = $1; - $fdef = ""; diff --git a/patches/parser/StripsCAndCppComments.diff b/patches/parser/StripsCAndCppComments.diff deleted file mode 100644 index d69869b..0000000 --- a/patches/parser/StripsCAndCppComments.diff +++ /dev/null @@ -1,37 +0,0 @@ ---- /mnt/gnu/cvs/mono/gtk-sharp/parser/gapi_pp.pl 2002-08-12 21:14:43.000000000 +0200 -+++ gapi_pp.pl 2003-06-21 12:13:49.000000000 +0200 -@@ -130,8 +130,33 @@ - print "private"; - } - -+ $comment = 0; -+ $begin = 0; -+ $end = 0; - do { -- print $line; -+ # Following ifs strips out // and /* */ C comments -+ if ($line =~ /\/\*/) { -+ $comment = 1; -+ $begin = 1; -+ } -+ -+ if ($comment != 1) { -+ $line =~ s/\/\/.*//; -+ print $line; -+ } -+ -+ if ($line =~ /\*\//) { -+ $comment = 0; -+ $end = 1; -+ } -+ -+ if ($begin == 1 && $end == 1) { -+ $line =~ s/\/\*.*\*\///; -+ print $line; -+ } -+ -+ $begin = 0; -+ $end = 0; - } until (($line = ) =~ /^}/); - print $line; - } diff --git a/sample/.cvsignore b/sample/.cvsignore index 4b28786..9b2d696 100644 --- a/sample/.cvsignore +++ b/sample/.cvsignore @@ -1 +1,3 @@ sample.exe +makefile +makefile.in diff --git a/sample/makefile b/sample/makefile.am similarity index 100% rename from sample/makefile rename to sample/makefile.am diff --git a/sources/.cvsignore b/sources/.cvsignore index 12e1073..321ec24 100644 --- a/sources/.cvsignore +++ b/sources/.cvsignore @@ -1 +1,3 @@ diacanvas2-0.10.0 +makefile +makefile.in diff --git a/sources/makefile b/sources/makefile.am similarity index 72% rename from sources/makefile rename to sources/makefile.am index 8fe11a1..4b168c6 100644 --- a/sources/makefile +++ b/sources/makefile.am @@ -7,8 +7,8 @@ get-source-code: wget http://aleron.dl.sourceforge.net/sourceforge/diacanvas/$(PACKAGE).tar.gz \ --output-document=- | tar -xz; - #export CVS_PASSWORD="" - #cvs -z3 -d:pserver:anonymous@cvs.sf.net:/cvsroot/diacanvas co $(PACKAGE) +#export CVS_PASSWORD="" +#cvs -z3 -d:pserver:anonymous@cvs.sf.net:/cvsroot/diacanvas co $(PACKAGE) distclean: rm -rf $(PACKAGE)