* sources/gtkhtml-font-style-enum.patch: A patch to use real values

in gtkhtml-enums.h so that the parser won't choke on the complex enum
declarations.

* sources/makefile: Apply the above patch after checking out the
source code for GtkHTML

svn path=/trunk/gtk-sharp/; revision=16275
This commit is contained in:
Duncan Mak 2003-07-15 23:00:42 +00:00
parent 90705a1c98
commit ed0079acdf
3 changed files with 44 additions and 1 deletions

View File

@ -1,3 +1,12 @@
2003-07-15 Duncan Mak <duncan@ximian.com>
* sources/gtkhtml-font-style-enum.patch: A patch to use real values
in gtkhtml-enums.h so that the parser won't choke on the complex enum
declarations.
* sources/makefile: Apply the above patch after checking out the
source code for GtkHTML
2003-07-14 Mike Kestner <mkestner@speakeasy.net>
* api/*-api.xml : regenerated

View File

@ -0,0 +1,31 @@
cvs server: I know nothing about gtkhtml
cvs server: Diffing gtkhtml
cvs server: Diffing gtkhtml/src
Index: gtkhtml/src/gtkhtml-enums.h
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml-enums.h,v
retrieving revision 1.35
diff -u -p -r1.35 gtkhtml-enums.h
--- gtkhtml/src/gtkhtml-enums.h 19 May 2003 14:41:02 -0000 1.35
+++ gtkhtml/src/gtkhtml-enums.h 15 Jul 2003 22:39:15 -0000
@@ -263,13 +263,13 @@ typedef enum {
GTK_HTML_FONT_STYLE_SIZE_6 = 6,
GTK_HTML_FONT_STYLE_SIZE_7 = 7,
GTK_HTML_FONT_STYLE_SIZE_MASK = 0x7,
- GTK_HTML_FONT_STYLE_BOLD = 1 << GTK_HTML_FONT_STYLE_SHIFT_BOLD,
- GTK_HTML_FONT_STYLE_ITALIC = 1 << GTK_HTML_FONT_STYLE_SHIFT_ITALIC,
- GTK_HTML_FONT_STYLE_UNDERLINE = 1 << GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE,
- GTK_HTML_FONT_STYLE_STRIKEOUT = 1 << GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT,
- GTK_HTML_FONT_STYLE_FIXED = 1 << GTK_HTML_FONT_STYLE_SHIFT_FIXED,
- GTK_HTML_FONT_STYLE_SUBSCRIPT = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT,
- GTK_HTML_FONT_STYLE_SUPERSCRIPT = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT,
+ GTK_HTML_FONT_STYLE_BOLD = 1 << 3,
+ GTK_HTML_FONT_STYLE_ITALIC = 1 << 4,
+ GTK_HTML_FONT_STYLE_UNDERLINE = 1 << 5,
+ GTK_HTML_FONT_STYLE_STRIKEOUT = 1 << 6,
+ GTK_HTML_FONT_STYLE_FIXED = 1 << 7,
+ GTK_HTML_FONT_STYLE_SUBSCRIPT = 1 << 8,
+ GTK_HTML_FONT_STYLE_SUPERSCRIPT = 1 << 9,
} GtkHTMLFontStyle;
typedef enum {

View File

@ -20,6 +20,7 @@ get-source-code:
for i in $(DOWNLOADS); do \
wget $$i --output-document=- | tar -xz ; \
done;
export CVS_PASSWORD=""
cvs -z3 -d:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co gtkhtml/src/gtkhtml.c
cvs -z3 -d:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co gtkhtml/src/gtkhtml.h
@ -27,10 +28,12 @@ get-source-code:
cvs -z3 -d:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co gtkhtml/src/gtkhtml-enums.h
cvs -z3 -d:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co gtkhtml/src/gtkhtml-stream.c
cvs -z3 -d:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co gtkhtml/src/gtkhtml-stream.h
patch -p0 < gtkhtml-font-style-enum.patch
ln -f -s ../gdk/gdkpixbuf-drawable.c gtk+-2.2.2/gdk-pixbuf/gdkpixbuf-drawable.c
ln -f -s ../gdk/gdkpixbuf.h gtk+-2.2.2/gdk-pixbuf/gdkpixbuf.h
ln -f -s ../gdk/gdkpixbuf-render.c gtk+-2.2.2/gdk-pixbuf/gdkpixbuf-render.c
distclean:
for i in `ls`; do \
if test -d $$i; then \