gtkhtml stable port information

Package: gtkhtml
Version: 1.0.2
Revision: 1058
Distribution: 10.4, 10.5
Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2
Source-MD5: 2220ffd7834c52177708599579531c23
Depends: %N-shlibs (= %v-%r), libghttp-shlibs
BuildDepends: freetype219, gal21 (>= 0.22-1014), gdk-pixbuf (>= 0.18.0-12), x11, audiofile, db3 (>= 3.3.11-1027), esound, glib, gtk+ (>= 1.2.10-20), libjpeg, libtiff, netpbm10, orbit-dev (>= 0.5.17-15), readline5, imlib (>= 1.9.14-14), bonobo-dev (>= 1.0.20-13), control-center-dev (>= 1.4.0.5-16), gconf-dev (>= 1.0.9-21), glibwww (>= 0.2-14), gnome-libs-dev (>= 1.4.2-19), gnome-print-dev (>= 0.36-11), oaf-dev (>= 0.6.10-22), guile16-dev (>= 1.6.7-1010), libwww, libxml, popt, libglade (>= 0.17-13), libghttp, gnome-vfs-dev (>= 1.0.5-29) | gnome-vfs-ssl-dev (>= 1.0.5-29), libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev, guile16 (>= 1.6.7-1010), fink (>= 0.24.12-1)
Replaces: gtkhtml1.1
Conflicts: gtkhtml1.1
PatchFile: %n.patch
PatchFile-MD5: 75f022a89ead36a462fd662f69344224
PatchScript: <<
%{default_script}
mv components/html-editor/Spell.idl components/html-editor/SpellI.idl
<<
UpdatePoMakefile: true
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
ConfigureParams: --with-gconf --with-bonobo
CompileScript: <<
%p//bin/guile16-build ./configure %c
%p/bin/guile16-build make
<<
InstallScript: <<
make install DESTDIR=%d
rm -rf %i/share/control-center/capplets
<<
SplitOff: <<
Package: %N-shlibs
Depends: gal21-shlibs (>= 0.22-1014), gconf (>= 1.0.9-21), control-center-shlibs (>= 1.4.0.5-16), gnome-print (>= 0.36-11), glibwww-shlibs (>= 0.2-14), bonobo (>= 1.0.20-13)
Replaces: %N (<= 1.0.2-3)
Files: lib/libgtkhtml.*.dylib share/locale share/gtkhtml
Shlibs: %p/lib/libgtkhtml.20.dylib 22.0.0 %n (>= 1.0.2-2)
DocFiles: AUTHORS BUGS COPYING* ChangeLog NEWS README TODO
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<< 1.0.2-2)
Files: include lib/libgtkhtml.* lib/*.sh
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.

testgtkhtml uses functions from libwww, but doesn't ensure the
appropriate libraries are listed on the link command line. The quick
fix is to get the flags from libwww-config on the fly in the
Makefile.
<<
License: GPL/LGPL
Maintainer: None
DescPackaging: <<
Originally packaged by Masanori Sekino.
<<
Homepage: http://www.gnome.org/

gtkhtml stable port .patch

diff -Naur gtkhtml-1.0.2/components/html-editor/Makefile.in gtkhtml-1.0.2-0001/components/html-editor/Makefile.in
--- gtkhtml-1.0.2/components/html-editor/Makefile.in 2002-03-19 12:29:02.000000000 -0500
+++ gtkhtml-1.0.2-0001/components/html-editor/Makefile.in 2006-03-19 16:52:32.000000000 -0500
@@ -153,13 +153,13 @@
IDLS = Editor.idl


-SPELL_IDLS = Spell.idl
+SPELL_IDLS = SpellI.idl


IDL_GENERATED = Editor.h Editor-common.c Editor-skels.c Editor-stubs.c


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


LDFLAGS = @LDFLAGS@ -dynamic
@@ -223,7 +223,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@editor-control-factory.lo engine.lo image.lo link.lo \
@EDITOR_SHLIB_TRUE@menubar.lo paragraph.lo persist-file-impl.lo \
@@ -239,8 +239,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@editor-control-factory.$(OBJEXT) engine.$(OBJEXT) \
@@ -621,7 +621,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` \
@@ -629,7 +629,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

@XML_I18N_MERGE_OAF_RULE@

diff -Naur gtkhtml-1.0.2/components/html-editor/Spell-common.c gtkhtml-1.0.2-0001/components/html-editor/Spell-common.c
--- gtkhtml-1.0.2/components/html-editor/Spell-common.c 2002-03-18 12:02:52.000000000 -0500
+++ gtkhtml-1.0.2-0001/components/html-editor/Spell-common.c 2006-03-19 16:52:32.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.0.2/components/html-editor/Spell-skels.c gtkhtml-1.0.2-0001/components/html-editor/Spell-skels.c
--- gtkhtml-1.0.2/components/html-editor/Spell-skels.c 2002-03-18 12:02:52.000000000 -0500
+++ gtkhtml-1.0.2-0001/components/html-editor/Spell-skels.c 2006-03-19 16:52:32.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.0.2/components/html-editor/Spell-stubs.c gtkhtml-1.0.2-0001/components/html-editor/Spell-stubs.c
--- gtkhtml-1.0.2/components/html-editor/Spell-stubs.c 2002-03-18 12:02:52.000000000 -0500
+++ gtkhtml-1.0.2-0001/components/html-editor/Spell-stubs.c 2006-03-19 16:52:32.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.0.2/components/html-editor/control-data.h gtkhtml-1.0.2-0001/components/html-editor/control-data.h
--- gtkhtml-1.0.2/components/html-editor/control-data.h 2002-03-18 11:56:08.000000000 -0500
+++ gtkhtml-1.0.2-0001/components/html-editor/control-data.h 2006-03-19 16:52:32.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.0.2/components/html-editor/popup.c gtkhtml-1.0.2-0001/components/html-editor/popup.c
--- gtkhtml-1.0.2/components/html-editor/popup.c 2002-03-18 11:56:09.000000000 -0500
+++ gtkhtml-1.0.2-0001/components/html-editor/popup.c 2006-03-19 16:53:04.000000000 -0500
@@ -446,6 +446,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.0.2/components/http-storage-module/Makefile.in gtkhtml-1.0.2-0001/components/http-storage-module/Makefile.in
--- gtkhtml-1.0.2/components/http-storage-module/Makefile.in 2002-03-19 12:29:04.000000000 -0500
+++ gtkhtml-1.0.2-0001/components/http-storage-module/Makefile.in 2006-03-19 16:52:32.000000000 -0500
@@ -145,7 +145,7 @@
INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -DPLUGIN_DIR=\""$(PLUGIN_DIR)"\" -I$(includedir) $(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.0.2/configure gtkhtml-1.0.2-0001/configure
--- gtkhtml-1.0.2/configure 2002-03-19 12:28:29.000000000 -0500
+++ gtkhtml-1.0.2-0001/configure 2006-03-19 16:52:32.000000000 -0500
@@ -5042,7 +5042,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
@@ -9483,7 +9483,7 @@
echo "${ECHO_T}found" >&6

GLIBWWW_CFLAGS="`gnome-config --cflags glibwww`"
- GLIBWWW_LIBS="`gnome-config --libs glibwww` -lwwwhtml -lmd5"
+ GLIBWWW_LIBS="`gnome-config --libs glibwww` `libwww-config --libs`"

have_glibwww=true
else
diff -Naur gtkhtml-1.0.2/src/htmlcluealigned.h gtkhtml-1.0.2-0001/src/htmlcluealigned.h
--- gtkhtml-1.0.2/src/htmlcluealigned.h 2001-05-21 08:47:11.000000000 -0400
+++ gtkhtml-1.0.2-0001/src/htmlcluealigned.h 2006-03-19 16:52:47.000000000 -0500
@@ -38,7 +38,6 @@
};


-extern HTMLClueAlignedClass html_cluealigned_class;


void html_cluealigned_type_init (void);

gtkhtml _unstable_ port .patch