From ed0079acdf74178659cfc6e418709b6259165651 Mon Sep 17 00:00:00 2001 From: Duncan Mak Date: Tue, 15 Jul 2003 23:00:42 +0000 Subject: [PATCH] * 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 --- ChangeLog | 9 ++++++++ sources/gtkhtml-font-style-enum.patch | 31 +++++++++++++++++++++++++++ sources/makefile | 5 ++++- 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 sources/gtkhtml-font-style-enum.patch diff --git a/ChangeLog b/ChangeLog index d1b54b406..ee181b2d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-07-15 Duncan Mak + + * 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 * api/*-api.xml : regenerated diff --git a/sources/gtkhtml-font-style-enum.patch b/sources/gtkhtml-font-style-enum.patch new file mode 100644 index 000000000..80a9f753d --- /dev/null +++ b/sources/gtkhtml-font-style-enum.patch @@ -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 { diff --git a/sources/makefile b/sources/makefile index eccb5c869..02bb89bf7 100644 --- a/sources/makefile +++ b/sources/makefile @@ -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 \