2004-05-04 Mike Kestner <mkestner@ximian.com>
* configure.in : require gtkhtml-3.0.10 so we can use a single so version (.4). * sources/* : update to gtkhtml-3.0.10. This produces zero change in the generated API. svn path=/trunk/gtk-sharp/; revision=26682
This commit is contained in:
parent
4c2b4d6482
commit
f5a8823bb6
6 changed files with 23 additions and 16 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2004-05-04 Mike Kestner <mkestner@ximian.com>
|
||||||
|
|
||||||
|
* configure.in : require gtkhtml-3.0.10 so we can use a single
|
||||||
|
so version (.4).
|
||||||
|
* sources/* : update to gtkhtml-3.0.10. This produces zero change
|
||||||
|
in the generated API.
|
||||||
|
|
||||||
2004-05-03 Todd Berman <tberman@sevenl.net>
|
2004-05-03 Todd Berman <tberman@sevenl.net>
|
||||||
|
|
||||||
* */*.pc.in: change to use @PACKAGE@ where its needed, fixes pc bug
|
* */*.pc.in: change to use @PACKAGE@ where its needed, fixes pc bug
|
||||||
|
|
|
@ -154,11 +154,11 @@ fi
|
||||||
RSVG_REQUIRED_VERSION=2.0.1
|
RSVG_REQUIRED_VERSION=2.0.1
|
||||||
PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no)
|
PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no)
|
||||||
|
|
||||||
GTKHTML_REQUIRED_VERSION=3.0
|
GTKHTML_REQUIRED_VERSION=3.0.10
|
||||||
PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
|
PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
|
||||||
if test "x$enable_gtkhtml" = "xyes"; then
|
if test "x$enable_gtkhtml" = "xyes"; then
|
||||||
GTKHTML_VERSION=3.0
|
GTKHTML_VERSION=3.0
|
||||||
GTKHTML_SOVERSION=2
|
GTKHTML_SOVERSION=4
|
||||||
else
|
else
|
||||||
PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.1 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
|
PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.1 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
|
||||||
if test "x$enable_gtkhtml" = "xyes"; then
|
if test "x$enable_gtkhtml" = "xyes"; then
|
||||||
|
|
|
@ -3,7 +3,7 @@ Makefile.in
|
||||||
atk-1.2.4
|
atk-1.2.4
|
||||||
gstreamer-0.6.4
|
gstreamer-0.6.4
|
||||||
gtk+-2.2.2
|
gtk+-2.2.2
|
||||||
gtkhtml-3.0.8
|
gtkhtml-3.0.10
|
||||||
libart_lgpl-2.3.10
|
libart_lgpl-2.3.10
|
||||||
libgda-1.0.0
|
libgda-1.0.0
|
||||||
libglade-2.0.0
|
libglade-2.0.0
|
||||||
|
|
|
@ -21,20 +21,20 @@ DOWNLOADS = \
|
||||||
http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.0/sources/vte-0.11.10.tar.gz
|
http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.0/sources/vte-0.11.10.tar.gz
|
||||||
|
|
||||||
GTKHTML_SOURCEFILES = \
|
GTKHTML_SOURCEFILES = \
|
||||||
gtkhtml-3.0.8/src/gtkhtml.c \
|
gtkhtml-3.0.10/src/gtkhtml.c \
|
||||||
gtkhtml-3.0.8/src/gtkhtml.h \
|
gtkhtml-3.0.10/src/gtkhtml.h \
|
||||||
gtkhtml-3.0.8/src/gtkhtml-types.h \
|
gtkhtml-3.0.10/src/gtkhtml-types.h \
|
||||||
gtkhtml-3.0.8/src/gtkhtml-enums.h \
|
gtkhtml-3.0.10/src/gtkhtml-enums.h \
|
||||||
gtkhtml-3.0.8/src/gtkhtml-embedded.c \
|
gtkhtml-3.0.10/src/gtkhtml-embedded.c \
|
||||||
gtkhtml-3.0.8/src/gtkhtml-embedded.h \
|
gtkhtml-3.0.10/src/gtkhtml-embedded.h \
|
||||||
gtkhtml-3.0.8/src/gtkhtml-stream.c \
|
gtkhtml-3.0.10/src/gtkhtml-stream.c \
|
||||||
gtkhtml-3.0.8/src/gtkhtml-stream.h
|
gtkhtml-3.0.10/src/gtkhtml-stream.h
|
||||||
|
|
||||||
api:
|
api:
|
||||||
PERLLIB=../parser PATH=../parser:$$PATH ../parser/gapi-parser gtk-sharp-sources.xml
|
PERLLIB=../parser PATH=../parser:$$PATH ../parser/gapi-parser gtk-sharp-sources.xml
|
||||||
|
|
||||||
get-gtkhtml-code:
|
get-gtkhtml-code:
|
||||||
wget http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.0/gtkhtml-3.0.8.tar.gz --output-document=- | tar -xz $(GTKHTML_SOURCEFILES)
|
wget http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.0/gtkhtml-3.0.10.tar.gz --output-document=- | tar -xz $(GTKHTML_SOURCEFILES)
|
||||||
patch -p0 < gtkhtml-font-style-enum.patch
|
patch -p0 < gtkhtml-font-style-enum.patch
|
||||||
|
|
||||||
get-source-code: get-gtkhtml-code
|
get-source-code: get-gtkhtml-code
|
||||||
|
|
|
@ -72,7 +72,7 @@
|
||||||
<api filename="../gtkhtml/gtkhtml-api.raw">
|
<api filename="../gtkhtml/gtkhtml-api.raw">
|
||||||
<library name="gtkhtml-3.0">
|
<library name="gtkhtml-3.0">
|
||||||
<namespace name="Gtk">
|
<namespace name="Gtk">
|
||||||
<dir>gtkhtml-3.0.8/src</dir>
|
<dir>gtkhtml-3.0.10/src</dir>
|
||||||
</namespace>
|
</namespace>
|
||||||
</library>
|
</library>
|
||||||
</api>
|
</api>
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
Index: gtkhtml-3.0.8/src/gtkhtml-enums.h
|
Index: gtkhtml-3.0.10/src/gtkhtml-enums.h
|
||||||
===================================================================
|
===================================================================
|
||||||
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml-enums.h,v
|
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml-enums.h,v
|
||||||
retrieving revision 1.35
|
retrieving revision 1.35
|
||||||
diff -u -p -r1.35 gtkhtml-enums.h
|
diff -u -p -r1.35 gtkhtml-enums.h
|
||||||
--- gtkhtml-3.0.8/src/gtkhtml-enums.h 19 May 2003 14:41:02 -0000 1.35
|
--- gtkhtml-3.0.10/src/gtkhtml-enums.h 19 May 2003 14:41:02 -0000 1.35
|
||||||
+++ gtkhtml-3.0.8/src/gtkhtml-enums.h 16 Jul 2003 02:06:40 -0000
|
+++ gtkhtml-3.0.10/src/gtkhtml-enums.h 16 Jul 2003 02:06:40 -0000
|
||||||
@@ -242,15 +242,13 @@ typedef enum {
|
@@ -242,15 +242,13 @@ typedef enum {
|
||||||
} GtkHTMLEtchStyle;
|
} GtkHTMLEtchStyle;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue