diff options
author | dholland <dholland@pkgsrc.org> | 2011-07-02 22:19:29 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2011-07-02 22:19:29 +0000 |
commit | 4cf29b14fd7afbabd25ce1dd3ff95a5a32b32705 (patch) | |
tree | 1c755fc98bfba24873413ed8ef5131bcfdd93e80 /www/amaya | |
parent | 06e4bddba93dad66a2075455e34528608ee1e761 (diff) | |
download | pkgsrc-4cf29b14fd7afbabd25ce1dd3ff95a5a32b32705.tar.gz |
Update amaya to 11.3.1. This is a leaf package, so it's ok during the
freeze; plus the prior version wasn't buildable anyhow.
pkgsrc changes:
- add comments to patches
- fix some pkglint
- add a LICENSE
- add a MESSAGE with url to the patches on cvsweb.n.o., which
the license may require
- enable the DAV and Redland RDF code
Vulnerabilities:
- Fixes Secunia 34531.
- Fixes CVE-2008-6005, which hasn't been in pkg-vulnerabilities for
some reason.
- No longer uses outdated builtin wxGTK, so CVE-2009-2369 no longer applies.
- It isn't clear if Secunia 32848 is fixed or not.
Upstream changes:
Amaya 11.3.1
9 December 2009
* Amaya merged paragraphs when several paragraphs are selected and
the user applies to it Strong, Emphasis or Code
* Sometimes after a <br> element is inserted the selection was misplaced
* The caret at the end of a line is sometimes not displayed
* The markup within <script> elements is now preserved
* Bold Italic fonts were not available on Windows platforms
* The $HOME variable is now ignored on Windows platforms
Amaya 11.3
2 December 2009
New Features
* The https protocol is now supported
* New version of the template editor: creation of XTiger
libraries, components, imports, etc.
* Automatic opening of the Structure view for template instances
* The vertical split opens the Structure view and the horizontal
split opens the Source view
* A double click on an item of the List of style sheets tool opens
the style sheet
* A new set of Amaya profiles: "Lite", "Lite+Web", "Lite+Web+CSS",
"Lite+Web+CSS+Math_Graphics", "Advanced"
* The Insert entity command now allows one to insert a unicode
character into a HTML document
* A new command Undo close Tab in the Tab contextual menu
* The Tab and Shift Tab commands allow one to move down/up list items
* The fonts configuration changes: old personal fonts.gl and
fonts.gl.win files have to be removed
Bug fixes
* The link dialogue didn't allow one to insert relative links into
a remote document
* Sometimes the focus in the link dialogue was lost
* Fix some rendering bugs and improve the CSS support
* Improve the edit of template instances: management of options
and attributes and fix bugs
* The refresh of tool panels was too slow
* PNG images were not displayed on 64-bit platforms
* On Mac OSX, the ^ dead key behaved like if "enter" was pressed
* On Mac OSX 10.5, sometimes cached files of the libwww were
stored into the "/" directory
* On Mac OS X platforms when scrolling, svg drawing moved up on the text
* The table of contents was not generated when the selection is not empty
* When the loaded file is ReadOnly, the Save As to another
location didn't work
Amaya 11.2
3 July 2009
New Features
* CSS: Support of z-index, opacity, SVG fill-rule, stop-opacity
and stop-color properties
* SVG: Implementation of linear gradients, copy/paste of markers
* Amaya proposes now to keep a local copy of edited pages when the
publishing fails
* Publishing: Resources can be saved with the document
* A new button allows one to lock/unlock WebDAV resources
Bug fixes
* Move the selection into the structure view when the created
<option> is not visible in the formated view
* The Attributes panel is updated as soon as it is opened
* When a column of a table is selected, Attributes and Style
panels apply to the <col> element
* Keep options of the table creation dialog
* Improve the management of template instances: options, repeats, etc.
* On Windows, local annotations were not correctly loaded
* On Mac OS X: Improve the management of libwww cached files
* The Code clean-up command now keeps style and lang attributes of
<div>, <table>, <span>, and <img> elements
* Improve the rendering of floated boxes and background images
* Fix some redisplay problems
* SVG: When there are several <group> elements, only the first
<group> could be selected
* SVG: When the <svg> element is centered, the position of new
components was miscalculated
* SVG: Improve the creation of arrows
* Fix a crash on Windows version when the Tab key was used in a
document that included a <form> element.
* The Type of the last created document was sometimes lost.
* Improve the WebDAV support
* Etag and preconditions were always checked when a document was
published
* Optimize the calculation of large tables and documents
* And other bug fixes...
Amaya 11.1
30 January 2009
New Features
* Text wrapping in the source view
* Partial support of SVG markers (arrow heads are now drawn with markers)
Bug fixes
* Fix possible security holes CVE-2008-6005
* Prevent a crash when the window, or a tab, or the application is
closed and a dialog is opened
* Display an empty window when the last tab of a window is closed
* Allow to create a link to the document itself
* Sometimes images were not loaded
* Keep options of the Search/Replace command
* Amaya ignored floated boxes within a table cell
* Mac OS X: Sometimes the horizontal scroll bar was not displayed
correctly
* Mac OS X and Windows: Next element and Previous element keys
were applied twice
Amaya 11.0
16 December 2008
New Features
* Support of XHTML+RDFa documents:
o RDFa attributes are parsed and can be edited
o Possibility to create XHTML+RDFa documents
o A command to add/remove namespace declarations of a document
o List of namespace declarations defined in the RDFa Preference.
* Shift+wheel scrolls the document horizontally
* Support direct resizing of images
* Integration of Japanese dialogs thanks to Martin D?rst
* XHTML, MathML, SVG, Template, and XML panels are now tabs of the
Elements tool
* Few new characters are proposed in the Special Characters tool
* A Span menu item is now available in the menu Insert > Character
Element
* SVG editing (a subset of the language)
* Template editing
* the Crtl-Click command opens a link in a new tab (Unix and Windows)
* The Reload command re-open the source or the structure view
* New management of Help documentation
* Improvement of template instances editing (Enter key,
transformations, contextual menus)
* A Tools > Code clean up command to clean up documents generated
by most word processors
Bug fixes
* Improvement of the rendering engine
* When the user selects in the structure view, the selection path
was not displayed in the status bar
* Sometimes images within a table were not displayed
* CSS style sheets attached to an object were not applied
* Close the help window when the user closes the last window document
* The Save all command was active only when a edited document is displayed
* Documents are now scrolled page by page
* On Mac OS X the focus could be lost when a dialog is closed
* On Mac OS X, Ctrl Enter didn't insert a <br>
* Improvement of MathML editing
* It was impossible to extend the selection outside a table
* <br> elements were not copied/pasted
* All attributes in MathML expressions were considered invalid
* Interpretation of attributes attached to <col> elements to fix
alignment, background-color, and width
* Display "Column" instead of "td" or "th" in the statusbar when
the whole column is selected
* A background image CSS property attached to any element (*) was
not applied immediately
* Improvement of XML document saving
* On Mac OS X, the default charset was set to us-ascii by error
* Amaya now uses the Content Location to save a remote document
without suffix (instead of redirecting to the Save As dialog)
* Amaya requested a confirmation each times the PUT is redirected
* Amaya keeps "\\windows-server\sharename\filename.html" URIs unchanged
* When text typed causes image contents to be pushed (to the
right) along with text, only part of the image was refreshed
* In source view, <shif-PageUP/DN>, <shift-DNarrow>, and
<shift-RTarrow> didn't work well.
Diffstat (limited to 'www/amaya')
-rw-r--r-- | www/amaya/MESSAGE | 9 | ||||
-rw-r--r-- | www/amaya/Makefile | 177 | ||||
-rw-r--r-- | www/amaya/PLIST | 345 | ||||
-rw-r--r-- | www/amaya/distinfo | 37 | ||||
-rw-r--r-- | www/amaya/patches/patch-aa | 4 | ||||
-rw-r--r-- | www/amaya/patches/patch-ab | 23 | ||||
-rw-r--r-- | www/amaya/patches/patch-ac | 4 | ||||
-rw-r--r-- | www/amaya/patches/patch-ae | 47 | ||||
-rw-r--r-- | www/amaya/patches/patch-ag | 4 | ||||
-rw-r--r-- | www/amaya/patches/patch-ai | 4 | ||||
-rw-r--r-- | www/amaya/patches/patch-aj | 123 | ||||
-rw-r--r-- | www/amaya/patches/patch-ak | 39 | ||||
-rw-r--r-- | www/amaya/patches/patch-al | 4 | ||||
-rw-r--r-- | www/amaya/patches/patch-am | 4 | ||||
-rw-r--r-- | www/amaya/patches/patch-an | 4 | ||||
-rw-r--r-- | www/amaya/patches/patch-ao | 14 | ||||
-rw-r--r-- | www/amaya/patches/patch-aq | 5 | ||||
-rw-r--r-- | www/amaya/patches/patch-as | 10 |
18 files changed, 502 insertions, 355 deletions
diff --git a/www/amaya/MESSAGE b/www/amaya/MESSAGE new file mode 100644 index 00000000000..512e4d7adff --- /dev/null +++ b/www/amaya/MESSAGE @@ -0,0 +1,9 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2011/07/02 22:19:29 dholland Exp $ + +The license of this package may require formal notice that the sources +have been patched. Patches and their history may be inspected here: + + http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/amaya/patches/ + +=========================================================================== diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 58417c9b599..8eb46d9c733 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.65 2011/07/02 19:05:06 dholland Exp $ +# $NetBSD: Makefile,v 1.66 2011/07/02 22:19:29 dholland Exp $ -DISTNAME= amaya-fullsrc-10.0.1 +DISTNAME= amaya-fullsrc-11.3.1 PKGNAME= ${DISTNAME:S/-fullsrc//} -PKGREVISION= 8 CATEGORIES= www MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \ ftp://ftp.w3.org/pub/amaya/ \ @@ -12,6 +11,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.w3.org/Amaya/ COMMENT= Web browser/editor from the World Wide Web Consortium (W3C) +LICENSE= amaya-license PKG_DESTDIR_SUPPORT= user-destdir @@ -19,6 +19,9 @@ USE_LANGUAGES= c c++ USE_TOOLS+= gmake perl pkg-config GNU_CONFIGURE= yes +# builds receive SIGSEGV (go figure) +MAKE_JOBS_SAFE= no + BUILDDIR= ${WRKDIR}/Amaya/work WRKSRC= ${WRKDIR} CONFIGURE_DIRS= Amaya/work # also sets BUILD_DIRS @@ -36,63 +39,57 @@ REQD_DIRS+= ${PREFIX}/share/Amaya ${PREFIX}/share/Amaya/fonts CFLAGS+= -fno-strict-aliasing .endif -# GNOME/KDE desktop icon and related bits -# These used to get installed only on Linux; in 10.0.1 they don't seem -# to exist any more, but given the makefiles in this package that -# doesn't prove anything, and I can't test on Linux easily. So I'm -# going to leave this here commented out, along with the PLIST -# entries, until they're confirmed to be gone. -#PLIST_VARS+= desktop -#.if ${OPSYS} == "Linux" -#PLIST.desktop= yes -#.endif - # # Some notes on the build issues, for the benefit of the next person # hacking this package: # # - The build directory must be a subdir of the Amaya dir of the -# distribution. If it isn't, the build breaks. Hence CONFIGURE_DIRS. +# distribution. If it isn't, the build breaks. This is why the +# build dir is put where it is and not directly under ${WRKDIR}. +# (This was true in 10.x; it might not be true any longer.) # -# - The copy of libwww that comes in the distfile is required; it is -# custom-patched in unspecified ways. The copy of expat in that copy -# of libwww is also custom-patched. This means we need to use that -# expat and not the pkgsrc one, which is problematic because wxWidgets -# also uses expat. +# - The distfile currently includes copies of Mesa, freetype, libwww, +# redland, and wxWidgets as well as Amaya itself. In 10.x it used to +# also contain a pile of graphics libraries; these have thankfully +# been pruned. # -# - The build system is incapable of building that libwww without -# help; if the libwww subdir of the build directory does not exist, -# the makefiles won't create it, and it's not created by the configure -# script. Thus the manual invocation of make libwww_config in -# post-configure. +# - There is no reason I can see to use or care about the included +# Mesa, freetype, or redland. # -# - The distfile contains not just one but multiple included copies of -# various basic libraries (libpng, libjpeg, zlib, expat) and for the -# most part we don't want to use those copies, because they're out of -# date. It is like pulling teeth - you have to patch all over the -# place, even though the configure script ostensibly supports using -# the system versions. +# - The pkgsrc package used to use the included wxWidgets because at +# the time it was put together pkgsrc didn't have wxGTK28, only +# 26. This is no longer true and it should be safe to ignore the +# included wxWidgets. However, if it needs to come back, beware of +# copies of other libs included in it that Amaya may forcibly build +# and use; in 10.x the only way to get the included wxWidgets to not +# use its own copies of png, jpeg, tiff, and xpm was to patch the +# Amaya build logic. I've left this patch in place for future +# reference, although it's only about 50% likely it'll have any effect +# next time. Do not believe the build docs or the configure script +# when it claims to allow you to disable builtin copies of libs; it +# lies. # -# - For now I'm using the included copy of wxWidgets, because the -# pkgsrc copy is too old. This has a couple of its own issues, but, -# once one forcibly persuades the Amaya configure script to configure -# it correctly, isn't a big problem. +# - The included libwww, however, appears to be necessary. In 10.x it +# was a custom-patched version; now it appears not to be but it is +# also a newer version than found in pkgsrc. As I don't think a newer +# libwww than the one in pkgsrc has actually been released, it may as +# well be a custom-patched version. Given the history it is unlikely +# that Amaya will work with the older libwww in pkgsrc... assuming it +# works at all of course... so it is probably best to use the included +# libwww until such time as this becoems clearer. # -# - Update 20110702: switched to pkgsrc wxWidgets because the builtin -# one doesn't compile any more. +# - The included libwww includes in turn its own copy of expat. In +# 10.x this was also a custom-patched version. This may or may not be +# true now. Regardless, Amaya shold be made to use pkgsrc expat, +# because as things stand it is likely to end up with multiple expats +# linked into it at once, and that's unlikely to work. I have not done +# this yet though. (XXX) # -# - The code using redland does not work, even using the copy of -# redland included in the distfile. The schemas it tries to build are -# syntactically invalid. It *might* be a simple problem, I don't know -# enough about that stuff to fix it. Maybe someone else does. -# -# - The DAV code does not build. It requires generated files from a -# later part of the build to already exist when it's compiled. I don't -# know if it also must come before that part of the build, but it -# wouldn't entirely surprise me if it did; between this and the libwww -# issue it's clear that whoever develops this thing never tries -# building a clean tree. By the time I got to this I was tired of the -# lossage and just disabled the DAV code entirely. +# - As of 10.x the code using redland did not work, even using the +# copy of redland included in the distfile. The schemas it tries to +# build are syntactically invalid. It *might* be a simple problem, I +# don't know enough about that stuff to fix it. Maybe someone else +# does. I haven't tried this in 11.x yet. (XXX) # # - The build target is "all". This is not the default. The default # build target (if you just run make) also sort of builds the package @@ -103,6 +100,18 @@ CFLAGS+= -fno-strict-aliasing # wrappers reorder these and break the build. I patched the makefiles # to always explicitly name .a files for internal program pieces. # +# - The DAV code does not build by default. It requires generated +# files from a later part of the build to already exist when it's +# compiled. (That is, davlib/ doesn't build until part of amaya/ is +# built, but you can't successfully build amaya/ without davlib/ +# because it needs to link with it. It turns out that this can be +# hacked around by forcibly disabling the davlib/ directory in the +# top-level makefile; if davlib is nonetheless enabled, the amaya/ +# makefile recurses back to it to build it after generating the file +# it needs. Sheesh. Between this and other issues it's clear that +# whoever develops this thing never tries building a clean tree, and +# sometimes I wonder if they compile it at all before releasing it. +# post-extract: ${MKDIR} ${BUILDDIR} @@ -110,72 +119,24 @@ post-extract: post-configure: ${CP} ${BUILDDIR}/Options.orig ${BUILDDIR}/Options ${TOUCH} ${BUILDDIR}/Makefile - cd ${BUILDDIR} && \ - ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${GMAKE} libwww_config + +# The davlib code doesn't build, so disable it. (no longer necessary) +#CONFIGURE_ARGS+= --without-dav # -# Components, deps, and included copies of libraries +# Use the supplied (prerelease?) libwww; use pkgsrc for everything else. +# See notes above, and check the cvs history for tips if trying to reenable +# the builtin wxWidgets. # +EXTRACT_ELEMENTS= Amaya libwww +CONFIGURE_ARGS+= --enable-system-redland +CONFIGURE_ARGS+= --enable-system-wx -EXTRACT_ELEMENTS= Amaya - -# Requires its own custom-patched libwww, -# which also incl. a custom-patched expat. -EXTRACT_ELEMENTS+= libwww -# -or- #.include "../../www/libwww/buildlink3.mk" -#.include "../../textproc/expat/buildlink3.mk" - -# The Amaya portion of the distfile inclues copies of libpng, jpeg, and zlib. -# Use pkgsrc's libpng, jpeg, and zlib instead. -CONFIGURE_ARGS+= --without-graphic-libs # Use pkgsrc libraries -# link correctly with pkgsrc zlib (XXX: is this needed or correct?) -LIBS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib -.include "../../mk/jpeg.buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" - -# The davlib code doesn't build. -CONFIGURE_ARGS+= --without-dav - -# pkgsrc doesn't have redland (yet?) -# disable; currently doesn't work and I don't have time to chase down why -#EXTRACT_ELEMENTS+= redland -# -or- -#CONFIGURE_ARGS+= --enable-system-redland -#.include "../../textproc/redland/buildlink3.mk" - -# pkgsrc's wxGTK is too old (2.6.3; 2.8.x is required) -#EXTRACT_ELEMENTS+= wxWidgets -#.include "../../x11/gtk2/buildlink3.mk" -#.include "../../x11/libXinerama/buildlink3.mk" -#.include "../../x11/libSM/buildlink3.mk" -#.include "../../x11/libXxf86vm/buildlink3.mk" -#.include "../../x11/xf86vidmodeproto/buildlink3.mk" -#.include "../../graphics/MesaLib/buildlink3.mk" -#.include "../../graphics/glu/buildlink3.mk" -#CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} -# wxWidgets has *another* copy of a bunch of image libs. -#CONFIGURE_ARGS+= --with-libpng=sys # Use pkgsrc libraries -#CONFIGURE_ARGS+= --with-libjpeg=sys # Use pkgsrc libraries -#CONFIGURE_ARGS+= --with-libtiff=sys # Use pkgsrc libraries -#CONFIGURE_ARGS+= --with-libxpm=sys # Use pkgsrc libraries -#.include "../../graphics/tiff/buildlink3.mk" -#.include "../../x11/libXpm/buildlink3.mk" -# wxWidgets also has a private copy of expat; since Amaya ostensibly -# needs the patched expat in its libwww, which is at least the same -# version as the one in wxWidgets, we'll let wxWidgets use its builtin -# copy. That way if both are linked the fallout should be limited, and -# maybe (ha!) the Amaya developers have seen to it. This will probably -# break with pkgsrc wxWidgets, but we can worry about that later. -#.include "../../textproc/expat/buildlink3.mk" -# -or- -CONFIGURE_ARGS+= --enable-system-wx # Use pkgsrc libraries +.include "../../textproc/redland/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/wxGTK28/buildlink3.mk" - -# also uses glib .include "../../devel/glib2/buildlink3.mk" - +.include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/amaya/PLIST b/www/amaya/PLIST index b0fffb14d7b..fd70a5b75fc 100644 --- a/www/amaya/PLIST +++ b/www/amaya/PLIST @@ -1,10 +1,5 @@ -@comment $NetBSD: PLIST,v 1.14 2009/06/14 22:00:14 joerg Exp $ +@comment $NetBSD: PLIST,v 1.15 2011/07/02 22:19:29 dholland Exp $ bin/amaya -share/Amaya/amaya/Amaya.svg -share/Amaya/amaya/AmayaPage.html -share/Amaya/amaya/AmayaPage.html.de -share/Amaya/amaya/AmayaPage.html.es -share/Amaya/amaya/AmayaPage.html.fr share/Amaya/amaya/AmayaPage_WX.html share/Amaya/amaya/AmayaPage_WX.html.de share/Amaya/amaya/AmayaPage_WX.html.es @@ -20,7 +15,6 @@ share/Amaya/amaya/HTML.en share/Amaya/amaya/HTML.trans share/Amaya/amaya/HTML.trans.es share/Amaya/amaya/HTML.trans.fr -share/Amaya/amaya/HTML.trans.new share/Amaya/amaya/HTMLP.PRS share/Amaya/amaya/HTMLPBW.PRS share/Amaya/amaya/HTMLPL.PRS @@ -55,6 +49,7 @@ share/Amaya/amaya/SVGTX.TRA share/Amaya/amaya/Template.STR share/Amaya/amaya/Template.en share/Amaya/amaya/TemplateP.PRS +share/Amaya/amaya/TemplatePI.PRS share/Amaya/amaya/TemplateT.TRA share/Amaya/amaya/TemplateTX.TRA share/Amaya/amaya/TextFile.STR @@ -62,6 +57,7 @@ share/Amaya/amaya/TextFile.conf share/Amaya/amaya/TextFile.en share/Amaya/amaya/TextFileP.PRS share/Amaya/amaya/TextFilePL.PRS +share/Amaya/amaya/TextFilePLOG.PRS share/Amaya/amaya/TextFilePP.PRS share/Amaya/amaya/TextFilePPUS.PRS share/Amaya/amaya/TextFileT.TRA @@ -86,6 +82,7 @@ share/Amaya/amaya/XMLPP.PRS share/Amaya/amaya/XMLPPUS.PRS share/Amaya/amaya/XMLT.TRA share/Amaya/amaya/XMLUSL.PRS +share/Amaya/amaya/add.png share/Amaya/amaya/advice.png share/Amaya/amaya/amaya.css share/Amaya/amaya/amaya.png @@ -108,8 +105,8 @@ share/Amaya/amaya/lost.gif share/Amaya/amaya/menu.png share/Amaya/amaya/option.gif share/Amaya/amaya/question.png -share/Amaya/amaya/radio-s.gif -share/Amaya/amaya/radio.gif +share/Amaya/amaya/radio-s.png +share/Amaya/amaya/radio.png share/Amaya/amaya/seealso.png share/Amaya/amaya/slider.gif share/Amaya/amaya/slidergl.gif @@ -123,12 +120,9 @@ share/Amaya/amaya/toggle.gif share/Amaya/amaya/top.png share/Amaya/amaya/xtigerbag.png share/Amaya/amaya/xtigeroption.png +share/Amaya/amaya/xtigeroptionset.png share/Amaya/amaya/xtigerrepeat.png share/Amaya/amaya/xtigeruse.png -share/Amaya/annotlib/Topics.en -share/Amaya/annotlib/closed.png -share/Amaya/annotlib/open.png -share/Amaya/annotlib/selected.gif share/Amaya/config/Classic.css share/Amaya/config/Modern.css share/Amaya/config/Standard.css @@ -157,64 +151,34 @@ share/Amaya/config/fi-amayadialogue share/Amaya/config/fi-amayamsg share/Amaya/config/fi-libdialogue share/Amaya/config/fonts.gl -share/Amaya/config/fonts.gl.deb -share/Amaya/config/fonts.gl.deb1 -share/Amaya/config/fonts.gl.mac -share/Amaya/config/fonts.gl.rd +share/Amaya/config/fonts.gl.uni share/Amaya/config/fonts.gl.win -share/Amaya/config/fonts.gl.win.nt -share/Amaya/config/fonts.tmpl -share/Amaya/config/fonts.unix -share/Amaya/config/fonts.unix.deb -share/Amaya/config/fonts.unix.rd +share/Amaya/config/fonts.gl.win.~1.14.~ +share/Amaya/config/fonts.gl.~1.27.~ share/Amaya/config/fonts.win share/Amaya/config/fr-amayadialogue share/Amaya/config/fr-amayamsg share/Amaya/config/fr-libdialogue -share/Amaya/config/gtkrc share/Amaya/config/hu-amayadialogue share/Amaya/config/hu-amayamsg share/Amaya/config/hu-libdialogue share/Amaya/config/it-amayadialogue share/Amaya/config/it-amayamsg share/Amaya/config/it-libdialogue -share/Amaya/config/jp-amayadialogue -share/Amaya/config/jp-amayamsg -share/Amaya/config/jp-libdialogue +share/Amaya/config/ja-amayadialogue +share/Amaya/config/ja-amayamsg +share/Amaya/config/ja-libdialogue share/Amaya/config/ka-amayadialogue share/Amaya/config/ka-amayamsg share/Amaya/config/ka-libdialogue -share/Amaya/config/libconfig/Forward.png -share/Amaya/config/libconfig/Forward.svg -share/Amaya/config/libconfig/amaya_logo.png -share/Amaya/config/libconfig/amaya_logo.svg -share/Amaya/config/libconfig/arrow1.png -share/Amaya/config/libconfig/arrow1.svg -share/Amaya/config/libconfig/arrow2.png -share/Amaya/config/libconfig/arrow2.svg -share/Amaya/config/libconfig/arrow3.png -share/Amaya/config/libconfig/arrow3.svg -share/Amaya/config/libconfig/arrow4.png -share/Amaya/config/libconfig/arrow4.svg -share/Amaya/config/libconfig/arrow5.png -share/Amaya/config/libconfig/arrow5.svg -share/Amaya/config/libconfig/arrow6.png -share/Amaya/config/libconfig/arrow6.svg -share/Amaya/config/libconfig/arrow7.png -share/Amaya/config/libconfig/arrow7.svg -share/Amaya/config/libconfig/audio.png -share/Amaya/config/libconfig/audio.svg -share/Amaya/config/libconfig/catalogue.css -share/Amaya/config/libconfig/colorbox.png -share/Amaya/config/libconfig/colorbox.svg -share/Amaya/config/libconfig/default_cat.lhtml -share/Amaya/config/libconfig/star.png -share/Amaya/config/libconfig/star.svg -share/Amaya/config/libconfig/trash.png -share/Amaya/config/libconfig/trash.svg +share/Amaya/config/nl-amayadialogue +share/Amaya/config/nl-amayamsg +share/Amaya/config/nl-libdialogue share/Amaya/config/pt-amayadialogue share/Amaya/config/pt-amayamsg share/Amaya/config/pt-libdialogue +share/Amaya/config/rdfa.dat +share/Amaya/config/rdfa_list.dat share/Amaya/config/replytypes.rdf share/Amaya/config/ru-amayadialogue share/Amaya/config/ru-amayamsg @@ -222,6 +186,8 @@ share/Amaya/config/ru-libdialogue share/Amaya/config/sk-amayadialogue share/Amaya/config/sk-amayamsg share/Amaya/config/sk-libdialogue +share/Amaya/config/sv-amayadialogue +share/Amaya/config/sv-amayamsg share/Amaya/config/thread.rdf share/Amaya/config/tr-amayadialogue share/Amaya/config/tr-amayamsg @@ -230,6 +196,9 @@ share/Amaya/config/tw-amayadialogue share/Amaya/config/tw-amayamsg share/Amaya/config/tw-libdialogue share/Amaya/config/typeIcon.rdf +share/Amaya/config/uk-amayadialogue +share/Amaya/config/uk-amayamsg +share/Amaya/config/uk-libdialogue share/Amaya/config/unix-thot.rc share/Amaya/dicopar/Eperso.dic share/Amaya/dicopar/Eprinc.dic @@ -316,13 +285,10 @@ share/Amaya/doc/WX/MakeBook.html share/Amaya/doc/WX/MakeBook.html.fr share/Amaya/doc/WX/Manual.html share/Amaya/doc/WX/Manual.html.fr -share/Amaya/doc/WX/Manual.html.sk share/Amaya/doc/WX/Math.html share/Amaya/doc/WX/Math.html.fr -share/Amaya/doc/WX/Math.html.sk share/Amaya/doc/WX/Numbering.html share/Amaya/doc/WX/Numbering.html.fr -share/Amaya/doc/WX/Numbering.html.sk share/Amaya/doc/WX/Printing.html share/Amaya/doc/WX/Printing.html.fr share/Amaya/doc/WX/Publishing.html @@ -362,8 +328,6 @@ share/Amaya/doc/WX/style.css share/Amaya/doc/WX/timeline_help.html share/Amaya/doc/images/Back.gif share/Amaya/doc/images/Browser.gif -share/Amaya/doc/images/CooperationMenu.gif -share/Amaya/doc/images/CooperationPreferences.gif share/Amaya/doc/images/DL.gif share/Amaya/doc/images/Em.gif share/Amaya/doc/images/Forward.gif @@ -467,6 +431,19 @@ share/Amaya/doc/images/tocview-de.jpg share/Amaya/doc/images/tocview.jpg share/Amaya/doc/images/up.gif share/Amaya/doc/images/w3c_home +share/Amaya/fonts/Cyberbit.ttf +share/Amaya/fonts/DejaVuSansCondensed-Bold.ttf +share/Amaya/fonts/DejaVuSansCondensed-BoldOblique.ttf +share/Amaya/fonts/DejaVuSansCondensed-Oblique.ttf +share/Amaya/fonts/DejaVuSansCondensed.ttf +share/Amaya/fonts/DejaVuSansMono-Bold.ttf +share/Amaya/fonts/DejaVuSansMono-BoldOblique.ttf +share/Amaya/fonts/DejaVuSansMono-Oblique.ttf +share/Amaya/fonts/DejaVuSansMono.ttf +share/Amaya/fonts/DejaVuSerifCondensed-Bold.ttf +share/Amaya/fonts/DejaVuSerifCondensed-BoldItalic.ttf +share/Amaya/fonts/DejaVuSerifCondensed-Italic.ttf +share/Amaya/fonts/DejaVuSerifCondensed.ttf share/Amaya/fonts/ESSTIX10.TTF share/Amaya/fonts/ESSTIX11.TTF share/Amaya/fonts/ESSTIX12.TTF @@ -614,6 +591,7 @@ share/Amaya/resources/icons/16x16/MATHML_laplacian.png share/Amaya/resources/icons/16x16/MATHML_lcm.png share/Amaya/resources/icons/16x16/MATHML_leq.png share/Amaya/resources/icons/16x16/MATHML_leqbinary.png +share/Amaya/resources/icons/16x16/MATHML_lfrac.png share/Amaya/resources/icons/16x16/MATHML_lim.png share/Amaya/resources/icons/16x16/MATHML_limtendsto.png share/Amaya/resources/icons/16x16/MATHML_listextension.png @@ -723,6 +701,71 @@ share/Amaya/resources/icons/16x16/MATHML_vectorrow.png share/Amaya/resources/icons/16x16/MATHML_verticalbrace.png share/Amaya/resources/icons/16x16/MATHML_xor.png share/Amaya/resources/icons/16x16/MATHML_xorbinary.png +share/Amaya/resources/icons/16x16/SVG_align_bottom.png +share/Amaya/resources/icons/16x16/SVG_align_center.png +share/Amaya/resources/icons/16x16/SVG_align_left.png +share/Amaya/resources/icons/16x16/SVG_align_middle.png +share/Amaya/resources/icons/16x16/SVG_align_right.png +share/Amaya/resources/icons/16x16/SVG_align_top.png +share/Amaya/resources/icons/16x16/SVG_bezier.png +share/Amaya/resources/icons/16x16/SVG_bring_forward.png +share/Amaya/resources/icons/16x16/SVG_bring_to_front.png +share/Amaya/resources/icons/16x16/SVG_circle.png +share/Amaya/resources/icons/16x16/SVG_closed_bezier.png +share/Amaya/resources/icons/16x16/SVG_cube.png +share/Amaya/resources/icons/16x16/SVG_cylinder.png +share/Amaya/resources/icons/16x16/SVG_diamond.png +share/Amaya/resources/icons/16x16/SVG_distribute_bottom.png +share/Amaya/resources/icons/16x16/SVG_distribute_center.png +share/Amaya/resources/icons/16x16/SVG_distribute_horizontal_spacing.png +share/Amaya/resources/icons/16x16/SVG_distribute_left.png +share/Amaya/resources/icons/16x16/SVG_distribute_middle.png +share/Amaya/resources/icons/16x16/SVG_distribute_right.png +share/Amaya/resources/icons/16x16/SVG_distribute_top.png +share/Amaya/resources/icons/16x16/SVG_distribute_vertical_spacing.png +share/Amaya/resources/icons/16x16/SVG_double_arrow.png +share/Amaya/resources/icons/16x16/SVG_ellipse.png +share/Amaya/resources/icons/16x16/SVG_equilateral_triangle.png +share/Amaya/resources/icons/16x16/SVG_flip_horizontally.png +share/Amaya/resources/icons/16x16/SVG_flip_vertically.png +share/Amaya/resources/icons/16x16/SVG_foreign_object.png +share/Amaya/resources/icons/16x16/SVG_group.png +share/Amaya/resources/icons/16x16/SVG_isosceles_triangle.png +share/Amaya/resources/icons/16x16/SVG_line.png +share/Amaya/resources/icons/16x16/SVG_parallelepiped.png +share/Amaya/resources/icons/16x16/SVG_parallelogram.png +share/Amaya/resources/icons/16x16/SVG_polygon.png +share/Amaya/resources/icons/16x16/SVG_polyline.png +share/Amaya/resources/icons/16x16/SVG_rectangle.png +share/Amaya/resources/icons/16x16/SVG_right_triangle.png +share/Amaya/resources/icons/16x16/SVG_rotate.png +share/Amaya/resources/icons/16x16/SVG_rotate_anticlockwise.png +share/Amaya/resources/icons/16x16/SVG_rotate_clockwise.png +share/Amaya/resources/icons/16x16/SVG_rounded_rectangle.png +share/Amaya/resources/icons/16x16/SVG_rounded_square.png +share/Amaya/resources/icons/16x16/SVG_scale.png +share/Amaya/resources/icons/16x16/SVG_select.png +share/Amaya/resources/icons/16x16/SVG_send_backward.png +share/Amaya/resources/icons/16x16/SVG_send_to_back.png +share/Amaya/resources/icons/16x16/SVG_simple_arrow.png +share/Amaya/resources/icons/16x16/SVG_simple_earrow.png +share/Amaya/resources/icons/16x16/SVG_skew.png +share/Amaya/resources/icons/16x16/SVG_square.png +share/Amaya/resources/icons/16x16/SVG_text.png +share/Amaya/resources/icons/16x16/SVG_translate.png +share/Amaya/resources/icons/16x16/SVG_trapezium.png +share/Amaya/resources/icons/16x16/SVG_ungroup.png +share/Amaya/resources/icons/16x16/SVG_zigzag.png +share/Amaya/resources/icons/16x16/TEMPLATE_bag.png +share/Amaya/resources/icons/16x16/TEMPLATE_import.png +share/Amaya/resources/icons/16x16/TEMPLATE_option.png +share/Amaya/resources/icons/16x16/TEMPLATE_repeat.png +share/Amaya/resources/icons/16x16/TEMPLATE_repeatcomp.png +share/Amaya/resources/icons/16x16/TEMPLATE_template.png +share/Amaya/resources/icons/16x16/TEMPLATE_union.png +share/Amaya/resources/icons/16x16/TEMPLATE_use.png +share/Amaya/resources/icons/16x16/TEMPLATE_usecomp.png +share/Amaya/resources/icons/16x16/TEMPLATE_usetext.png share/Amaya/resources/icons/16x16/Table_bottom.png share/Amaya/resources/icons/16x16/Table_col.png share/Amaya/resources/icons/16x16/Table_col_a.png @@ -795,11 +838,13 @@ share/Amaya/resources/icons/16x16/document_log.png share/Amaya/resources/icons/16x16/document_math.png share/Amaya/resources/icons/16x16/document_source.png share/Amaya/resources/icons/16x16/document_svg.png +share/Amaya/resources/icons/16x16/document_template.png share/Amaya/resources/icons/16x16/document_text.png share/Amaya/resources/icons/16x16/document_xml.png share/Amaya/resources/icons/16x16/down.png share/Amaya/resources/icons/16x16/dummy.ico share/Amaya/resources/icons/16x16/dummy.png +share/Amaya/resources/icons/16x16/edit.png share/Amaya/resources/icons/16x16/editadd.png share/Amaya/resources/icons/16x16/editdelete.png share/Amaya/resources/icons/16x16/error.png @@ -817,6 +862,7 @@ share/Amaya/resources/icons/16x16/ledred.png share/Amaya/resources/icons/16x16/left_image.png share/Amaya/resources/icons/16x16/logo.png share/Amaya/resources/icons/16x16/new.png +share/Amaya/resources/icons/16x16/no_edit.png share/Amaya/resources/icons/16x16/ok.png share/Amaya/resources/icons/16x16/open.png share/Amaya/resources/icons/16x16/paste.png @@ -829,12 +875,10 @@ share/Amaya/resources/icons/16x16/refresh.png share/Amaya/resources/icons/16x16/reload.png share/Amaya/resources/icons/16x16/right_image.png share/Amaya/resources/icons/16x16/save.png -share/Amaya/resources/icons/16x16/save_all.png share/Amaya/resources/icons/16x16/spellcheck.png share/Amaya/resources/icons/16x16/split_horizontaly.png share/Amaya/resources/icons/16x16/split_verticaly.png share/Amaya/resources/icons/16x16/stop.png -share/Amaya/resources/icons/16x16/tableaux.png share/Amaya/resources/icons/16x16/trash.png share/Amaya/resources/icons/16x16/undo.png share/Amaya/resources/icons/16x16/up.png @@ -877,6 +921,173 @@ share/Amaya/resources/icons/misc/logo.ico share/Amaya/resources/icons/misc/logo.png share/Amaya/resources/icons/misc/right.png share/Amaya/resources/icons/misc/up.png +share/Amaya/resources/svg/3d/cone.png +share/Amaya/resources/svg/3d/cone.svg +share/Amaya/resources/svg/3d/cube.png +share/Amaya/resources/svg/3d/cube.svg +share/Amaya/resources/svg/3d/cylinder.png +share/Amaya/resources/svg/3d/cylinder.svg +share/Amaya/resources/svg/3d/octahedron.png +share/Amaya/resources/svg/3d/octahedron.svg +share/Amaya/resources/svg/3d/parallelepiped.png +share/Amaya/resources/svg/3d/parallelepiped.svg +share/Amaya/resources/svg/3d/pyramid.png +share/Amaya/resources/svg/3d/pyramid.svg +share/Amaya/resources/svg/balloons/cloud.png +share/Amaya/resources/svg/balloons/cloud.svg +share/Amaya/resources/svg/balloons/rectangular.png +share/Amaya/resources/svg/balloons/rectangular.svg +share/Amaya/resources/svg/balloons/round.png +share/Amaya/resources/svg/balloons/round.svg +share/Amaya/resources/svg/balloons/rounded_rectangular.png +share/Amaya/resources/svg/balloons/rounded_rectangular.svg +share/Amaya/resources/svg/balloons/scream.png +share/Amaya/resources/svg/balloons/scream.svg +share/Amaya/resources/svg/balloons/thought.png +share/Amaya/resources/svg/balloons/thought.svg +share/Amaya/resources/svg/block_arrows/2-way_rounded_arrow.png +share/Amaya/resources/svg/block_arrows/2-way_rounded_arrow.svg +share/Amaya/resources/svg/block_arrows/3-way_arrow.png +share/Amaya/resources/svg/block_arrows/3-way_arrow.svg +share/Amaya/resources/svg/block_arrows/3-way_arrow_callout.png +share/Amaya/resources/svg/block_arrows/3-way_arrow_callout.svg +share/Amaya/resources/svg/block_arrows/4-way_arrow.png +share/Amaya/resources/svg/block_arrows/4-way_arrow.svg +share/Amaya/resources/svg/block_arrows/4-way_arrow_callout.png +share/Amaya/resources/svg/block_arrows/4-way_arrow_callout.svg +share/Amaya/resources/svg/block_arrows/S-shape_arrow.png +share/Amaya/resources/svg/block_arrows/S-shape_arrow.svg +share/Amaya/resources/svg/block_arrows/chevron.png +share/Amaya/resources/svg/block_arrows/chevron.svg +share/Amaya/resources/svg/block_arrows/circular_arrow.png +share/Amaya/resources/svg/block_arrows/circular_arrow.svg +share/Amaya/resources/svg/block_arrows/corner_arrow.png +share/Amaya/resources/svg/block_arrows/corner_arrow.svg +share/Amaya/resources/svg/block_arrows/corner_double_arrow.png +share/Amaya/resources/svg/block_arrows/corner_double_arrow.svg +share/Amaya/resources/svg/block_arrows/corner_double_arrow_callout.png +share/Amaya/resources/svg/block_arrows/corner_double_arrow_callout.svg +share/Amaya/resources/svg/block_arrows/double_arrow.png +share/Amaya/resources/svg/block_arrows/double_arrow.svg +share/Amaya/resources/svg/block_arrows/double_arrow_callout.png +share/Amaya/resources/svg/block_arrows/double_arrow_callout.svg +share/Amaya/resources/svg/block_arrows/notched_arrow.png +share/Amaya/resources/svg/block_arrows/notched_arrow.svg +share/Amaya/resources/svg/block_arrows/pentagon.png +share/Amaya/resources/svg/block_arrows/pentagon.svg +share/Amaya/resources/svg/block_arrows/rounded_arrow.png +share/Amaya/resources/svg/block_arrows/rounded_arrow.svg +share/Amaya/resources/svg/block_arrows/simple_arrow.png +share/Amaya/resources/svg/block_arrows/simple_arrow.svg +share/Amaya/resources/svg/block_arrows/simple_arrow_callout.png +share/Amaya/resources/svg/block_arrows/simple_arrow_callout.svg +share/Amaya/resources/svg/block_arrows/split_arrow.png +share/Amaya/resources/svg/block_arrows/split_arrow.svg +share/Amaya/resources/svg/block_arrows/striped_arrow.png +share/Amaya/resources/svg/block_arrows/striped_arrow.svg +share/Amaya/resources/svg/chemistry/beaker.png +share/Amaya/resources/svg/chemistry/beaker.svg +share/Amaya/resources/svg/chemistry/boiling_flask.png +share/Amaya/resources/svg/chemistry/boiling_flask.svg +share/Amaya/resources/svg/chemistry/buchner_flask.png +share/Amaya/resources/svg/chemistry/buchner_flask.svg +share/Amaya/resources/svg/chemistry/bunsen_burner.png +share/Amaya/resources/svg/chemistry/bunsen_burner.svg +share/Amaya/resources/svg/chemistry/burette.png +share/Amaya/resources/svg/chemistry/burette.svg +share/Amaya/resources/svg/chemistry/erlenmeyer_flask.png +share/Amaya/resources/svg/chemistry/erlenmeyer_flask.svg +share/Amaya/resources/svg/chemistry/funnel.png +share/Amaya/resources/svg/chemistry/funnel.svg +share/Amaya/resources/svg/chemistry/pipette.png +share/Amaya/resources/svg/chemistry/pipette.svg +share/Amaya/resources/svg/chemistry/test_tube.png +share/Amaya/resources/svg/chemistry/test_tube.svg +share/Amaya/resources/svg/circuit_diagram/capacitor.png +share/Amaya/resources/svg/circuit_diagram/capacitor.svg +share/Amaya/resources/svg/circuit_diagram/current_source.png +share/Amaya/resources/svg/circuit_diagram/current_source.svg +share/Amaya/resources/svg/circuit_diagram/current_source2.png +share/Amaya/resources/svg/circuit_diagram/current_source2.svg +share/Amaya/resources/svg/circuit_diagram/diode.png +share/Amaya/resources/svg/circuit_diagram/diode.svg +share/Amaya/resources/svg/circuit_diagram/ground_point.png +share/Amaya/resources/svg/circuit_diagram/ground_point.svg +share/Amaya/resources/svg/circuit_diagram/inductor.png +share/Amaya/resources/svg/circuit_diagram/inductor.svg +share/Amaya/resources/svg/circuit_diagram/led.png +share/Amaya/resources/svg/circuit_diagram/led.svg +share/Amaya/resources/svg/circuit_diagram/op-amp.png +share/Amaya/resources/svg/circuit_diagram/op-amp.svg +share/Amaya/resources/svg/circuit_diagram/op-amp2.png +share/Amaya/resources/svg/circuit_diagram/op-amp2.svg +share/Amaya/resources/svg/circuit_diagram/resistor.png +share/Amaya/resources/svg/circuit_diagram/resistor.svg +share/Amaya/resources/svg/circuit_diagram/resistor2.png +share/Amaya/resources/svg/circuit_diagram/resistor2.svg +share/Amaya/resources/svg/circuit_diagram/switch.png +share/Amaya/resources/svg/circuit_diagram/switch.svg +share/Amaya/resources/svg/circuit_diagram/transistor.png +share/Amaya/resources/svg/circuit_diagram/transistor.svg +share/Amaya/resources/svg/circuit_diagram/voltage_source.png +share/Amaya/resources/svg/circuit_diagram/voltage_source.svg +share/Amaya/resources/svg/circuit_diagram/voltage_source2.png +share/Amaya/resources/svg/circuit_diagram/voltage_source2.svg +share/Amaya/resources/svg/circuit_diagram/zener_diode.png +share/Amaya/resources/svg/circuit_diagram/zener_diode.svg +share/Amaya/resources/svg/cloud.png +share/Amaya/resources/svg/cloud.svg +share/Amaya/resources/svg/cross.png +share/Amaya/resources/svg/cross.svg +share/Amaya/resources/svg/flower.png +share/Amaya/resources/svg/flower.svg +share/Amaya/resources/svg/frame.png +share/Amaya/resources/svg/frame.svg +share/Amaya/resources/svg/heart.png +share/Amaya/resources/svg/heart.svg +share/Amaya/resources/svg/lightning_bolt.png +share/Amaya/resources/svg/lightning_bolt.svg +share/Amaya/resources/svg/logic_gates/and.png +share/Amaya/resources/svg/logic_gates/and.svg +share/Amaya/resources/svg/logic_gates/nand.png +share/Amaya/resources/svg/logic_gates/nand.svg +share/Amaya/resources/svg/logic_gates/nor.png +share/Amaya/resources/svg/logic_gates/nor.svg +share/Amaya/resources/svg/logic_gates/not.png +share/Amaya/resources/svg/logic_gates/not.svg +share/Amaya/resources/svg/logic_gates/or.png +share/Amaya/resources/svg/logic_gates/or.svg +share/Amaya/resources/svg/logic_gates/xnor.png +share/Amaya/resources/svg/logic_gates/xnor.svg +share/Amaya/resources/svg/logic_gates/xor.png +share/Amaya/resources/svg/logic_gates/xor.svg +share/Amaya/resources/svg/markers.svg +share/Amaya/resources/svg/moon.png +share/Amaya/resources/svg/moon.svg +share/Amaya/resources/svg/polygons_and_stars/heptagon.png +share/Amaya/resources/svg/polygons_and_stars/heptagon.svg +share/Amaya/resources/svg/polygons_and_stars/hexagon.png +share/Amaya/resources/svg/polygons_and_stars/hexagon.svg +share/Amaya/resources/svg/polygons_and_stars/octogon.png +share/Amaya/resources/svg/polygons_and_stars/octogon.svg +share/Amaya/resources/svg/polygons_and_stars/pentagon.png +share/Amaya/resources/svg/polygons_and_stars/pentagon.svg +share/Amaya/resources/svg/polygons_and_stars/star4.png +share/Amaya/resources/svg/polygons_and_stars/star4.svg +share/Amaya/resources/svg/polygons_and_stars/star5.png +share/Amaya/resources/svg/polygons_and_stars/star5.svg +share/Amaya/resources/svg/polygons_and_stars/star6.png +share/Amaya/resources/svg/polygons_and_stars/star6.svg +share/Amaya/resources/svg/prohibited.png +share/Amaya/resources/svg/prohibited.svg +share/Amaya/resources/svg/ring.png +share/Amaya/resources/svg/ring.svg +share/Amaya/resources/svg/scroll.png +share/Amaya/resources/svg/scroll.svg +share/Amaya/resources/svg/smiley.png +share/Amaya/resources/svg/smiley.svg +share/Amaya/resources/svg/sun.png +share/Amaya/resources/svg/sun.svg share/Amaya/resources/xrc/AuthentDlgWX.xrc share/Amaya/resources/xrc/CheckedListDlgWX.xrc share/Amaya/resources/xrc/ConfirmCloseTab.xrc @@ -884,13 +1095,15 @@ share/Amaya/resources/xrc/CreateTableDlgWX.xrc share/Amaya/resources/xrc/DocInfoDlgWX.xrc share/Amaya/resources/xrc/EmailDlg.xrc share/Amaya/resources/xrc/FontDlgWX.xrc +share/Amaya/resources/xrc/GraphicsInfoDlgWX.xrc share/Amaya/resources/xrc/HRefDlgWX.xrc share/Amaya/resources/xrc/ImageDlgWX.xrc -share/Amaya/resources/xrc/ImageDlgWX_new.xrc share/Amaya/resources/xrc/InitConfirmDlgWX.xrc share/Amaya/resources/xrc/ListDlgWX.xrc share/Amaya/resources/xrc/ListEditDlgWX.xrc +share/Amaya/resources/xrc/ListNSDlgWX.xrc share/Amaya/resources/xrc/MakeIdDlgWX.xrc +share/Amaya/resources/xrc/MetaDlgWX.xrc share/Amaya/resources/xrc/ObjectDlgWX.xrc share/Amaya/resources/xrc/OpenDocDlgWX.xrc share/Amaya/resources/xrc/Panel.xrc @@ -898,8 +1111,10 @@ share/Amaya/resources/xrc/Panel_ApplyClass.xrc share/Amaya/resources/xrc/Panel_Attribute.xrc share/Amaya/resources/xrc/Panel_Explorer.xrc share/Amaya/resources/xrc/Panel_MathML.xrc +share/Amaya/resources/xrc/Panel_SVG.xrc share/Amaya/resources/xrc/Panel_Style.xrc share/Amaya/resources/xrc/Panel_StyleList.xrc +share/Amaya/resources/xrc/Panel_Template.xrc share/Amaya/resources/xrc/Panel_XHTML.xrc share/Amaya/resources/xrc/Panel_XML.xrc share/Amaya/resources/xrc/PreferenceDlgWX.xrc @@ -912,15 +1127,11 @@ share/Amaya/resources/xrc/SelectOperatorDlgWX.xrc share/Amaya/resources/xrc/SendByMailDlgWX.xrc share/Amaya/resources/xrc/SpellCheckDlgWX.xrc share/Amaya/resources/xrc/StyleDlgWX.xrc -share/Amaya/resources/xrc/TableDlgWX.xrc +share/Amaya/resources/xrc/TemplateDlgWX.xrc share/Amaya/resources/xrc/TitleDlgWX.xrc share/Amaya/resources/xrc/Toolbar.xrc share/Amaya/resources/xrc/Toolbar_mac.xrc share/Amaya/resources/xrc/WinPrintDlgWX.xrc -@comment These no longer seem to exist, but I might be wrong. -@comment ${PLIST.desktop}share/applications/amaya-8.8.1.desktop -@comment ${PLIST.desktop}share/pixmaps/amaya-8.8.1.png share/Amaya/wx/bin/amaya share/Amaya/wx/bin/amaya_bin share/Amaya/wx/bin/print -@pkgdir share/Amaya/davlib diff --git a/www/amaya/distinfo b/www/amaya/distinfo index 7e66be09de1..3d5753cb2e4 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,21 +1,20 @@ -$NetBSD: distinfo,v 1.21 2011/07/02 18:54:48 dholland Exp $ +$NetBSD: distinfo,v 1.22 2011/07/02 22:19:29 dholland Exp $ -SHA1 (amaya-fullsrc-10.0.1.tgz) = a2dcceedaa2c0256f04aaa86e3dc319d4ff26ade -RMD160 (amaya-fullsrc-10.0.1.tgz) = d1a20a03a18ef3b06cf9dcbab907fb412de0ad6b -Size (amaya-fullsrc-10.0.1.tgz) = 28608680 bytes -SHA1 (patch-aa) = 9620e7027e71f8a96ae22c351c3b207e58a9ed07 -SHA1 (patch-ab) = 3435b82c09111f328281bea855e4a30558d88e2f -SHA1 (patch-ac) = 68e3c4adbf7841763cf5f015b9eafff236e27d93 -SHA1 (patch-ae) = ae2485427e13e88047ba916e4b4a4cb3ce5adaa7 -SHA1 (patch-ag) = b7d83ecd163ed35a10e3c10199e479686d44276b -SHA1 (patch-ai) = 6d40c18c13ae9f5627315dd93af599a041faed2d -SHA1 (patch-aj) = 9a3c16cc015cc1d1f6be536595667e46aaab566b -SHA1 (patch-ak) = 5f6b57ccc712a97cf0bb1e872a4af901b4d67f7a -SHA1 (patch-al) = 5d7801f70de4a364c7a05165ffcd4f5f861f51ba -SHA1 (patch-am) = 41ec6959384913cee891a9dd2fd0f2b910fbcdf4 -SHA1 (patch-an) = a18967c5a7df9ced4c7239a3c40beb9889f614f6 -SHA1 (patch-ao) = 2a2d1097622dca7e0dedf11e45a947bd3b09b2c3 -SHA1 (patch-ap) = 4554fbe8fd17088ce81273d9938c22b17a7dd20b -SHA1 (patch-aq) = eb251555054a83d69771542609a99fc0d5599947 +SHA1 (amaya-fullsrc-11.3.1.tgz) = 7b180434a8271ecdeb3ae821997619bc3dcd2da4 +RMD160 (amaya-fullsrc-11.3.1.tgz) = 12206de82551ed2eb548e3c778909bf0d9cafe43 +Size (amaya-fullsrc-11.3.1.tgz) = 37240030 bytes +SHA1 (patch-aa) = bd04e6ee2a23b18696dad50168da5b6f31bbb3a1 +SHA1 (patch-ab) = d3280c6137eb1b37f62986a5bfe3fc8a23c4b24c +SHA1 (patch-ac) = 3140206116c5dfdbf9257d754c1ea06966d8bd22 +SHA1 (patch-ae) = 76fe53fc0d21d8e32c290bbdc87c2f74a3e9eba9 +SHA1 (patch-ag) = b88c1bf59e479a2ed7ed5ce82459aee21e86e1c2 +SHA1 (patch-ai) = 11bce2a566e426bc354b6d5fdb582d1f4c7dd6ff +SHA1 (patch-aj) = cc7dfa39870b9cbb2489989f7368fbc775999952 +SHA1 (patch-ak) = a3c4ae24d486d3dd6296d3decabd52ded2e0740c +SHA1 (patch-al) = ba540d7cdc1100be17f97d396ad78609c23199e8 +SHA1 (patch-am) = 65655039f8fdf8de905acaccfefd4445c408222a +SHA1 (patch-an) = 6fa9e54e3d48c7f75805525a76a39ebf6daa55d5 +SHA1 (patch-ao) = 095eb0d2d47b1cc4993dd159ad419da47ddf3ee3 +SHA1 (patch-aq) = 9cae8443030f95248b46ee4dc5d1082621c552db SHA1 (patch-ar) = 10a28a129d24f90f5cc8ad297ef14a2d36e74f24 -SHA1 (patch-as) = a57eca7364bd169206468c99c020cbd57fcecbab +SHA1 (patch-as) = 97b8de2ca8aa7818b4a9fd1f45b42ea97b318a66 diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa index d77dbbd37bb..13b620082eb 100644 --- a/www/amaya/patches/patch-aa +++ b/www/amaya/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.13 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-aa,v 1.14 2011/07/02 22:19:30 dholland Exp $ + +- need to be able to check for wchar.h --- Amaya/config.h.in~ 2003-01-07 09:33:07.000000000 -0500 +++ Amaya/config.h.in 2008-09-08 04:37:57.000000000 -0400 diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab index 6761ceb8526..2cc44b10be2 100644 --- a/www/amaya/patches/patch-ab +++ b/www/amaya/patches/patch-ab @@ -1,8 +1,15 @@ -$NetBSD: patch-ab,v 1.14 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-ab,v 1.15 2011/07/02 22:19:30 dholland Exp $ ---- Amaya/configure.orig 2008-01-31 09:07:46.000000000 -0500 -+++ Amaya/configure 2008-09-09 20:44:33.000000000 -0400 -@@ -4939,7 +4939,7 @@ done +- need to check for wchar.h +- configure the included wxWidgets to use pksrc png/jpeg/tiff/xpm instead + of its own copies (note: the included wxWidgets currently isn't being + used, but this change will be wanted again if it ever comes back) +- don't overwrite pkgsrc CFLAGS/CXXFLAGS +- fix install paths for pkgsrc + +--- Amaya/configure.orig 2009-12-09 13:42:57.000000000 +0000 ++++ Amaya/configure +@@ -5471,7 +5471,7 @@ done @@ -10,8 +17,8 @@ $NetBSD: patch-ab,v 1.14 2011/07/02 18:54:49 dholland Exp $ +for ac_header in stdio.h wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then -@@ -13574,11 +13574,11 @@ echo "$as_me: error: wxWidgets library s + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +@@ -13689,11 +13689,11 @@ echo "$as_me: error: wxWidgets library s # --enable-unicode compile wxString with Unicode support # --with-gtk use GTK+ # --with-opengl use OpenGL (or Mesa) @@ -25,7 +32,7 @@ $NetBSD: patch-ab,v 1.14 2011/07/02 18:54:49 dholland Exp $ fi if test $with_wxdebug = yes ; then WXCONFIGURE_OPTION="$WXCONFIGURE_OPTION --enable-debug" -@@ -13696,8 +13696,8 @@ if test "$with_debug" = "yes" ; then +@@ -13810,8 +13810,8 @@ if test "$with_debug" = "yes" ; then CXXFLAGS="-g" else with_debug="no" @@ -36,7 +43,7 @@ $NetBSD: patch-ab,v 1.14 2011/07/02 18:54:49 dholland Exp $ fi if test "${CC}" = "gcc" ; then -@@ -14510,7 +14510,7 @@ if test "${VPATHOPT}" = "" ; then +@@ -14785,7 +14785,7 @@ if test "${VPATHOPT}" = "" ; then VPATHOPT="VPATH" fi diff --git a/www/amaya/patches/patch-ac b/www/amaya/patches/patch-ac index de44490a5af..e61ec5aaef3 100644 --- a/www/amaya/patches/patch-ac +++ b/www/amaya/patches/patch-ac @@ -1,4 +1,6 @@ -$NetBSD: patch-ac,v 1.12 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-ac,v 1.13 2011/07/02 22:19:30 dholland Exp $ + +- needs <wchar.h> --- Amaya/thotlib/include/ustring.h~ 2007-10-18 03:40:32.000000000 -0400 +++ Amaya/thotlib/include/ustring.h 2008-09-08 04:46:10.000000000 -0400 diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae index cd8d186610f..3e621c438f0 100644 --- a/www/amaya/patches/patch-ae +++ b/www/amaya/patches/patch-ae @@ -1,8 +1,38 @@ -$NetBSD: patch-ae,v 1.11 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-ae,v 1.12 2011/07/02 22:19:30 dholland Exp $ ---- Amaya/thotlib/image/pnghandler.c~ 2007-03-02 05:33:21.000000000 -0500 -+++ Amaya/thotlib/image/pnghandler.c 2008-09-08 04:47:23.000000000 -0400 -@@ -587,7 +587,7 @@ static unsigned char *ReadPng (FILE *inf +- Don't use the png library to free twice. +- Fix build with recent libpng. + +--- Amaya/thotlib/image/pnghandler.c.orig 2009-09-09 09:54:50.000000000 +0000 ++++ Amaya/thotlib/image/pnghandler.c +@@ -128,7 +128,7 @@ static unsigned char *ReadPng (FILE *pfF + png_byte **ppbRowPointers; + unsigned char *pixels; + unsigned int i, j, passes; +- unsigned long lw, lh; ++ unsigned lw, lh; + int iBitDepth, iColorType; + double dGamma; + +@@ -149,7 +149,7 @@ static unsigned char *ReadPng (FILE *pfF + png_destroy_read_struct (&png_ptr, NULL, NULL); + return NULL; + } +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL); +@@ -175,7 +175,7 @@ static unsigned char *ReadPng (FILE *pfF + png_set_palette_to_rgb (png_ptr); + /* 8 bits / channel is needed */ + if (iColorType == PNG_COLOR_TYPE_GRAY && iBitDepth < 8) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + /* all transparency type : 1 color, indexed => alpha channel*/ + if (png_get_valid (png_ptr, info_ptr,PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (png_ptr); +@@ -588,7 +588,7 @@ static unsigned char *ReadPng (FILE *inf } /* clean up after the read, and free any memory allocated */ @@ -11,3 +41,12 @@ $NetBSD: patch-ae,v 1.11 2011/07/02 18:54:49 dholland Exp $ /* Free all of the memory associated with the png_ptr and info_ptr */ png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL); /* free the structures */ +@@ -858,7 +858,7 @@ ThotBool SavePng (const char *filename, + png_destroy_write_struct(&png, (png_infopp) NULL); + return FALSE; + } +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + png_destroy_write_struct(&png, &pngInfo); + TtaWriteClose (pngFile); diff --git a/www/amaya/patches/patch-ag b/www/amaya/patches/patch-ag index 097f25fb3d0..7f6d0ccaf15 100644 --- a/www/amaya/patches/patch-ag +++ b/www/amaya/patches/patch-ag @@ -1,4 +1,6 @@ -$NetBSD: patch-ag,v 1.8 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-ag,v 1.9 2011/07/02 22:19:30 dholland Exp $ + +- use standard headers correctly --- Amaya/tools/cextract-1.7/xtract.h.orig 2005-05-30 10:21:42.000000000 -0400 +++ Amaya/tools/cextract-1.7/xtract.h 2008-09-08 05:20:38.000000000 -0400 diff --git a/www/amaya/patches/patch-ai b/www/amaya/patches/patch-ai index c72811a8091..cf47e74ea92 100644 --- a/www/amaya/patches/patch-ai +++ b/www/amaya/patches/patch-ai @@ -1,4 +1,6 @@ -$NetBSD: patch-ai,v 1.3 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-ai,v 1.4 2011/07/02 22:19:30 dholland Exp $ + +- disable macos stuff that doesn't work --- Amaya/batch/script_install_macosxbundle.in~ 2007-03-29 09:24:04.000000000 -0400 +++ Amaya/batch/script_install_macosxbundle.in 2008-09-08 04:50:37.000000000 -0400 diff --git a/www/amaya/patches/patch-aj b/www/amaya/patches/patch-aj index cb0817c9323..7f8d4758354 100644 --- a/www/amaya/patches/patch-aj +++ b/www/amaya/patches/patch-aj @@ -1,8 +1,24 @@ -$NetBSD: patch-aj,v 1.2 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-aj,v 1.3 2011/07/02 22:19:30 dholland Exp $ ---- Amaya/Makefile.in.orig 2007-12-06 08:09:56.000000000 -0500 -+++ Amaya/Makefile.in 2008-09-08 14:19:26.000000000 -0400 -@@ -37,44 +37,44 @@ force : +- fix energizer-bunny-makefiles +- hack around build failure in davlib/ (see pkgsrc Makefile for discussion) + +--- Amaya/Makefile.in.orig 2009-09-15 12:41:32.000000000 +0000 ++++ Amaya/Makefile.in +@@ -13,7 +13,11 @@ include Options + LIBWWW = libwww + + #MKP: adding davlib +-SUBDIRS = @SUBDIRS@ tools thotlib batch annotlib @DAVDIR@ amaya ++# Does not build this way - you have to do a partial build in amaya/ first. ++# it appears that if you don't recurse into davlib but do enable it, it ++# cross-recurses from amaya/ after building the needed generated files. ++# Sheesh. ++SUBDIRS = @SUBDIRS@ tools thotlib batch annotlib amaya + EXTRA_SUBDIRS= $(BUILDRAPTOR) @BUILDLIBWWW@ $(WX_BUILDDIR) $(GL_BUILDDIR) + + prefix = @prefix@ +@@ -36,44 +40,44 @@ force : batch: rebuild force @(if test -d batch ; then cd batch ; \ @@ -58,7 +74,7 @@ $NetBSD: patch-aj,v 1.2 2011/07/02 18:54:49 dholland Exp $ reallyclean : clean $(RM) config.cache config.h config.log config.status -@@ -87,14 +87,14 @@ tempclean : +@@ -86,14 +90,14 @@ tempclean : install : rebuild @(for dir in $(SUBDIRS) ;\ do if test -d $$dir ; then cd $$dir ; \ @@ -77,7 +93,7 @@ $NetBSD: patch-aj,v 1.2 2011/07/02 18:54:49 dholland Exp $ update : @(cd $(THOTDIR) ; cvs update -dP) -@@ -105,26 +105,26 @@ commit : +@@ -104,26 +108,26 @@ commit : @(cd $(THOTDIR) ; cvs commit) tools/mkdep/mkdep : @@ -111,98 +127,3 @@ $NetBSD: patch-aj,v 1.2 2011/07/02 18:54:49 dholland Exp $ # # Rules to rebuild the libWWW package -@@ -150,11 +150,11 @@ AMAYA_LIBWWW_STANDARD_LIBS = \ - - libwww_config : - @(if [ ! -d $(THOTDIR)/../$(LIBWWW) ] ; then \ -- $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; \ -- fi) -+ $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; exit 1; \ -+ fi) || exit 1 - @(if [ ! -d $(LIBWWW) ] ; then \ - $(MKDIR) $(LIBWWW) ; \ -- fi) -+ fi) || exit 1 - #MKP: adding --with-dav - @(localdir=`pwd` ; libwwwdir="$$localdir/../../$(LIBWWW)" ; \ - cd $(LIBWWW) ; unset LANG; \ -@@ -170,7 +170,7 @@ libwww_config : - $(SED) "s/\(\#define HAVE_APPKIT_APPKIT_H 1\)/\/* \1 *\//" \ - wwwconf.h.orig > wwwconf.h ; \ - $(ECHO) "wwwconf.h patched !" ; \ -- fi) -+ fi) || exit 1 - - libwww_make_module_md5 \ - libmd5 : force -@@ -178,7 +178,7 @@ libmd5 : force - cd $(LIBWWW)/modules/md5 ; \ - $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \ - CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \ -- libmd5.la) -+ libmd5.la) || exit 1 - - libwww_install_module_md5 : force - @(if [ -e libmd5.a -a ! -L libmd5.a ] ; then \ -@@ -194,7 +194,7 @@ libexpat : force - cd $(LIBWWW)/modules/expat/ ; \ - $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \ - CPPFLAGS="$(CPPFLAGS)" \ -- ) -+ ) || exit 1 - - libwww_install_module_expat : force - @(if [ -e libexpat.a -a ! -L libexpat.a ] ; then \ -@@ -230,7 +230,7 @@ $(AMAYA_LIBWWW_STANDARD_LIBS) : force - cd $(LIBWWW)/Library/src ; \ - $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \ - CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \ -- $$all_libs) -+ $$all_libs) || exit 1 - - libwww_install_standard : force - @(for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \ -@@ -299,7 +299,7 @@ redland_config: @MAKEREDLAND@ force - redland_make: @MAKEREDLAND@ force - @(cd $(REDLAND) ; \ - $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -DLIBRDF_INTERNAL=1"; \ -- ) -+ ) || exit 1 - - redland: @MAKEREDLAND@ redland_config redland_make - @($(ECHO) "redland is installed") -@@ -308,25 +308,25 @@ redland: @MAKEREDLAND@ redland_config re - # Rules to rebuild the libjpeg package - # - --libjpeg libjpeg.a : force -- @($(RM) $(THOTDIR)/libjpeg/*.o) -- @(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") -+#libjpeg libjpeg.a : force -+# @($(RM) $(THOTDIR)/libjpeg/*.o) -+# @(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1 - - # - # Rules to rebuild the libpng package - # - --libpng libpng.a : force -- @($(RM) $(THOTDIR)/libpng/*.o) -- @(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") -+#libpng libpng.a : force -+# @($(RM) $(THOTDIR)/libpng/*.o) -+# @(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1 - - # - # Rules to rebuild the libpng package - # - --libz libz.a : force -- @($(RM) $(THOTDIR)/libpng/libz/*.o) -- @(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") -+#libz libz.a : force -+# @($(RM) $(THOTDIR)/libpng/libz/*.o) -+# @(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1 - - # - # This section try to maintain the Makefile(s) up-to-date in diff --git a/www/amaya/patches/patch-ak b/www/amaya/patches/patch-ak index ac83ce8a9c2..1dd3aee6d15 100644 --- a/www/amaya/patches/patch-ak +++ b/www/amaya/patches/patch-ak @@ -1,38 +1,19 @@ -$NetBSD: patch-ak,v 1.2 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-ak,v 1.3 2011/07/02 22:19:30 dholland Exp $ ---- Amaya/amaya/Makefile.in.orig 2008-02-05 05:31:51.000000000 -0500 -+++ Amaya/amaya/Makefile.in 2008-09-08 15:33:36.000000000 -0400 -@@ -17,7 +17,7 @@ INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUD +- Fix linkage of internal static libs so they don't trip on the wrappers. + +--- Amaya/amaya/Makefile.in.orig 2009-11-09 11:45:10.000000000 +0000 ++++ Amaya/amaya/Makefile.in +@@ -16,7 +16,7 @@ include ../Options + INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(EXPAT_INCLUDES) $(GUI_INCLUDES) $(EXTRA_INCLUDES) $(GL_INCLUDES) $(GTK_GL_INCLUDES) $(FREETYPE_INCLUDES) $(XFT_INCLUDES) LIBS = $(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) \ - @AMAYA_RAPTOR_LIBS@ \ $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \ - -L../thotlib -L.. -lThotEditor \ + ../thotlib/libThotEditor.a \ - $(AMAYA_OPTION_EXTRA_LIBS) $(IMGLIBS) $(EXPAT_LIBRARIES) \ + $(AMAYA_OPTION_EXTRA_LIBS) $(EXPAT_LIBRARIES) \ + $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(XFT_LIBRARIES) \ $(AMAYA_LIBWWW_LIBS) \ - @LIBS@ $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(XFT_LIBRARIES) \ -@@ -73,14 +73,14 @@ force : - ../thotlib/libThotEditor.a : force - @(cd ../thotlib ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" libThotEditor) - --../libjpeg.a : @MAKEJPEG@ force -- @(cd ../libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") -+#../libjpeg.a : @MAKEJPEG@ force -+# @(cd ../libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") - --../libpng.a : @MAKEPNG@ force -- @(cd ../libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") -+#../libpng.a : @MAKEPNG@ force -+# @(cd ../libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") - --../libz.a : @MAKEPNG@ force -- @(cd ../libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") -+#../libz.a : @MAKEPNG@ force -+# @(cd ../libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") - - ../tools/mkdep/mkdep : - @(cd ../tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") -@@ -169,7 +169,7 @@ AMAYA_LIBS= ../thotlib/libThotEditor.a \ +@@ -156,7 +156,7 @@ AMAYA_LIBS= ../thotlib/libThotEditor.a \ libCSS.a $(AMAYA_OPTION_LIBS) \ $(WX_LINKDEPS) diff --git a/www/amaya/patches/patch-al b/www/amaya/patches/patch-al index 361d5c00d82..bebd7ea1997 100644 --- a/www/amaya/patches/patch-al +++ b/www/amaya/patches/patch-al @@ -1,4 +1,6 @@ -$NetBSD: patch-al,v 1.2 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-al,v 1.3 2011/07/02 22:19:30 dholland Exp $ + +- use correct system types --- Amaya/tools/cextract-1.7/io.c~ 2005-05-30 10:21:55.000000000 -0400 +++ Amaya/tools/cextract-1.7/io.c 2008-09-08 05:30:58.000000000 -0400 diff --git a/www/amaya/patches/patch-am b/www/amaya/patches/patch-am index 95a882a2084..d81d1d25199 100644 --- a/www/amaya/patches/patch-am +++ b/www/amaya/patches/patch-am @@ -1,4 +1,6 @@ -$NetBSD: patch-am,v 1.2 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-am,v 1.3 2011/07/02 22:19:30 dholland Exp $ + +- LP64 fixes --- Amaya/thotlib/base/testcase.c~ 2007-04-25 03:25:54.000000000 -0400 +++ Amaya/thotlib/base/testcase.c 2008-09-08 05:34:11.000000000 -0400 diff --git a/www/amaya/patches/patch-an b/www/amaya/patches/patch-an index 440c142029f..3f47e3369e4 100644 --- a/www/amaya/patches/patch-an +++ b/www/amaya/patches/patch-an @@ -1,4 +1,6 @@ -$NetBSD: patch-an,v 1.2 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-an,v 1.3 2011/07/02 22:19:30 dholland Exp $ + +- the shipped code doesn't build --- Amaya/thotlib/unicode/ustring.c~ 2007-10-18 03:40:32.000000000 -0400 +++ Amaya/thotlib/unicode/ustring.c 2008-09-08 05:37:01.000000000 -0400 diff --git a/www/amaya/patches/patch-ao b/www/amaya/patches/patch-ao index 3678f635080..21f2ef41ef3 100644 --- a/www/amaya/patches/patch-ao +++ b/www/amaya/patches/patch-ao @@ -1,13 +1,15 @@ -$NetBSD: patch-ao,v 1.2 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-ao,v 1.3 2011/07/02 22:19:30 dholland Exp $ ---- Amaya/thotlib/base/structlist.c~ 2008-01-21 06:24:18.000000000 -0500 -+++ Amaya/thotlib/base/structlist.c 2008-09-08 05:45:32.000000000 -0400 -@@ -577,7 +577,7 @@ static void WrTree (PtrElement pNode, in +- don't truncate intptr_t to int + +--- Amaya/thotlib/base/structlist.c.orig 2009-10-26 15:53:57.000000000 +0000 ++++ Amaya/thotlib/base/structlist.c +@@ -596,7 +596,7 @@ static void WrTree (PtrElement pNode, in switch (pAttr1->AttrType) { case AtNumAttr: -- fprintf (fileDescriptor, "%d", pAttr->AeAttrValue); -+ fprintf (fileDescriptor, "%lld", (long long) pAttr->AeAttrValue); +- fprintf (fileDescriptor, "%d", (int)pAttr->AeAttrValue); ++ fprintf (fileDescriptor, "%lld", (long long)pAttr->AeAttrValue); break; case AtTextAttr: if (pAttr->AeAttrText) diff --git a/www/amaya/patches/patch-aq b/www/amaya/patches/patch-aq index 28f91353d0f..d0b2d5c1ad8 100644 --- a/www/amaya/patches/patch-aq +++ b/www/amaya/patches/patch-aq @@ -1,4 +1,7 @@ -$NetBSD: patch-aq,v 1.2 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-aq,v 1.3 2011/07/02 22:19:30 dholland Exp $ + +- Make linkage of internal static libs explicit so the wrappers don't +mess things up. --- Amaya/batch/Makefile.in.orig 2006-11-13 07:24:16.000000000 -0500 +++ Amaya/batch/Makefile.in 2008-09-08 07:32:38.000000000 -0400 diff --git a/www/amaya/patches/patch-as b/www/amaya/patches/patch-as index e9e6257e3cc..f65ce82746e 100644 --- a/www/amaya/patches/patch-as +++ b/www/amaya/patches/patch-as @@ -1,12 +1,12 @@ -$NetBSD: patch-as,v 1.1 2011/07/02 18:54:49 dholland Exp $ +$NetBSD: patch-as,v 1.2 2011/07/02 22:19:30 dholland Exp $ Remove bashism. ---- libwww/configure~ 2006-03-22 15:17:24.000000000 +0000 +--- libwww/configure.orig 2009-09-08 10:03:59.000000000 +0000 +++ libwww/configure -@@ -32726,7 +32726,7 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 - echo "${ECHO_T}$ac_cv_func_remove" >&6 +@@ -33053,7 +33053,7 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 + echo "${ECHO_T}$ac_cv_func_remove" >&6; } - if test "$ac_cv_func_remove" == yes ; then + if test "$ac_cv_func_remove" = yes ; then |