Update of /cvsroot/fink/experimental/fingolfin/finkinfo/gnome
In directory sc8-pr-cvs1:/tmp/cvs-serv14972/gnome
Added Files:
gal21-0.22-1.info gal21-0.22-1.patch gtkhtml1.1-1.1.7-1.info
gtkhtml1.1-1.1.7-1.patch
Log Message:
new gal21/gtkhtml needed for evo 1.2.1; updated evo package (not yet tested)
--- NEW FILE: gal21-0.22-1.info ---
Package: gal21
Version: 0.22
Revision: 1
Source: mirror:gnome:sources/gal/%v/gal-%v.tar.bz2
Source-MD5: f2d5e447b6e239bc68f66f8a48d0897b
Depends: %N-shlibs (= %v-%r)
BuildDepends: gtk+, gnome-libs-dev (>= 1.4.2-2), libxml, gnome-print-dev, gtk-doc,
dlcompat-dev
Replaces: gal, gal19
Conflicts: gal, gal19
Patch: %f.patch
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -fstrict-aliasing -funroll-loops
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
Depends: gtk+-shlibs
Files: lib/libgal.*.dylib share/gal/%v share/locale
Shlibs: %p/lib/libgal.21.dylib 22.1.0 %n (>= 0.22-1)
DocFiles: AUTHORS COPYING* ChangeLog MAINTAINERS NEWS README
<<
DocFiles: AUTHORS COPYING* ChangeLog MAINTAINERS NEWS README
Description: GNOME application library
DescDetail: Reuseable GNOME library functions.
DescPort: <<
Disabled building of test programs.
<<
License: GPL/LGPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- NEW FILE: gal21-0.22-1.patch ---
diff -ru gal-0.22/Makefile.in gal-0.22-patched/Makefile.in
--- gal-0.22/Makefile.in 2002-12-05 18:13:21.000000000 +0100
+++ gal-0.22-patched/Makefile.in 2003-01-14 19:32:39.000000000 +0100
@@ -154,7 +154,7 @@
gnomelocaledir = @gnomelocaledir@
l = @l@
-SUBDIRS = gal po intl tests docs art macros
+SUBDIRS = gal po intl docs art macros
confexecdir = $(libdir)
confexec_DATA = galConf.sh
diff -ru gal-0.22/gal/e-table/e-table-memory-store.c
gal-0.22-patched/gal/e-table/e-table-memory-store.c
--- gal-0.22/gal/e-table/e-table-memory-store.c 2002-11-26 23:21:40.000000000 +0100
+++ gal-0.22-patched/gal/e-table/e-table-memory-store.c 2003-01-14 16:59:22.000000000
++0100
@@ -26,7 +26,7 @@
#include "e-table-memory-store.h"
#define PARENT_TYPE e_table_memory_get_type ()
-ETableMemoryClass *parent_class = NULL;
+static ETableMemoryClass *parent_class = NULL;
#define STORE_LOCATOR(etms, col, row) (*((etms)->priv->store + (row) *
(etms)->priv->col_count + (col)))
diff -ru gal-0.22/gal/widgets/e-categories-master-list-dialog-model.c
gal-0.22-patched/gal/widgets/e-categories-master-list-dialog-model.c
--- gal-0.22/gal/widgets/e-categories-master-list-dialog-model.c 2002-04-25
22:05:39.000000000 +0200
+++ gal-0.22-patched/gal/widgets/e-categories-master-list-dialog-model.c
+2003-01-14 16:59:26.000000000 +0100
@@ -28,7 +28,7 @@
#include <gnome.h>
#define PARENT_TYPE e_table_model_get_type()
-ETableModelClass *parent_class;
+static ETableModelClass *parent_class;
/*
* ECategoriesMasterListDialogModel callbacks
diff -ru gal-0.22/ltmain.sh gal-0.22-patched/ltmain.sh
--- gal-0.22/ltmain.sh 2002-12-05 18:12:44.000000000 +0100
+++ gal-0.22-patched/ltmain.sh 2003-01-14 19:31:12.000000000 +0100
@@ -2317,8 +2317,8 @@
major=.`expr $current - $age`
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
- verstring="-compatibility_version $minor_current -current_version
$minor_current.$revision"
+ major_plus_one=`expr $current - $age + 1`
+ verstring="-compatibility_version $major_plus_one -current_version
+$major_plus_one.$age.$revision"
;;
freebsd-aout)
@@ -2952,7 +2952,23 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
+ if test "x$verstring" = "x0.0"; then
+ tmp_verstring=
+ else
+ tmp_verstring="$verstring"
+ fi
+ save_deplibs="$deplibs"
+ for conv in $convenience; do
+ tmp_deplibs=
+ for test_deplib in $deplibs; do
+ if test "$test_deplib" != "$conv"; then
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ fi
+ done
+ deplibs="$tmp_deplibs"
+ done
eval cmds=\"$archive_cmds\"
+ deplibs="$save_deplibs"
fi
save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do
diff -ru gal-0.22/po/Makefile.in.in gal-0.22-patched/po/Makefile.in.in
--- gal-0.22/po/Makefile.in.in 2002-12-05 18:12:58.000000000 +0100
+++ gal-0.22-patched/po/Makefile.in.in 2003-01-14 19:33:40.000000000 +0100
@@ -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 \
--- NEW FILE: gtkhtml1.1-1.1.7-1.info ---
Package: gtkhtml1.1
Version: 1.1.7
Revision: 1
Source: mirror:gnome:sources/gtkhtml/1.1/gtkhtml-%v.tar.bz2
Source-MD5: 83cd60ab9a108d2a0d65b3bf760affa4
Depends: %N-shlibs (= %v-%r), libghttp-shlibs, control-center-shlibs
BuildDepends: gnome-libs-dev, libghttp, gconf-dev, oaf-dev, bonobo-dev (>= 1.0.20-3),
control-center-dev, gal21, gnome-print-dev, gtk-doc, dlcompat-dev
Replaces: gtkhtml
Conflicts: gtkhtml
Patch: %f.patch
PatchScript: mv components/html-editor/Spell.idl components/html-editor/SpellI.idl
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -fstrict-aliasing -funroll-loops
ConfigureParams: --with-gconf --with-bonobo
InstallScript: <<
make install DESTDIR=%d
rm -rf %i/share/control-center/capplets
<<
SplitOff: <<
Package: %N-shlibs
Depends: gconf-shlibs, gal21-shlibs, bonobo-shlibs
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: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- NEW FILE: gtkhtml1.1-1.1.7-1.patch ---
diff -Naur gtkhtml-1.1.6.old/components/html-editor/Makefile.in
gtkhtml-1.1.6.new/components/html-editor/Makefile.in
--- gtkhtml-1.1.6.old/components/html-editor/Makefile.in Thu Nov 7 06:05:57
2002
+++ gtkhtml-1.1.6.new/components/html-editor/Makefile.in Wed Nov 13 03:12:23
+2002
@@ -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 = \
@[EMAIL PROTECTED] Editor-skels.lo Editor-stubs.lo \
-@[EMAIL PROTECTED] Spell-skels.lo Spell-stubs.lo \
+@[EMAIL PROTECTED] SpellI-skels.lo SpellI-stubs.lo \
@[EMAIL PROTECTED] cell.lo control-data.lo dialog.lo \
@[EMAIL PROTECTED] editor-control-factory.lo engine.lo \
@[EMAIL PROTECTED] 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.6.old/components/html-editor/Spell-common.c
gtkhtml-1.1.6.new/components/html-editor/Spell-common.c
--- gtkhtml-1.1.6.old/components/html-editor/Spell-common.c Wed Nov 6 06:09:06
2002
+++ gtkhtml-1.1.6.new/components/html-editor/Spell-common.c Wed Nov 13 02:59:34
+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.1.6.old/components/html-editor/Spell-skels.c
gtkhtml-1.1.6.new/components/html-editor/Spell-skels.c
--- gtkhtml-1.1.6.old/components/html-editor/Spell-skels.c Wed Nov 6 06:09:06
2002
+++ gtkhtml-1.1.6.new/components/html-editor/Spell-skels.c Wed Nov 13 02:59:34
+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.1.6.old/components/html-editor/Spell-stubs.c
gtkhtml-1.1.6.new/components/html-editor/Spell-stubs.c
--- gtkhtml-1.1.6.old/components/html-editor/Spell-stubs.c Wed Nov 6 06:09:06
2002
+++ gtkhtml-1.1.6.new/components/html-editor/Spell-stubs.c Wed Nov 13 02:59:34
+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.1.6.old/components/html-editor/control-data.h
gtkhtml-1.1.6.new/components/html-editor/control-data.h
--- gtkhtml-1.1.6.old/components/html-editor/control-data.h Thu Jun 6 23:06:21
2002
+++ gtkhtml-1.1.6.new/components/html-editor/control-data.h Wed Nov 13 02:59:34
+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.1.6.old/components/http-storage-module/Makefile.in
gtkhtml-1.1.6.new/components/http-storage-module/Makefile.in
--- gtkhtml-1.1.6.old/components/http-storage-module/Makefile.in Thu Nov 7
06:06:05 2002
+++ gtkhtml-1.1.6.new/components/http-storage-module/Makefile.in Wed Nov 13
+02:59:34 2002
@@ -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.6.old/configure gtkhtml-1.1.6.new/configure
--- gtkhtml-1.1.6.old/configure Thu Nov 7 04:45:22 2002
+++ gtkhtml-1.1.6.new/configure Wed Nov 13 02:59:34 2002
@@ -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.6.old/po/Makefile.in.in gtkhtml-1.1.6.new/po/Makefile.in.in
--- gtkhtml-1.1.6.old/po/Makefile.in.in Thu Nov 7 04:45:44 2002
+++ gtkhtml-1.1.6.new/po/Makefile.in.in Wed Nov 20 01:06:03 2002
@@ -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 \
-------------------------------------------------------
This SF.NET email is sponsored by: Take your first step towards giving
your online business a competitive advantage. Test-drive a Thawte SSL
certificate - our easy online guide will show you how. Click here to get
started: http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0027en
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
