Re: [Announce] Amaya 10 .1-pre5 snapshot
Regis Boudin <[email protected]>
| Newsgroups | gmane.comp.web.amaya.devel,gmane.comp.web.amaya.general |
|---|---|
| Message-ID | <1224448449.3471.14.camel@x40> |
Hi all, after a bit of work, I updated the patches applied for the debian package and will make an upload soonish. The patches are attached, applied in the following order : * cflags_cleanup.diff : stops forcing the -O2 and -g flags so I can set them at compile time. * desktop_file_fix.patch : drops the deprecated "Encoding" field and calls amaya directly instead of yet another copy of the arguments before amaya_bin * warnings_fix.diff : fixes a bunch of compile warnings * build_cleanup.diff : Drops a number of now unused tests and variables in the build system * libwww_cleanup.diff : A first set of modifications towards enabling the use of shared libwww. Should be safe to apply. * enable_system_libwww.diff : the actual patch enabling the shared libwww * curl_pre.diff : a serie of simples modifications aiming at reducing dependencies to the libwww, such as using __CR__ instead of CR. Idealy, I would like to get feedback about trying to merge warnings_fix.diff, build_cleanup.diff, libwww_cleanup.diff, and curl_pre.diff as usual, any comment, correction about my patches would be more than welcome, including from packagers of other distros. Regis On Fri, 2008-10-17 at 17:31 +0200, Irene Vatton wrote: > > The snapshot Amaya 10.1-pre5 is now available. > > Major changes since amaya 10.1-pre4 concern: > o The SVG editor > o The template editor > o The editing of template instances > o Reload to re-open the source view or the structure view > o And several bug fixes > > For more more detail see the "Latest CVS changes" section in > http://www.w3.org/Amaya > > Binaries distributions are available at: > http://www.w3.org/Amaya/User/BinDist.html > > Sources distributions are available at: > http://www.w3.org/Amaya/User/SourceDist.html >
build_cleanup.diff
(text/x-patch, 3.5 KB)
Index: Amaya/configure.in
===================================================================
--- Amaya.orig/configure.in 2008-09-19 22:11:14.000000000 +0100
+++ Amaya/configure.in 2008-09-19 22:12:07.000000000 +0100
@@ -808,12 +808,6 @@
esac],
[with_templates="yes"])
-if test "$with_templates" = yes -a "$with_wx" != "yes"; then
- AC_MSG_WARN(Templates are only available in WX version !!)
- AC_MSG_WARN(Disabling templates)
- with_templates="no"
-fi
-
if test "$with_templates" = "yes" ; then
TEMPLATES_OPTIONS="-DTEMPLATES"
else
@@ -913,12 +907,6 @@
AMAYA_OPTIONS="$AMAYA_OPTIONS -DAMAYA_DEBUG"
fi
-if test "$with_wx" = "yes" ; then
- IMGLIBS=""
-else
- IMGLIBS="-ljpeg -lpng -lz"
-fi
-
EXTRA_INCLUDES=
# check for malloc.h
@@ -998,7 +986,6 @@
AC_SUBST(THOT_OPTIONS)
AC_SUBST(AMAYA_OPTIONS)
-AC_SUBST(IMGLIBS)
AC_SUBST(EXTRA_INCLUDES)
AC_SUBST(DAVDIR)
@@ -1175,12 +1162,10 @@
fi
fi
-if test "$with_wx" = "yes" ; then
- if test "$with_wxdebug" = "yes" ; then
- echo "Amaya configured with wxWidgets {srcdir=$WX_SRCDIR} (debug)"
- else
- echo "Amaya configured with wxWidgets {srcdir=$WX_SRCDIR}"
- fi
+if test "$with_wxdebug" = "yes" ; then
+ echo "Amaya configured with wxWidgets {srcdir=$WX_SRCDIR} (debug)"
+else
+ echo "Amaya configured with wxWidgets {srcdir=$WX_SRCDIR}"
fi
Index: Amaya/Options.in
===================================================================
--- Amaya.orig/Options.in 2008-09-19 22:12:28.000000000 +0100
+++ Amaya/Options.in 2008-09-19 22:12:40.000000000 +0100
@@ -39,7 +39,6 @@
AMAYA_ANNOT_INCLUDES=@AMAYA_ANNOT_INCLUDES@
AMAYA_ANNOT_EXTRA_LIBS=@AMAYA_ANNOT_EXTRA_LIBS@
-IMGLIBS=@IMGLIBS@
EXTRA_INCLUDES=@EXTRA_INCLUDES@
EXPAT_INCLUDES=
Index: Amaya/thotlib/Makefile.in
===================================================================
--- Amaya.orig/thotlib/Makefile.in 2008-09-19 22:16:18.000000000 +0100
+++ Amaya/thotlib/Makefile.in 2008-09-19 22:22:05.000000000 +0100
@@ -12,8 +12,8 @@
include ../Options
-INCLUDES= -DHAVE_CONFIG_H -I.. -I@top_srcdir@/amaya/xpm ${THOTINCLUDES} $(GUI_INCLUDES) $(GL_INCLUDES) $(GTK_GL_INCLUDES) $(XFT_INCLUDES) $(FREETYPE_INCLUDES) ${EXTRA_INCLUDES}
-LIBS = -L. -L.. @LIBS@ $(IMGLIBS) $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(XFT_LIBRARIES) $(FREETYPE_LIBRARIES) $(GTK_LIBRARIES) $(WX_LIBRARIES)
+INCLUDES= -DHAVE_CONFIG_H -I.. -I@top_srcdir@/amaya/xpm ${THOTINCLUDES} $(GUI_INCLUDES) $(GL_INCLUDES) $(FREETYPE_INCLUDES) ${EXTRA_INCLUDES}
+LIBS = -L. -L.. @LIBS@ $(GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(WX_LIBRARIES)
prefix = @prefix@
exec_prefix = @exec_prefix@
Index: Amaya/amaya/Makefile.in
===================================================================
--- Amaya.orig/amaya/Makefile.in 2008-09-19 22:17:25.000000000 +0100
+++ Amaya/amaya/Makefile.in 2008-09-19 22:21:18.000000000 +0100
@@ -13,13 +13,13 @@
include ../Options
-INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(EXPAT_INCLUDES) $(GUI_INCLUDES) $(EXTRA_INCLUDES) $(GL_INCLUDES) $(GTK_GL_INCLUDES) $(FREETYPE_INCLUDES) $(XFT_INCLUDES)
+INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(EXPAT_INCLUDES) $(GUI_INCLUDES) $(EXTRA_INCLUDES) $(GL_INCLUDES) $(FREETYPE_INCLUDES)
LIBS = $(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) \
$(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \
-L../thotlib -L.. -lThotEditor \
$(AMAYA_OPTION_EXTRA_LIBS) $(EXPAT_LIBRARIES) \
$(AMAYA_LIBWWW_LIBS) \
- $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(XFT_LIBRARIES) \
+ $(GL_LIBRARIES) $(FREETYPE_LIBRARIES) \
@AMAYA_RAPTOR_LIBS@ \
$(WX_LIBRARIES)
cflags_cleanup.diff
(text/x-patch, 1.2 KB)
Stop forcing the CFLAGS and CXXFLAGS in configure, let autotools set
a sensible default and the user force them if he wants
Index: amaya-10.1~pre4+dfsg.0/configure.in
===================================================================
--- amaya-10.1~pre4+dfsg.0.orig/configure.in 2008-09-03 20:39:02.000000000 +0100
+++ amaya-10.1~pre4+dfsg.0/configure.in 2008-09-03 20:39:06.000000000 +0100
@@ -473,18 +473,8 @@
# Check if debug is enable
AC_ARG_WITH(debug, [ --with-debug compiles Amaya with debuging options (-g) ])
-if test "$with_debug" = "yes" ; then
- with_debug="yes"
- CFLAGS="-g"
- CXXFLAGS="-g"
-else
- with_debug="no"
- CFLAGS="-O2"
- CXXFLAGS="-O2"
-fi
if test "${CC}" = "gcc" ; then
- CFLAGS="${CFLAGS} -Wall"
case "${host}" in
*-*-irix5* | *-*irix6* )
CFLAGS="${CFLAGS} -fsigned-char"
@@ -496,13 +486,8 @@
CFLAGS="${CFLAGS} -DCONST= "
fi
-
-# force C mode (-x c)
-CFLAGS="${CFLAGS} -x c"
-
-# C++ options (-x c++)
-CXX_OPTIONS="-D__cplusplus"
-CXXFLAGS="${CXXFLAGS} -Wall -x c++ ${CXX_OPTIONS}"
+CFLAGS="${CFLAGS} -Wall"
+CXXFLAGS="${CXXFLAGS} -Wall"
# setup LDFLAGS
# on macosx, specific flags must be set to avoid conflicts with allready installed libwww
curl_pre.diff
(text/x-patch, 8.3 KB)
Index: amaya-10.1~pre5+dfsg.0/amaya/EDITORactions.c
===================================================================
--- amaya-10.1~pre5+dfsg.0.orig/amaya/EDITORactions.c 2008-10-13 16:37:52.000000000 +0100
+++ amaya-10.1~pre5+dfsg.0/amaya/EDITORactions.c 2008-10-19 20:52:34.000000000 +0100
@@ -39,7 +39,6 @@
#include "css_f.h"
#include "html2thot_f.h"
#include "init_f.h"
-#include "query_f.h"
#include "AHTURLTools_f.h"
#include "EDITORactions_f.h"
#include "EDITimage_f.h"
@@ -5429,16 +5428,6 @@
}
/*----------------------------------------------------------------------
- CleanCache
- A frontend to the CleanCache function, called thru an Amaya menu
- ----------------------------------------------------------------------*/
-void FlushCache (Document doc, View view)
-{
- StopAllRequests (doc);
- libwww_CleanCache ();
-}
-
-/*----------------------------------------------------------------------
ConfigAmaya
A frontend to all Amaya configurations
----------------------------------------------------------------------*/
Index: amaya-10.1~pre5+dfsg.0/amaya/html2thot.c
===================================================================
--- amaya-10.1~pre5+dfsg.0.orig/amaya/html2thot.c 2008-10-10 16:17:27.000000000 +0100
+++ amaya-10.1~pre5+dfsg.0/amaya/html2thot.c 2008-10-19 20:52:34.000000000 +0100
@@ -3646,7 +3646,7 @@
if (c != EOS)
{
- if (!HTMLcontext.parsingCSS && ((int) c == EOL || (int) c == CR))
+ if (!HTMLcontext.parsingCSS && ((int) c == EOL || (int) c == __CR__))
/* new line in a comment */
{
/* put the content of the inputBuffer into the current */
@@ -3744,7 +3744,7 @@
if (c != EOS)
{
- if (!HTMLcontext.parsingCSS && ((int) c == EOL || (int) c == CR))
+ if (!HTMLcontext.parsingCSS && ((int) c == EOL || (int) c == __CR__))
/* new line in a ASP */
{
/* put the content of the inputBuffer into the current */
@@ -3868,7 +3868,7 @@
/* as many DOCTYPE_line elements as needed */
while (inputBuffer[i] != EOS)
{
- if (inputBuffer[i] != EOL && inputBuffer[i] != CR)
+ if (inputBuffer[i] != EOL && inputBuffer[i] != __CR__)
buffer[j++] = inputBuffer[i];
else
{
@@ -3962,7 +3962,7 @@
if (c != EOS)
{
- if (!HTMLcontext.parsingCSS && ((int) c == EOL || (int) c == CR))
+ if (!HTMLcontext.parsingCSS && ((int) c == EOL || (int) c == __CR__))
/* new line in a comment */
{
/* put the content of the inputBuffer into the current */
@@ -4566,12 +4566,12 @@
}
if (*endOfFile == FALSE)
{
- if ((int) charRead == CR)
+ if ((int) charRead == __CR__)
/* CR has been read */
{
/* Read next character */
charRead = GetNextChar (infile, InputText, index, endOfFile);
- if ((int) charRead != EOL && (int) charRead != CR)
+ if ((int) charRead != EOL && (int) charRead != __CR__)
/* next character is not LF. Store next character and return LF */
{
PreviousBufChar = charRead;
@@ -4579,9 +4579,9 @@
}
}
/* update the counters of characters and lines read */
- if ((int) charRead == EOL || (int) charRead == CR)
+ if ((int) charRead == EOL || (int) charRead == __CR__)
{
- if ((int) charRead == CR)
+ if ((int) charRead == __CR__)
{
beg_pair = TRUE;
if (InputText == NULL)
@@ -4642,7 +4642,7 @@
/* Replace HT by space, except in preformatted text. */
/* Ignore spaces at the beginning and at the end of input lines */
/* Ignore non printable characters except HT, LF, FF. */
- if ((int) charRead == EOL || (int) charRead == CR)
+ if ((int) charRead == EOL || (int) charRead == __CR__)
/* LF = end of input line */
{
/* don't replace end of line by space in a doctype declaration */
Index: amaya-10.1~pre5+dfsg.0/amaya/SVGbuilder.c
===================================================================
--- amaya-10.1~pre5+dfsg.0.orig/amaya/SVGbuilder.c 2008-10-08 09:25:17.000000000 +0100
+++ amaya-10.1~pre5+dfsg.0/amaya/SVGbuilder.c 2008-10-19 20:52:34.000000000 +0100
@@ -972,7 +972,7 @@
static void NextWhiteSpace(char **ptr)
{
while (**ptr != EOS && **ptr != SPACE && **ptr != BSPACE &&
- **ptr != EOL && **ptr != TAB && **ptr != CR)
+ **ptr != EOL && **ptr != TAB && **ptr != __CR__)
(*ptr)++;
}
@@ -1182,7 +1182,7 @@
{
while (*pref != EOS && *pref != ',' &&
*pref != SPACE && *pref != BSPACE &&
- *pref != EOL && *pref != TAB && *pref != CR)
+ *pref != EOL && *pref != TAB && *pref != __CR__)
pref++;
if (*pref == ',')
pref++;
@@ -1193,7 +1193,7 @@
{
while (*ptr != EOS && *ptr != ',' && *ptr != SPACE &&
*ptr != BSPACE && *ptr != EOL && *ptr != TAB &&
- *ptr != CR)
+ *ptr != __CR__)
ptr++;
if (*ptr == ',')
ptr++;
@@ -1557,7 +1557,7 @@
/* skip the following spaces */
while (*ptr != EOS &&
(*ptr == ',' || *ptr == SPACE || *ptr == BSPACE ||
- *ptr == EOL || *ptr == TAB || *ptr == CR))
+ *ptr == EOL || *ptr == TAB || *ptr == __CR__))
ptr++;
return (ptr);
}
@@ -1933,7 +1933,7 @@
/* skip the following spaces */
while (*ptr != EOS &&
(*ptr == ',' || *ptr == SPACE || *ptr == BSPACE ||
- *ptr == EOL || *ptr == TAB || *ptr == CR))
+ *ptr == EOL || *ptr == TAB || *ptr == __CR__))
ptr++;
return (ptr);
}
Index: amaya-10.1~pre5+dfsg.0/amaya/Xml2thot.c
===================================================================
--- amaya-10.1~pre5+dfsg.0.orig/amaya/Xml2thot.c 2008-10-14 17:12:10.000000000 +0100
+++ amaya-10.1~pre5+dfsg.0/amaya/Xml2thot.c 2008-10-19 20:52:34.000000000 +0100
@@ -2481,7 +2481,7 @@
{
if (RemoveLeadingSpace)
{
- while (data[i] == EOL || data[i] == CR ||
+ while (data[i] == EOL || data[i] == __CR__ ||
data[i] == TAB || data[i] == SPACE)
i++;
if (data[i] != EOS)
@@ -2489,7 +2489,7 @@
}
else
{
- if (data[0] == EOL || data[0] == CR)
+ if (data[0] == EOL || data[0] == __CR__)
i = 1;
ImmediatelyAfterTag = FALSE;
}
@@ -2529,7 +2529,7 @@
{
while (bufferws[i] != EOS)
{
- if (bufferws[i] == EOL || bufferws[i] == CR ||
+ if (bufferws[i] == EOL || bufferws[i] == __CR__ ||
bufferws[i] == TAB)
bufferws[i]= SPACE;
i++;
Index: amaya-10.1~pre5+dfsg.0/amaya/css.c
===================================================================
--- amaya-10.1~pre5+dfsg.0.orig/amaya/css.c 2008-09-03 15:08:18.000000000 +0100
+++ amaya-10.1~pre5+dfsg.0/amaya/css.c 2008-10-19 20:52:34.000000000 +0100
@@ -27,7 +27,6 @@
#define THOT_EXPORT extern
#include "css_f.h"
#include "init_f.h"
-#include "query_f.h"
#include "AHTURLTools_f.h"
#include "UIcss_f.h"
#include "styleparser_f.h"
Index: amaya-10.1~pre5+dfsg.0/amaya/styleparser.c
===================================================================
--- amaya-10.1~pre5+dfsg.0.orig/amaya/styleparser.c 2008-10-14 14:59:54.000000000 +0100
+++ amaya-10.1~pre5+dfsg.0/amaya/styleparser.c 2008-10-19 20:52:34.000000000 +0100
@@ -7409,7 +7409,7 @@
/* verify and clean the selector string */
sel_end = decl_end - 1;
while (*sel_end == SPACE || *sel_end == BSPACE ||
- *sel_end == EOL || *sel_end == CR)
+ *sel_end == EOL || *sel_end == __CR__)
sel_end--;
sel_end++;
*sel_end = EOS;
@@ -8004,10 +8004,10 @@
{
LineNumber++;
lineComment = FALSE;
- c = CR;
+ c = __CR__;
}
- if (!lineComment && c != CR)
+ if (!lineComment && c != __CR__)
CSSindex++;
if (CSSindex >= MAX_CSS_LENGTH && CSScomment < MAX_CSS_LENGTH)
desktop_file_fix.patch
(text/x-patch, 1.5 KB)
Remove deprecated Encoding field from .desktop file Just call straight amaya instead of a long line setting multiple environment variable. The script called sets them anyway Index: amaya-10.1~pre1+dfsg1/batch/script_install_gnomekde.in =================================================================== --- amaya-10.1~pre1+dfsg1.orig/batch/script_install_gnomekde.in 2008-04-30 19:41:23.000000000 +0100 +++ amaya-10.1~pre1+dfsg1/batch/script_install_gnomekde.in 2008-04-30 19:42:11.000000000 +0100 @@ -60,12 +60,11 @@ # --- creating amaya.desktop $ECHO "--> Creating $GNOMEKDEDIR/applications/amaya.desktop file" $ECHO "[Desktop Entry]" > $GNOMEKDEDIR/applications/amaya.desktop -$ECHO "Encoding=UTF-8" >> $GNOMEKDEDIR/applications/amaya.desktop $ECHO "Name=Amaya" >> $GNOMEKDEDIR/applications/amaya.desktop $ECHO "Comment=Edit the Web" >> $GNOMEKDEDIR/applications/amaya.desktop $ECHO "Comment[fr]=Editez le Web" >> $GNOMEKDEDIR/applications/amaya.desktop $ECHO "Categories=Application;Network;Development;" >> $GNOMEKDEDIR/applications/amaya.desktop -$ECHO "Exec=env XLIB_SKIP_ARGB_VISUALS=1 G_SLICE="always-malloc" $PREFIX/$AMAYA_INSTALLDIR/$AMAYAGUI/bin/amaya_bin %u" >> $GNOMEKDEDIR/applications/amaya.desktop +$ECHO "Exec=amaya %u" >> $GNOMEKDEDIR/applications/amaya.desktop $ECHO "Icon=amaya.png" >> $GNOMEKDEDIR/applications/amaya.desktop $ECHO "Terminal=false" >> $GNOMEKDEDIR/applications/amaya.desktop $ECHO "Type=Application" >> $GNOMEKDEDIR/applications/amaya.desktop
enable_system_libwww.diff
(text/x-patch, 9.5 KB)
Index: Amaya/Makefile.in
===================================================================
--- Amaya.orig/Makefile.in 2008-07-08 12:13:24.000000000 +0100
+++ Amaya/Makefile.in 2008-09-21 21:52:05.000000000 +0100
@@ -14,7 +14,7 @@
#MKP: adding davlib
SUBDIRS = @SUBDIRS@ tools thotlib batch annotlib @DAVDIR@ amaya
-EXTRA_SUBDIRS= $(BUILDRAPTOR) $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR)
+EXTRA_SUBDIRS= $(BUILDRAPTOR) @BUILDLIBWWW@ $(WX_BUILDDIR) $(GL_BUILDDIR)
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -23,7 +23,7 @@
srcdir = $(THOTDIR)
-default : tools gl @BUILDWXWIDGETS@ @BUILDRAPTOR@ thotlib batch amaya_prog print_prog
+default : tools gl @BUILDWXWIDGETS@ @BUILDRAPTOR@ @BUILDLIBWWW@ thotlib batch amaya_prog print_prog
amaya : tools thotlib amaya_prog print_prog
@@ -128,127 +128,8 @@
#
# Rules to rebuild the libWWW package
#
-
-# MKP: adding libwwwdav
-AMAYA_LIBWWW_STANDARD_LIBS = \
- libwwwapp \
- libwwwhttp \
- libwwwhtml \
- libwwwmime \
- libwwwcache \
- libwwwstream \
- libwwwfile \
- libwwwdir \
- libwwwtrans \
- libwwwcore \
- libwwwutils \
- libwwwftp \
- @MAKE_LIBWWW_RDF_PARSER@ \
- libwwwzip \
- @LIBDAV@
-
-libwww_config :
- @(if [ ! -d $(THOTDIR)/../$(LIBWWW) ] ; then \
- $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; \
- fi)
- @(if [ ! -d $(LIBWWW) ] ; then \
- $(MKDIR) $(LIBWWW) ; \
- fi)
-#MKP: adding --with-dav
- @(localdir=`pwd` ; libwwwdir="$$localdir/../../$(LIBWWW)" ; \
- cd $(LIBWWW) ; unset LANG; \
- if [ ! -f Makefile -o ! -f wwwconf.h ] ; then \
- $$libwwwdir/configure \
- --build=@build_alias@ --host=@host_alias@ --target=@target_alias@ \
- --disable-shared \
- @WITHDAV@ \
- --with-zlib; \
- $(ECHO) "libwww is configured" ; \
- $(ECHO) "patching wwwconf.h because appkit.h do not compile on macos, and it seems that appkit.h is not used in amaya" ; \
- $(CP) wwwconf.h wwwconf.h.orig ; \
- $(SED) "s/\(\#define HAVE_APPKIT_APPKIT_H 1\)/\/* \1 *\//" \
- wwwconf.h.orig > wwwconf.h ; \
- $(ECHO) "wwwconf.h patched !" ; \
- fi)
-
-libwww_make_module_md5 \
-libmd5 : force
- @(localdir=`pwd`; \
- cd $(LIBWWW)/modules/md5 ; \
- $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
- CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
- libmd5.la)
-
-libwww_install_module_md5 : force
- @(if [ -e libmd5.a -a ! -L libmd5.a ] ; then \
- $(RM) libmd5.a ; \
- fi ; \
- if [ ! -L libmd5.a ] ; then \
- $(LN_S) $(LIBWWW)/modules/md5/.libs/libmd5.a ./libmd5.a ; \
- fi)
-
-libwww_make_module_expat \
-libexpat : force
- @(localdir=`pwd`; \
- cd $(LIBWWW)/modules/expat/ ; \
- $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \
- CPPFLAGS="$(CPPFLAGS)" \
- )
-
-libwww_install_module_expat : force
- @(if [ -e libexpat.a -a ! -L libexpat.a ] ; then \
- $(RM) libexpat.a ; \
- fi ; \
- if [ ! -L libexpat.a ] ; then \
- $(LN_S) $(LIBWWW)/modules/expat/.libs/libexpat.a ./libexpat.a ; \
- fi)
-
-#libwww_make_module_idn \
-#libidn : force
-# @(localdir=`pwd`; \
-# cd $(LIBWWW)/modules/idn/ ; \
-# $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DLIBWWW_USEIDN" \
-# CPPFLAGS="$(CPPFLAGS)" \
-# )
-
-#libwww_install_module_idn : force
-# @(if [ -e libidn.a -a ! -L libidn.a ] ; then \
-# $(RM) libidn.a ; \
-# fi ; \
-# if [ ! -L libidn.a ] ; then \
-# $(LN_S) $(LIBWWW)/modules/idn/.libs/libidn.a ./libidn.a ; \
-# fi)
-
-libwww_make_standard_libs \
-$(AMAYA_LIBWWW_STANDARD_LIBS) : force
- @(localdir=`pwd`; \
- all_libs="" ; \
- for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \
- all_libs="$$all_libs $$lib.la" ; \
- done ; \
- cd $(LIBWWW)/Library/src ; \
- $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
- CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
- $$all_libs)
-
-libwww_install_standard : force
- @(for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \
- if [ -e $$lib.a -a ! -L $$lib.a ] ; then \
- $(RM) $$lib.a ; \
- fi ; \
- if [ ! -L $$lib.a ] ; then \
- $(LN_S) $(LIBWWW)/Library/src/.libs/$$lib.a ./$$lib.a ; \
- fi ; \
- done)
-
-#libwww_make_module_libs : libwww_make_module_md5 libwww_make_module_expat libwww_make_module_idn
-libwww_make_module_libs : libwww_make_module_md5 libwww_make_module_expat
-libwww_make : libwww_make_module_libs libwww_make_standard_libs
-#libwww_install_modules : libwww_install_module_md5 libwww_install_module_expat libwww_install_module_idn
-libwww_install_modules : libwww_install_module_md5 libwww_install_module_expat
-libwww_install : libwww_install_modules libwww_install_standard
-
-libwww : libwww_config libwww_make
+libwww: force
+ $(MAKE) -C libwww
@($(ECHO) "libwww is installed")
#
Index: Amaya/amaya/Makefile.libwww
===================================================================
--- Amaya.orig/amaya/Makefile.libwww 2008-09-21 16:10:32.000000000 +0100
+++ Amaya/amaya/Makefile.libwww 2008-09-21 21:54:24.000000000 +0100
@@ -18,39 +18,14 @@
AMAYA_LIBWWW_OPTION_LIBS=
-#MKP: added -lwwwdav
-AMAYA_LIBWWW_LIBS= \
- -L../$(LIBWWW)/Library/src/.libs \
- $(LIBWWW_RDF_PARSER) \
- -lwwwzip \
- -lwwwapp \
- -lwwwhtml \
- -lwwwhttp \
- -lwwwmime \
- -lwwwftp \
- -lwwwfile \
- -lwwwdir \
- -lwwwcache \
- -lwwwstream \
- -lwwwtrans \
- -lwwwcore \
- -lwwwutils \
- $(WWWDAV) \
- -L../$(LIBWWW)/modules/md5/.libs \
- -lmd5 \
- ../$(LIBWWW)/modules/expat/.libs/libexpat.a
-# -L../$(LIBWWW)/modules/expat/.libs \
-# -lexpat \
+AMAYA_LIBWWW_LIBS= @LIBWWW_LDFLAGS@
AMAYA_LIBWWW_EXTRA_LIBS=
-AMAYA_LIBWWW_INCLUDES= -I../libwww \
- -I$(THOTDIR)/../libwww/Library/src \
- -I$(THOTDIR)../libwww/modules/md5 \
- -I$(THOTDIR)/../libwww/modules/expat/lib
+AMAYA_LIBWWW_INCLUDES= @LIBWWW_CFLAGS@
# this dependency calls the ../Makefile rule that compiles libwww
-AMAYA_LIBWWW_SRC= amaya_comp_libwww
+AMAYA_LIBWWW_SRC= @BUILDLIBWWW@
-amaya_comp_libwww : force
+libwww : force
@(cd .. ; $(MAKE) libwww)
Index: Amaya/configure.in
===================================================================
--- Amaya.orig/configure.in 2008-09-19 22:22:13.000000000 +0100
+++ Amaya/configure.in 2008-09-21 21:34:28.000000000 +0100
@@ -689,6 +689,27 @@
esac],
[with_svg="yes"])
+#################### LibWWW and WebDAV Support ################################
+
+AC_ARG_ENABLE([system-libwww],
+ AC_HELP_STRING([--enable-system-libwww],[try the libWWW system library]),
+ [case "${enableval}" in
+ yes) with_system_libwww="yes" ;;
+ no) with_system_libwww="no" ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-system-libwww]) ;;
+ esac],
+ [with_system_libwww="no"])
+
+if test "$with_system_libwww" = "yes" ; then
+ # check to see if we have a libWWW library
+ AC_PATH_PROG([LIBWWW_CONFIG],[libwww-config])
+
+ if test "$LIBWWW_CONFIG" = "" ; then
+ AC_MSG_WARN(Not using system-provided libWWW, falling back to the builtin version.)
+ with_system_libwww="no"
+ fi
+fi
+
dnl
dnl WebDAV support enabled by default
dnl
@@ -710,30 +731,66 @@
fi
if test "$with_dav" = "yes" ; then
+ WITHDAV="--with-dav"
+else
+ WITHDAV="--without-dav"
+fi
+
+if test "$enable_system_libwww" != "yes" ; then
+ # configure libwww
+ CURRENT_PATH="`pwd`"
+ mkdir libwww
+ cd libwww && \
+ $CURRENT_PATH/../../libwww/configure \
+ --build=$build_alias --host=$host_alias --target=$target_alias \
+ --disable-shared \
+ $WITHDAV \
+ --with-zlib && \
+ echo "libwww is configured" ; \
+ echo "patching wwwconf.h because appkit.h do not compile on macos, and it seems that appkit.h is not used in amaya" ; \
+ cp wwwconf.h wwwconf.h.orig ; \
+ sed -e "s/\(\#define HAVE_APPKIT_APPKIT_H 1\)/\/* \1 *\//" \
+ wwwconf.h.orig > wwwconf.h ; \
+ echo "wwwconf.h patched !" ; \
+ cd ..
+ chmod +x libwww/libwww-config
+ BUILDLIBWWW="libwww"
+ LIBWWW_CONFIG="libwww/libwww-config"
+ LIBWWW_LDFLAGS="-L$CURRENT_PATH/libwww/Library/src/.libs -L$CURRENT_PATH/libwww/modules/md5/.libs -L$CURRENT_PATH/libwww/modules/expat/.libs `$LIBWWW_CONFIG --libs`"
+ LIBWWW_CFLAGS="-I$CURRENT_PATH/../../libwww/Library/src -I$CURRENT_PATH/libwww"
+else
+ LIBWWW_CFLAGS="`$LIBWWW_CONFIG --cflags`"
+ LIBWWW_LDFLAGS="`$LIBWWW_CONFIG --libs`"
+
+ if test "$with_dav" = "yes" ; then
+ AC_CHECK_LIB([wwwdav],
+ [toto],
+ [LIBWWW_LDFLAGS="$LIBWWW_LDFLAGS -lwwwdav"],
+ [AC_MSG_WARN([libwwwdav is not available, disabling WebDAV]); with_dav="no"])
+ fi
+fi
+
+if test "$with_dav" = "yes" ; then
DAV_OPTIONS=-DDAV
DAVDIR="davlib"
- LIBDAV="libwwwdav"
- WITHDAV="--with-dav"
- WWWDAV="-lwwwdav"
+ LIBWWW_LDFLAGS="$LIBWWW_LDFLAGS -lwwwdav"
else
with_dav="no"
DAV_OPTIONS=""
DAVDIR=""
- LIBDAV=""
- WITHDAV=""
- WWWDAV=""
fi
-CURRENTPATH="`pwd`"
-LIBWWW_CFLAGS="-I$CURRENTPATH/../../libwww/Library/src -I$CURRENTPATH/../../libwww/modules/expat/lib -I$CURRENTPATH/../../libwww"
+AC_SUBST(BUILDLIBWWW)
AC_SUBST(LIBWWW_CFLAGS)
+AC_SUBST(LIBWWW_LDFLAGS)
AC_SUBST(DAVDIR)
AC_SUBST(LIBDAV)
-AC_SUBST(WITHDAV)
AC_SUBST(WWWDAV)
+############# end of LibWWW and WebDAV Support ################################
+
##########################Annotations Support####################
dnl
dnl annotations are enabled by default
@@ -880,12 +937,6 @@
if test "$build_amaya" = "yes" ; then
- if test ! -f $srcdir/../libwww/Makefile.in ; then
- AC_MSG_WARN(libwww sources not found !!)
- AC_MSG_WARN(Disabling Amaya build !)
- build_amaya="no"
- fi
-
if test ! -f $srcdir/amaya/MathML.S ; then
if test "$with_math" = "yes" ; then
AC_MSG_WARN(MathML sources not found !!)
libwww_cleanup.diff
(text/x-patch, 5.5 KB)
Index: Amaya/davlib/Makefile.in
===================================================================
--- Amaya.orig/davlib/Makefile.in 2008-09-19 22:10:52.000000000 +0100
+++ Amaya/davlib/Makefile.in 2008-09-19 22:22:13.000000000 +0100
@@ -13,38 +13,14 @@
INCLUDES =-DHAVE_CONFIG_H -I.. \
-I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \
- -I@top_srcdir@/amaya/f -I../libwww \
+ -I@top_srcdir@/amaya/f \
+ @LIBWWW_CFLAGS@ \
-I@top_srcdir@/thotlib/include \
- -I@top_srcdir@/../libwww/Library/src \
- -I@top_srcdir@/../libwww/modules/expat/lib \
-I$(DAVLIB)/tree/h -I$(DAVLIB)/h \
$(GUI_INCLUDES)
OPTIONS = @AMAYA_OPTIONS@ $(AMAYA_DAV_OPTIONS)
-LIBWWW_LIBS= \
- -L../$(LIBWWW)/Library/src/.libs \
- -lwwwapp \
- -lwwwhttp \
- -lwwwxml \
- -lwwwhtml \
- -lwwwmime \
- -lwwwcache \
- -lwwwstream \
- -lwwwfile \
- -lwwwdir \
- -lwwwtrans \
- -lwwwcore \
- -lwwwutils \
- -lwwwzip \
- -lwwwftp \
- -lwwwdav \
- -L../$(LIBWWW)/modules/md5/.libs \
- -lmd5 \
- -L../$(LIBWWW)/modules/expat/.libs \
- -lexpat \
- -ldl -L/usr/lib
-
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -52,7 +28,7 @@
############################################
-all : tree awparser.o AHTLockBase.o HTHome dav_obj davlib.a
+all : tree awparser.o AHTLockBase.o dav_obj davlib.a
dav_obj : $(AMAYA_DAV_OBJ)
@@ -108,8 +84,7 @@
awnode.o \
awstring.o \
awpair.o \
- list.o \
- ../$(LIBWWW)/Library/src/HTHome.o
+ list.o
#
# dependencies
Index: Amaya/annotlib/Makefile.in
===================================================================
--- Amaya.orig/annotlib/Makefile.in 2008-09-19 22:10:52.000000000 +0100
+++ Amaya/annotlib/Makefile.in 2008-09-19 22:22:13.000000000 +0100
@@ -14,9 +14,8 @@
INCLUDES= -DHAVE_CONFIG_H -DANNOTATIONS \
-I.. -I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \
- -I@top_srcdir@/amaya/f -I../libwww \
- -I@top_srcdir@/../libwww/Library/src \
- -I@top_srcdir@/../libwww/modules/expat/lib \
+ -I@top_srcdir@/amaya/f \
+ @LIBWWW_CFLAGS@ \
@AMAYA_RAPTOR_INCLUDES@ @THOTINCLUDES@ $(GUI_INCLUDES)
Index: Amaya/configure.in
===================================================================
--- Amaya.orig/configure.in 2008-09-19 22:12:07.000000000 +0100
+++ Amaya/configure.in 2008-09-19 22:22:13.000000000 +0100
@@ -689,6 +689,51 @@
esac],
[with_svg="yes"])
+dnl
+dnl WebDAV support enabled by default
+dnl
+AC_ARG_WITH(dav,
+ AC_HELP_STRING([--with-dav],[enable WebDAV support (default)]),
+ [case "${withval}" in
+ yes) with_dav="yes" ;;
+ no) with_dav="no" ;;
+ *) AC_MSG_ERROR(bad value ${withval} for --with-dav) ;;
+ esac],
+ [with_dav="yes"])
+
+# If DAV is enabled, check if the source code is present
+if test ! -f $srcdir/davlib/Makefile.in ; then
+ if test "$with_dav" = "yes" ; then
+ AC_MSG_WARN(WebDAV makefile not found, disabling WebDAV build)
+ with_dav="no"
+ fi
+fi
+
+if test "$with_dav" = "yes" ; then
+ DAV_OPTIONS=-DDAV
+ DAVDIR="davlib"
+ LIBDAV="libwwwdav"
+ WITHDAV="--with-dav"
+ WWWDAV="-lwwwdav"
+else
+ with_dav="no"
+ DAV_OPTIONS=""
+ DAVDIR=""
+ LIBDAV=""
+ WITHDAV=""
+ WWWDAV=""
+fi
+
+CURRENTPATH="`pwd`"
+LIBWWW_CFLAGS="-I$CURRENTPATH/../../libwww/Library/src -I$CURRENTPATH/../../libwww/modules/expat/lib -I$CURRENTPATH/../../libwww"
+
+AC_SUBST(LIBWWW_CFLAGS)
+
+AC_SUBST(DAVDIR)
+AC_SUBST(LIBDAV)
+AC_SUBST(WITHDAV)
+AC_SUBST(WWWDAV)
+
##########################Annotations Support####################
dnl
dnl annotations are enabled by default
@@ -833,28 +878,6 @@
GENERIC_XML_OPTIONS=""
fi
-dnl
-dnl WebDAV support enabled by default
-dnl
-AC_ARG_WITH(dav, [ --with-dav enable WebDAV support (default) ])
-if test "$with_dav" = "" ; then
- with_dav="yes"
-fi
-if test "$with_dav" = "yes" ; then
- DAV_OPTIONS=-DDAV
- DAVDIR="davlib"
- LIBDAV="libwwwdav"
- WITHDAV="--with-dav"
- WWWDAV="-lwwwdav"
-else
- with_dav="no"
- DAV_OPTIONS=""
- DAVDIR=""
- LIBDAV=""
- WITHDAV=""
- WWWDAV=""
-fi
-
if test "$build_amaya" = "yes" ; then
if test ! -f $srcdir/../libwww/Makefile.in ; then
@@ -881,19 +904,6 @@
fi
fi
- if test ! -f $srcdir/davlib/Makefile.in ; then
- if test "$with_dav" = "yes" ; then
- AC_MSG_WARN(WebDAV makefile not found !!)
- AC_MSG_WARN(Disabling WebDAV build !)
- with_dav="no"
- DAVDIR=""
- LIBDAV=""
- WITHDAV=""
- WWWDAV=""
- fi
- fi
-
-
fi
dnl
@@ -988,11 +998,6 @@
AC_SUBST(AMAYA_OPTIONS)
AC_SUBST(EXTRA_INCLUDES)
-AC_SUBST(DAVDIR)
-AC_SUBST(LIBDAV)
-AC_SUBST(WITHDAV)
-AC_SUBST(WWWDAV)
-
AC_SUBST(MAKE_LIBWWW_RDF_PARSER)
AC_SUBST(LIBWWW_RDF_PARSER)
#AC_SUBST(ANNOTLIB_COMPILE_BM)
Index: Amaya/amaya/Makefile.math
===================================================================
--- Amaya.orig/amaya/Makefile.math 2008-09-19 22:10:52.000000000 +0100
+++ Amaya/amaya/Makefile.math 2008-09-19 22:22:13.000000000 +0100
@@ -23,7 +23,7 @@
MATH_SCHEMAS= $(AMAYA)/MathML.S $(AMAYA)/MathMLP.P $(AMAYA)/MathMLT.T
-math_schema= compMATH compMATHP compMATHT
+math_schema= compMATH compMATHP compMATHT MathML.h
#
# Structure schema compilation.
Index: Amaya/amaya/Makefile.svg
===================================================================
--- Amaya.orig/amaya/Makefile.svg 2008-09-19 22:10:52.000000000 +0100
+++ Amaya/amaya/Makefile.svg 2008-09-19 22:22:13.000000000 +0100
@@ -31,7 +31,7 @@
$(AMAYA)/Timeline.S $(AMAYA)/TimelineP.P $(AMAYA)/TimelineT.T
svg_schema= compSVG compSVGP compSVGT \
- compTimeline compTimelineP compTimelineT
+ compTimeline compTimelineP compTimelineT SVG.h
#
warnings_fix.diff
(text/x-patch, 2.8 KB)
Index: amaya-10.1~pre4+dfsg.0/thotlib/internals/h/frame.h
===================================================================
--- amaya-10.1~pre4+dfsg.0.orig/thotlib/internals/h/frame.h 2008-09-03 20:53:52.000000000 +0100
+++ amaya-10.1~pre4+dfsg.0/thotlib/internals/h/frame.h 2008-09-03 20:54:00.000000000 +0100
@@ -56,7 +56,7 @@
} Frame_Ctl;
-typedef enum
+enum
{
ToolBarBrowsing,
ToolBarEditing,
Index: amaya-10.1~pre4+dfsg.0/thotlib/base/structlist.c
===================================================================
--- amaya-10.1~pre4+dfsg.0.orig/thotlib/base/structlist.c 2008-09-03 21:10:28.000000000 +0100
+++ amaya-10.1~pre4+dfsg.0/thotlib/base/structlist.c 2008-09-03 21:11:06.000000000 +0100
@@ -3752,6 +3752,7 @@
fprintf (fileDescriptor, " =");
}
else if (RP->PrPresMode == PresImmediate)
+ {
if (RP->PrAttrValue)
fprintf (fileDescriptor, "??");
else
@@ -3759,6 +3760,7 @@
fprintf (fileDescriptor, "None");
else if (pPSch->PsConstant[RP->PrIntValue-1].PdString)
fprintf (fileDescriptor, pPSch->PsConstant[RP->PrIntValue-1].PdString);
+ }
break;
case PtListStylePosition:
fprintf (fileDescriptor, "ListStylePosition: ");
Index: amaya-10.1~pre4+dfsg.0/thotlib/content/dictionary.c
===================================================================
--- amaya-10.1~pre4+dfsg.0.orig/thotlib/content/dictionary.c 2008-09-03 21:15:40.000000000 +0100
+++ amaya-10.1~pre4+dfsg.0/thotlib/content/dictionary.c 2008-09-03 21:16:45.000000000 +0100
@@ -132,7 +132,7 @@
d = 0;
while (d < MaxDictionaries && dictTable[d] != pdict)
d++;
- if (dictTable[d] == pdict)
+ if (d < MaxDictionaries)
{
TtaFreeMemory (pdict->DictDirectory);
/* Releases the string and the list of words */
@@ -590,7 +590,7 @@
d = 0;
while (d < MaxDictionaries && dictTable[d] != pdict)
d++;
- if (dictTable[d] == pdict)
+ if (d < MaxDictionaries)
{
/* Getting information about the dictionary */
strcpy (dictName, pdict->DictName);
Index: amaya-10.1~pre4+dfsg.0/thotlib/image/picture.c
===================================================================
--- amaya-10.1~pre4+dfsg.0.orig/thotlib/image/picture.c 2008-09-03 21:17:34.000000000 +0100
+++ amaya-10.1~pre4+dfsg.0/thotlib/image/picture.c 2008-09-03 21:18:00.000000000 +0100
@@ -413,11 +413,13 @@
{
ptr1 += ix;
if (y < GL_h)
+ {
/* copy R,G,B,A */
if (w < iw)
memcpy (ptr2, ptr1, w);
else
memcpy (ptr2, ptr1, iw);
+ }
/* jump over the black transparent zone*/
ptr1 += w;
ptr2 += iw;