Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26239
Modified Files:
gtkhtml.info gtkhtml.patch
Log Message:
gcc 4 ok
Index: gtkhtml.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtkhtml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gtkhtml.patch 20 Jan 2006 20:25:02 -0000 1.1
+++ gtkhtml.patch 19 Mar 2006 23:04:28 -0000 1.2
@@ -1,6 +1,6 @@
-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
+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
@@ -55,9 +55,9 @@
@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
+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 @@
*/
@@ -67,9 +67,9 @@
#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
+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 @@
*/
@@ -79,9 +79,9 @@
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
+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 @@
*/
@@ -91,9 +91,9 @@
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
+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"
@@ -103,9 +103,20 @@
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
+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)
@@ -115,9 +126,9 @@
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
+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
@@ -136,3 +147,14 @@
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);
Index: gtkhtml.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtkhtml.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gtkhtml.info 15 Feb 2006 00:17:17 -0000 1.5
+++ gtkhtml.info 19 Mar 2006 23:04:28 -0000 1.6
@@ -1,11 +1,10 @@
Package: gtkhtml
Version: 1.0.2
-Revision: 1053
-Architecture: powerpc
+Revision: 1054
Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2
Source-MD5: 2220ffd7834c52177708599579531c23
Depends: %N-shlibs (= %v-%r), libghttp-shlibs
-BuildDepends: 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,
netpbm, orbit-dev (>= 0.5.17-15), readline (>= 4.3-1028), 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), gettext-dev, gettext-bin, gettext-tools,
libiconv-dev, x11-dev, gcc3.3, guile16 (>= 1.6.7-1010)
+BuildDepends: 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,
netpbm, orbit-dev (>= 0.5.17-15), readline (>= 4.3-1028), 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), gettext-dev, gettext-bin, gettext-tools,
libiconv-dev, x11-dev, guile16 (>= 1.6.7-1010)
Replaces: gtkhtml1.1
Conflicts: gtkhtml1.1
Patch: %n.patch
@@ -16,8 +15,8 @@
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
+ %p//bin/guile16-build ./configure %c
+ %p/bin/guile16-build make
<<
InstallScript: <<
make install DESTDIR=%d
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
