gtkhtml1.1 stable port information

Package: gtkhtml1.1
Version: 1.1.7
Revision: 1015
Distribution: 10.4, 10.5
Source: mirror:gnome:sources/gtkhtml/1.1/gtkhtml-%v.tar.bz2
Source-MD5: 83cd60ab9a108d2a0d65b3bf760affa4
Depends: %N-shlibs (= %v-%r), libghttp-shlibs, control-center-shlibs (>= 1.4.0.5-16)
BuildDepends: freetype219, libxml, audiofile, libglade, glib, gdk-pixbuf, x11, gnome-libs-dev (>= 1.4.2-19), libghttp, gconf (>= 1.0.9-21), gconf-dev (>= 1.0.9-21), oaf-dev (>= 0.6.10-22), bonobo-dev (>= 1.0.20-13), control-center-dev (>= 1.4.0.5-16), gal21 (>= 0.22-1014), gnome-print-dev (>= 0.36-11), gtk-doc (>= 1.8-1), readline5, orbit-dev (>= 0.5.17-15), imlib (>= 1.9.14-14), esound (>= 0.2.38-1), popt, libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev, fink (>= 0.24.12-1), gtk+
Replaces: gtkhtml
Conflicts: gtkhtml
PatchFile: %n.patch
PatchFile-MD5: f4edccb9c814d9095133909a8a9f8588
PatchScript: <<
%{default_script}
mv components/html-editor/Spell.idl components/html-editor/SpellI.idl
<<
SetCFLAGS: -Os
ConfigureParams: --with-gconf --with-bonobo
InstallScript: <<
make install DESTDIR=%d
rm -rf %i/share/control-center/capplets
<<
SplitOff: <<
Package: %N-shlibs
Depends: gconf-shlibs (>= 1.0.9-21), gal21-shlibs (>= 0.22-1014), bonobo-shlibs (>= 1.0.20-13)
Files: lib/libgtkhtml-1.1.*.dylib share/locale share/gtkhtml-1.1
Shlibs: %p/lib/libgtkhtml-1.1.3.dylib 4.0.0 %n (>= 1.1.6-1)
DocFiles: AUTHORS BUGS COPYING* ChangeLog NEWS README TODO
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Files: include lib/libgtkhtml-1.1.* lib/pkgconfig
DocFiles: AUTHORS BUGS COPYING* ChangeLog NEWS README TODO
<<
DocFiles: AUTHORS BUGS COPYING* ChangeLog NEWS README TODO
Description: HTML rendering/printing/editing engine
DescDetail: <<
This is GtkHTML, a lightweight HTML rendering/printing/editing engine.
It was originally based on KHTMLW, but is now being developed
independently of it.
<<
DescPort: <<
Renamed Spell.idl to SpellI.idl, because it will overwrite spell.h.
Added -module libtool flag to http-storage-module.
Fixed declaration and definition mismatch.
<<
License: GPL/LGPL
Maintainer: None
DescPackaging: <<
Originally packaged by Masanori Sekino.
<<
Homepage: http://www.gnome.org/

gtkhtml1.1 stable port .patch

diff -Naur gtkhtml-1.1.7-0001/components/html-editor/Makefile.in gtkhtml-1.1.7-0002/components/html-editor/Makefile.in
--- gtkhtml-1.1.7-0001/components/html-editor/Makefile.in 2002-12-05 13:02:57.000000000 -0500
+++ gtkhtml-1.1.7-0002/components/html-editor/Makefile.in 2006-03-19 02:44:54.000000000 -0500
@@ -177,7 +177,7 @@


SPELL_IDLS = \
- Spell.idl
+ SpellI.idl


IDL_GENERATED = \
@@ -188,10 +188,10 @@


SPELL_IDL_GENERATED = \
- Spell.h \
- Spell-common.c \
- Spell-skels.c \
- Spell-stubs.c
+ SpellI.h \
+ SpellI-common.c \
+ SpellI-skels.c \
+ SpellI-stubs.c


LDADD = \
@@ -329,7 +329,7 @@
libgnome_gtkhtml_editor_la_LIBADD =
@EDITOR_SHLIB_TRUE@libgnome_gtkhtml_editor_la_OBJECTS = \
@EDITOR_SHLIB_TRUE@Editor-common.lo Editor-skels.lo Editor-stubs.lo \
-@EDITOR_SHLIB_TRUE@Spell-common.lo Spell-skels.lo Spell-stubs.lo \
+@EDITOR_SHLIB_TRUE@SpellI-common.lo SpellI-skels.lo SpellI-stubs.lo \
@EDITOR_SHLIB_TRUE@body.lo cell.lo control-data.lo dialog.lo \
@EDITOR_SHLIB_TRUE@e-html-utils.lo editor-control-factory.lo engine.lo \
@EDITOR_SHLIB_TRUE@image.lo link.lo menubar.lo paragraph.lo \
@@ -344,8 +344,8 @@

@EDITOR_SHLIB_FALSE@gnome_gtkhtml_editor_OBJECTS = \
@EDITOR_SHLIB_FALSE@Editor-common.$(OBJEXT) Editor-skels.$(OBJEXT) \
-@EDITOR_SHLIB_FALSE@Editor-stubs.$(OBJEXT) Spell-common.$(OBJEXT) \
-@EDITOR_SHLIB_FALSE@Spell-skels.$(OBJEXT) Spell-stubs.$(OBJEXT) \
+@EDITOR_SHLIB_FALSE@Editor-stubs.$(OBJEXT) SpellI-common.$(OBJEXT) \
+@EDITOR_SHLIB_FALSE@SpellI-skels.$(OBJEXT) SpellI-stubs.$(OBJEXT) \
@EDITOR_SHLIB_FALSE@body.$(OBJEXT) cell.$(OBJEXT) \
@EDITOR_SHLIB_FALSE@control-data.$(OBJEXT) dialog.$(OBJEXT) \
@EDITOR_SHLIB_FALSE@e-html-utils.$(OBJEXT) \
@@ -645,7 +645,7 @@
../../src/htmlcolor.h ../../src/htmlcolorset.h \
../../src/htmlsettings.h ../../src/htmlpainter.h body.h \
control-data.h ../../src/htmlgdkpainter.h search.h replace.h \
- image.h link.h rule.h engine.h Editor.h Spell.h properties.h \
+ image.h link.h rule.h engine.h Editor.h SpellI.h properties.h \
utils.h
cell.o: cell.c ../../src/htmlclue.h ../../src/htmlobject.h \
../../src/htmltypes.h ../../src/gtkhtml-enums.h \
@@ -660,7 +660,7 @@
../../src/htmltablecell.h ../../src/htmlcluev.h \
../../src/htmlsettings.h ../../src/htmlpainter.h ../../config.h \
properties.h control-data.h ../../src/htmlgdkpainter.h search.h \
- replace.h image.h link.h rule.h engine.h Editor.h Spell.h \
+ replace.h image.h link.h rule.h engine.h Editor.h SpellI.h \
cell.h utils.h
control-data.o: control-data.c ../../config.h control-data.h \
../../src/gtkhtml.h ../../src/gtkhtml-types.h \
@@ -668,14 +668,14 @@
../../src/htmlenums.h ../../src/htmlgdkpainter.h \
../../src/htmlpainter.h ../../src/htmlfontmanager.h \
../../src/gtkhtmlfontstyle.h search.h replace.h image.h link.h \
- rule.h engine.h Editor.h Spell.h spell.h properties.h
+ rule.h engine.h Editor.h SpellI.h spell.h properties.h
dialog.o: dialog.c ../../config.h dialog.h control-data.h \
../../src/gtkhtml.h ../../src/gtkhtml-types.h \
../../src/gtkhtml-enums.h ../../src/htmltypes.h \
../../src/htmlenums.h ../../src/htmlgdkpainter.h \
../../src/htmlpainter.h ../../src/htmlfontmanager.h \
../../src/gtkhtmlfontstyle.h search.h replace.h image.h link.h \
- rule.h engine.h Editor.h Spell.h
+ rule.h engine.h Editor.h SpellI.h
e-html-utils.o: e-html-utils.c e-html-utils.h
Editor-common.o: Editor-common.c Editor.h
editor-control-factory.o: editor-control-factory.c ../../config.h \
@@ -692,7 +692,7 @@
../../src/htmlpainter.h ../../src/htmlcolorset.h \
../../src/htmlplainpainter.h ../../src/htmlgdkpainter.h \
engine.h control-data.h search.h replace.h image.h link.h \
- rule.h Spell.h menubar.h persist-file-impl.h \
+ rule.h SpellI.h menubar.h persist-file-impl.h \
persist-stream-impl.h popup.h toolbar.h properties.h text.h \
paragraph.h body.h spell.h html-stream-mem.h \
../../src/gtkhtmldebug.h
@@ -708,7 +708,7 @@
../../src/htmltext.h ../../src/htmltype.h ../../src/htmlundo.h \
../../src/htmlundo-action.h engine.h Editor.h control-data.h \
../../src/htmlgdkpainter.h ../../src/htmlpainter.h search.h \
- replace.h image.h link.h rule.h Spell.h spell.h
+ replace.h image.h link.h rule.h SpellI.h spell.h
html-stream-mem.o: html-stream-mem.c ../../config.h ../../src/gtkhtml.h \
../../src/gtkhtml-types.h ../../src/gtkhtml-enums.h \
../../src/htmltypes.h ../../src/htmlenums.h \
@@ -729,7 +729,7 @@
../../src/htmlobject.h ../../src/htmlsettings.h \
../../src/htmlpainter.h image.h control-data.h \
../../src/htmlgdkpainter.h search.h replace.h link.h rule.h \
- engine.h Editor.h Spell.h properties.h utils.h
+ engine.h Editor.h SpellI.h properties.h utils.h
link.o: link.c ../../config.h ../../src/htmlcolor.h \
../../src/htmltypes.h ../../src/gtkhtml-enums.h \
../../src/gtkhtml-types.h ../../src/htmlenums.h \
@@ -744,7 +744,7 @@
../../src/htmlselection.h ../../src/htmlsettings.h \
../../src/htmlpainter.h properties.h control-data.h \
../../src/htmlgdkpainter.h search.h replace.h image.h link.h \
- rule.h engine.h Editor.h Spell.h
+ rule.h engine.h Editor.h SpellI.h
menubar.o: menubar.c ../../config.h \
../../src/htmlengine-edit-cut-and-paste.h ../../src/htmltypes.h \
../../src/gtkhtml-enums.h ../../src/gtkhtml-types.h \
@@ -752,7 +752,7 @@
../../src/gtkhtml.h control-data.h ../../src/htmlgdkpainter.h \
../../src/htmlpainter.h ../../src/htmlfontmanager.h \
../../src/gtkhtmlfontstyle.h search.h replace.h image.h link.h \
- rule.h engine.h Editor.h Spell.h body.h properties.h text.h \
+ rule.h engine.h Editor.h SpellI.h body.h properties.h text.h \
paragraph.h spell.h table.h template.h
paragraph.o: paragraph.c ../../config.h \
../../src/htmlengine-edit-clueflowstyle.h \
@@ -764,7 +764,7 @@
../../src/htmlobject.h ../../src/htmlengine-save.h paragraph.h \
control-data.h ../../src/gtkhtml.h ../../src/htmlgdkpainter.h \
../../src/htmlpainter.h search.h replace.h image.h link.h \
- rule.h engine.h Editor.h Spell.h properties.h utils.h
+ rule.h engine.h Editor.h SpellI.h properties.h utils.h
persist-file-impl.o: persist-file-impl.c ../../config.h \
../../src/gtkhtml.h ../../src/gtkhtml-types.h \
../../src/gtkhtml-enums.h ../../src/htmltypes.h \
@@ -788,7 +788,7 @@
../../src/htmltablecell.h ../../src/htmlcluev.h body.h \
control-data.h ../../src/htmlgdkpainter.h \
../../src/htmlpainter.h search.h replace.h image.h link.h \
- rule.h engine.h Editor.h Spell.h cell.h menubar.h popup.h \
+ rule.h engine.h Editor.h SpellI.h cell.h menubar.h popup.h \
properties.h paragraph.h spell.h table.h text.h
properties.o: properties.c ../../config.h dialog.h control-data.h \
../../src/gtkhtml.h ../../src/gtkhtml-types.h \
@@ -796,14 +796,14 @@
../../src/htmlenums.h ../../src/htmlgdkpainter.h \
../../src/htmlpainter.h ../../src/htmlfontmanager.h \
../../src/gtkhtmlfontstyle.h search.h replace.h image.h link.h \
- rule.h engine.h Editor.h Spell.h properties.h
+ rule.h engine.h Editor.h SpellI.h properties.h
replace.o: replace.c ../../config.h replace.h control-data.h \
../../src/gtkhtml.h ../../src/gtkhtml-types.h \
../../src/gtkhtml-enums.h ../../src/htmltypes.h \
../../src/htmlenums.h ../../src/htmlgdkpainter.h \
../../src/htmlpainter.h ../../src/htmlfontmanager.h \
../../src/gtkhtmlfontstyle.h search.h image.h link.h rule.h \
- engine.h Editor.h Spell.h dialog.h ../../src/htmlengine.h \
+ engine.h Editor.h SpellI.h dialog.h ../../src/htmlengine.h \
../../src/htmlcursor.h
rule.o: rule.c ../../src/gtkhtml.h ../../src/gtkhtml-types.h \
../../src/gtkhtml-enums.h ../../src/htmltypes.h \
@@ -815,19 +815,19 @@
../../src/htmlrule.h ../../src/htmlobject.h ../../config.h \
properties.h control-data.h ../../src/htmlgdkpainter.h \
../../src/htmlpainter.h search.h replace.h image.h link.h \
- rule.h engine.h Editor.h Spell.h utils.h
+ rule.h engine.h Editor.h SpellI.h utils.h
search.o: search.c ../../config.h search.h ../../src/gtkhtml.h \
../../src/gtkhtml-types.h ../../src/gtkhtml-enums.h \
../../src/htmltypes.h ../../src/htmlenums.h control-data.h \
../../src/htmlgdkpainter.h ../../src/htmlpainter.h \
../../src/htmlfontmanager.h ../../src/gtkhtmlfontstyle.h \
- replace.h image.h link.h rule.h engine.h Editor.h Spell.h \
+ replace.h image.h link.h rule.h engine.h Editor.h SpellI.h \
dialog.h ../../src/htmlengine-search.h ../../src/htmlengine.h \
../../src/htmlcursor.h
-Spell-common.o: Spell-common.c Spell.h
-Spell-skels.o: Spell-skels.c Spell.h
-Spell-stubs.o: Spell-stubs.c Spell.h
-spell.o: spell.c ../../config.h ../../src/gtkhtml.h \
+SpellI-common.o: SpellI-common.c SpellI.h
+SpellI-skels.o: SpellI-skels.c SpellI.h
+SpellI-stubs.o: SpellI-stubs.c SpellI.h
+spellI.o: spell.c ../../config.h ../../src/gtkhtml.h \
../../src/gtkhtml-types.h ../../src/gtkhtml-enums.h \
../../src/htmltypes.h ../../src/htmlenums.h \
../../src/gtkhtml-properties.h ../../src/htmlclueflow.h \
@@ -839,7 +839,7 @@
../../src/htmlengine-edit-selection-updater.h \
../../src/htmlselection.h menubar.h control-data.h \
../../src/htmlgdkpainter.h ../../src/htmlpainter.h search.h \
- replace.h image.h link.h rule.h engine.h Editor.h Spell.h \
+ replace.h image.h link.h rule.h engine.h Editor.h SpellI.h \
spell.h
table.o: table.c ../../src/gtkhtml.h ../../src/gtkhtml-types.h \
../../src/gtkhtml-enums.h ../../src/htmltypes.h \
@@ -852,7 +852,7 @@
../../src/htmltable.h ../../src/htmlsettings.h \
../../src/htmlpainter.h ../../config.h properties.h \
control-data.h ../../src/htmlgdkpainter.h search.h replace.h \
- image.h link.h rule.h engine.h Editor.h Spell.h table.h utils.h
+ image.h link.h rule.h engine.h Editor.h SpellI.h table.h utils.h
template.o: template.c ../../src/gtkhtml.h ../../src/gtkhtml-types.h \
../../src/gtkhtml-enums.h ../../src/htmltypes.h \
../../src/htmlenums.h ../../src/htmlcursor.h \
@@ -862,7 +862,7 @@
../../src/htmlengine-save.h ../../config.h properties.h \
control-data.h ../../src/htmlgdkpainter.h \
../../src/htmlpainter.h search.h replace.h image.h link.h \
- rule.h engine.h Editor.h Spell.h template.h utils.h
+ rule.h engine.h Editor.h SpellI.h template.h utils.h
test-html-editor-control.o: test-html-editor-control.c ../../config.h \
Editor.h ../../src/gtkhtml.h ../../src/gtkhtml-types.h \
../../src/gtkhtml-enums.h ../../src/htmltypes.h \
@@ -881,7 +881,7 @@
../../src/htmlengine-save.h ../../src/htmlselection.h \
../../src/htmlsettings.h ../../src/htmlpainter.h text.h \
control-data.h ../../src/htmlgdkpainter.h search.h replace.h \
- image.h link.h rule.h engine.h Editor.h Spell.h properties.h \
+ image.h link.h rule.h engine.h Editor.h SpellI.h properties.h \
utils.h
toolbar.o: toolbar.c ../../config.h toolbar.h ../../src/gtkhtml.h \
../../src/gtkhtml-types.h ../../src/gtkhtml-enums.h \
@@ -889,7 +889,7 @@
../../src/htmlgdkpainter.h ../../src/htmlpainter.h \
../../src/htmlfontmanager.h ../../src/gtkhtmlfontstyle.h \
search.h replace.h image.h link.h rule.h engine.h Editor.h \
- Spell.h utils.h ../../src/htmlcolor.h ../../src/htmlcolorset.h \
+ SpellI.h utils.h ../../src/htmlcolor.h ../../src/htmlcolorset.h \
../../src/htmlengine-edit-fontstyle.h ../../src/htmlengine.h \
../../src/htmlcursor.h ../../src/htmlsettings.h tt.xpm
utils.o: utils.c ../../config.h ../../src/gtkhtml-compat.h utils.h \
@@ -992,7 +992,7 @@


Editor-common.o: Editor.h
-Spell-common.o: Spell.h
+SpellI-common.o: SpellI.h

$(IDL_GENERATED): $(IDLS)
$(ORBIT_IDL) -I$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
@@ -1000,7 +1000,7 @@

$(SPELL_IDL_GENERATED): $(SPELL_IDLS)
$(ORBIT_IDL) -I$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
- -I$(srcdir) $(srcdir)/Spell.idl
+ -I$(srcdir) $(srcdir)/SpellI.idl
@EDITOR_SHLIB_TRUE@install-exec-hook:
@EDITOR_SHLIB_FALSE@install-exec-hook:
@EDITOR_SHLIB_FALSE@ mv $(DESTDIR)$(bindir)/gnome-gtkhtml-editor $(DESTDIR)$(bindir)/gnome-gtkhtml-editor-@EDITOR_API_VERSION@
diff -Naur gtkhtml-1.1.7-0001/components/html-editor/Spell-common.c gtkhtml-1.1.7-0002/components/html-editor/Spell-common.c
--- gtkhtml-1.1.7-0001/components/html-editor/Spell-common.c 2002-11-14 11:35:21.000000000 -0500
+++ gtkhtml-1.1.7-0002/components/html-editor/Spell-common.c 2006-03-19 02:44:54.000000000 -0500
@@ -3,7 +3,7 @@
*/

#include
-#include "Spell.h"
+#include "SpellI.h"

#if ( (TC_IMPL_TC_CORBA_sequence_CORBA_string_0 == 'S') \
&& (TC_IMPL_TC_CORBA_sequence_CORBA_string_1 == 'p') \
diff -Naur gtkhtml-1.1.7-0001/components/html-editor/Spell-skels.c gtkhtml-1.1.7-0002/components/html-editor/Spell-skels.c
--- gtkhtml-1.1.7-0001/components/html-editor/Spell-skels.c 2002-11-14 11:35:21.000000000 -0500
+++ gtkhtml-1.1.7-0002/components/html-editor/Spell-skels.c 2006-03-19 02:44:54.000000000 -0500
@@ -3,7 +3,7 @@
*/

#include
-#include "Spell.h"
+#include "SpellI.h"

void
_ORBIT_GNOME_Spell_Dictionary_Error_marshal(GIOPSendBuffer *
diff -Naur gtkhtml-1.1.7-0001/components/html-editor/Spell-stubs.c gtkhtml-1.1.7-0002/components/html-editor/Spell-stubs.c
--- gtkhtml-1.1.7-0001/components/html-editor/Spell-stubs.c 2002-11-14 11:35:21.000000000 -0500
+++ gtkhtml-1.1.7-0002/components/html-editor/Spell-stubs.c 2006-03-19 02:44:54.000000000 -0500
@@ -3,7 +3,7 @@
*/

#include
-#include "Spell.h"
+#include "SpellI.h"

void
_ORBIT_GNOME_Spell_Dictionary_Error_demarshal(GIOPRecvBuffer *
diff -Naur gtkhtml-1.1.7-0001/components/html-editor/control-data.h gtkhtml-1.1.7-0002/components/html-editor/control-data.h
--- gtkhtml-1.1.7-0001/components/html-editor/control-data.h 2002-06-06 10:06:21.000000000 -0400
+++ gtkhtml-1.1.7-0002/components/html-editor/control-data.h 2006-03-19 02:44:54.000000000 -0500
@@ -37,7 +37,7 @@
#include "link.h"
#include "rule.h"
#include "engine.h"
-#include "Spell.h"
+#include "SpellI.h"

struct _GtkHTMLControlData {
GtkHTML *html;
diff -Naur gtkhtml-1.1.7-0001/components/html-editor/popup.c gtkhtml-1.1.7-0002/components/html-editor/popup.c
--- gtkhtml-1.1.7-0001/components/html-editor/popup.c 2002-10-02 13:11:34.000000000 -0400
+++ gtkhtml-1.1.7-0002/components/html-editor/popup.c 2006-03-19 02:46:01.000000000 -0500
@@ -500,6 +500,7 @@
ADD_PROP (TABLE);
ADD_ITEM (_("Table..."), prop_dialog, TABLE);
default:
+ ;
}
if (obj->parent && obj->parent->parent && HTML_IS_TABLE_CELL (obj->parent->parent)) {
if (cd->format_html) {
diff -Naur gtkhtml-1.1.7-0001/components/http-storage-module/Makefile.in gtkhtml-1.1.7-0002/components/http-storage-module/Makefile.in
--- gtkhtml-1.1.7-0001/components/http-storage-module/Makefile.in 2002-12-05 13:02:58.000000000 -0500
+++ gtkhtml-1.1.7-0002/components/http-storage-module/Makefile.in 2006-03-19 02:44:54.000000000 -0500
@@ -163,7 +163,7 @@
$(EXTRA_GNOME_CFLAGS)


-common_ldflags = -avoid-version
+common_ldflags = -module -avoid-version

bonobo_plugindir = $(PLUGIN_DIR)
bonobo_plugin_LTLIBRARIES = libstorage_http.la
diff -Naur gtkhtml-1.1.7-0001/configure gtkhtml-1.1.7-0002/configure
--- gtkhtml-1.1.7-0001/configure 2002-12-04 16:20:11.000000000 -0500
+++ gtkhtml-1.1.7-0002/configure 2006-03-19 02:44:54.000000000 -0500
@@ -5684,7 +5684,7 @@
# FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes.
- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+ archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
diff -Naur gtkhtml-1.1.7-0001/po/Makefile.in.in gtkhtml-1.1.7-0002/po/Makefile.in.in
--- gtkhtml-1.1.7-0001/po/Makefile.in.in 2002-12-04 16:20:16.000000000 -0500
+++ gtkhtml-1.1.7-0002/po/Makefile.in.in 2006-03-19 02:44:54.000000000 -0500
@@ -106,7 +106,7 @@
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//' -e 's/\.mo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
if test -r $$cat; then \
diff -Naur gtkhtml-1.1.7-0001/src/htmlcluealigned.h gtkhtml-1.1.7-0002/src/htmlcluealigned.h
--- gtkhtml-1.1.7-0001/src/htmlcluealigned.h 2001-05-21 08:47:11.000000000 -0400
+++ gtkhtml-1.1.7-0002/src/htmlcluealigned.h 2006-03-19 02:45:38.000000000 -0500
@@ -38,7 +38,6 @@
};


-extern HTMLClueAlignedClass html_cluealigned_class;


void html_cluealigned_type_init (void);

gtkhtml1.1 _unstable_ port .patch