Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27408
Added Files:
gtkhtml.info gtkhtml.patch
Log Message:
move from unstable
--- NEW FILE: gtkhtml.patch ---
diff -Naur gtkhtml-1.0.2.old/components/html-editor/Makefile.in
gtkhtml-1.0.2.new/components/html-editor/Makefile.in
--- gtkhtml-1.0.2.old/components/html-editor/Makefile.in Wed Mar 20
02:29:02 2002
+++ gtkhtml-1.0.2.new/components/html-editor/Makefile.in Wed Jun 12
21:41:49 2002
@@ -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 =
@[EMAIL PROTECTED] = \
@[EMAIL PROTECTED] Editor-skels.lo Editor-stubs.lo \
[EMAIL PROTECTED]@Spell-common.lo Spell-skels.lo Spell-stubs.lo \
[EMAIL PROTECTED]@SpellI-common.lo SpellI-skels.lo SpellI-stubs.lo \
@[EMAIL PROTECTED] cell.lo control-data.lo dialog.lo \
@[EMAIL PROTECTED] engine.lo image.lo link.lo \
@[EMAIL PROTECTED] paragraph.lo persist-file-impl.lo \
@@ -239,8 +239,8 @@
@[EMAIL PROTECTED] = \
@[EMAIL PROTECTED](OBJEXT) Editor-skels.$(OBJEXT) \
[EMAIL PROTECTED]@Editor-stubs.$(OBJEXT) Spell-common.$(OBJEXT) \
[EMAIL PROTECTED]@Spell-skels.$(OBJEXT) Spell-stubs.$(OBJEXT) \
[EMAIL PROTECTED]@Editor-stubs.$(OBJEXT) SpellI-common.$(OBJEXT) \
[EMAIL PROTECTED]@SpellI-skels.$(OBJEXT) SpellI-stubs.$(OBJEXT) \
@[EMAIL PROTECTED](OBJEXT) cell.$(OBJEXT) \
@[EMAIL PROTECTED](OBJEXT) dialog.$(OBJEXT) \
@[EMAIL PROTECTED](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.old/components/html-editor/Spell-common.c
gtkhtml-1.0.2.new/components/html-editor/Spell-common.c
--- gtkhtml-1.0.2.old/components/html-editor/Spell-common.c Tue Mar 19
02:02:52 2002
+++ gtkhtml-1.0.2.new/components/html-editor/Spell-common.c Wed Jun 12
21:41:49 2002
@@ -3,7 +3,7 @@
*/
#include <string.h>
-#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.old/components/html-editor/Spell-skels.c
gtkhtml-1.0.2.new/components/html-editor/Spell-skels.c
--- gtkhtml-1.0.2.old/components/html-editor/Spell-skels.c Tue Mar 19
02:02:52 2002
+++ gtkhtml-1.0.2.new/components/html-editor/Spell-skels.c Wed Jun 12
21:41:49 2002
@@ -3,7 +3,7 @@
*/
#include <string.h>
-#include "Spell.h"
+#include "SpellI.h"
void
_ORBIT_GNOME_Spell_Dictionary_Error_marshal(GIOPSendBuffer *
diff -Naur gtkhtml-1.0.2.old/components/html-editor/Spell-stubs.c
gtkhtml-1.0.2.new/components/html-editor/Spell-stubs.c
--- gtkhtml-1.0.2.old/components/html-editor/Spell-stubs.c Tue Mar 19
02:02:52 2002
+++ gtkhtml-1.0.2.new/components/html-editor/Spell-stubs.c Wed Jun 12
21:41:49 2002
@@ -3,7 +3,7 @@
*/
#include <string.h>
-#include "Spell.h"
+#include "SpellI.h"
void
_ORBIT_GNOME_Spell_Dictionary_Error_demarshal(GIOPRecvBuffer *
diff -Naur gtkhtml-1.0.2.old/components/html-editor/control-data.h
gtkhtml-1.0.2.new/components/html-editor/control-data.h
--- gtkhtml-1.0.2.old/components/html-editor/control-data.h Tue Mar 19
01:56:08 2002
+++ gtkhtml-1.0.2.new/components/html-editor/control-data.h Wed Jun 12
21:41:49 2002
@@ -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.old/components/http-storage-module/Makefile.in
gtkhtml-1.0.2.new/components/http-storage-module/Makefile.in
--- gtkhtml-1.0.2.old/components/http-storage-module/Makefile.in Wed Mar
20 02:29:04 2002
+++ gtkhtml-1.0.2.new/components/http-storage-module/Makefile.in Wed Jun
12 21:41:49 2002
@@ -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.old/configure gtkhtml-1.0.2.new/configure
--- gtkhtml-1.0.2.old/configure Wed Mar 20 02:28:29 2002
+++ gtkhtml-1.0.2.new/configure Wed Jun 12 21:42:10 2002
@@ -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
--- NEW FILE: gtkhtml.info ---
Package: gtkhtml
Version: 1.0.2
Revision: 50
Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2
Source-MD5: 2220ffd7834c52177708599579531c23
Depends: %N-shlibs (= %v-%r), libghttp-shlibs
BuildDepends: gal21, gdk-pixbuf (>= 0.18.0-12), x11, audiofile, db3 (>=
3.3.11-8), esound, glib, gtk+ (>= 1.2.10-20), libjpeg, libtiff, netpbm,
orbit-dev (>= 0.5.17-15), readline (>= 4.3-5), 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, libwww, libxml, popt, libglade
(>= 0.17-13), libghttp, gnome-vfs-dev (>= 1.0.5-29) | gnome-vfs-ssl-dev (>=
1.0.5-29), gettext-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev,
gcc3.3, guile16
Replaces: gtkhtml1.1
Conflicts: gtkhtml1.1
Patch: %n.patch
PatchScript: mv components/html-editor/Spell.idl
components/html-editor/SpellI.idl
UpdatePoMakefile: true
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
SetCPPFLAGS: -no-cpp-precomp
ConfigureParams: --with-gconf --with-bonobo
CompileScript: <<
export CC=gcc-3.3; export CXX=g++-3.3; %p//bin/guile16-build ./configure %c
%p/bin/guile16-build make CC=gcc-3.3 CXX=g++-3.3
<<
InstallScript: <<
make install DESTDIR=%d
rm -rf %i/share/control-center/capplets
<<
SplitOff: <<
Package: %N-shlibs
Depends: gal21-shlibs, gconf (>= 1.0.9-21), control-center-shlibs (>=
1.4.0.5-16), gnome-print (>= 0.36-11), glibwww (>= 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.21.dylib 21.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 <[email protected]>
DescPackaging: <<
Originally packaged by Masanori Sekino.
<<
Homepage: http://www.gnome.org/
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
