Update of /cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3562/10.4-transitional/unstable/crypto/finkinfo
Modified Files:
gtkhtml3.8.15.info
Log Message:
new %v; deprecate %N (move files used at runtime to %N-shlibs since they are
versioned and/or encourage people to Depends on packages that would conflict
among versions)
Index: gtkhtml3.8.15.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/gtkhtml3.8.15.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gtkhtml3.8.15.info 7 Apr 2006 08:14:45 -0000 1.4
+++ gtkhtml3.8.15.info 12 May 2006 14:30:49 -0000 1.5
@@ -1,13 +1,11 @@
Package: gtkhtml3.8.15
-Version: 3.10.0
+Version: 3.10.1
Revision: 1
-Depends: %N-shlibs (= %v-%r), libgettext3-shlibs, libiconv
+Depends: %N-shlibs (>= %v-%r)
BuildDepends: automake1.9, libtool14 (>= 1.5.8-1), libjpeg, audiofile, esound,
libsoup2.2.8-ssl (>= 2.2.6.1-2), glib2-dev (>= 2.4.6-7), atk1 (>= 1.6.1-3),
pango1-xft2-dev (>= 1.6.0-1), gconf2-dev (>= 2.6.3-10), gtk+2-dev (>= 2.4.9-8),
libart2 (>= 2.3.16-2), libgnome2-dev (>= 2.10.0-1), libgnomeui2-dev (>=
2.6.1.1-9), gnome-vfs2-ssl-dev (>= 2.6.1.1-15) | gnome-vfs2-dev (>=
2.6.1.1-15), libgnomeprintui2.2-dev (>= 2.6.2-8), libgnomeprint2.2-dev (>=
2.6.2-9), libbonoboui2-dev (>= 2.6.1-10), libbonobo2-dev (>= 2.6.2-9),
libgnomecanvas2-dev (>= 2.6.1.1-7), orbit2-dev (>= 2.10.3-9), libxml2 (>=
2.6.1-1), gal2.4.0-dev, gail17-dev (>= 1.6.6-7), pkgconfig, libgettext3-dev,
gettext-bin, libiconv-dev, intltool (>= 0.30-1), libglade2, x11-dev,
popt-shlibs, gnutls12, libtasn1, libgcrypt, libgpg-error, pth,
gnome-icon-theme, popt, gnome-keyring-dev
BuildConflicts: freetype, freetype-hinting, gal19
-Conflicts: gtkhtml3
-Replaces: gtkhtml3
Source: mirror:gnome:sources/gtkhtml/3.10/gtkhtml-%v.tar.bz2
-Source-MD5: 1d564a2d9a7a4911c8d1b50868acef81
+Source-MD5: f2b7ff386dae9fcc3b01c4116564722d
PatchScript: <<
mv components/html-editor/Spell.idl components/html-editor/SpellI.idl
perl -pi -e 's|Spell([\.\-])|SpellI$1|g' components/html-editor/*
@@ -15,9 +13,11 @@
perl -pi.bak -e 's|extern HTMLClueAlignedClass html_cluealigned_class.*||g'
src/htmlcluealigned.h
perl -pi.bak -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
+
+ perl -pi -e 's/(#include "editor-control-factory.h")/#include
"gtkhtml-private.h"\n\1/' components/html-editor/editor-control-factory.c
<<
SetCPPFLAGS: -no-cpp-precomp
-SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing -flat_namespace -undefined
suppress
+SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --disable-dependency-tracking --libexecdir=%p/lib
@@ -28,11 +28,18 @@
# cd src; DYLD_LIBRARY_PATH=.libs make test
# cd src; DYLD_LIBRARY_PATH=.libs make stress-test
<<
+InstallScript: <<
+ make install DESTDIR=%d
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%N
+<<
SplitOff: <<
Package: %N-shlibs
- Depends: atk1-shlibs (>= 1.6.1-3), gail17-shlibs (>= 1.6.6-7),
libgettext3-shlibs, glib2-shlibs (>= 2.4.6-7), gtk+2-shlibs (>= 2.4.9-8),
libart2-shlibs (>= 2.3.16-2), libgnome2-shlibs (>= 2.10.0-1),
libgnomeui2-shlibs (>= 2.6.1.1-9), libgnomecanvas2-shlibs (>= 2.6.1.1-7),
libiconv, libxml2-shlibs (>= 2.6.1-1), pango1-xft2-shlibs (>= 1.6.0-1),
libsoup2.2.8-ssl-shlibs (>= 2.2.6.1-2), orbit2-shlibs (>= 2.1.0.3-9),
audiofile-shlibs, libbonoboui2 (>= 2.6.1-10), libbonobo2-shlibs (>= 2.6.2-9),
esound-shlibs, gconf2-shlibs (>= 2.6.3-10), libglade2-shlibs,
libgnomeprintui2.2-shlibs (>= 2.6.2-8), libgnomeprint2.2-shlibs (>= 2.6.2-9),
gnome-vfs2-ssl-shlibs (>= 2.6.1.1-15) | gnome-vfs2-shlibs (>= 2.6.1.1-15),
libjpeg-shlibs, popt-shlibs, x11, gnome-keyring-shlibs
- Files: lib/libgtkhtml-3.8.*.dylib lib/gtkhtml/lib*.so
+ Depends: atk1-shlibs (>= 1.6.1-3), gail17-shlibs (>= 1.6.6-7),
libgettext3-shlibs, glib2-shlibs (>= 2.4.6-7), gtk+2-shlibs (>= 2.4.9-8),
libart2-shlibs (>= 2.3.16-2), libgnome2-shlibs (>= 2.10.0-1),
libgnomeui2-shlibs (>= 2.6.1.1-9), libgnomecanvas2-shlibs (>= 2.6.1.1-7),
libiconv, libxml2-shlibs (>= 2.6.1-1), pango1-xft2-shlibs (>= 1.6.0-1),
libsoup2.2.8-ssl-shlibs (>= 2.2.6.1-2), orbit2-shlibs (>= 2.1.0.3-9),
audiofile-shlibs, libbonoboui2 (>= 2.6.1-10), libbonobo2-shlibs (>= 2.6.2-9),
esound-shlibs, gconf2-shlibs (>= 2.6.3-10), libglade2-shlibs,
libgnomeprintui2.2-shlibs (>= 2.6.2-8), libgnomeprint2.2-shlibs (>= 2.6.2-9),
gnome-vfs2-ssl-shlibs (>= 2.6.1.1-15) | gnome-vfs2-shlibs (>= 2.6.1.1-15),
libjpeg-shlibs, popt-shlibs, x11, gnome-keyring-shlibs, libgettext3-shlibs,
libiconv
+ Conflicts: gtkhtml3
+ Replaces: gtkhtml3, %N (<< 3.10.1-1)
+ Files: lib/libgtkhtml-3.8.*.dylib lib/gtkhtml/lib*.so share/gtkhtml-3.8
lib/bonobo share/locale
Shlibs: <<
%p/lib/libgtkhtml-3.8.15.dylib 19.0.0 %n (>= 3.8.0-1)
<<
@@ -63,15 +70,12 @@
<<
<<
-DocFiles: <<
- AUTHORS BUGS COPYING COPYING.LIB NEWS README TODO
- a11y/ChangeLog:ChangeLog.a11y
- art/ChangeLog:ChangeLog.art
- components/html-editor/ChangeLog:ChangeLog.components.html-editor
- po/ChangeLog:ChangeLog.po
- src/ChangeLog:ChangeLog.src
-<<
Description: HTML rendering/printing/editing engine
+DescUsage: <<
+ %N is a dummy package: if you really used to need it, you should
+ Depends: %N-shlibs (>= 3.10.1-1) instead, which supplies all the
+ files that were previously in %N.
+<<
DescPort: <<
Rename components/html-editor/Spell.idl -> SpellI.idl and adjust all
references to it accordingly. No idea why.
@@ -80,6 +84,10 @@
deps of libsoup) but aren't actually linked into the files installed
by gtkhtml3.8.15 so are BuildDepends but their -shlibs are not
Depends here.
+
+ Add #include "gtkhtml-private.h" to editor-control-factory.c to
+ solve inplicit incorrect declaration of gtk_html_filename_from_uri.
+ See: http://bugzilla.gnome.org/show_bug.cgi?id=341522
<<
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
