pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/amaya Update amaya to 11.3.1. This is a leaf packa...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2c10c355bfca
branches: trunk
changeset: 590085:2c10c355bfca
user: dholland <dholland%pkgsrc.org@localhost>
date: Sat Jul 02 22:19:29 2011 +0000
description:
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:
www/amaya/MESSAGE | 9 +
www/amaya/Makefile | 181 +++++++++--------------
www/amaya/PLIST | 345 ++++++++++++++++++++++++++++++++++++--------
www/amaya/distinfo | 37 ++--
www/amaya/patches/patch-aa | 4 +-
www/amaya/patches/patch-ab | 23 +-
www/amaya/patches/patch-ac | 4 +-
www/amaya/patches/patch-ae | 47 +++++-
www/amaya/patches/patch-ag | 4 +-
www/amaya/patches/patch-ai | 4 +-
www/amaya/patches/patch-aj | 123 ++-------------
www/amaya/patches/patch-ak | 39 +---
www/amaya/patches/patch-al | 4 +-
www/amaya/patches/patch-am | 4 +-
www/amaya/patches/patch-an | 4 +-
www/amaya/patches/patch-ao | 14 +-
www/amaya/patches/patch-aq | 5 +-
www/amaya/patches/patch-as | 10 +-
18 files changed, 504 insertions(+), 357 deletions(-)
diffs (truncated from 1288 to 300 lines):
diff -r 7bea86ba2b70 -r 2c10c355bfca www/amaya/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/amaya/MESSAGE Sat Jul 02 22:19:29 2011 +0000
@@ -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 -r 7bea86ba2b70 -r 2c10c355bfca www/amaya/Makefile
--- a/www/amaya/Makefile Sat Jul 02 21:33:09 2011 +0000
+++ b/www/amaya/Makefile Sat Jul 02 22:19:29 2011 +0000
@@ -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 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
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_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 @@
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.
-#
-# - 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.
+# 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 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.
+# - 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 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.
+# - There is no reason I can see to use or care about the included
+# Mesa, freetype, or redland.
#
-# - 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.
-#
-# - Update 20110702: switched to pkgsrc wxWidgets because the builtin
-# one doesn't compile any more.
+# - 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.
#
-# - 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 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.
#
-# - 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.
+# - 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)
+#
+# - 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 @@
# 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-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
-
-# 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
+EXTRACT_ELEMENTS= Amaya libwww
+CONFIGURE_ARGS+= --enable-system-redland
+CONFIGURE_ARGS+= --enable-system-wx
-# 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 "../../www/libwww/buildlink3.mk"
+.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 -r 7bea86ba2b70 -r 2c10c355bfca www/amaya/PLIST
--- a/www/amaya/PLIST Sat Jul 02 21:33:09 2011 +0000
+++ b/www/amaya/PLIST Sat Jul 02 22:19:29 2011 +0000
@@ -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.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/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.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/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
Home |
Main Index |
Thread Index |
Old Index