virtuoso-opensource DFSG changes

Thu Feb 11 19:17:15 UTC 2010

Will Daniels wrote:

> Seems many of the current patches can be dropped for 6.1.0 but looks
> like the OAT patch in crypto.js will need updating and I haven't exactly
> figured out what it's all about yet. I can't find any bug record on
> sf.net to help there, is there some discussion I can reference?

OK, as best as I can tell, the following issues are now resolved in the
upstream sources:

  - DFSG: OAT Scripts
    * msapi.js: Dead in upstream CVS [1]
    * ymapapi.js: Dead in upstream CVS [2]
    * customYahooLoader.js: Dead in upstream CVS [3]
    * bootstrap.js: Use of customYahooLoader.js removed upstream [4]

  - DFSG: CalendarPopup.js
    * in appsrc/ODS-Addressbook/www/template/template.vspx [5]
    * in appsrc/ODS-Bookmark/www/template/template.vspx [6]
    * in appsrc/ODS-Briefcase/www/template/template.vspx [7]
    * in appsrc/ODS-Calendar/www/template/template.vspx [8]
    * in appsrc/ODS-FeedManager/www/template/template.vspx [9]
    * in appsrc/ODS-Framework/comp/page.xsl [10]
    * in appsrc/ODS-Polls/www/template/template.vspx [11]
    * in appsrc/ODS-WebMail/xslt/common.xsl [12]

  - DFSG Rich Text Editor
    * in appsrc/ODS-Framework/Makefile.am [13]
    * in appsrc/ODS-WebMail/Makefile.am [14]
    * in appsrc/ODS-Framework/make_vad.sh [15]

  - DFSG: schemaview
    * binsrc/samples/schemaview/Makefile.am: Dead in upstream CVS [16]

  - DFSG: sha.h Dependency
    * in libsrc/Wi/Makefile.am [17]

  - DFSG: TPC-W Code
    * in binsrc/samples/Makefile.am [18]
    * in configure.in [19]

  - DFSG: yacutia/ie7
    * in binsrc/yacutia/Makefile.am [20]

  - Repack: zlib Library
    * libsrc/Wi/bif_file.c: Fixed upstream for external zlib [21]

Also the following build issue seems resolved upstream:

  - gmake to make
    * in libsrc/Wi/Makefile.am [22]

The list is not exhaustive with respect to upstream - I only checked the
things we were patching for 6.0.1rc1. So I think we can drop the
following quilt patches completely:

  - repack-calendarpopup.patch
  - repack-rte.patch
  - repack-schemaview.patch
  - repack-sha.patch
  - repack-tpcw.patch
  - repack-yacutia-ie7.patch

What issues remain are:

  - Build: generated code multiple outputs
    * libsrc/plugin/Makefile.am: No change; patched

  - Build: gmake to make
    * binsrc/sqldoc/vspx_doc.sh: No change; patched

  - DFSG: ODS Wiki
    * No change; repack to remove

  - DFSG: Tutorial
    * No change; repack to remove binaries

  - DFSG: OAT Scripts
    * OpenLayers.js: No change; remove on repack
    * webclip.js: No change; remove on repack
    * crypto.js: No change; repack to remove md5 and sha functions
    * bootstrap.js: Improved; patch to fix crypto usage

  - Repack: zlib Library
    * Blanked out libsrc/zlib/Makefile.am for autotools

  - Repack: PCRE Library
    * AC_CHECK_LIB(pcre, pcre_compile) in /configure.in
    * Patched for external lib in libsrc/Wi/bif_regexp.c
    * Patched for external lib in libsrc/Wi/xqf.c
    * Patched for external lib in libsrc/util/Makefile.am

So that the quilt patch series is now:

  - build-generated-code-multiple-outputs.patch (same)
  - build-gmake-to-make.patch (reduced)
  - repack-tutorial.patch (same)
  - repack-ods-wiki.patch (same)
  - repack-oat.patch (reduced)
  - repack-pcre.patch (refreshed)
  - repack-zlib.patch (reduced)

Hope this is of some use. As usual I got in a mess with git and
associated tools. My master/upstream/pristine-tar branches on assembla
ended up in a bad state so I rewound them today and tried to redo the
workflow with pristine-tar and git-import-orig that I finally figured
out after spotting the gbp.conf file and a bit of googling...doh! What
can I say...I'm learning!? :D

This scale of packaging may be unreasonably beyond my experience to
be involved, but since I started it I would like to continue to follow
things and try to help where I can, if nobody minds. I think I'm
learning a lot here.

I think everything ended up mostly consistent, but my master branch was
still a mess so I cloned a fresh "alioth" branch from alioth/master and
rebased my changes into 3 commits there, which would be the best branch
for you to pull from if interested. I will just restart my master branch
from whatever you push in the end for 6.1.0 :D

What are the next priorities do you think? To re-organise the package
properly? The dependencies are in a mess (my fault) and kubuntu has done
something now with converting this package to build a "nepomuk-virtuoso"
package in lucid and the two don't sit well together just yet...not sure
what the plan is there, though I guess this is the wrong forum for
worrying about ubuntu :P

Cheers,
Will

[1] CVS/MAIN revision 1.7: Removed custom map loaders
[2] CVS/MAIN revision 1.5: Removed custom map loaders
[3] CVS/MAIN revision 1.8: Removed custom map loaders
[4] CVS/MAIN revision 1.26: Removed custom map loaders

[5] CVS/MAIN revision 1.29: Added new popup calendar based on OAT
[6] CVS/MAIN revision 1.36: Added new popup calendar based on OAT
[7] CVS/MAIN revision 1.26: Added new popup calendar based on OAT
[8] CVS/MAIN revision 1.34: Fixed JS popup calendar
[9] CVS/MAIN revision 1.35: Added new popup calendar based on OAT
[10] CVS/MAIN revision 1.40: Added new popup calendar based on OAT
[11] CVS/MAIN revision 1.19: Added new popup calendar based on OAT
[12] CVS/MAIN revision 1.28: Added new popup calendar based on OAT

[13] CVS/MAIN revision 1.18: Added ckeditor to replace rte
[14] CVS/MAIN revision 1.17: Removed deprecated version of rte
[15] CVS/MAIN revision 1.63: Added ckeditor to replace rte

[16] CVS/MAIN revision 1.2: Removed reprecated samples/demos

[17] CVS/MAIN revision 1.62: Fixed dependency

[18] CVS/MAIN revision 1.5: Removed reprecated samples/demos
[19] CVS/MAIN revision 1.296: Removed deprecated samples

[20] CVS/MAIN revision 1.7: Removed support for IE 5 and 6 compatibility

[21] CVS/MAIN revision 1.60: Fixed building with external zlib

[22] CVS/MAIN revision 1.63: Fixed building on debian