Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25076
Modified Files:
gtkhtml1.1.info gtkhtml1.1.patch
Log Message:
no more gcc 3.3
Index: gtkhtml1.1.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtkhtml1.1.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtkhtml1.1.info 15 Feb 2006 00:17:17 -0000 1.3
+++ gtkhtml1.1.info 19 Mar 2006 08:52:48 -0000 1.4
@@ -1,11 +1,11 @@
Package: gtkhtml1.1
Version: 1.1.7
-Revision: 1013
+Revision: 1014
Architecture: powerpc
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: 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, readline (>=
4.3-1028), orbit-dev (>= 0.5.17-15), imlib (>= 1.9.14-14), esound, popt,
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev, gcc3.3
+BuildDepends: 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, readline (>=
4.3-1028), orbit-dev (>= 0.5.17-15), imlib (>= 1.9.14-14), esound, popt,
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev
Replaces: gtkhtml
Conflicts: gtkhtml
Patch: %n.patch
@@ -13,8 +13,6 @@
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -fstrict-aliasing -funroll-loops
ConfigureParams: --with-gconf --with-bonobo
-SetCC: gcc-3.3
-SetCXX: g++-3.3
InstallScript: <<
make install DESTDIR=%d
rm -rf %i/share/control-center/capplets
Index: gtkhtml1.1.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtkhtml1.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gtkhtml1.1.patch 20 Jan 2006 20:25:02 -0000 1.1
+++ gtkhtml1.1.patch 19 Mar 2006 08:52:48 -0000 1.2
@@ -1,6 +1,6 @@
-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
+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 @@
@@ -249,9 +249,9 @@
@[EMAIL PROTECTED]:
@[EMAIL PROTECTED]:
@EDITOR_SHLIB_FALSE@ mv $(DESTDIR)$(bindir)/gnome-gtkhtml-editor
$(DESTDIR)$(bindir)/[EMAIL PROTECTED]@
-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
+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 @@
*/
@@ -261,9 +261,9 @@
#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
+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 @@
*/
@@ -273,9 +273,9 @@
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
+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 @@
*/
@@ -285,9 +285,9 @@
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
+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"
@@ -297,9 +297,20 @@
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
+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)
@@ -309,9 +320,9 @@
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
+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
@@ -321,9 +332,9 @@
# 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
+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 \
@@ -333,3 +344,14 @@
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);
-------------------------------------------------------
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
